timeshifter/pacdef_rust
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refact(rustup): Use bail instead of panic

Browse Source 
Use anyhow::bail to return an Err type instead of panicking and exiting
the program.

Signed-off-by: innocentzero <isfarulhaque@proton.me>
This commit is contained in:
innocentzero
2024-04-02 04:51:15 +05:30
parent 6f92e66777
commit fd47659959
1 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/pacdef_core/src/backend/actual/rustup.rs
+40 -28
View File
@@ -57,16 +57,17 @@ impl Backend for Rustup {
.context("Getting all installed packages") .context("Getting all installed packages")
} }
fn make_dependency(&self, _: &[Package]) -> Result<std::process::ExitStatus> { fn make_dependency(&self, _: &[Package]) -> Result<ExitStatus> {
panic!("Not supported by {}", self.get_binary()) anyhow::bail!("Not supported by {}", self.get_binary())
} }
fn install_packages(&self, packages: &[Package], _: bool) -> Result<std::process::ExitStatus> { fn install_packages(&self, packages: &[Package], _: bool) -> Result<ExitStatus> {
for p in packages { for p in packages {
let repo = p let repo = if p.repo.is_some() {
.repo p.repo.as_ref().expect("This should never be reached")
.as_ref() } else {
.expect("Not specified whether it is a toolchain or a component!"); anyhow::bail!("Not specified whether it is a toolchain or a component")
};
let mut cmd = Command::new(self.get_binary()); let mut cmd = Command::new(self.get_binary());
match repo.as_str() { match repo.as_str() {
@@ -81,8 +82,9 @@ impl Backend for Rustup {
let component = iter.next().expect("Component not specified!"); let component = iter.next().expect("Component not specified!");
cmd.arg(toolchain).arg(component); cmd.arg(toolchain).arg(component);
} }
_ => panic!("No such type is managed by rustup!"), _ => anyhow::bail!("No such type is managed by rustup!"),
} }
let result = cmd.status().context("Installing toolchain {p}"); let result = cmd.status().context("Installing toolchain {p}");
if !result.as_ref().is_ok_and(|exit| exit.success()) { if !result.as_ref().is_ok_and(|exit| exit.success()) {
return result; return result;
@@ -91,44 +93,54 @@ impl Backend for Rustup {
Ok(ExitStatus::from_raw(0)) Ok(ExitStatus::from_raw(0))
} }
fn remove_packages( fn remove_packages(&self, packages: &[Package], _: bool) -> Result<ExitStatus> {
&self,
packages: &[Package],
_: bool,
) -> anyhow::Result<std::process::ExitStatus> {
let mut toolchains_rem = Vec::new(); let mut toolchains_rem = Vec::new();
for p in packages { for p in packages {
let repo = p let repo = if p.repo.is_some() {
.repo p.repo.as_ref().expect("This will never be printed!")
.as_ref() } else {
.expect("Not specified whether it is a toolchain or a component"); anyhow::bail!("Not specified whether it is a toolchain or a component")
};
if repo == "toolchain" { if repo == "toolchain" {
let mut cmd = Command::new(self.get_binary()); let mut cmd = Command::new(self.get_binary());
cmd.args(get_remove_switches(Repotype::Toolchain)) cmd.args(get_remove_switches(Repotype::Toolchain))
.arg(&p.name); .arg(&p.name);
toolchains_rem.push(p.name.as_str()); toolchains_rem.push(p.name.as_str());
let result = cmd.status().context("Removing toolchain {p}"); let result = cmd.status().context("Removing toolchain {p}");
if !result.as_ref().is_ok_and(|exit| exit.success()) { if !result.as_ref().is_ok_and(|exit| exit.success()) {
return result; return result;
} }
} }
} }
for p in packages { for p in packages {
let repo = p let repo = if p.repo.is_some() {
.repo p.repo.as_ref().expect("This will never be printed!")
.as_ref() } else {
.expect("Not specified whether it is a toolchain or a component"); anyhow::bail!("Not specified whether it is a toolchain or a component")
let mut iter = p.name.split('/'); };
let toolchain = iter
.next() let mut iter = p.name.split('/').peekable();
.expect("No toolchain name provided for component"); let toolchain = if iter.peek().is_some() {
iter.next().expect("This should never be printed")
} else {
anyhow::bail!("No toolchain name provided for the given component!")
};
if repo == "component" && !toolchains_rem.contains(&toolchain) { if repo == "component" && !toolchains_rem.contains(&toolchain) {
let mut cmd = Command::new(self.get_binary()); let mut cmd = Command::new(self.get_binary());
cmd.args(get_remove_switches(repo)).arg(toolchain).arg(
iter.next() cmd.args(get_remove_switches(Repotype::Component))
.unwrap_or_else(|| panic!("Component name not provided for {}", p.name)), .arg(toolchain)
.arg(
iter.next().unwrap_or_else(|| {
panic!("Component name not provided for {}", p.name)
}),
); );
let result = cmd.status().context("Removing toolchain {p}"); let result = cmd.status().context("Removing toolchain {p}");
if !result.as_ref().is_ok_and(|exit| exit.success()) { if !result.as_ref().is_ok_and(|exit| exit.success()) {
return result; return result;