From 39496e836eee161eacf2e4c8a7a5b020137c0d6c Mon Sep 17 00:00:00 2001 From: teackot Date: Tue, 16 May 2023 19:42:53 +0300 Subject: [PATCH] Fix formatting --- crates/pacdef_core/src/backend/actual/flatpak.rs | 11 +++++------ crates/pacdef_core/src/backend/actual/mod.rs | 2 +- crates/pacdef_core/src/backend/backend_trait.rs | 2 +- crates/pacdef_core/src/core.rs | 5 ++++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/crates/pacdef_core/src/backend/actual/flatpak.rs b/crates/pacdef_core/src/backend/actual/flatpak.rs index 43a275c..8d23d64 100644 --- a/crates/pacdef_core/src/backend/actual/flatpak.rs +++ b/crates/pacdef_core/src/backend/actual/flatpak.rs @@ -58,7 +58,7 @@ impl Flatpak { fn get_installed_packages(&self, include_implicit: bool) -> Result> { let mut cmd = Command::new(BINARY); - cmd.args(&["list", "--columns=application"]); + cmd.args(["list", "--columns=application"]); if !include_implicit { cmd.arg("--app"); } @@ -67,10 +67,9 @@ impl Flatpak { } let output = String::from_utf8(cmd.output()?.stdout)?; - Ok( - output.lines() - .map(|pkg| Package::from(pkg)) - .collect::>() - ) + Ok(output + .lines() + .map(Package::from) + .collect::>()) } } diff --git a/crates/pacdef_core/src/backend/actual/mod.rs b/crates/pacdef_core/src/backend/actual/mod.rs index 8c61e68..a30c8c1 100644 --- a/crates/pacdef_core/src/backend/actual/mod.rs +++ b/crates/pacdef_core/src/backend/actual/mod.rs @@ -2,6 +2,6 @@ pub mod arch; #[cfg(feature = "debian")] pub mod debian; +pub mod flatpak; pub mod python; pub mod rust; -pub mod flatpak; diff --git a/crates/pacdef_core/src/backend/backend_trait.rs b/crates/pacdef_core/src/backend/backend_trait.rs index 9b84448..4b7c481 100644 --- a/crates/pacdef_core/src/backend/backend_trait.rs +++ b/crates/pacdef_core/src/backend/backend_trait.rs @@ -186,7 +186,7 @@ where let mut map = HashMap::new(); for (value, key) in to_assign { - let inner = map.entry(key).or_insert(vec![]); + let inner: &mut Vec = map.entry(key).or_default(); inner.push(value); } diff --git a/crates/pacdef_core/src/core.rs b/crates/pacdef_core/src/core.rs index ce62d13..63110d3 100644 --- a/crates/pacdef_core/src/core.rs +++ b/crates/pacdef_core/src/core.rs @@ -129,7 +129,10 @@ impl Pacdef { } } - if let Some(flatpak) = backend.as_any_mut().downcast_mut::() { + if let Some(flatpak) = backend + .as_any_mut() + .downcast_mut::() + { flatpak.systemwide = self.config.flatpak_systemwide; } }