minor fixes

Author: yaahc

src/bin/cargo/commands/fix.rs

@@ -142,8 +142,6 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
         .or_else(|| Some(vec![]))
         .filter(|_| use_clippy);
 
-    // dbg!(&clippy_args, use_clippy);
-
     if use_clippy && !config.cli_unstable().unstable_options {
         return Err(failure::format_err!(
             "`cargo fix --clippy` is unstable, pass `-Z unstable-options` to enable it"

src/cargo/ops/fix.rs

@@ -63,7 +63,6 @@ const BROKEN_CODE_ENV: &str = "__CARGO_FIX_BROKEN_CODE";
 const PREPARE_FOR_ENV: &str = "__CARGO_FIX_PREPARE_FOR";
 const EDITION_ENV: &str = "__CARGO_FIX_EDITION";
 const IDIOMS_ENV: &str = "__CARGO_FIX_IDIOMS";
-const CLIPPY_FIX_ENV: &str = "__CARGO_FIX_CLIPPY_PLZ";
 const CLIPPY_FIX_ARGS: &str = "__CARGO_FIX_CLIPPY_ARGS";
 
 pub struct FixOptions<'a> {
@@ -106,13 +105,13 @@ pub fn fix(ws: &Workspace<'_>, opts: &mut FixOptions<'_>) -> CargoResult<()> {
         if let Err(e) = util::process("clippy-driver").arg("-V").exec_with_output() {
             eprintln!("Warning: clippy-driver not found: {:?}", e);
         }
-        wrapper.env(CLIPPY_FIX_ENV, "1");
+
         opts.compile_opts.build_config.primary_unit_rustc = Some(util::config::clippy_driver());
-    }
 
-    if let Some(clippy_args) = &opts.clippy_args {
-        let clippy_args = serde_json::to_string(&clippy_args).unwrap();
-        wrapper.env(CLIPPY_FIX_ARGS, clippy_args);
+        if let Some(clippy_args) = &opts.clippy_args {
+            let clippy_args = serde_json::to_string(&clippy_args).unwrap();
+            wrapper.env(CLIPPY_FIX_ARGS, clippy_args);
+        }
     }
 
     *opts

tests/testsuite/cache_messages.rs

@@ -1,4 +1,4 @@
-use crate::support::{is_nightly, process, project, registry::Package};
+use crate::support::{clippy_is_available, is_nightly, process, project, registry::Package};
 use std::path::Path;
 
 fn as_str(bytes: &[u8]) -> &str {
@@ -255,6 +255,44 @@ fn fix() {
     assert_eq!(p.read_file("src/lib.rs"), "pub fn r#try() {}");
 }
 
+#[cargo_test]
+fn clippy() {
+    if !is_nightly() {
+        // --json-rendered is unstable
+        eprintln!("skipping test: requires nightly");
+        return;
+    }
+
+    if !clippy_is_available() {
+        return;
+    }
+
+    // Caching clippy output.
+    // This is just a random clippy lint (assertions_on_constants) that
+    // hopefully won't change much in the future.
+    let p = project()
+        .file("src/lib.rs", "pub fn f() { assert!(true); }")
+        .build();
+
+    p.cargo("clippy-preview -Zunstable-options -Zcache-messages")
+        .masquerade_as_nightly_cargo()
+        .with_stderr_contains("[..]assert!(true)[..]")
+        .run();
+
+    // Again, reading from the cache.
+    p.cargo("clippy-preview -Zunstable-options -Zcache-messages")
+        .masquerade_as_nightly_cargo()
+        .with_stderr_contains("[..]assert!(true)[..]")
+        .run();
+
+    // FIXME: Unfortunately clippy is sharing the same hash with check. This
+    // causes the cache to be reused when it shouldn't.
+    p.cargo("check -Zcache-messages")
+        .masquerade_as_nightly_cargo()
+        .with_stderr_contains("[..]assert!(true)[..]") // This should not be here.
+        .run();
+}
+
 #[cargo_test]
 fn very_verbose() {
     if !is_nightly() {

tests/testsuite/clippy.rs

@@ -29,7 +29,6 @@ mod cargo_features;
 mod cfg;
 mod check;
 mod clean;
-mod clippy;
 mod collisions;
 mod concurrent;
 mod config;