Rollup merge of rust-lang#65552 - JohnTitor:use-bitwise-not, r=Dylan-DPC

tmandry · web-flow · commit 3850408b9b85 · 2019-10-18T13:48:38.000-07:00
Clarify diagnostics when using `~` as a unary op It seems we prefer `bitwise not` to `bitwise negation`. Fixes rust-lang#57239 r? @estebank
diff --git a/src/libsyntax/parse/parser/expr.rs b/src/libsyntax/parse/parser/expr.rs
@@ -423,7 +423,7 @@ impl<'a> Parser<'a> {
                 self.struct_span_err(span_of_tilde, "`~` cannot be used as a unary operator")
                     .span_suggestion_short(
                         span_of_tilde,
-                        "use `!` to perform bitwise negation",
+                        "use `!` to perform bitwise not",
                         "!".to_owned(),
                         Applicability::MachineApplicable
                     )
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
@@ -2,7 +2,7 @@ error: `~` cannot be used as a unary operator
   --> $DIR/issue-41679-tilde-bitwise-negation-attempt.rs:2:13
    |
 LL |     let x = ~1;
-   |             ^ help: use `!` to perform bitwise negation
+   |             ^ help: use `!` to perform bitwise not
 
 error: aborting due to previous error
 

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ impl<'a> Parser<'a> {`
`423`	`423`	self.struct_span_err(span_of_tilde, "`~` cannot be used as a unary operator")
`424`	`424`	`.span_suggestion_short(`
`425`	`425`	`span_of_tilde,`
`426`		- "use `!` to perform bitwise negation",
	`426`	+ "use `!` to perform bitwise not",
`427`	`427`	`"!".to_owned(),`
`428`	`428`	`Applicability::MachineApplicable`
`429`	`429`	`)`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error: `~` cannot be used as a unary operator
`2`	`2`	`--> $DIR/issue-41679-tilde-bitwise-negation-attempt.rs:2:13`
`3`	`3`	`\|`
`4`	`4`	`LL \| let x = ~1;`
`5`		- \| ^ help: use `!` to perform bitwise negation
	`5`	+ \| ^ help: use `!` to perform bitwise not
`6`	`6`
`7`	`7`	`error: aborting due to previous error`
`8`	`8`