Skip to content

Commit 6d9fed3

Browse files
committed
chore: Enable clippy
The clippy issue was on nightly. As of #427 we are no longer on nightly
1 parent d1fc602 commit 6d9fed3

File tree

5 files changed

+12
-15
lines changed

5 files changed

+12
-15
lines changed

crates/nix_rs/src/command.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ impl NixCmd {
7979
pub fn command(&self) -> Command {
8080
let mut cmd = Command::new("nix");
8181
cmd.kill_on_drop(true);
82-
cmd.args(self.args.into_iter());
82+
cmd.args(&self.args);
8383
cmd
8484
}
8585

crates/omnix-ci/src/step/custom.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ impl CustomStep {
7676
override_inputs: subflake.override_inputs.clone(),
7777
current_dir: Some(path.clone()),
7878
no_write_lock_file: false,
79-
..Default::default()
8079
};
8180

8281
match self {

crates/omnix-health/src/check/shell.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,9 @@ impl Shell {
172172
OS::MacOS { .. } => "Library/Application Support/nushell",
173173
_ => ".config/nushell",
174174
};
175-
vec!["env.nu", "config.nu", "login.nu"]
175+
["env.nu", "config.nu", "login.nu"]
176176
.iter()
177-
.map(|f| format!("{}/{}", base, f).into())
177+
.map(|f| format!("{}/{}", base, f))
178178
.collect()
179179
}
180180
}

crates/omnix-health/src/json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ impl HealthEnvInfo {
5151
.context("Unable to gather nix info")?;
5252

5353
Ok(Self {
54-
nix_installer: nix_info.nix_env.installer.clone().into(),
54+
nix_installer: nix_info.nix_env.installer.clone(),
5555
system: nix_info.nix_config.system.value.clone(),
5656
os: nix_info.nix_env.os.clone(),
5757
total_memory: nix_info.nix_env.total_memory,

om.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,14 @@ ci:
2525
systems:
2626
- x86_64-linux
2727
- aarch64-darwin
28-
# Disabled until upstream bug is fixed,
29-
# https://github.com/rust-lang/rust-clippy/issues/14045
30-
# cargo-clippy:
31-
# type: devshell
32-
# command:
33-
# - just
34-
# - clippy
35-
# systems:
36-
# - x86_64-linux
37-
# - aarch64-darwin
28+
cargo-clippy:
29+
type: devshell
30+
command:
31+
- just
32+
- clippy
33+
systems:
34+
- x86_64-linux
35+
- aarch64-darwin
3836
cargo-doc:
3937
type: devshell
4038
command:

0 commit comments

Comments
 (0)