formatting

Author: henriquekirchheck

src/clean.rs

@@ -354,12 +354,11 @@ fn profiles_in_dir<P: AsRef<Path> + fmt::Debug>(dir: P) -> Vec<PathBuf> {
                         let path = e.path();
 
                         if let Ok(dst) = path.read_link() {
-                            let name = match dst.file_name() {
-                                Some(f) => f.to_string_lossy(),
-                                None => {
-                                    warn!("Failed to get filename for {:?}", dst);
-                                    continue;
-                                }
+                            let name = if let Some(f) = dst.file_name() {
+                                f.to_string_lossy()
+                            } else {
+                                warn!("Failed to get filename for {:?}", dst);
+                                continue;
                             };
 
                             if GENERATION_REGEX.captures(&name).is_some() {

src/commands.rs

@@ -50,17 +50,17 @@ impl ElevationStrategy {
     pub fn resolve(&self) -> Result<OsString> {
         match self {
             ElevationStrategy::Auto => Self::choice(),
-            ElevationStrategy::Prefer(program) => {
-                which(program).map(|x| x.into_os_string()).or_else(|_| {
+            ElevationStrategy::Prefer(program) => which(program)
+                .map(std::path::PathBuf::into_os_string)
+                .or_else(|_| {
                     let auto = Self::choice()?;
                     warn!(
                         "{} not found. Using {} instead",
                         program.to_string_lossy(),
                         auto.to_string_lossy()
                     );
                     Ok(auto)
-                })
-            }
+                }),
             ElevationStrategy::Force(program) => Ok(program.into()),
         }
     }
@@ -81,7 +81,7 @@ impl ElevationStrategy {
     ///
     /// The logic for choosing this order is that a person with `doas` installed is more likely
     /// to be using it as their main privilege elevation program.
-    /// `run0` and `pkexec` are preinstalled in any NixOS system with polkit support installed,
+    /// `run0` and `pkexec` are preinstalled in any `NixOS` system with polkit support installed,
     /// so they have been placed lower as it's easier to deactivate sudo than it is to remove
     /// `run0`/`pkexec`
     ///
@@ -304,14 +304,18 @@ impl Command {
 
         // Insert 'env' command to explicitly pass environment variables to the elevated command
         cmd = cmd.arg("env");
-        for arg in self.env_vars.iter().flat_map(|(key, action)| match action {
-            EnvAction::Set(value) => Some(format!("{key}={value}")),
-            EnvAction::Preserve => match std::env::var(key) {
-                Ok(value) => Some(format!("{key}={value}")),
-                Err(_) => None,
-            },
-            EnvAction::Remove => None,
-        }) {
+        for arg in self
+            .env_vars
+            .iter()
+            .filter_map(|(key, action)| match action {
+                EnvAction::Set(value) => Some(format!("{key}={value}")),
+                EnvAction::Preserve => match std::env::var(key) {
+                    Ok(value) => Some(format!("{key}={value}")),
+                    Err(_) => None,
+                },
+                EnvAction::Remove => None,
+            })
+        {
             cmd = cmd.arg(arg);
         }
 

src/darwin.rs

@@ -4,10 +4,10 @@ use std::path::PathBuf;
 use color_eyre::eyre::{Context, bail, eyre};
 use tracing::{debug, warn};
 
-use crate::commands::ElevationStrategy;
 use crate::Result;
 use crate::commands;
 use crate::commands::Command;
+use crate::commands::ElevationStrategy;
 use crate::installable::Installable;
 use crate::interface::{DarwinArgs, DarwinRebuildArgs, DarwinReplArgs, DarwinSubcommand, DiffType};
 use crate::nixos::toplevel_for;

src/home.rs

@@ -112,12 +112,11 @@ impl HomeRebuildArgs {
         let spec_location =
             PathBuf::from(std::env::var("HOME")?).join(".local/share/home-manager/specialisation");
 
-        let current_specialisation = match spec_location.to_str() {
-            Some(s) => std::fs::read_to_string(s).ok(),
-            None => {
-                tracing::warn!("spec_location path is not valid UTF-8");
-                None
-            }
+        let current_specialisation = if let Some(s) = spec_location.to_str() {
+            std::fs::read_to_string(s).ok()
+        } else {
+            tracing::warn!("spec_location path is not valid UTF-8");
+            None
         };
 
         let target_specialisation = if self.no_specialisation {

src/interface.rs

@@ -7,12 +7,12 @@ use clap::ValueEnum;
 use clap::{Args, Parser, Subcommand, builder::Styles};
 use clap_verbosity_flag::InfoLevel;
 
-use crate::commands::ElevationStrategy;
 use crate::Result;
 use crate::checks::{
     DarwinReplFeatures, FeatureRequirements, FlakeFeatures, HomeReplFeatures, LegacyFeatures,
     NoFeatures, OsReplFeatures,
 };
+use crate::commands::ElevationStrategy;
 use crate::installable::Installable;
 
 const fn make_style() -> Styles {

src/main.rs

@@ -43,8 +43,7 @@ fn main() -> Result<()> {
 
     let elevation = args
         .elevation_program
-        .map(|program| ElevationStrategy::Prefer(program))
-        .unwrap_or(ElevationStrategy::Auto);
+        .map_or(ElevationStrategy::Auto, ElevationStrategy::Prefer);
 
     args.command.run(elevation)
 }

src/nixos.rs

@@ -66,7 +66,12 @@ impl OsBuildVmArgs {
 impl OsRebuildArgs {
     // final_attr is the attribute of config.system.build.X to evaluate.
     #[expect(clippy::cognitive_complexity, clippy::too_many_lines)]
-    fn rebuild(self, variant: &OsRebuildVariant, final_attr: Option<String>, elevation: ElevationStrategy) -> Result<()> {
+    fn rebuild(
+        self,
+        variant: &OsRebuildVariant,
+        final_attr: Option<String>,
+        elevation: ElevationStrategy,
+    ) -> Result<()> {
         use OsRebuildVariant::{Boot, Build, BuildVm, Switch, Test};
 
         if self.build_host.is_some() || self.target_host.is_some() {

src/util.rs

@@ -288,7 +288,7 @@ pub fn get_missing_experimental_features(required_features: &[&str]) -> Result<V
 ///
 /// ```rust
 /// use nh::commands::ElevationStrategy;
-/// 
+///
 /// // Elevate the current process to run as root
 /// let elevate: fn(ElevationStrategy) -> ! = nh::util::self_elevate;
 /// ```