fix(check): fix the suggested fix command by always using -p

Author: dawedawe

src/cargo/core/compiler/job_queue/mod.rs

@@ -1085,15 +1085,8 @@ impl<'gctx> DrainState<'gctx> {
                         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() {
-                            format!("{} -p {}", named, unit.pkg.name())
-                        } else {
-                            named
-                        }
-                    };
+                    let mut args =
+                        format!("{} -p {}", unit.target.description_named(), unit.pkg.name());
                     if unit.mode.is_rustc_test()
                         && !(unit.target.is_test() || unit.target.is_bench())
                     {

tests/testsuite/check.rs

@@ -532,7 +532,7 @@ fn check_virtual_manifest_one_bin_project_not_in_default_members() {
         .build();
 
     p.cargo("check -p bar")
-        .with_stderr_contains("[..]run `cargo fix --bin \"bar\"` to apply[..]")
+        .with_stderr_contains("[..]run `cargo fix --bin \"bar\" -p bar` to apply[..]")
         .run();
 }
 
@@ -1421,7 +1421,7 @@ fn check_fixable_example() {
     p.cargo("check --all-targets")
         .with_stderr_data(str![[r#"
 ...
-[WARNING] `foo` (example "ex1") generated 1 warning (run `cargo fix --example "ex1"` to apply 1 suggestion)
+[WARNING] `foo` (example "ex1") generated 1 warning (run `cargo fix --example "ex1" -p foo` to apply 1 suggestion)
 ...
 "#]])
         .run();
@@ -1467,7 +1467,7 @@ fn check_fixable_bench() {
     p.cargo("check --all-targets")
         .with_stderr_data(str![[r#"
 ...
-[WARNING] `foo` (bench "bench") generated 1 warning (run `cargo fix --bench "bench"` to apply 1 suggestion)
+[WARNING] `foo` (bench "bench") generated 1 warning (run `cargo fix --bench "bench" -p foo` to apply 1 suggestion)
 ...
 "#]])
         .run();
@@ -1517,9 +1517,9 @@ fn check_fixable_mixed() {
         .build();
     p.cargo("check --all-targets")
         .with_stderr_data(str![[r#"
-[WARNING] `foo` (example "ex1") generated 1 warning (run `cargo fix --example "ex1"` to apply 1 suggestion)
-[WARNING] `foo` (bench "bench") generated 1 warning (run `cargo fix --bench "bench"` to apply 1 suggestion)
-[WARNING] `foo` (bin "foo" test) generated 2 warnings (run `cargo fix --bin "foo" --tests` to apply 2 suggestions)
+[WARNING] `foo` (example "ex1") generated 1 warning (run `cargo fix --example "ex1" -p foo` to apply 1 suggestion)
+[WARNING] `foo` (bench "bench") generated 1 warning (run `cargo fix --bench "bench" -p foo` to apply 1 suggestion)
+[WARNING] `foo` (bin "foo" test) generated 2 warnings (run `cargo fix --bin "foo" -p foo --tests` to apply 2 suggestions)
 ...
 "#]].unordered())
         .run();