treewide: apply fixable clippy lints

Author: NotAShelf

src/clean.rs

@@ -15,7 +15,7 @@ use regex::Regex;
 use tracing::{debug, info, instrument, span, warn, Level};
 use uzers::os::unix::UserExt;
 
-use crate::{commands::Command, *};
+use crate::{commands::Command, Result, interface};
 
 // Nix impl:
 // https://github.com/NixOS/nix/blob/master/src/nix-collect-garbage/nix-collect-garbage.cc
@@ -42,12 +42,12 @@ impl interface::CleanMode {
         // What profiles to clean depending on the call mode
         let uid = nix::unistd::Uid::effective();
         let args = match self {
-            interface::CleanMode::Profile(args) => {
+            Self::Profile(args) => {
                 profiles.push(args.profile.clone());
                 is_profile_clean = true;
                 &args.common
             }
-            interface::CleanMode::All(args) => {
+            Self::All(args) => {
                 if !uid.is_root() {
                     crate::self_elevate();
                 }
@@ -72,7 +72,7 @@ impl interface::CleanMode {
                 }
                 args
             }
-            interface::CleanMode::User(args) => {
+            Self::User(args) => {
                 if uid.is_root() {
                     bail!("nh clean user: don't run me as root!");
                 }
@@ -129,7 +129,7 @@ impl interface::CleanMode {
                     AccessFlags::F_OK | AccessFlags::W_OK,
                     AtFlags::AT_SYMLINK_NOFOLLOW,
                 ) {
-                    Ok(_) => true,
+                    Ok(()) => true,
                     Err(errno) => match errno {
                         Errno::EACCES | Errno::ENOENT => false,
                         _ => {
@@ -191,7 +191,7 @@ impl interface::CleanMode {
             }
             println!();
         }
-        for (profile, generations_tagged) in profiles_tagged.iter() {
+        for (profile, generations_tagged) in &profiles_tagged {
             println!("{}", profile.to_string_lossy().blue().bold());
             for (gen, tbr) in generations_tagged.iter().rev() {
                 if *tbr {
@@ -218,7 +218,7 @@ impl interface::CleanMode {
                 }
             }
 
-            for (_, generations_tagged) in profiles_tagged.iter() {
+            for generations_tagged in profiles_tagged.values() {
                 for (gen, tbr) in generations_tagged.iter().rev() {
                     if *tbr {
                         remove_path_nofail(&gen.path);
@@ -324,7 +324,7 @@ fn cleanable_generations(
     }
 
     let now = SystemTime::now();
-    for (gen, tbr) in result.iter_mut() {
+    for (gen, tbr) in &mut result {
         match now.duration_since(gen.last_modified) {
             Err(err) => {
                 warn!(?err, ?now, ?gen, "Failed to compare time!");

src/commands.rs

@@ -43,12 +43,12 @@ impl Command {
         }
     }
 
-    pub fn elevate(mut self, elevate: bool) -> Self {
+    pub const fn elevate(mut self, elevate: bool) -> Self {
         self.elevate = elevate;
         self
     }
 
-    pub fn dry(mut self, dry: bool) -> Self {
+    pub const fn dry(mut self, dry: bool) -> Self {
         self.dry = dry;
         self
     }
@@ -163,7 +163,7 @@ pub struct Build {
 }
 
 impl Build {
-    pub fn new(installable: Installable) -> Self {
+    pub const fn new(installable: Installable) -> Self {
         Self {
             message: None,
             installable,
@@ -183,7 +183,7 @@ impl Build {
         self
     }
 
-    pub fn nom(mut self, yes: bool) -> Self {
+    pub const fn nom(mut self, yes: bool) -> Self {
         self.nom = yes;
         self
     }

src/completion.rs

@@ -3,7 +3,7 @@ use color_eyre::Result;
 use tracing::instrument;
 
 use crate::interface::Main;
-use crate::*;
+use crate::interface;
 
 impl interface::CompletionArgs {
     #[instrument(ret, level = "trace")]

src/darwin.rs

@@ -17,7 +17,7 @@ const CURRENT_PROFILE: &str = "/run/current-system";
 
 impl DarwinArgs {
     pub fn run(self) -> Result<()> {
-        use DarwinRebuildVariant::*;
+        use DarwinRebuildVariant::{Build, Switch};
         match self.subcommand {
             DarwinSubcommand::Switch(args) => args.rebuild(Switch),
             DarwinSubcommand::Build(args) => {
@@ -38,7 +38,7 @@ enum DarwinRebuildVariant {
 
 impl DarwinRebuildArgs {
     fn rebuild(self, variant: DarwinRebuildVariant) -> Result<()> {
-        use DarwinRebuildVariant::*;
+        use DarwinRebuildVariant::{Build, Switch};
 
         if nix::unistd::Uid::effective().is_root() {
             bail!("Don't run nh os as root. I will call sudo internally as needed");
@@ -121,7 +121,7 @@ impl DarwinRebuildArgs {
             }
         }
 
-        if let Switch = variant {
+        if matches!(variant, Switch) {
             Command::new("nix")
                 .args(["build", "--no-link", "--profile", SYSTEM_PROFILE])
                 .arg(out_path.get_path())

src/generations.rs

@@ -14,7 +14,7 @@ pub struct GenerationInfo {
     /// Date on switch a generation was built
     pub date: String,
 
-    /// NixOS version derived from `nixos-version`
+    /// `NixOS` version derived from `nixos-version`
     pub nixos_version: String,
 
     /// Version of the bootable kernel for a given generation
@@ -66,7 +66,7 @@ pub fn describe(generation_dir: &Path, current_profile: &Path) -> Option<Generat
         .join("kernel")
         .canonicalize()
         .ok()
-        .and_then(|path| path.parent().map(|p| p.to_path_buf()))
+        .and_then(|path| path.parent().map(std::path::Path::to_path_buf))
         .unwrap_or_else(|| PathBuf::from("Unknown"));
 
     let kernel_modules_dir = kernel_dir.join("lib/modules");
@@ -195,9 +195,7 @@ pub fn print_info(mut generations: Vec<GenerationInfo>) {
     // Parse all dates at once and cache them
     let mut parsed_dates = HashMap::with_capacity(generations.len());
     for gen in &generations {
-        let date = DateTime::parse_from_rfc3339(&gen.date)
-            .map(|dt| dt.with_timezone(&Local))
-            .unwrap_or_else(|_| Local.timestamp_opt(0, 0).unwrap());
+        let date = DateTime::parse_from_rfc3339(&gen.date).map_or_else(|_| Local.timestamp_opt(0, 0).unwrap(), |dt| dt.with_timezone(&Local));
         parsed_dates.insert(
             gen.date.clone(),
             date.format("%Y-%m-%d %H:%M:%S").to_string(),
@@ -216,7 +214,7 @@ pub fn print_info(mut generations: Vec<GenerationInfo>) {
         println!("Error getting current generation!");
     }
 
-    println!("Closure Size: {}", closure);
+    println!("Closure Size: {closure}");
     println!();
 
     // Determine column widths for pretty printing
@@ -256,7 +254,7 @@ pub fn print_info(mut generations: Vec<GenerationInfo>) {
             generation
                 .specialisations
                 .iter()
-                .map(|s| format!("*{}", s))
+                .map(|s| format!("*{s}"))
                 .collect::<Vec<String>>()
                 .join(" ")
         };

src/home.rs

@@ -15,7 +15,7 @@ use crate::util::get_hostname;
 
 impl interface::HomeArgs {
     pub fn run(self) -> Result<()> {
-        use HomeRebuildVariant::*;
+        use HomeRebuildVariant::{Build, Switch};
         match self.subcommand {
             HomeSubcommand::Switch(args) => args.rebuild(Switch),
             HomeSubcommand::Build(args) => {
@@ -37,7 +37,7 @@ enum HomeRebuildVariant {
 
 impl HomeRebuildArgs {
     fn rebuild(self, variant: HomeRebuildVariant) -> Result<()> {
-        use HomeRebuildVariant::*;
+        use HomeRebuildVariant::Build;
 
         if self.update_args.update {
             update(&self.common.installable, self.update_args.update_input)?;
@@ -170,10 +170,10 @@ where
     I: IntoIterator<Item = S>,
     S: AsRef<std::ffi::OsStr>,
 {
-    let mut res = installable.clone();
+    let mut res = installable;
     let extra_args: Vec<OsString> = {
         let mut vec = Vec::new();
-        for elem in extra_args.into_iter() {
+        for elem in extra_args {
             vec.push(elem.as_ref().to_owned());
         }
         vec
@@ -206,7 +206,7 @@ where
             // Check if an explicit configuration name was provided via the flag
             if let Some(config_name) = configuration_name {
                 // Verify the provided configuration exists
-                let func = format!(r#" x: x ? "{}" "#, config_name);
+                let func = format!(r#" x: x ? "{config_name}" "#);
                 let check_res = commands::Command::new("nix")
                     .arg("eval")
                     .args(&extra_args)
@@ -228,29 +228,26 @@ where
                         )
                     })?;
 
-                match check_res.map(|s| s.trim().to_owned()).as_deref() {
-                    Some("true") => {
-                        debug!("Using explicit configuration from flag: {}", config_name);
-                        attribute.push(config_name.clone());
-                        if push_drv {
-                            attribute.extend(toplevel.clone());
-                        }
-                        found_config = true;
-                    }
-                    _ => {
-                        // Explicit config provided but not found
-                        let tried_attr_path = {
-                            let mut attr_path = attribute.clone();
-                            attr_path.push(config_name.clone());
-                            Installable::Flake {
-                                reference: flake_reference.clone(),
-                                attribute: attr_path,
-                            }
-                            .to_args()
-                            .join(" ")
-                        };
-                        bail!("Explicitly specified home-manager configuration not found: {tried_attr_path}");
+                if check_res.map(|s| s.trim().to_owned()).as_deref() == Some("true") {
+                    debug!("Using explicit configuration from flag: {}", config_name);
+                    attribute.push(config_name);
+                    if push_drv {
+                        attribute.extend(toplevel.clone());
                     }
+                    found_config = true;
+                } else {
+                    // Explicit config provided but not found
+                    let tried_attr_path = {
+                        let mut attr_path = attribute.clone();
+                        attr_path.push(config_name);
+                        Installable::Flake {
+                            reference: flake_reference,
+                            attribute: attr_path,
+                        }
+                        .to_args()
+                        .join(" ")
+                    };
+                    bail!("Explicitly specified home-manager configuration not found: {tried_attr_path}");
                 }
             }
 
@@ -260,8 +257,8 @@ where
                 let hostname = get_hostname()?;
                 let mut tried = vec![];
 
-                for attr_name in [format!("{username}@{hostname}"), username.to_string()] {
-                    let func = format!(r#" x: x ? "{}" "#, attr_name);
+                for attr_name in [format!("{username}@{hostname}"), username] {
+                    let func = format!(r#" x: x ? "{attr_name}" "#);
                     let check_res = commands::Command::new("nix")
                         .arg("eval")
                         .args(&extra_args)
@@ -293,7 +290,7 @@ where
                     match check_res.map(|s| s.trim().to_owned()).as_deref() {
                         Some("true") => {
                             debug!("Using automatically detected configuration: {}", attr_name);
-                            attribute.push(attr_name.clone());
+                            attribute.push(attr_name);
                             if push_drv {
                                 attribute.extend(toplevel.clone());
                             }