diff options
| author | Esteban Küber <esteban@kuber.com.ar> | 2018-10-29 09:39:58 -0700 |
|---|---|---|
| committer | Esteban Küber <esteban@kuber.com.ar> | 2018-10-29 09:39:58 -0700 |
| commit | 54858d5a6709f3fee2481fc9d607b81683f6b1ec (patch) | |
| tree | 9c95ea80865d143a6ed111c7b942b03927689f71 /src | |
| parent | 3e22e0c3bc54825f096111bc86ea6e4a6b076ba0 (diff) | |
| download | rust-54858d5a6709f3fee2481fc9d607b81683f6b1ec.tar.gz rust-54858d5a6709f3fee2481fc9d607b81683f6b1ec.zip | |
Fix regression
Diffstat (limited to 'src')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/issues/issue-46186.stderr | 4 | ||||
| -rw-r--r-- | src/test/ui/issues/issue-49040.stderr | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 003f83a5c6e..326271a517b 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -6307,7 +6307,7 @@ impl<'a> Parser<'a> { if !self.eat(term) { let token_str = self.this_token_descr(); let mut err = self.fatal(&format!("expected item, found {}", token_str)); - if token_str == ";" { + if self.token == token::Semi { let msg = "consider removing this semicolon"; err.span_suggestion_short_with_applicability( self.span, msg, String::new(), Applicability::MachineApplicable diff --git a/src/test/ui/issues/issue-46186.stderr b/src/test/ui/issues/issue-46186.stderr index 1482b204d64..c64d5c68a79 100644 --- a/src/test/ui/issues/issue-46186.stderr +++ b/src/test/ui/issues/issue-46186.stderr @@ -2,7 +2,9 @@ error: expected item, found `;` --> $DIR/issue-46186.rs:13:2 | LL | }; //~ ERROR expected item, found `;` - | ^ expected item + | ^ help: consider removing this semicolon + | + = help: braced struct declarations are not followed by a semicolon error: aborting due to previous error diff --git a/src/test/ui/issues/issue-49040.stderr b/src/test/ui/issues/issue-49040.stderr index 5fc3528e74b..b6f624dac7d 100644 --- a/src/test/ui/issues/issue-49040.stderr +++ b/src/test/ui/issues/issue-49040.stderr @@ -2,7 +2,7 @@ error: expected item, found `;` --> $DIR/issue-49040.rs:11:28 | LL | #![allow(unused_variables)]; //~ ERROR expected item, found `;` - | ^ expected item + | ^ help: consider removing this semicolon error: aborting due to previous error |