compiletest: Make SUGGESTION annotations viral

petrochenkov · petrochenkov · commit 0ca31277f319 · 2025-04-10T23:48:57.000+03:00
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
@@ -306,7 +306,7 @@ impl TestProps {
                 (ErrorKind::Note, true),
                 (ErrorKind::Error, true),
                 (ErrorKind::Warning, true),
-                (ErrorKind::Suggestion, false),
+                (ErrorKind::Suggestion, true),
             ]),
         }
     }
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
@@ -711,6 +711,7 @@ impl<'test> TestCx<'test> {
 
         let expect_help = expected_errors.iter().any(|ee| ee.kind == Some(ErrorKind::Help));
         let expect_note = expected_errors.iter().any(|ee| ee.kind == Some(ErrorKind::Note));
+        let expect_sugg = expected_errors.iter().any(|ee| ee.kind == Some(ErrorKind::Suggestion));
 
         // Parse the JSON output from the compiler and extract out the messages.
         let actual_errors = json::parse_output(&diagnostic_file_name, &proc_res.stderr, proc_res);
@@ -737,8 +738,12 @@ impl<'test> TestCx<'test> {
 
                 None => {
                     // If the test is a known bug, don't require that the error is annotated
-                    if self.is_unexpected_compiler_message(&actual_error, expect_help, expect_note)
-                    {
+                    if self.is_unexpected_compiler_message(
+                        &actual_error,
+                        expect_help,
+                        expect_note,
+                        expect_sugg,
+                    ) {
                         self.error(&format!(
                             "{}:{}: unexpected {}: '{}'",
                             file_name,
@@ -802,6 +807,7 @@ impl<'test> TestCx<'test> {
         actual_error: &Error,
         expect_help: bool,
         expect_note: bool,
+        expect_sugg: bool,
     ) -> bool {
         actual_error.require_annotation
             && actual_error.kind.map_or(false, |err_kind| {
@@ -811,6 +817,7 @@ impl<'test> TestCx<'test> {
                 match err_kind {
                     ErrorKind::Help => expect_help && default_require_annotations,
                     ErrorKind::Note => expect_note && default_require_annotations,
+                    ErrorKind::Suggestion => expect_sugg && default_require_annotations,
                     _ => default_require_annotations,
                 }
             })
diff --git a/tests/ui/async-await/suggest-missing-await.rs b/tests/ui/async-await/suggest-missing-await.rs
@@ -1,4 +1,5 @@
 //@ edition:2018
+//@ dont-require-annotations:SUGGESTION
 
 fn take_u32(_x: u32) {}
 
diff --git a/tests/ui/async-await/suggest-missing-await.stderr b/tests/ui/async-await/suggest-missing-await.stderr
@@ -1,18 +1,18 @@
 error[E0308]: mismatched types
-  --> $DIR/suggest-missing-await.rs:12:14
+  --> $DIR/suggest-missing-await.rs:13:14
    |
 LL |     take_u32(x)
    |     -------- ^ expected `u32`, found future
    |     |
    |     arguments to this function are incorrect
    |
 note: calling an async function returns a future
-  --> $DIR/suggest-missing-await.rs:12:14
+  --> $DIR/suggest-missing-await.rs:13:14
    |
 LL |     take_u32(x)
    |              ^
 note: function defined here
-  --> $DIR/suggest-missing-await.rs:3:4
+  --> $DIR/suggest-missing-await.rs:4:4
    |
 LL | fn take_u32(_x: u32) {}
    |    ^^^^^^^^ -------
@@ -22,13 +22,13 @@ LL |     take_u32(x.await)
    |               ++++++
 
 error[E0308]: mismatched types
-  --> $DIR/suggest-missing-await.rs:22:5
+  --> $DIR/suggest-missing-await.rs:23:5
    |
 LL |     dummy()
    |     ^^^^^^^ expected `()`, found future
    |
 note: calling an async function returns a future
-  --> $DIR/suggest-missing-await.rs:22:5
+  --> $DIR/suggest-missing-await.rs:23:5
    |
 LL |     dummy()
    |     ^^^^^^^
@@ -42,7 +42,7 @@ LL |     dummy();
    |            +
 
 error[E0308]: `if` and `else` have incompatible types
-  --> $DIR/suggest-missing-await.rs:35:9
+  --> $DIR/suggest-missing-await.rs:36:9
    |
 LL |       let _x = if true {
    |  ______________-
@@ -64,7 +64,7 @@ LL |         dummy().await
    |                ++++++
 
 error[E0308]: `match` arms have incompatible types
-  --> $DIR/suggest-missing-await.rs:45:14
+  --> $DIR/suggest-missing-await.rs:46:14
    |
 LL |       let _x = match 0usize {
    |  ______________-
@@ -87,7 +87,7 @@ LL ~         1 => dummy().await,
    |
 
 error[E0308]: mismatched types
-  --> $DIR/suggest-missing-await.rs:53:9
+  --> $DIR/suggest-missing-await.rs:54:9
    |
 LL |     let _x = match dummy() {
    |                    ------- this expression has type `impl Future<Output = ()>`
@@ -102,7 +102,7 @@ LL |     let _x = match dummy().await {
    |                           ++++++
 
 error[E0308]: mismatched types
-  --> $DIR/suggest-missing-await.rs:67:9
+  --> $DIR/suggest-missing-await.rs:68:9
    |
 LL |     match dummy_result() {
    |           -------------- this expression has type `impl Future<Output = Result<(), ()>>`
@@ -118,7 +118,7 @@ LL |     match dummy_result().await {
    |                         ++++++
 
 error[E0308]: mismatched types
-  --> $DIR/suggest-missing-await.rs:69:9
+  --> $DIR/suggest-missing-await.rs:70:9
    |
 LL |     match dummy_result() {
    |           -------------- this expression has type `impl Future<Output = Result<(), ()>>`
@@ -134,7 +134,7 @@ LL |     match dummy_result().await {
    |                         ++++++
 
 error[E0308]: mismatched types
-  --> $DIR/suggest-missing-await.rs:77:27
+  --> $DIR/suggest-missing-await.rs:78:27
    |
 LL |     Some(do_async()).map(|()| {});
    |                           ^^
diff --git a/tests/ui/cast/cast-as-bool.rs b/tests/ui/cast/cast-as-bool.rs
@@ -1,3 +1,5 @@
+//@ dont-require-annotations:SUGGESTION
+
 fn main() {
     let u = 5 as bool; //~ ERROR cannot cast `i32` as `bool`
                        //~| HELP compare with zero instead
diff --git a/tests/ui/cast/cast-as-bool.stderr b/tests/ui/cast/cast-as-bool.stderr
@@ -1,5 +1,5 @@
 error[E0054]: cannot cast `i32` as `bool`
-  --> $DIR/cast-as-bool.rs:2:13
+  --> $DIR/cast-as-bool.rs:4:13
    |
 LL |     let u = 5 as bool;
    |             ^^^^^^^^^
@@ -11,7 +11,7 @@ LL +     let u = 5 != 0;
    |
 
 error[E0054]: cannot cast `i32` as `bool`
-  --> $DIR/cast-as-bool.rs:6:13
+  --> $DIR/cast-as-bool.rs:8:13
    |
 LL |     let t = (1 + 2) as bool;
    |             ^^^^^^^^^^^^^^^
@@ -23,7 +23,7 @@ LL +     let t = (1 + 2) != 0;
    |
 
 error[E0054]: cannot cast `u32` as `bool`
-  --> $DIR/cast-as-bool.rs:10:13
+  --> $DIR/cast-as-bool.rs:12:13
    |
 LL |     let _ = 5_u32 as bool;
    |             ^^^^^^^^^^^^^
@@ -35,7 +35,7 @@ LL +     let _ = 5_u32 != 0;
    |
 
 error[E0054]: cannot cast `f64` as `bool`
-  --> $DIR/cast-as-bool.rs:13:13
+  --> $DIR/cast-as-bool.rs:15:13
    |
 LL |     let _ = 64.0_f64 as bool;
    |             ^^^^^^^^^^^^^^^^
@@ -47,43 +47,43 @@ LL +     let _ = 64.0_f64 != 0;
    |
 
 error[E0054]: cannot cast `IntEnum` as `bool`
-  --> $DIR/cast-as-bool.rs:24:13
+  --> $DIR/cast-as-bool.rs:26:13
    |
 LL |     let _ = IntEnum::One as bool;
    |             ^^^^^^^^^^^^^^^^^^^^ unsupported cast
 
 error[E0054]: cannot cast `fn(u8) -> String {uwu}` as `bool`
-  --> $DIR/cast-as-bool.rs:33:13
+  --> $DIR/cast-as-bool.rs:35:13
    |
 LL |     let _ = uwu as bool;
    |             ^^^^^^^^^^^ unsupported cast
 
 error[E0054]: cannot cast `unsafe fn() {owo}` as `bool`
-  --> $DIR/cast-as-bool.rs:35:13
+  --> $DIR/cast-as-bool.rs:37:13
    |
 LL |     let _ = owo as bool;
    |             ^^^^^^^^^^^ unsupported cast
 
 error[E0054]: cannot cast `fn(u8) -> String` as `bool`
-  --> $DIR/cast-as-bool.rs:38:13
+  --> $DIR/cast-as-bool.rs:40:13
    |
 LL |     let _ = uwu as fn(u8) -> String as bool;
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unsupported cast
 
 error[E0054]: cannot cast `char` as `bool`
-  --> $DIR/cast-as-bool.rs:40:13
+  --> $DIR/cast-as-bool.rs:42:13
    |
 LL |     let _ = 'x' as bool;
    |             ^^^^^^^^^^^ unsupported cast
 
 error[E0054]: cannot cast `*const ()` as `bool`
-  --> $DIR/cast-as-bool.rs:44:13
+  --> $DIR/cast-as-bool.rs:46:13
    |
 LL |     let _ = ptr as bool;
    |             ^^^^^^^^^^^ unsupported cast
 
 error[E0606]: casting `&'static str` as `bool` is invalid
-  --> $DIR/cast-as-bool.rs:46:13
+  --> $DIR/cast-as-bool.rs:48:13
    |
 LL |     let v = "hello" as bool;
    |             ^^^^^^^^^^^^^^^
diff --git a/tests/ui/fn/suggest-return-closure.rs b/tests/ui/fn/suggest-return-closure.rs
@@ -19,6 +19,7 @@ fn fn_mut() -> _ {
     let x = String::new();
     //~^ HELP: consider changing this to be mutable
     //~| NOTE binding `x` declared here
+    //~| SUGGESTION mut
     |c| { //~ NOTE: value captured here
         x.push(c);
         //~^ ERROR: does not live long enough
diff --git a/tests/ui/fn/suggest-return-closure.stderr b/tests/ui/fn/suggest-return-closure.stderr
@@ -21,7 +21,7 @@ LL | fn fn_mut() -> _ {
    = note: for more information on `Fn` traits and closure types, see https://doc.rust-lang.org/book/ch13-01-closures.html
 
 error[E0121]: the placeholder `_` is not allowed within types on item signatures for return types
-  --> $DIR/suggest-return-closure.rs:32:13
+  --> $DIR/suggest-return-closure.rs:33:13
    |
 LL | fn fun() -> _ {
    |             ^
@@ -32,7 +32,7 @@ LL | fn fun() -> _ {
    = note: for more information on `Fn` traits and closure types, see https://doc.rust-lang.org/book/ch13-01-closures.html
 
 error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
-  --> $DIR/suggest-return-closure.rs:23:9
+  --> $DIR/suggest-return-closure.rs:24:9
    |
 LL |         x.push(c);
    |         ^ cannot borrow as mutable
@@ -43,7 +43,7 @@ LL |     let mut x = String::new();
    |         +++
 
 error[E0597]: `x` does not live long enough
-  --> $DIR/suggest-return-closure.rs:23:9
+  --> $DIR/suggest-return-closure.rs:24:9
    |
 LL |     let x = String::new();
    |         - binding `x` declared here
diff --git a/tests/ui/parser/inverted-parameters.rs b/tests/ui/parser/inverted-parameters.rs
@@ -1,3 +1,5 @@
+//@ dont-require-annotations:SUGGESTION
+
 struct S;
 
 impl S {
diff --git a/tests/ui/parser/inverted-parameters.stderr b/tests/ui/parser/inverted-parameters.stderr
@@ -1,5 +1,5 @@
 error: expected one of `:`, `@`, or `|`, found `bar`
-  --> $DIR/inverted-parameters.rs:4:24
+  --> $DIR/inverted-parameters.rs:6:24
    |
 LL |     fn foo(&self, &str bar) {}
    |                   -----^^^
@@ -8,7 +8,7 @@ LL |     fn foo(&self, &str bar) {}
    |                   help: declare the type after the parameter binding: `<identifier>: <type>`
 
 error: expected one of `:`, `@`, or `|`, found `quux`
-  --> $DIR/inverted-parameters.rs:10:10
+  --> $DIR/inverted-parameters.rs:12:10
    |
 LL | fn baz(S quux, xyzzy: i32) {}
    |        --^^^^
@@ -17,19 +17,19 @@ LL | fn baz(S quux, xyzzy: i32) {}
    |        help: declare the type after the parameter binding: `<identifier>: <type>`
 
 error: expected one of `:`, `@`, or `|`, found `a`
-  --> $DIR/inverted-parameters.rs:15:12
+  --> $DIR/inverted-parameters.rs:17:12
    |
 LL | fn one(i32 a b) {}
    |            ^ expected one of `:`, `@`, or `|`
 
 error: expected one of `:` or `|`, found `(`
-  --> $DIR/inverted-parameters.rs:18:23
+  --> $DIR/inverted-parameters.rs:20:23
    |
 LL | fn pattern((i32, i32) (a, b)) {}
    |                       ^ expected one of `:` or `|`
 
 error: expected one of `:`, `@`, or `|`, found `)`
-  --> $DIR/inverted-parameters.rs:21:12
+  --> $DIR/inverted-parameters.rs:23:12
    |
 LL | fn fizz(i32) {}
    |            ^ expected one of `:`, `@`, or `|`
@@ -49,7 +49,7 @@ LL | fn fizz(_: i32) {}
    |         ++
 
 error: expected one of `:`, `@`, or `|`, found `S`
-  --> $DIR/inverted-parameters.rs:27:23
+  --> $DIR/inverted-parameters.rs:29:23
    |
 LL | fn missing_colon(quux S) {}
    |                  -----^
diff --git a/tests/ui/suggestions/suggest-ref-mut.rs b/tests/ui/suggestions/suggest-ref-mut.rs
@@ -1,3 +1,5 @@
+//@ dont-require-annotations:SUGGESTION
+
 struct X(usize);
 
 impl X {
diff --git a/tests/ui/suggestions/suggest-ref-mut.stderr b/tests/ui/suggestions/suggest-ref-mut.stderr
@@ -1,5 +1,5 @@
 error[E0594]: cannot assign to `self.0`, which is behind a `&` reference
-  --> $DIR/suggest-ref-mut.rs:7:9
+  --> $DIR/suggest-ref-mut.rs:9:9
    |
 LL |         self.0 = 32;
    |         ^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be written
@@ -10,7 +10,7 @@ LL |     fn zap(&mut self) {
    |             +++
 
 error[E0594]: cannot assign to `*foo`, which is behind a `&` reference
-  --> $DIR/suggest-ref-mut.rs:15:5
+  --> $DIR/suggest-ref-mut.rs:17:5
    |
 LL |     *foo = 32;
    |     ^^^^^^^^^ `foo` is a `&` reference, so the data it refers to cannot be written
@@ -21,7 +21,7 @@ LL |     let ref mut foo = 16;
    |             +++
 
 error[E0594]: cannot assign to `*bar`, which is behind a `&` reference
-  --> $DIR/suggest-ref-mut.rs:19:9
+  --> $DIR/suggest-ref-mut.rs:21:9
    |
 LL |         *bar = 32;
    |         ^^^^^^^^^ `bar` is a `&` reference, so the data it refers to cannot be written
@@ -32,7 +32,7 @@ LL |     if let Some(ref mut bar) = Some(16) {
    |                     +++
 
 error[E0594]: cannot assign to `*quo`, which is behind a `&` reference
-  --> $DIR/suggest-ref-mut.rs:23:22
+  --> $DIR/suggest-ref-mut.rs:25:22
    |
 LL |         ref quo => { *quo = 32; },
    |                      ^^^^^^^^^ `quo` is a `&` reference, so the data it refers to cannot be written
diff --git a/tests/ui/typeck/issue-90027-async-fn-return-suggestion.rs b/tests/ui/typeck/issue-90027-async-fn-return-suggestion.rs
@@ -1,4 +1,5 @@
 //@ edition:2018
+//@ dont-require-annotations:SUGGESTION
 
 async fn hello() { //~ HELP try adding a return type
     0
diff --git a/tests/ui/typeck/issue-90027-async-fn-return-suggestion.stderr b/tests/ui/typeck/issue-90027-async-fn-return-suggestion.stderr

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ impl TestProps {`
`306`	`306`	`(ErrorKind::Note, true),`
`307`	`307`	`(ErrorKind::Error, true),`
`308`	`308`	`(ErrorKind::Warning, true),`
`309`		`- (ErrorKind::Suggestion, false),`
	`309`	`+ (ErrorKind::Suggestion, true),`
`310`	`310`	`]),`
`311`	`311`	`}`
`312`	`312`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`//@ edition:2018`
	`2`	`+//@ dont-require-annotations:SUGGESTION`
`2`	`3`
`3`	`4`	`fn take_u32(_x: u32) {}`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//@ dont-require-annotations:SUGGESTION`
	`2`	`+`
`1`	`3`	`fn main() {`
`2`	`4`	let u = 5 as bool; //~ ERROR cannot cast `i32` as `bool`
`3`	`5`	`//~\| HELP compare with zero instead`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error[E0054]: cannot cast `i32` as `bool`
`2`		`- --> $DIR/cast-as-bool.rs:2:13`
	`2`	`+ --> $DIR/cast-as-bool.rs:4:13`
`3`	`3`	`\|`
`4`	`4`	`LL \| let u = 5 as bool;`
`5`	`5`	`\| ^^^^^^^^^`
`@@ -11,7 +11,7 @@ LL + let u = 5 != 0;`
`11`	`11`	`\|`
`12`	`12`
`13`	`13`	error[E0054]: cannot cast `i32` as `bool`
`14`		`- --> $DIR/cast-as-bool.rs:6:13`
	`14`	`+ --> $DIR/cast-as-bool.rs:8:13`
`15`	`15`	`\|`
`16`	`16`	`LL \| let t = (1 + 2) as bool;`
`17`	`17`	`\| ^^^^^^^^^^^^^^^`
`@@ -23,7 +23,7 @@ LL + let t = (1 + 2) != 0;`
`23`	`23`	`\|`
`24`	`24`
`25`	`25`	error[E0054]: cannot cast `u32` as `bool`
`26`		`- --> $DIR/cast-as-bool.rs:10:13`
	`26`	`+ --> $DIR/cast-as-bool.rs:12:13`
`27`	`27`	`\|`
`28`	`28`	`LL \| let _ = 5_u32 as bool;`
`29`	`29`	`\| ^^^^^^^^^^^^^`
`@@ -35,7 +35,7 @@ LL + let _ = 5_u32 != 0;`
`35`	`35`	`\|`
`36`	`36`
`37`	`37`	error[E0054]: cannot cast `f64` as `bool`
`38`		`- --> $DIR/cast-as-bool.rs:13:13`
	`38`	`+ --> $DIR/cast-as-bool.rs:15:13`
`39`	`39`	`\|`
`40`	`40`	`LL \| let _ = 64.0_f64 as bool;`
`41`	`41`	`\| ^^^^^^^^^^^^^^^^`
`@@ -47,43 +47,43 @@ LL + let _ = 64.0_f64 != 0;`
`47`	`47`	`\|`
`48`	`48`
`49`	`49`	error[E0054]: cannot cast `IntEnum` as `bool`
`50`		`- --> $DIR/cast-as-bool.rs:24:13`
	`50`	`+ --> $DIR/cast-as-bool.rs:26:13`
`51`	`51`	`\|`
`52`	`52`	`LL \| let _ = IntEnum::One as bool;`
`53`	`53`	`\| ^^^^^^^^^^^^^^^^^^^^ unsupported cast`
`54`	`54`
`55`	`55`	error[E0054]: cannot cast `fn(u8) -> String {uwu}` as `bool`
`56`		`- --> $DIR/cast-as-bool.rs:33:13`
	`56`	`+ --> $DIR/cast-as-bool.rs:35:13`
`57`	`57`	`\|`
`58`	`58`	`LL \| let _ = uwu as bool;`
`59`	`59`	`\| ^^^^^^^^^^^ unsupported cast`
`60`	`60`
`61`	`61`	error[E0054]: cannot cast `unsafe fn() {owo}` as `bool`
`62`		`- --> $DIR/cast-as-bool.rs:35:13`
	`62`	`+ --> $DIR/cast-as-bool.rs:37:13`
`63`	`63`	`\|`
`64`	`64`	`LL \| let _ = owo as bool;`
`65`	`65`	`\| ^^^^^^^^^^^ unsupported cast`
`66`	`66`
`67`	`67`	error[E0054]: cannot cast `fn(u8) -> String` as `bool`
`68`		`- --> $DIR/cast-as-bool.rs:38:13`
	`68`	`+ --> $DIR/cast-as-bool.rs:40:13`
`69`	`69`	`\|`
`70`	`70`	`LL \| let _ = uwu as fn(u8) -> String as bool;`
`71`	`71`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ unsupported cast`
`72`	`72`
`73`	`73`	error[E0054]: cannot cast `char` as `bool`
`74`		`- --> $DIR/cast-as-bool.rs:40:13`
	`74`	`+ --> $DIR/cast-as-bool.rs:42:13`
`75`	`75`	`\|`
`76`	`76`	`LL \| let _ = 'x' as bool;`
`77`	`77`	`\| ^^^^^^^^^^^ unsupported cast`
`78`	`78`
`79`	`79`	error[E0054]: cannot cast `*const ()` as `bool`
`80`		`- --> $DIR/cast-as-bool.rs:44:13`
	`80`	`+ --> $DIR/cast-as-bool.rs:46:13`
`81`	`81`	`\|`
`82`	`82`	`LL \| let _ = ptr as bool;`
`83`	`83`	`\| ^^^^^^^^^^^ unsupported cast`
`84`	`84`
`85`	`85`	error[E0606]: casting `&'static str` as `bool` is invalid
`86`		`- --> $DIR/cast-as-bool.rs:46:13`
	`86`	`+ --> $DIR/cast-as-bool.rs:48:13`
`87`	`87`	`\|`
`88`	`88`	`LL \| let v = "hello" as bool;`
`89`	`89`	`\| ^^^^^^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//@ dont-require-annotations:SUGGESTION`
	`2`	`+`
`1`	`3`	`struct S;`
`2`	`4`
`3`	`5`	`impl S {`