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

refact(rustup): Use anyhow::Error

Browse Source 
Remove repeated instances of anyhow::Error and make the code sparser.

Signed-off-by: innocentzero <isfarulhaque@proton.me>
This commit is contained in:
innocentzero
2024-04-02 04:51:15 +05:30
parent 4e2ef50df7
commit c7596f62b7
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/pacdef_core/src/backend/actual/rustup.rs
+8 -14
View File
@@ -1,11 +1,11 @@
use crate::backend::backend_trait::{Backend, Switches, Text}; use crate::backend::backend_trait::{Backend, Switches, Text};
use crate::backend::macros::impl_backend_constants; use crate::backend::macros::impl_backend_constants;
use crate::{Group, Package}; use crate::{Group, Package};
use anyhow::Context; use anyhow::{Context, Result};
use core::panic; use core::panic;
use std::collections::HashSet; use std::collections::HashSet;
use std::os::unix::process::ExitStatusExt; use std::os::unix::process::ExitStatusExt;
use std::process::Command; use std::process::{Command, ExitStatus};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct Rustup { pub struct Rustup {
@@ -26,7 +26,7 @@ const SUPPORTS_AS_DEPENDENCY: bool = false;
impl Backend for Rustup { impl Backend for Rustup {
impl_backend_constants!(); impl_backend_constants!();
fn get_all_installed_packages(&self) -> anyhow::Result<HashSet<Package>> { fn get_all_installed_packages(&self) -> Result<HashSet<Package>> {
let mut toolchains_vec = self let mut toolchains_vec = self
.run_toolchain_command(self.get_info_switches("toolchain")) .run_toolchain_command(self.get_info_switches("toolchain"))
.context("Getting installed toolchains")?; .context("Getting installed toolchains")?;
@@ -46,22 +46,16 @@ impl Backend for Rustup {
Ok(toolchains) Ok(toolchains)
} }
fn get_explicitly_installed_packages(&self) -> anyhow::Result<HashSet<Package>> { fn get_explicitly_installed_packages(&self) -> Result<HashSet<Package>> {
self.get_all_installed_packages() self.get_all_installed_packages()
.context("Getting all installed packages") .context("Getting all installed packages")
} }
fn make_dependency(&self, _: &[Package]) -> anyhow::Result<std::process::ExitStatus> { fn make_dependency(&self, _: &[Package]) -> Result<std::process::ExitStatus> {
panic!("Not supported by {}", self.get_binary()) panic!("Not supported by {}", self.get_binary())
} }
fn install_packages( fn install_packages(&self, packages: &[Package], _: bool) -> Result<std::process::ExitStatus> {
&self,
packages: &[Package],
_: bool,
) -> anyhow::Result<std::process::ExitStatus> {
let mut result: anyhow::Result<std::process::ExitStatus> =
Ok(std::process::ExitStatus::from_raw(0));
for p in packages { for p in packages {
let repo = p let repo = p
.repo .repo
@@ -168,7 +162,7 @@ impl Rustup {
&self, &self,
args: &[&str], args: &[&str],
toolchains: &mut Vec<String>, toolchains: &mut Vec<String>,
) -> Result<Vec<String>, anyhow::Error> { ) -> Result<Vec<String>> {
let mut val = Vec::new(); let mut val = Vec::new();
for toolchain in toolchains { for toolchain in toolchains {
let mut cmd = Command::new(self.get_binary()); let mut cmd = Command::new(self.get_binary());
@@ -194,7 +188,7 @@ impl Rustup {
} }
Ok(val) Ok(val)
} }
fn run_toolchain_command(&self, args: &[&str]) -> Result<Vec<String>, anyhow::Error> { fn run_toolchain_command(&self, args: &[&str]) -> Result<Vec<String>> {
let mut cmd = Command::new(self.get_binary()); let mut cmd = Command::new(self.get_binary());
cmd.args(args); cmd.args(args);
let output = String::from_utf8(cmd.output()?.stdout)?; let output = String::from_utf8(cmd.output()?.stdout)?;