about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-05-05 17:35:28 -0400
committerGitHub <noreply@github.com>2017-05-05 17:35:28 -0400
commit9b2aacfdbe9569666d2d723bcde78ba3deef41a0 (patch)
tree31e1e5d12193f74ac7e7d34c3bbd79cc4c93cc9b /src
parentecd7b48b25740160a6b8942085e8417acf7ebb28 (diff)
parenta9d3b3498e20a926d5b1662eb576d7db230ca110 (diff)
downloadrust-9b2aacfdbe9569666d2d723bcde78ba3deef41a0.tar.gz
rust-9b2aacfdbe9569666d2d723bcde78ba3deef41a0.zip
Rollup merge of #41722 - F001:warnTilde, r=petrochenkov
Suggest `!` for bitwise negation when encountering a `~`

Fix #41679

Here is a program

```rust
fn main() {
    let x = ~1;
}
```

It's output:
```
error: `~` can not be used as an unary operator
 --> /home/fcc/temp/test.rs:4:13
  |
4 |     let x = ~1;
  |             ^^
  |
  = help: use `!` instead of `~` if you meant to bitwise negation
```

cc @bstrie
Diffstat (limited to 'src')
-rw-r--r--src/libsyntax/parse/parser.rs13
-rw-r--r--src/test/ui/did_you_mean/issue-41679.rs13
-rw-r--r--src/test/ui/did_you_mean/issue-41679.stderr10
3 files changed, 36 insertions, 0 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index d252963274e..f99f39dae6b 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -2700,6 +2700,19 @@ impl<'a> Parser<'a> {
                 let (span, e) = self.interpolated_or_expr_span(e)?;
                 (span, self.mk_unary(UnOp::Not, e))
             }
+            // Suggest `!` for bitwise negation when encountering a `~`
+            token::Tilde => {
+                self.bump();
+                let e = self.parse_prefix_expr(None);
+                let (span, e) = self.interpolated_or_expr_span(e)?;
+                let span_of_tilde = lo;
+                let mut err = self.diagnostic().struct_span_err(span_of_tilde,
+                        "`~` can not be used as an unary operator");
+                err.span_label(span_of_tilde, &"did you mean `!`?");
+                err.help("use `!` instead of `~` if you meant to perform bitwise negation");
+                err.emit();
+                (span, self.mk_unary(UnOp::Not, e))
+            }
             token::BinOp(token::Minus) => {
                 self.bump();
                 let e = self.parse_prefix_expr(None);
diff --git a/src/test/ui/did_you_mean/issue-41679.rs b/src/test/ui/did_you_mean/issue-41679.rs
new file mode 100644
index 00000000000..5091b9efc34
--- /dev/null
+++ b/src/test/ui/did_you_mean/issue-41679.rs
@@ -0,0 +1,13 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+fn main() {
+    let x = ~1;
+}
diff --git a/src/test/ui/did_you_mean/issue-41679.stderr b/src/test/ui/did_you_mean/issue-41679.stderr
new file mode 100644
index 00000000000..5a89ec96e24
--- /dev/null
+++ b/src/test/ui/did_you_mean/issue-41679.stderr
@@ -0,0 +1,10 @@
+error: `~` can not be used as an unary operator
+  --> $DIR/issue-41679.rs:12:13
+   |
+12 |     let x = ~1;
+   |             ^ did you mean `!`?
+   |
+   = help: use `!` instead of `~` if you meant to perform bitwise negation
+
+error: aborting due to previous error
+