fix(ops): add warning when no fixes suggested with --broken-code

Author: raushan728

crates/cargo-util-terminal/src/shell.rs

@@ -233,6 +233,14 @@ impl Shell {
         self.print_report(report, false)
     }
 
+    /// Prints a cyan 'help' message.
+    pub fn help<T: fmt::Display>(&mut self, message: T) -> CargoResult<()> {
+        let report = &[annotate_snippets::Group::with_title(
+            annotate_snippets::Level::HELP.secondary_title(message.to_string()),
+        )];
+        self.print_report(report, false)
+    }
+
     /// Updates the verbosity of the shell.
     pub fn set_verbosity(&mut self, verbosity: Verbosity) {
         self.verbosity = verbosity;

src/cargo/ops/fix/mod.rs

@@ -791,10 +791,26 @@ pub fn fix_exec_rustc(gctx: &GlobalContext, lock_addr: &str) -> CargoResult<()>
 
     // If there were any fixes, let the user know that there was a failure
     // attempting to apply them, and to ask for a bug report.
-    //
-    // FIXME: The error message here is not correct with --broken-code.
-    //        https://github.com/rust-lang/cargo/issues/10955
     if fixes.files.is_empty() {
+        if !fixes.last_output.status.success() {
+            if allow_broken_code {
+                gctx.shell()
+                    .warn("no fixes were suggested because the code is already broken")?;
+                gctx.shell().note(
+                    "cargo fix requires code that compiles successfully to apply automatic fixes",
+                )?;
+                gctx.shell()
+                    .note("the broken code was saved due to `--broken-code`")?;
+            } else {
+                gctx.shell()
+                    .warn("no fixes were suggested because the code is already broken")?;
+                gctx.shell().note(
+                    "cargo fix requires code that compiles successfully to apply automatic fixes",
+                )?;
+                gctx.shell()
+                    .help("use `--broken-code` to save partial progress")?;
+            }
+        }
         // No fixes were available. Display whatever errors happened.
         emit_output(&fixes.last_output)?;
         exit_with(fixes.last_output.status);

tests/testsuite/fix.rs

@@ -2380,6 +2380,9 @@ fn fix_in_rust_src() {
         .with_status(101)
         .with_stderr_data(str![[r#"
 [CHECKING] foo v0.0.0 ([ROOT]/foo)
+[WARNING] no fixes were suggested because the code is already broken
+[NOTE] cargo fix requires code that compiles successfully to apply automatic fixes
+[NOTE] the broken code was saved due to `--broken-code`
 error[E0308]: mismatched types
  --> lib.rs:5:9
   |

tests/testsuite/fix_n_times.rs

@@ -532,6 +532,9 @@ fn starts_with_error() {
         },
         str![[r#"
 [CHECKING] foo v0.0.1 ([ROOT]/foo)
+[WARNING] no fixes were suggested because the code is already broken
+[NOTE] cargo fix requires code that compiles successfully to apply automatic fixes
+[HELP] use `--broken-code` to save partial progress
 rustc fix shim error count=1
 [ERROR] could not compile `foo` (lib) due to 1 previous error
 
@@ -550,6 +553,9 @@ fn broken_code_no_suggestions() {
         },
         str![[r#"
 [CHECKING] foo v0.0.1 ([ROOT]/foo)
+[WARNING] no fixes were suggested because the code is already broken
+[NOTE] cargo fix requires code that compiles successfully to apply automatic fixes
+[NOTE] the broken code was saved due to `--broken-code`
 rustc fix shim error count=1
 [ERROR] could not compile `foo` (lib) due to 1 previous error