Merge pull request rust-lang#19576 from chenyukang/yukang-fix-rustfmt-error

Veykril · web-flow · commit 45be9c2e7d95 · 2025-04-14T04:57:34.000Z
Ignore errors from rustfmt which may trigger error notification
diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/request.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/handlers/request.rs
@@ -2418,7 +2418,11 @@ fn run_rustfmt(
                 Ok(None)
             }
             // rustfmt panicked at lexing/parsing the file
-            Some(101) if !rustfmt_not_installed && captured_stderr.starts_with("error[") => {
+            Some(101)
+                if !rustfmt_not_installed
+                    && (captured_stderr.starts_with("error[")
+                        || captured_stderr.starts_with("error:")) =>
+            {
                 Ok(None)
             }
             _ => {

Original file line number	Diff line number	Diff line change
`@@ -2418,7 +2418,11 @@ fn run_rustfmt(`
`2418`	`2418`	`Ok(None)`
`2419`	`2419`	`}`
`2420`	`2420`	`// rustfmt panicked at lexing/parsing the file`
`2421`		`- Some(101) if !rustfmt_not_installed && captured_stderr.starts_with("error[") => {`
	`2421`	`+ Some(101)`
	`2422`	`+ if !rustfmt_not_installed`
	`2423`	`+ && (captured_stderr.starts_with("error[")`
	`2424`	`+ \|\| captured_stderr.starts_with("error:")) =>`
	`2425`	`+ {`
`2422`	`2426`	`Ok(None)`
`2423`	`2427`	`}`
`2424`	`2428`	`_ => {`