more tweak on diagnostic messages

chenyukang · chenyukang · commit f43562b95bb8 · 2022-09-15T22:39:16.000+08:00
diff --git a/compiler/rustc_error_messages/locales/en-US/parser.ftl b/compiler/rustc_error_messages/locales/en-US/parser.ftl
@@ -47,15 +47,15 @@ parser_invalid_comparison_operator = invalid comparison operator `{$invalid}`
     .spaceship_operator_invalid = `<=>` is not a valid comparison operator, use `std::cmp::Ordering`
 
 parser_invalid_logical_operator = `{$incorrect}` is not a logical operator
-    .note = unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
+    .note = unlike in e.g., Python and PHP, `&&` and `||` are used for logical operators
     .use_amp_amp_for_conjunction = use `&&` to perform logical conjunction
     .use_pipe_pipe_for_disjunction = use `||` to perform logical disjunction
 
 parser_tilde_is_not_unary_operator = `~` cannot be used as a unary operator
     .suggestion = use `!` to perform bitwise not
 
 parser_unexpected_token_after_not = unexpected {$negated_desc} after identifier
-    .suggestion = use `!` to perform bitwise not
+    .suggestion = use `!` to perform {$negated_msg}
 
 parser_malformed_loop_label = malformed loop label
     .suggestion = use the correct loop label format
diff --git a/compiler/rustc_parse/src/parser/diagnostics.rs b/compiler/rustc_parse/src/parser/diagnostics.rs
@@ -430,6 +430,7 @@ pub(crate) struct NotAsNegationOperator {
     #[primary_span]
     pub negated: Span,
     pub negated_desc: String,
+    pub negated_msg: String,
     #[suggestion_short(applicability = "machine-applicable", code = "!")]
     pub not: Span,
 }
diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs
@@ -660,9 +660,18 @@ impl<'a> Parser<'a> {
     fn recover_not_expr(&mut self, lo: Span) -> PResult<'a, (Span, ExprKind)> {
         // Emit the error...
         let negated_token = self.look_ahead(1, |t| t.clone());
+        let negtated_msg = if negated_token.is_numeric_lit() {
+            "bitwise not"
+        } else if negated_token.is_bool_lit() {
+            "logical negation"
+        } else {
+            "logical negation or bitwise not"
+        };
+
         self.sess.emit_err(NotAsNegationOperator {
             negated: negated_token.span,
             negated_desc: super::token_descr(&negated_token),
+            negated_msg: negtated_msg.to_string(),
             // Span the `not` plus trailing whitespace to avoid
             // trailing whitespace after the `!` in our suggestion
             not: self.sess.source_map().span_until_non_whitespace(lo.to(negated_token.span)),
diff --git a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.fixed b/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.fixed
@@ -3,4 +3,8 @@
 fn main() {
     let _x = !1; //~ ERROR cannot be used as a unary operator
     let _y = !1; //~ ERROR unexpected `1` after identifier
+    let _z = !false; //~ ERROR unexpected keyword `false` after identifier
+    let _a = !true; //~ ERROR unexpected keyword `true` after identifier
+    let v = 1 + 2;
+    let _v = !v; //~ ERROR unexpected `v` after identifier
 }
diff --git a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.rs b/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.rs
@@ -3,4 +3,8 @@
 fn main() {
     let _x = ~1; //~ ERROR cannot be used as a unary operator
     let _y = not 1; //~ ERROR unexpected `1` after identifier
+    let _z = not false; //~ ERROR unexpected keyword `false` after identifier
+    let _a = not true; //~ ERROR unexpected keyword `true` after identifier
+    let v = 1 + 2;
+    let _v = not v; //~ ERROR unexpected `v` after identifier
 }
diff --git a/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.stderr b/src/test/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.stderr
@@ -12,5 +12,29 @@ LL |     let _y = not 1;
    |              |
    |              help: use `!` to perform bitwise not
 
-error: aborting due to 2 previous errors
+error: unexpected keyword `false` after identifier
+  --> $DIR/issue-41679-tilde-bitwise-negation-attempt.rs:6:18
+   |
+LL |     let _z = not false;
+   |              ----^^^^^
+   |              |
+   |              help: use `!` to perform logical negation
+
+error: unexpected keyword `true` after identifier
+  --> $DIR/issue-41679-tilde-bitwise-negation-attempt.rs:7:18
+   |
+LL |     let _a = not true;
+   |              ----^^^^
+   |              |
+   |              help: use `!` to perform logical negation
+
+error: unexpected `v` after identifier
+  --> $DIR/issue-41679-tilde-bitwise-negation-attempt.rs:9:18
+   |
+LL |     let _v = not v;
+   |              ----^
+   |              |
+   |              help: use `!` to perform logical negation or bitwise not
+
+error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.stderr b/src/test/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.stderr
@@ -4,21 +4,21 @@ error: unexpected `for_you` after identifier
 LL |     if not for_you {
    |        ----^^^^^^^
    |        |
-   |        help: use `!` to perform bitwise not
+   |        help: use `!` to perform logical negation or bitwise not
 
 error: unexpected `the_worst` after identifier
   --> $DIR/issue-46836-identifier-not-instead-of-negation.rs:11:15
    |
 LL |     while not the_worst {
    |           ----^^^^^^^^^
    |           |
-   |           help: use `!` to perform bitwise not
+   |           help: use `!` to perform logical negation or bitwise not
 
 error: unexpected `println` after identifier
   --> $DIR/issue-46836-identifier-not-instead-of-negation.rs:20:9
    |
 LL |     if not  // lack of braces is [sic]
-   |        ----- help: use `!` to perform bitwise not
+   |        ----- help: use `!` to perform logical negation or bitwise not
 LL |         println!("Then when?");
    |         ^^^^^^^
 
@@ -50,7 +50,7 @@ error: unexpected `be_smothered_out_before` after identifier
 LL |     let young_souls = not be_smothered_out_before;
    |                       ----^^^^^^^^^^^^^^^^^^^^^^^
    |                       |
-   |                       help: use `!` to perform bitwise not
+   |                       help: use `!` to perform logical negation or bitwise not
 
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr b/src/test/ui/did_you_mean/issue-54109-and_instead_of_ampersands.stderr
@@ -4,63 +4,63 @@ error: `and` is not a logical operator
 LL |     let _ = a and b;
    |               ^^^ help: use `&&` to perform logical conjunction
    |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
+   = note: unlike in e.g., Python and PHP, `&&` and `||` are used for logical operators
 
 error: `and` is not a logical operator
   --> $DIR/issue-54109-and_instead_of_ampersands.rs:9:10
    |
 LL |     if a and b {
    |          ^^^ help: use `&&` to perform logical conjunction
    |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
+   = note: unlike in e.g., Python and PHP, `&&` and `||` are used for logical operators
 
 error: `or` is not a logical operator
   --> $DIR/issue-54109-and_instead_of_ampersands.rs:20:15
    |
 LL |     let _ = a or b;
    |               ^^ help: use `||` to perform logical disjunction
    |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
+   = note: unlike in e.g., Python and PHP, `&&` and `||` are used for logical operators
 
 error: `or` is not a logical operator
   --> $DIR/issue-54109-and_instead_of_ampersands.rs:22:10
    |
 LL |     if a or b {
    |          ^^ help: use `||` to perform logical disjunction
    |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
+   = note: unlike in e.g., Python and PHP, `&&` and `||` are used for logical operators
 
 error: `and` is not a logical operator
   --> $DIR/issue-54109-and_instead_of_ampersands.rs:30:11
    |
 LL |     if (a and b) {
    |           ^^^ help: use `&&` to perform logical conjunction
    |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
+   = note: unlike in e.g., Python and PHP, `&&` and `||` are used for logical operators
 
 error: `or` is not a logical operator
   --> $DIR/issue-54109-and_instead_of_ampersands.rs:38:11
    |
 LL |     if (a or b) {
    |           ^^ help: use `||` to perform logical disjunction
    |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
+   = note: unlike in e.g., Python and PHP, `&&` and `||` are used for logical operators
 
 error: `and` is not a logical operator
   --> $DIR/issue-54109-and_instead_of_ampersands.rs:46:13
    |
 LL |     while a and b {
    |             ^^^ help: use `&&` to perform logical conjunction
    |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
+   = note: unlike in e.g., Python and PHP, `&&` and `||` are used for logical operators
 
 error: `or` is not a logical operator
   --> $DIR/issue-54109-and_instead_of_ampersands.rs:54:13
    |
 LL |     while a or b {
    |             ^^ help: use `||` to perform logical disjunction
    |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
+   = note: unlike in e.g., Python and PHP, `&&` and `||` are used for logical operators
 
 error[E0308]: mismatched types
   --> $DIR/issue-54109-and_instead_of_ampersands.rs:13:33
diff --git a/src/test/ui/did_you_mean/issue-54109-without-witness.stderr b/src/test/ui/did_you_mean/issue-54109-without-witness.stderr
@@ -4,63 +4,63 @@ error: `and` is not a logical operator
 LL |     let _ = a and b;
    |               ^^^ help: use `&&` to perform logical conjunction
    |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
+   = note: unlike in e.g., Python and PHP, `&&` and `||` are used for logical operators
 
 error: `and` is not a logical operator
   --> $DIR/issue-54109-without-witness.rs:15:10
    |
 LL |     if a and b {
    |          ^^^ help: use `&&` to perform logical conjunction
    |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
+   = note: unlike in e.g., Python and PHP, `&&` and `||` are used for logical operators
 
 error: `or` is not a logical operator
   --> $DIR/issue-54109-without-witness.rs:24:15
    |
 LL |     let _ = a or b;
    |               ^^ help: use `||` to perform logical disjunction
    |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
+   = note: unlike in e.g., Python and PHP, `&&` and `||` are used for logical operators
 
 error: `or` is not a logical operator
   --> $DIR/issue-54109-without-witness.rs:26:10
    |
 LL |     if a or b {
    |          ^^ help: use `||` to perform logical disjunction
    |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
+   = note: unlike in e.g., Python and PHP, `&&` and `||` are used for logical operators
 
 error: `and` is not a logical operator
   --> $DIR/issue-54109-without-witness.rs:34:11
    |
 LL |     if (a and b) {
    |           ^^^ help: use `&&` to perform logical conjunction
    |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
+   = note: unlike in e.g., Python and PHP, `&&` and `||` are used for logical operators
 
 error: `or` is not a logical operator
   --> $DIR/issue-54109-without-witness.rs:42:11
    |
 LL |     if (a or b) {
    |           ^^ help: use `||` to perform logical disjunction
    |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
+   = note: unlike in e.g., Python and PHP, `&&` and `||` are used for logical operators
 
 error: `and` is not a logical operator
   --> $DIR/issue-54109-without-witness.rs:50:13
    |
 LL |     while a and b {
    |             ^^^ help: use `&&` to perform logical conjunction
    |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
+   = note: unlike in e.g., Python and PHP, `&&` and `||` are used for logical operators
 
 error: `or` is not a logical operator
   --> $DIR/issue-54109-without-witness.rs:58:13
    |
 LL |     while a or b {
    |             ^^ help: use `||` to perform logical disjunction
    |
-   = note: unlike in e.g., python and PHP, `&&` and `||` are used for logical operators
+   = note: unlike in e.g., Python and PHP, `&&` and `||` are used for logical operators
 
 error: aborting due to 8 previous errors
 

Original file line number	Diff line number	Diff line change
`@@ -430,6 +430,7 @@ pub(crate) struct NotAsNegationOperator {`
`430`	`430`	`#[primary_span]`
`431`	`431`	`pub negated: Span,`
`432`	`432`	`pub negated_desc: String,`
	`433`	`+ pub negated_msg: String,`
`433`	`434`	`#[suggestion_short(applicability = "machine-applicable", code = "!")]`
`434`	`435`	`pub not: Span,`
`435`	`436`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,8 @@`
`3`	`3`	`fn main() {`
`4`	`4`	`let _x = !1; //~ ERROR cannot be used as a unary operator`
`5`	`5`	let _y = !1; //~ ERROR unexpected `1` after identifier
	`6`	+ let _z = !false; //~ ERROR unexpected keyword `false` after identifier
	`7`	+ let _a = !true; //~ ERROR unexpected keyword `true` after identifier
	`8`	`+ let v = 1 + 2;`
	`9`	+ let _v = !v; //~ ERROR unexpected `v` after identifier
`6`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,8 @@`
`3`	`3`	`fn main() {`
`4`	`4`	`let _x = ~1; //~ ERROR cannot be used as a unary operator`
`5`	`5`	let _y = not 1; //~ ERROR unexpected `1` after identifier
	`6`	+ let _z = not false; //~ ERROR unexpected keyword `false` after identifier
	`7`	+ let _a = not true; //~ ERROR unexpected keyword `true` after identifier
	`8`	`+ let v = 1 + 2;`
	`9`	+ let _v = not v; //~ ERROR unexpected `v` after identifier
`6`	`10`	`}`
Original file line number	Diff line number	Diff line change
@@ -4,63 +4,63 @@ error: `and` is not a logical operator
`4`	`4`	`LL \| let _ = a and b;`
`5`	`5`	\| ^^^ help: use `&&` to perform logical conjunction
`6`	`6`	`\|`
`7`		- = note: unlike in e.g., python and PHP, `&&` and `\|\|` are used for logical operators
	`7`	+ = note: unlike in e.g., Python and PHP, `&&` and `\|\|` are used for logical operators
`8`	`8`
`9`	`9`	error: `and` is not a logical operator
`10`	`10`	`--> $DIR/issue-54109-and_instead_of_ampersands.rs:9:10`
`11`	`11`	`\|`
`12`	`12`	`LL \| if a and b {`
`13`	`13`	\| ^^^ help: use `&&` to perform logical conjunction
`14`	`14`	`\|`
`15`		- = note: unlike in e.g., python and PHP, `&&` and `\|\|` are used for logical operators
	`15`	+ = note: unlike in e.g., Python and PHP, `&&` and `\|\|` are used for logical operators
`16`	`16`
`17`	`17`	error: `or` is not a logical operator
`18`	`18`	`--> $DIR/issue-54109-and_instead_of_ampersands.rs:20:15`
`19`	`19`	`\|`
`20`	`20`	`LL \| let _ = a or b;`
`21`	`21`	\| ^^ help: use `\|\|` to perform logical disjunction
`22`	`22`	`\|`
`23`		- = note: unlike in e.g., python and PHP, `&&` and `\|\|` are used for logical operators
	`23`	+ = note: unlike in e.g., Python and PHP, `&&` and `\|\|` are used for logical operators
`24`	`24`
`25`	`25`	error: `or` is not a logical operator
`26`	`26`	`--> $DIR/issue-54109-and_instead_of_ampersands.rs:22:10`
`27`	`27`	`\|`
`28`	`28`	`LL \| if a or b {`
`29`	`29`	\| ^^ help: use `\|\|` to perform logical disjunction
`30`	`30`	`\|`
`31`		- = note: unlike in e.g., python and PHP, `&&` and `\|\|` are used for logical operators
	`31`	+ = note: unlike in e.g., Python and PHP, `&&` and `\|\|` are used for logical operators
`32`	`32`
`33`	`33`	error: `and` is not a logical operator
`34`	`34`	`--> $DIR/issue-54109-and_instead_of_ampersands.rs:30:11`
`35`	`35`	`\|`
`36`	`36`	`LL \| if (a and b) {`
`37`	`37`	\| ^^^ help: use `&&` to perform logical conjunction
`38`	`38`	`\|`
`39`		- = note: unlike in e.g., python and PHP, `&&` and `\|\|` are used for logical operators
	`39`	+ = note: unlike in e.g., Python and PHP, `&&` and `\|\|` are used for logical operators
`40`	`40`
`41`	`41`	error: `or` is not a logical operator
`42`	`42`	`--> $DIR/issue-54109-and_instead_of_ampersands.rs:38:11`
`43`	`43`	`\|`
`44`	`44`	`LL \| if (a or b) {`
`45`	`45`	\| ^^ help: use `\|\|` to perform logical disjunction
`46`	`46`	`\|`
`47`		- = note: unlike in e.g., python and PHP, `&&` and `\|\|` are used for logical operators
	`47`	+ = note: unlike in e.g., Python and PHP, `&&` and `\|\|` are used for logical operators
`48`	`48`
`49`	`49`	error: `and` is not a logical operator
`50`	`50`	`--> $DIR/issue-54109-and_instead_of_ampersands.rs:46:13`
`51`	`51`	`\|`
`52`	`52`	`LL \| while a and b {`
`53`	`53`	\| ^^^ help: use `&&` to perform logical conjunction
`54`	`54`	`\|`
`55`		- = note: unlike in e.g., python and PHP, `&&` and `\|\|` are used for logical operators
	`55`	+ = note: unlike in e.g., Python and PHP, `&&` and `\|\|` are used for logical operators
`56`	`56`
`57`	`57`	error: `or` is not a logical operator
`58`	`58`	`--> $DIR/issue-54109-and_instead_of_ampersands.rs:54:13`
`59`	`59`	`\|`
`60`	`60`	`LL \| while a or b {`
`61`	`61`	\| ^^ help: use `\|\|` to perform logical disjunction
`62`	`62`	`\|`
`63`		- = note: unlike in e.g., python and PHP, `&&` and `\|\|` are used for logical operators
	`63`	+ = note: unlike in e.g., Python and PHP, `&&` and `\|\|` are used for logical operators
`64`	`64`
`65`	`65`	`error[E0308]: mismatched types`
`66`	`66`	`--> $DIR/issue-54109-and_instead_of_ampersands.rs:13:33`