From 33c32088fa36955db38eed071841e42c8dba5f82 Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Thu, 15 Dec 2022 10:54:35 -0600
Subject: [PATCH] fix: Make auto-fix note work with `clippy`

---
 src/cargo/core/compiler/job_queue.rs | 30 ++++++++++++++----
 tests/testsuite/check.rs             | 47 ++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/src/cargo/core/compiler/job_queue.rs b/src/cargo/core/compiler/job_queue.rs
index e7c88c16f6d..66b790439c4 100644
--- a/src/cargo/core/compiler/job_queue.rs
+++ b/src/cargo/core/compiler/job_queue.rs
@@ -54,6 +54,7 @@ use std::collections::{BTreeMap, HashMap, HashSet};
 use std::fmt::Write as _;
 use std::io;
 use std::marker;
+use std::path::PathBuf;
 use std::sync::Arc;
 use std::thread::{self, Scope};
 use std::time::Duration;
@@ -799,7 +800,11 @@ impl<'cfg> DrainState<'cfg> {
                             self.tokens.extend(rustc_tokens);
                         }
                         self.to_send_clients.remove(&id);
-                        self.report_warning_count(cx.bcx.config, id);
+                        self.report_warning_count(
+                            cx.bcx.config,
+                            id,
+                            &cx.bcx.rustc().workspace_wrapper,
+                        );
                         self.active.remove(&id).unwrap()
                     }
                     // ... otherwise if it hasn't finished we leave it
@@ -1243,7 +1248,12 @@ impl<'cfg> DrainState<'cfg> {
     }
 
     /// Displays a final report of the warnings emitted by a particular job.
-    fn report_warning_count(&mut self, config: &Config, id: JobId) {
+    fn report_warning_count(
+        &mut self,
+        config: &Config,
+        id: JobId,
+        rustc_workspace_wrapper: &Option<PathBuf>,
+    ) {
         let count = match self.warning_count.remove(&id) {
             // An error could add an entry for a `Unit`
             // with 0 warnings but having fixable
@@ -1276,7 +1286,16 @@ impl<'cfg> DrainState<'cfg> {
             if let FixableWarnings::Positive(fixable) = count.fixable {
                 // `cargo fix` doesnt have an option for custom builds
                 if !unit.target.is_custom_build() {
-                    let mut command = {
+                    // To make sure the correct command is shown for `clippy` we
+                    // check if `RUSTC_WORKSPACE_WRAPPER` is set and pointing towards
+                    // `clippy-driver`.
+                    let clippy = std::ffi::OsStr::new("clippy-driver");
+                    let command = match rustc_workspace_wrapper.as_ref().and_then(|x| x.file_stem())
+                    {
+                        Some(wrapper) if wrapper == clippy => "cargo clippy --fix",
+                        _ => "cargo fix",
+                    };
+                    let mut args = {
                         let named = unit.target.description_named();
                         // if its a lib we need to add the package to fix
                         if unit.target.is_lib() {
@@ -1288,7 +1307,7 @@ impl<'cfg> DrainState<'cfg> {
                     if unit.mode.is_rustc_test()
                         && !(unit.target.is_test() || unit.target.is_bench())
                     {
-                        command.push_str(" --tests");
+                        args.push_str(" --tests");
                     }
                     let mut suggestions = format!("{} suggestion", fixable);
                     if fixable > 1 {
@@ -1296,8 +1315,7 @@ impl<'cfg> DrainState<'cfg> {
                     }
                     drop(write!(
                         message,
-                        " (run `cargo fix --{}` to apply {})",
-                        command, suggestions
+                        " (run `{command} --{args}` to apply {suggestions})"
                     ))
                 }
             }
diff --git a/tests/testsuite/check.rs b/tests/testsuite/check.rs
index 2cfb797cd4e..f2916605985 100644
--- a/tests/testsuite/check.rs
+++ b/tests/testsuite/check.rs
@@ -1447,3 +1447,50 @@ fn check_fixable_mixed() {
         .with_stderr_contains("[..] (run `cargo fix --bench \"bench\"` to apply 1 suggestion)")
         .run();
 }
+
+#[cargo_test]
+fn check_fixable_warning_for_clippy() {
+    // A wrapper around `rustc` instead of calling `clippy`
+    let clippy_driver = project()
+        .at(cargo_test_support::paths::global_root().join("clippy-driver"))
+        .file("Cargo.toml", &basic_manifest("clippy-driver", "0.0.1"))
+        .file(
+            "src/main.rs",
+            r#"
+            fn main() {
+                let mut args = std::env::args_os();
+                let _me = args.next().unwrap();
+                let rustc = args.next().unwrap();
+                let status = std::process::Command::new(rustc).args(args).status().unwrap();
+                std::process::exit(status.code().unwrap_or(1));
+            }
+            "#,
+        )
+        .build();
+    clippy_driver.cargo("build").run();
+
+    let foo = project()
+        .file(
+            "Cargo.toml",
+            r#"
+                [package]
+                name = "foo"
+                version = "0.0.1"
+            "#,
+        )
+        // We don't want to show a warning that is `clippy`
+        // specific since we are using a `rustc` wrapper
+        // inplace of `clippy`
+        .file("src/lib.rs", "use std::io;")
+        .build();
+
+    foo.cargo("check")
+        // We can't use `clippy` so we use a `rustc` workspace wrapper instead
+        .env(
+            "RUSTC_WORKSPACE_WRAPPER",
+            clippy_driver.bin("clippy-driver"),
+        )
+        .masquerade_as_nightly_cargo(&["auto-fix note"])
+        .with_stderr_contains("[..] (run `cargo clippy --fix --lib -p foo` to apply 1 suggestion)")
+        .run();
+}