diff --git a/crates/nix_rs/src/command.rs b/crates/nix_rs/src/command.rs index 291560a2..27aa9432 100644 --- a/crates/nix_rs/src/command.rs +++ b/crates/nix_rs/src/command.rs @@ -79,7 +79,7 @@ impl NixCmd { pub fn command(&self) -> Command { let mut cmd = Command::new("nix"); cmd.kill_on_drop(true); - cmd.args(self.args.into_iter()); + cmd.args(&self.args); cmd } diff --git a/crates/omnix-ci/src/step/custom.rs b/crates/omnix-ci/src/step/custom.rs index 99f2381f..83d75d14 100644 --- a/crates/omnix-ci/src/step/custom.rs +++ b/crates/omnix-ci/src/step/custom.rs @@ -76,7 +76,6 @@ impl CustomStep { override_inputs: subflake.override_inputs.clone(), current_dir: Some(path.clone()), no_write_lock_file: false, - ..Default::default() }; match self { diff --git a/crates/omnix-health/src/check/shell.rs b/crates/omnix-health/src/check/shell.rs index 3f4719ac..fbed53ec 100644 --- a/crates/omnix-health/src/check/shell.rs +++ b/crates/omnix-health/src/check/shell.rs @@ -172,9 +172,9 @@ impl Shell { OS::MacOS { .. } => "Library/Application Support/nushell", _ => ".config/nushell", }; - vec!["env.nu", "config.nu", "login.nu"] + ["env.nu", "config.nu", "login.nu"] .iter() - .map(|f| format!("{}/{}", base, f).into()) + .map(|f| format!("{}/{}", base, f)) .collect() } } diff --git a/crates/omnix-health/src/json.rs b/crates/omnix-health/src/json.rs index f69e7bbf..45e26993 100644 --- a/crates/omnix-health/src/json.rs +++ b/crates/omnix-health/src/json.rs @@ -51,7 +51,7 @@ impl HealthEnvInfo { .context("Unable to gather nix info")?; Ok(Self { - nix_installer: nix_info.nix_env.installer.clone().into(), + nix_installer: nix_info.nix_env.installer.clone(), system: nix_info.nix_config.system.value.clone(), os: nix_info.nix_env.os.clone(), total_memory: nix_info.nix_env.total_memory, diff --git a/om.yaml b/om.yaml index e99a1aa2..b3dbf269 100644 --- a/om.yaml +++ b/om.yaml @@ -25,16 +25,14 @@ ci: systems: - x86_64-linux - aarch64-darwin - # Disabled until upstream bug is fixed, - # https://github.com/rust-lang/rust-clippy/issues/14045 - # cargo-clippy: - # type: devshell - # command: - # - just - # - clippy - # systems: - # - x86_64-linux - # - aarch64-darwin + cargo-clippy: + type: devshell + command: + - just + - clippy + systems: + - x86_64-linux + - aarch64-darwin cargo-doc: type: devshell command: