Merge branch 'master' into softnpu-bump

oxidecomputer · Dec 5, 2023 · 9786ad1 · 9786ad1
2 parents c45098e + 26806e8
commit 9786ad1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,5 +1,5 @@
 [alias]
-xtask = "run --package xtask --"
+xtask = "run --package xtask --quiet --"
 
 [env]
 # Currently required by Falcon due to

diff --git a/xtask/src/task_clippy.rs b/xtask/src/task_clippy.rs
@@ -13,13 +13,16 @@ pub(crate) fn cmd_clippy(strict: bool, quiet: bool) -> Result<()> {
 
     let run_clippy = |args: &[&str]| -> Result<bool> {
         let mut cmd = Command::new("cargo");
-        cmd.arg("clippy").arg("--no-deps").args(args).current_dir(&wroot);
+        cmd.arg("clippy").args(args).current_dir(&wroot);
 
         if quiet {
             cmd.arg("--quiet");
         }
+
+        // no-deps and subsequent options must follow `--`
+        cmd.args(["--", "--no-deps"]);
         if strict {
-            cmd.args(["--", "-Dwarnings"]);
+            cmd.arg("-Dwarnings");
         }
 
         let status = cmd.spawn()?.wait()?;