Skip to content

Commit 701587a

Browse files
committed
chore: convert impossible cases to expect
1 parent 74607eb commit 701587a

File tree

1 file changed

+26
-36
lines changed

1 file changed

+26
-36
lines changed

cargo-dist/src/tasks.rs

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1981,18 +1981,17 @@ impl<'pkg_graph> DistGraphBuilder<'pkg_graph> {
19811981
}
19821982
let release = self.release(to_release);
19831983
let release_id = &release.id;
1984-
let Some(schema_release) = self.manifest.release_by_name(&release.app_name) else {
1985-
warn!("skipping shell installer: couldn't find the release");
1986-
return;
1987-
};
1988-
let Some(install_dir_env_var) = schema_release.install_dir_env_var.to_owned() else {
1989-
warn!("skipping shell installer: couldn't determine app-specific environment variable");
1990-
return;
1991-
};
1992-
let Some(download_url) = schema_release.artifact_download_url() else {
1993-
warn!("skipping shell installer: couldn't compute a URL to download artifacts from");
1994-
return;
1995-
};
1984+
let schema_release = self
1985+
.manifest
1986+
.release_by_name(&release.app_name)
1987+
.expect("couldn't find the release!?");
1988+
let install_dir_env_var = schema_release
1989+
.install_dir_env_var
1990+
.to_owned()
1991+
.expect("couldn't determine app-specific environment variable!?");
1992+
let download_url = schema_release
1993+
.artifact_download_url()
1994+
.expect("couldn't compute a URL to download artifacts from!?");
19961995
let artifact_name = format!("{release_id}-installer.sh");
19971996
let artifact_path = self.inner.dist_dir.join(&artifact_name);
19981997
let installer_url = format!("{download_url}/{artifact_name}");
@@ -2064,14 +2063,11 @@ impl<'pkg_graph> DistGraphBuilder<'pkg_graph> {
20642063
} else {
20652064
&release.id
20662065
};
2067-
let Some(download_url) = self
2066+
let download_url = self
20682067
.manifest
20692068
.release_by_name(&release.id)
20702069
.and_then(|r| r.artifact_download_url())
2071-
else {
2072-
warn!("skipping Homebrew formula: couldn't compute a URL to download artifacts from");
2073-
return;
2074-
};
2070+
.expect("couldn't compute a URL to download artifacts from!?");
20752071

20762072
let artifact_name = format!("{formula}.rb");
20772073
let artifact_path = self.inner.dist_dir.join(&artifact_name);
@@ -2222,20 +2218,17 @@ impl<'pkg_graph> DistGraphBuilder<'pkg_graph> {
22222218
// Get the basic info about the installer
22232219
let release = self.release(to_release);
22242220
let release_id = &release.id;
2225-
let Some(schema_release) = self.manifest.release_by_name(&release.app_name) else {
2226-
warn!("skipping powershell installer: couldn't find the release");
2227-
return;
2228-
};
2229-
let Some(install_dir_env_var) = schema_release.install_dir_env_var.to_owned() else {
2230-
warn!("skipping shell installer: couldn't determine app-specific environment variable");
2231-
return;
2232-
};
2233-
let Some(download_url) = schema_release.artifact_download_url() else {
2234-
warn!(
2235-
"skipping powershell installer: couldn't compute a URL to download artifacts from"
2236-
);
2237-
return;
2238-
};
2221+
let schema_release = self
2222+
.manifest
2223+
.release_by_name(&release.app_name)
2224+
.expect("couldn't find the release!?");
2225+
let install_dir_env_var = schema_release
2226+
.install_dir_env_var
2227+
.to_owned()
2228+
.expect("couldn't determine app-specific environment variable!?");
2229+
let download_url = schema_release
2230+
.artifact_download_url()
2231+
.expect("couldn't compute a URL to download artifacts from!?");
22392232
let artifact_name = format!("{release_id}-installer.ps1");
22402233
let artifact_path = self.inner.dist_dir.join(&artifact_name);
22412234
let installer_url = format!("{download_url}/{artifact_name}");
@@ -2299,14 +2292,11 @@ impl<'pkg_graph> DistGraphBuilder<'pkg_graph> {
22992292
}
23002293
let release = self.release(to_release);
23012294
let release_id = &release.id;
2302-
let Some(download_url) = self
2295+
let download_url = self
23032296
.manifest
23042297
.release_by_name(&release.app_name)
23052298
.and_then(|r| r.artifact_download_url())
2306-
else {
2307-
warn!("skipping npm installer: couldn't compute a URL to download artifacts from");
2308-
return;
2309-
};
2299+
.expect("couldn't compute a URL to download artifacts from!?");
23102300

23112301
let app_name = if let Some(name) = &release.npm_package {
23122302
name.clone()

0 commit comments

Comments
 (0)