fix(ops): correct error message when using --broken-code

Author: raushan728

src/cargo/ops/fix/mod.rs

@@ -791,9 +791,6 @@ 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() {
         // No fixes were available. Display whatever errors happened.
         emit_output(&fixes.last_output)?;
@@ -814,6 +811,7 @@ pub fn fix_exec_rustc(gctx: &GlobalContext, lock_addr: &str) -> CargoResult<()>
             krate,
             &fixes.last_output.stderr,
             fixes.last_output.status,
+            allow_broken_code,
         )?;
         // Display the diagnostics that appeared at the start, before the
         // fixes failed. This can help with diagnosing which suggestions
@@ -1171,6 +1169,7 @@ fn log_failed_fix(
     krate: Option<String>,
     stderr: &[u8],
     status: ExitStatus,
+    allow_broken_code: bool,
 ) -> CargoResult<()> {
     let stderr = str::from_utf8(stderr).context("failed to parse rustc stderr as utf-8")?;
 
@@ -1205,6 +1204,7 @@ fn log_failed_fix(
         krate,
         errors,
         abnormal_exit,
+        allow_broken_code,
     }
     .post(gctx)?;
 

src/cargo/util/diagnostic_server.rs

@@ -40,6 +40,7 @@ pub enum Message {
         krate: Option<String>,
         errors: Vec<String>,
         abnormal_exit: Option<String>,
+        allow_broken_code: bool,
     },
     ReplaceFailed {
         file: String,
@@ -145,6 +146,7 @@ impl<'a> DiagnosticPrinter<'a> {
                 krate,
                 errors,
                 abnormal_exit,
+                allow_broken_code,
             } => {
                 if let Some(ref krate) = *krate {
                     self.gctx.shell().warn(&format!(
@@ -168,12 +170,21 @@ impl<'a> DiagnosticPrinter<'a> {
                     }
                     writeln!(self.gctx.shell().err())?;
                 }
-                let issue_link = get_bug_report_url(self.workspace_wrapper);
-                write!(
-                    self.gctx.shell().err(),
-                    "{}",
-                    gen_please_report_this_bug_text(issue_link)
-                )?;
+                if *allow_broken_code {
+                    writeln!(
+                        self.gctx.shell().err(),
+                        "Fix failed, but broken code changes were saved as \
+                         requested with `--broken-code`.\n\
+                         The code needs to be manually reviewed and fixed.\n"
+                    )?;
+                } else {
+                    let issue_link = get_bug_report_url(self.workspace_wrapper);
+                    write!(
+                        self.gctx.shell().err(),
+                        "{}",
+                        gen_please_report_this_bug_text(issue_link)
+                    )?;
+                }
                 if !errors.is_empty() {
                     writeln!(
                         self.gctx.shell().err(),

tests/testsuite/fix.rs

@@ -1432,7 +1432,12 @@ fn fix_to_broken_code() {
 ...
 [WARNING] failed to automatically apply fixes suggested by rustc to crate `bar`
 ...
+Fix failed, but broken code changes were saved as requested with `--broken-code`.
+The code needs to be manually reviewed and fixed.
+...
 "#]])
+        .with_stderr_does_not_contain("[..]--broken-code[..]flag[..]")
+        .with_stderr_does_not_contain("[..]bug report[..]")
         .run();
 
     assert_e2e().eq(