Reword suggestion message

estebank · estebank · commit c09c73b99622 · 2024-11-16T20:03:31.000Z
diff --git a/compiler/rustc_parse/src/parser/stmt.rs b/compiler/rustc_parse/src/parser/stmt.rs
@@ -581,7 +581,7 @@ impl<'a> Parser<'a> {
                     {
                         // These are more likely to have been meant as a block body.
                         e.multipart_suggestion(
-                            "try placing this code inside a block",
+                            "you might have meant to write this as part of a block",
                             vec![
                                 (stmt_span.shrink_to_lo(), "{ ".to_string()),
                                 (stmt_span.shrink_to_hi(), " }".to_string()),
@@ -593,7 +593,7 @@ impl<'a> Parser<'a> {
                     (token::OpenDelim(Delimiter::Brace), _) => {}
                     (_, _) => {
                         e.multipart_suggestion(
-                            "try placing this code inside a block",
+                            "you might have meant to write this as part of a block",
                             vec![
                                 (stmt_span.shrink_to_lo(), "{ ".to_string()),
                                 (stmt_span.shrink_to_hi(), " }".to_string()),
diff --git a/tests/ui/let-else/let-else-if.stderr b/tests/ui/let-else/let-else-if.stderr
@@ -4,7 +4,7 @@ error: conditional `else if` is not supported for `let...else`
 LL |     let Some(_) = Some(()) else if true {
    |                                 ^^ expected `{`
    |
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL ~     let Some(_) = Some(()) else { if true {
 LL |
diff --git a/tests/ui/lint/issue-104392.stderr b/tests/ui/lint/issue-104392.stderr
@@ -6,7 +6,7 @@ LL |     { unsafe 92 }
    |       |
    |       while parsing this `unsafe` expression
    |
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |     { unsafe { 92 } }
    |              +    +
diff --git a/tests/ui/missing/missing-block-hint.stderr b/tests/ui/missing/missing-block-hint.stderr
@@ -25,7 +25,7 @@ note: the `if` expression is missing a block after this condition
    |
 LL |         if (foo)
    |            ^^^^^
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |             { bar; }
    |             +      +
diff --git a/tests/ui/parser/bad-if-statements.stderr b/tests/ui/parser/bad-if-statements.stderr
@@ -29,7 +29,7 @@ note: the `if` expression is missing a block after this condition
    |
 LL |     if true x
    |        ^^^^
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |     if true { x }
    |             +   +
@@ -65,7 +65,7 @@ note: the `if` expression is missing a block after this condition
    |
 LL |     if true x else {}
    |        ^^^^
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |     if true { x } else {}
    |             +   +
diff --git a/tests/ui/parser/block-no-opening-brace.stderr b/tests/ui/parser/block-no-opening-brace.stderr
@@ -6,7 +6,7 @@ LL |     loop
 LL |         let x = 0;
    |         ^^^ expected `{`
    |
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |         { let x = 0; }
    |         +            +
@@ -21,7 +21,7 @@ LL |     while true
 LL |         let x = 0;
    |         ^^^ expected `{`
    |
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |         { let x = 0; }
    |         +            +
@@ -32,7 +32,7 @@ error: expected `{`, found keyword `let`
 LL |         let x = 0;
    |         ^^^ expected `{`
    |
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |         { let x = 0; }
    |         +            +
diff --git a/tests/ui/parser/closure-return-syntax.stderr b/tests/ui/parser/closure-return-syntax.stderr
@@ -4,7 +4,7 @@ error: expected `{`, found `22`
 LL |     let x = || -> i32 22;
    |                       ^^ expected `{`
    |
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |     let x = || -> i32 { 22 };
    |                       +    +
diff --git a/tests/ui/parser/else-no-if.stderr b/tests/ui/parser/else-no-if.stderr
@@ -30,7 +30,7 @@ error: expected `{`, found `falsy`
 LL |     } else falsy();
    |            ^^^^^ expected `{`
    |
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |     } else { falsy() };
    |            +         +
@@ -41,7 +41,7 @@ error: expected `{`, found keyword `loop`
 LL |     } else loop{}
    |            ^^^^ expected `{`
    |
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |     } else { loop{} }
    |            +        +
@@ -65,7 +65,7 @@ error: expected `{`, found `falsy`
 LL |     } else falsy!();
    |            ^^^^^ expected `{`
    |
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |     } else { falsy!() };
    |            +          +
@@ -89,7 +89,7 @@ error: expected `{`, found `falsy`
 LL |     } else falsy! {};
    |            ^^^^^ expected `{`
    |
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |     } else { falsy! {} };
    |            +           +
diff --git a/tests/ui/parser/label-after-block-like.stderr b/tests/ui/parser/label-after-block-like.stderr
@@ -23,7 +23,7 @@ note: the `if` expression is missing a block after this condition
    |
 LL |     if let () = () 'a {}
    |        ^^^^^^^^^^^
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |     if let () = () { 'a {} }
    |                    +       +
@@ -53,7 +53,7 @@ note: the `if` expression is missing a block after this condition
    |
 LL |     if true 'a {}
    |        ^^^^
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |     if true { 'a {} }
    |             +       +
@@ -80,7 +80,7 @@ LL |     loop 'a {}
    |     |
    |     while parsing this `loop` expression
    |
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |     loop { 'a {} }
    |          +       +
@@ -108,7 +108,7 @@ LL |     while true 'a {}
    |     |     this `while` condition successfully parsed
    |     while parsing the body of this `while` expression
    |
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |     while true { 'a {} }
    |                +       +
@@ -136,7 +136,7 @@ LL |     while let () = () 'a {}
    |     |     this `while` condition successfully parsed
    |     while parsing the body of this `while` expression
    |
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |     while let () = () { 'a {} }
    |                       +       +
@@ -161,7 +161,7 @@ error: expected `{`, found `'a`
 LL |     for _ in 0..0 'a {}
    |                   ^^ expected `{`
    |
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |     for _ in 0..0 { 'a {} }
    |                   +       +
@@ -188,7 +188,7 @@ LL |     unsafe 'a {}
    |     |
    |     while parsing this `unsafe` expression
    |
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |     unsafe { 'a {} }
    |            +       +
diff --git a/tests/ui/unsafe/unsafe-block-without-braces.stderr b/tests/ui/unsafe/unsafe-block-without-braces.stderr
@@ -6,7 +6,7 @@ LL |     unsafe //{
 LL |         std::mem::transmute::<f32, u32>(1.0);
    |         ^^^ expected `{`
    |
-help: try placing this code inside a block
+help: you might have meant to write this as part of a block
    |
 LL |         { std::mem::transmute::<f32, u32>(1.0); }
    |         +                                       +

Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error: conditional `else if` is not supported for `let...else`
`4`	`4`	`LL \| let Some(_) = Some(()) else if true {`
`5`	`5`	\| ^^ expected `{`
`6`	`6`	`\|`
`7`		`-help: try placing this code inside a block`
	`7`	`+help: you might have meant to write this as part of a block`
`8`	`8`	`\|`
`9`	`9`	`LL ~ let Some(_) = Some(()) else { if true {`
`10`	`10`	`LL \|`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ LL \| { unsafe 92 }`
`6`	`6`	`\| \|`
`7`	`7`	\| while parsing this `unsafe` expression
`8`	`8`	`\|`
`9`		`-help: try placing this code inside a block`
	`9`	`+help: you might have meant to write this as part of a block`
`10`	`10`	`\|`
`11`	`11`	`LL \| { unsafe { 92 } }`
`12`	`12`	`\| + +`
Original file line number	Diff line number	Diff line change
@@ -25,7 +25,7 @@ note: the `if` expression is missing a block after this condition
`25`	`25`	`\|`
`26`	`26`	`LL \| if (foo)`
`27`	`27`	`\| ^^^^^`
`28`		`-help: try placing this code inside a block`
	`28`	`+help: you might have meant to write this as part of a block`
`29`	`29`	`\|`
`30`	`30`	`LL \| { bar; }`
`31`	`31`	`\| + +`
Original file line number	Diff line number	Diff line change
@@ -29,7 +29,7 @@ note: the `if` expression is missing a block after this condition
`29`	`29`	`\|`
`30`	`30`	`LL \| if true x`
`31`	`31`	`\| ^^^^`
`32`		`-help: try placing this code inside a block`
	`32`	`+help: you might have meant to write this as part of a block`
`33`	`33`	`\|`
`34`	`34`	`LL \| if true { x }`
`35`	`35`	`\| + +`
@@ -65,7 +65,7 @@ note: the `if` expression is missing a block after this condition
`65`	`65`	`\|`
`66`	`66`	`LL \| if true x else {}`
`67`	`67`	`\| ^^^^`
`68`		`-help: try placing this code inside a block`
	`68`	`+help: you might have meant to write this as part of a block`
`69`	`69`	`\|`
`70`	`70`	`LL \| if true { x } else {}`
`71`	`71`	`\| + +`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ LL \| loop`
`6`	`6`	`LL \| let x = 0;`
`7`	`7`	\| ^^^ expected `{`
`8`	`8`	`\|`
`9`		`-help: try placing this code inside a block`
	`9`	`+help: you might have meant to write this as part of a block`
`10`	`10`	`\|`
`11`	`11`	`LL \| { let x = 0; }`
`12`	`12`	`\| + +`
`@@ -21,7 +21,7 @@ LL \| while true`
`21`	`21`	`LL \| let x = 0;`
`22`	`22`	\| ^^^ expected `{`
`23`	`23`	`\|`
`24`		`-help: try placing this code inside a block`
	`24`	`+help: you might have meant to write this as part of a block`
`25`	`25`	`\|`
`26`	`26`	`LL \| { let x = 0; }`
`27`	`27`	`\| + +`
@@ -32,7 +32,7 @@ error: expected `{`, found keyword `let`
`32`	`32`	`LL \| let x = 0;`
`33`	`33`	\| ^^^ expected `{`
`34`	`34`	`\|`
`35`		`-help: try placing this code inside a block`
	`35`	`+help: you might have meant to write this as part of a block`
`36`	`36`	`\|`
`37`	`37`	`LL \| { let x = 0; }`
`38`	`38`	`\| + +`
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error: expected `{`, found `22`
`4`	`4`	`LL \| let x = \|\| -> i32 22;`
`5`	`5`	\| ^^ expected `{`
`6`	`6`	`\|`
`7`		`-help: try placing this code inside a block`
	`7`	`+help: you might have meant to write this as part of a block`
`8`	`8`	`\|`
`9`	`9`	`LL \| let x = \|\| -> i32 { 22 };`
`10`	`10`	`\| + +`
Original file line number	Diff line number	Diff line change
@@ -30,7 +30,7 @@ error: expected `{`, found `falsy`
`30`	`30`	`LL \| } else falsy();`
`31`	`31`	\| ^^^^^ expected `{`
`32`	`32`	`\|`
`33`		`-help: try placing this code inside a block`
	`33`	`+help: you might have meant to write this as part of a block`
`34`	`34`	`\|`
`35`	`35`	`LL \| } else { falsy() };`
`36`	`36`	`\| + +`
@@ -41,7 +41,7 @@ error: expected `{`, found keyword `loop`
`41`	`41`	`LL \| } else loop{}`
`42`	`42`	\| ^^^^ expected `{`
`43`	`43`	`\|`
`44`		`-help: try placing this code inside a block`
	`44`	`+help: you might have meant to write this as part of a block`
`45`	`45`	`\|`
`46`	`46`	`LL \| } else { loop{} }`
`47`	`47`	`\| + +`
@@ -65,7 +65,7 @@ error: expected `{`, found `falsy`
`65`	`65`	`LL \| } else falsy!();`
`66`	`66`	\| ^^^^^ expected `{`
`67`	`67`	`\|`
`68`		`-help: try placing this code inside a block`
	`68`	`+help: you might have meant to write this as part of a block`
`69`	`69`	`\|`
`70`	`70`	`LL \| } else { falsy!() };`
`71`	`71`	`\| + +`
@@ -89,7 +89,7 @@ error: expected `{`, found `falsy`
`89`	`89`	`LL \| } else falsy! {};`
`90`	`90`	\| ^^^^^ expected `{`
`91`	`91`	`\|`
`92`		`-help: try placing this code inside a block`
	`92`	`+help: you might have meant to write this as part of a block`
`93`	`93`	`\|`
`94`	`94`	`LL \| } else { falsy! {} };`
`95`	`95`	`\| + +`
Original file line number	Diff line number	Diff line change
@@ -23,7 +23,7 @@ note: the `if` expression is missing a block after this condition
`23`	`23`	`\|`
`24`	`24`	`LL \| if let () = () 'a {}`
`25`	`25`	`\| ^^^^^^^^^^^`
`26`		`-help: try placing this code inside a block`
	`26`	`+help: you might have meant to write this as part of a block`
`27`	`27`	`\|`
`28`	`28`	`LL \| if let () = () { 'a {} }`
`29`	`29`	`\| + +`
@@ -53,7 +53,7 @@ note: the `if` expression is missing a block after this condition
`53`	`53`	`\|`
`54`	`54`	`LL \| if true 'a {}`
`55`	`55`	`\| ^^^^`
`56`		`-help: try placing this code inside a block`
	`56`	`+help: you might have meant to write this as part of a block`
`57`	`57`	`\|`
`58`	`58`	`LL \| if true { 'a {} }`
`59`	`59`	`\| + +`
`@@ -80,7 +80,7 @@ LL \| loop 'a {}`
`80`	`80`	`\| \|`
`81`	`81`	\| while parsing this `loop` expression
`82`	`82`	`\|`
`83`		`-help: try placing this code inside a block`
	`83`	`+help: you might have meant to write this as part of a block`
`84`	`84`	`\|`
`85`	`85`	`LL \| loop { 'a {} }`
`86`	`86`	`\| + +`
`@@ -108,7 +108,7 @@ LL \| while true 'a {}`
`108`	`108`	\| \| this `while` condition successfully parsed
`109`	`109`	\| while parsing the body of this `while` expression
`110`	`110`	`\|`
`111`		`-help: try placing this code inside a block`
	`111`	`+help: you might have meant to write this as part of a block`
`112`	`112`	`\|`
`113`	`113`	`LL \| while true { 'a {} }`
`114`	`114`	`\| + +`
`@@ -136,7 +136,7 @@ LL \| while let () = () 'a {}`
`136`	`136`	\| \| this `while` condition successfully parsed
`137`	`137`	\| while parsing the body of this `while` expression
`138`	`138`	`\|`
`139`		`-help: try placing this code inside a block`
	`139`	`+help: you might have meant to write this as part of a block`
`140`	`140`	`\|`
`141`	`141`	`LL \| while let () = () { 'a {} }`
`142`	`142`	`\| + +`
@@ -161,7 +161,7 @@ error: expected `{`, found `'a`
`161`	`161`	`LL \| for _ in 0..0 'a {}`
`162`	`162`	\| ^^ expected `{`
`163`	`163`	`\|`
`164`		`-help: try placing this code inside a block`
	`164`	`+help: you might have meant to write this as part of a block`
`165`	`165`	`\|`
`166`	`166`	`LL \| for _ in 0..0 { 'a {} }`
`167`	`167`	`\| + +`
`@@ -188,7 +188,7 @@ LL \| unsafe 'a {}`
`188`	`188`	`\| \|`
`189`	`189`	\| while parsing this `unsafe` expression
`190`	`190`	`\|`
`191`		`-help: try placing this code inside a block`
	`191`	`+help: you might have meant to write this as part of a block`
`192`	`192`	`\|`
`193`	`193`	`LL \| unsafe { 'a {} }`
`194`	`194`	`\| + +`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ LL \| unsafe //{`
`6`	`6`	`LL \| std::mem::transmute::<f32, u32>(1.0);`
`7`	`7`	\| ^^^ expected `{`
`8`	`8`	`\|`
`9`		`-help: try placing this code inside a block`
	`9`	`+help: you might have meant to write this as part of a block`
`10`	`10`	`\|`
`11`	`11`	`LL \| { std::mem::transmute::<f32, u32>(1.0); }`
`12`	`12`	`\| + +`