cargo fmt

ripytide · Dec 23, 2024 · 1559e37 · 1559e37
1 parent 0ba5985
commit 1559e37
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 73 deletions.
diff --git a/src/backends/apt.rs b/src/backends/apt.rs
@@ -83,10 +83,7 @@ impl Backend for Apt {
         run_command_for_stdout(["apt", "--version"], Perms::Same, false)
     }
 
-    fn missing(
-        required: Self::Options,
-        installed: Option<Self::Options>,
-    ) -> Option<Self::Options> {
+    fn missing(required: Self::Options, installed: Option<Self::Options>) -> Option<Self::Options> {
         match installed {
             Some(_) => None,
             None => Some(required),

diff --git a/src/backends/arch.rs b/src/backends/arch.rs
@@ -171,11 +171,7 @@ impl Backend for Arch {
         Ok(())
     }
 
-    fn remove(
-        packages: &BTreeSet<String>,
-        no_confirm: bool,
-        config: &Config,
-    ) -> Result<()> {
+    fn remove(packages: &BTreeSet<String>, no_confirm: bool, config: &Config) -> Result<()> {
         if !packages.is_empty() {
             run_command(
                 [

diff --git a/src/backends/brew.rs b/src/backends/brew.rs
@@ -39,11 +39,7 @@ impl Backend for Brew {
             .collect())
     }
 
-    fn install(
-        packages: &BTreeMap<String, Self::Options>,
-        _: bool,
-        _: &Config,
-    ) -> Result<()> {
+    fn install(packages: &BTreeMap<String, Self::Options>, _: bool, _: &Config) -> Result<()> {
         if !packages.is_empty() {
             run_command(
                 ["brew", "install"]
@@ -79,10 +75,7 @@ impl Backend for Brew {
         run_command_for_stdout(["brew", "--version"], Perms::Same, false)
     }
 
-    fn missing(
-        required: Self::Options,
-        installed: Option<Self::Options>,
-    ) -> Option<Self::Options> {
+    fn missing(required: Self::Options, installed: Option<Self::Options>) -> Option<Self::Options> {
         match installed {
             Some(_) => None,
             None => Some(required),

diff --git a/src/backends/cargo.rs b/src/backends/cargo.rs
@@ -59,11 +59,7 @@ impl Backend for Cargo {
         extract_packages(&contents).wrap_err("extracting packages from crates file")
     }
 
-    fn install(
-        packages: &BTreeMap<String, Self::Options>,
-        _: bool,
-        _: &Config,
-    ) -> Result<()> {
+    fn install(packages: &BTreeMap<String, Self::Options>, _: bool, _: &Config) -> Result<()> {
         for (package, options) in packages {
             run_command(
                 ["cargo", "install"]

diff --git a/src/backends/mod.rs b/src/backends/mod.rs
@@ -56,11 +56,7 @@ pub trait Backend {
         config: &Config,
     ) -> Result<()>;
 
-    fn remove(
-        packages: &BTreeSet<String>,
-        no_confirm: bool,
-        config: &Config,
-    ) -> Result<()>;
+    fn remove(packages: &BTreeSet<String>, no_confirm: bool, config: &Config) -> Result<()>;
 
     fn clean_cache(config: &Config) -> Result<()>;
 

diff --git a/src/backends/pipx.rs b/src/backends/pipx.rs
@@ -38,17 +38,10 @@ impl Backend for Pipx {
             true,
         )?)?;
 
-        Ok(names
-            .into_iter()
-            .map(|x| (x, Self::Options {}))
-            .collect())
+        Ok(names.into_iter().map(|x| (x, Self::Options {})).collect())
     }
 
-    fn install(
-        packages: &BTreeMap<String, Self::Options>,
-        _: bool,
-        _: &Config,
-    ) -> Result<()> {
+    fn install(packages: &BTreeMap<String, Self::Options>, _: bool, _: &Config) -> Result<()> {
         if !packages.is_empty() {
             run_command(
                 ["pipx", "install"]
@@ -82,10 +75,7 @@ impl Backend for Pipx {
         run_command_for_stdout(["pipx", "--version"], Perms::Same, false)
     }
 
-    fn missing(
-        required: Self::Options,
-        installed: Option<Self::Options>,
-    ) -> Option<Self::Options> {
+    fn missing(required: Self::Options, installed: Option<Self::Options>) -> Option<Self::Options> {
         match installed {
             Some(_) => None,
             None => Some(required),

diff --git a/src/backends/rustup.rs b/src/backends/rustup.rs
@@ -72,11 +72,7 @@ impl Backend for Rustup {
         Ok(packages)
     }
 
-    fn install(
-        packages: &BTreeMap<String, Self::Options>,
-        _: bool,
-        _: &Config,
-    ) -> Result<()> {
+    fn install(packages: &BTreeMap<String, Self::Options>, _: bool, _: &Config) -> Result<()> {
         for (toolchain, rustup_options) in packages.iter() {
             run_command(
                 ["rustup", "toolchain", "install", toolchain.as_str()],

diff --git a/src/backends/snap.rs b/src/backends/snap.rs
@@ -38,11 +38,7 @@ impl Backend for Snap {
             .collect())
     }
 
-    fn install(
-        packages: &BTreeMap<String, Self::Options>,
-        _: bool,
-        _: &Config,
-    ) -> Result<()> {
+    fn install(packages: &BTreeMap<String, Self::Options>, _: bool, _: &Config) -> Result<()> {
         if !packages.is_empty() {
             run_command(
                 ["snap", "install"]

diff --git a/src/backends/winget.rs b/src/backends/winget.rs
@@ -61,11 +61,7 @@ impl Backend for WinGet {
             .collect())
     }
 
-    fn install(
-        packages: &BTreeMap<String, Self::Options>,
-        _: bool,
-        _: &Config,
-    ) -> Result<()> {
+    fn install(packages: &BTreeMap<String, Self::Options>, _: bool, _: &Config) -> Result<()> {
         if !packages.is_empty() {
             run_command(
                 ["winget", "install"]
@@ -101,10 +97,7 @@ impl Backend for WinGet {
         run_command_for_stdout(["winget", "--version"], Perms::Same, false)
     }
 
-    fn missing(
-        required: Self::Options,
-        installed: Option<Self::Options>,
-    ) -> Option<Self::Options> {
+    fn missing(required: Self::Options, installed: Option<Self::Options>) -> Option<Self::Options> {
         match installed {
             Some(_) => None,
             None => Some(required),

diff --git a/src/backends/xbps.rs b/src/backends/xbps.rs
@@ -24,9 +24,7 @@ impl Backend for Xbps {
         Ok(packages)
     }
 
-    fn query(
-        config: &Config,
-    ) -> Result<std::collections::BTreeMap<String, Self::Options>> {
+    fn query(config: &Config) -> Result<std::collections::BTreeMap<String, Self::Options>> {
         if Self::version(config).is_err() {
             return Ok(BTreeMap::new());
         }
@@ -95,10 +93,7 @@ impl Backend for Xbps {
         run_command_for_stdout(["xbps-query", "--version"], Perms::Same, false)
     }
 
-    fn missing(
-        required: Self::Options,
-        installed: Option<Self::Options>,
-    ) -> Option<Self::Options> {
+    fn missing(required: Self::Options, installed: Option<Self::Options>) -> Option<Self::Options> {
         match installed {
             Some(_) => None,
             None => Some(required),

diff --git a/src/core.rs b/src/core.rs
@@ -218,8 +218,7 @@ impl CleanCacheCommand {
 }
 
 fn unmanaged(required: &Options, config: &Config) -> Result<PackageIds> {
-    Options::query(config)
-        .map(|x| x.to_package_ids().difference(&required.to_package_ids()))
+    Options::query(config).map(|x| x.to_package_ids().difference(&required.to_package_ids()))
 }
 fn missing(required: &Options, config: &Config) -> Result<Options> {
     let installed = Options::query(config)?;

diff --git a/src/groups.rs b/src/groups.rs
@@ -19,10 +19,7 @@ impl Groups {
     pub fn contains(&self, backend: AnyBackend, package: &str) -> Vec<PathBuf> {
         let mut result = Vec::new();
         for (group_file, raw_options) in self.0.iter() {
-            if raw_options
-                .to_raw_package_ids()
-                .contains(backend, package)
-            {
+            if raw_options.to_raw_package_ids().contains(backend, package) {
                 result.push(group_file.clone());
             }
         }