some changes, ill clean this up in a hot sec

Author: yaahc

src/cargo/ops/fix.rs

@@ -75,7 +75,6 @@ pub struct FixOptions<'a> {
     pub allow_no_vcs: bool,
     pub allow_staged: bool,
     pub broken_code: bool,
-    pub use_clippy: bool,
     pub clippy_args: Option<Vec<String>>,
 }
 
@@ -103,7 +102,7 @@ pub fn fix(ws: &Workspace<'_>, opts: &mut FixOptions<'_>) -> CargoResult<()> {
         wrapper.env(IDIOMS_ENV, "1");
     }
 
-    if opts.use_clippy {
+    if opts.clippy_args.is_some() {
         if let Err(e) = util::process("clippy-driver").arg("-V").exec_with_output() {
             eprintln!("Warning: clippy-driver not found: {:?}", e);
         }
@@ -401,7 +400,6 @@ fn rustfix_and_fix(
 
     let mut cmd = Command::new(rustc);
     cmd.arg("--error-format=json");
-
     args.apply(&mut cmd);
     let output = cmd
         .output()

src/cargo/util/config.rs

@@ -1790,7 +1790,6 @@ impl Drop for PackageCacheLock<'_> {
 /// Allows override of the path via `CARGO_CLIPPY_DRIVER` env variable
 pub fn clippy_driver() -> PathBuf {
     env::var("CARGO_CLIPPY_DRIVER")
-        .ok()
-        .unwrap_or_else(|| "clippy-driver".into())
+        .unwrap_or_else(|_| "clippy_driver".into())
         .into()
 }

tests/testsuite/clippy.rs

@@ -1,4 +1,4 @@
-use crate::support::{is_nightly, process, project};
+use crate::support::{clippy_is_available, is_nightly, process, project};
 
 #[cargo_test]
 fn clippy() {
@@ -7,9 +7,8 @@ fn clippy() {
         eprintln!("skipping test: requires nightly");
         return;
     }
-    if let Err(e) = process("clippy-driver").arg("-V").exec_with_output() {
-        eprintln!("clippy-driver not available, skipping clippy test");
-        eprintln!("{:?}", e);
+
+    if !clippy_is_available() {
         return;
     }
 
@@ -38,42 +37,3 @@ fn clippy() {
         .with_stderr_contains("[..]assert!(true)[..]") // This should not be here.
         .run();
 }
-
-#[cargo_test]
-fn fix_with_clippy() {
-    if !is_nightly() {
-        // fix --clippy is unstable
-        eprintln!("skipping test: requires nightly");
-        return;
-    }
-
-    if let Err(e) = process("clippy-driver").arg("-V").exec_with_output() {
-        eprintln!("clippy-driver not available, skipping clippy test");
-        eprintln!("{:?}", e);
-        return;
-    }
-
-    let p = project()
-        .file(
-            "src/lib.rs",
-            "
-                pub fn foo() {
-                    let mut v = Vec::<String>::new();
-                    let _ = v.iter_mut().filter(|&ref a| a.is_empty());
-                }
-    ",
-        )
-        .build();
-
-    let stderr = "\
-[CHECKING] foo v0.0.1 ([..])
-[FIXING] src/lib.rs (1 fix)
-[FINISHED] [..]
-";
-
-    p.cargo("fix -Zunstable-options --clippy --allow-no-vcs")
-        .masquerade_as_nightly_cargo()
-        .with_stderr(stderr)
-        .with_stdout("")
-        .run();
-}

tests/testsuite/fix.rs

@@ -1285,3 +1285,41 @@ fn fix_in_existing_repo_weird_ignore() {
         .run();
     p.cargo("fix").cwd("src").run();
 }
+
+#[cargo_test]
+fn fix_with_clippy() {
+    if !is_nightly() {
+        // fix --clippy is unstable
+        eprintln!("skipping test: requires nightly");
+        return;
+    }
+
+    if !clippy_is_available() {
+        return;
+    }
+
+    let p = project()
+        .file(
+            "src/lib.rs",
+            "
+                pub fn foo() {
+                    let mut v = Vec::<String>::new();
+                    let _ = v.iter_mut().filter(|&ref a| a.is_empty());
+                }
+    ",
+        )
+        .build();
+
+    let stderr = "\
+[CHECKING] foo v0.0.1 ([..])
+[FIXING] src/lib.rs (1 fix)
+[FINISHED] [..]
+";
+
+    p.cargo("fix -Zunstable-options --clippy --allow-no-vcs")
+        .masquerade_as_nightly_cargo()
+        .diff_lines("", "", false)
+        .with_stderr(stderr)
+        .with_stdout("")
+        .run();
+}

tests/testsuite/support/mod.rs

@@ -1753,3 +1753,13 @@ pub fn slow_cpu_multiplier(main: u64) -> Duration {
     }
     Duration::from_secs(*SLOW_CPU_MULTIPLIER * main)
 }
+
+pub fn clippy_is_available() -> bool {
+    if let Err(e) = process("clippy-driver").arg("-V").exec_with_output() {
+        eprintln!("clippy-driver not available, skipping clippy test");
+        eprintln!("{:?}", e);
+        false
+    } else {
+        true
+    }
+}