rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Point at last valid token on failed expect_one_of

Browse Source 
```rust
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `)`
  --> $DIR/token-error-correct-3.rs:29:9
   |
25 |         foo()
   |             - expected one of `.`, `;`, `?`, `}`, or an operator after this
...
29 |     } else {
   |     ^ unexpected token
```
This commit is contained in:
Esteban Küber
2017-03-24 19:14:58 -07:00
parent c62e532f3d
commit 03eca71381
8 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/libsyntax/parse/parser.rs
View File

@@ -548,20 +548,20 @@ impl<'a> Parser<'a> {
expected.dedup();
let expect = tokens_to_string(&expected[..]);
let actual = self.this_token_to_string();
Err(self.fatal(
&(if expected.len() > 1 {
(format!("expected one of {}, found `{}`",
expect,
actual))
} else if expected.is_empty() {
(format!("unexpected token: `{}`",
actual))
} else {
(format!("expected {}, found `{}`",
expect,
actual))
})[..]
))
let (msg_exp, label_exp) = if expected.len() > 1 {
(format!("expected one of {}, found `{}`", expect, actual),
format!("expected one of {} after this", expect))
} else if expected.is_empty() {
(format!("unexpected token: `{}`", actual),
"unexpected token after this".to_string())
} else {
(format!("expected {}, found `{}`", expect, actual),
format!("expected {} after this", expect))
};
let mut err = self.fatal(&msg_exp);
err.span_label(self.prev_span, &label_exp);
err.span_label(self.span, &"unexpected token");
Err(err)
}
}