bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #46381 - estebank:expected-span, r=nikomatsakis

Browse source 
Point to next token when it is in the expected line

r? @nikomatsakis
This commit is contained in:
bors 2017-12-02 20:06:42 +00:00
commit f9b0897c5d
4 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libsyntax/codemap.rs
View file

@ -358,7 +358,7 @@ impl CodeMap {
}
// If the relevant filemap is empty, we don't return a line number.
fn lookup_line(&self, pos: BytePos) -> Result<FileMapAndLine, Rc<FileMap>> {
pub fn lookup_line(&self, pos: BytePos) -> Result<FileMapAndLine, Rc<FileMap>> {
let idx = self.lookup_filemap_idx(pos);
let files = self.files.borrow();

21
src/libsyntax/parse/parser.rs
View file

@ -660,12 +660,29 @@ impl<'a> Parser<'a> {
} else {
label_sp
};
if self.span.contains(sp) {
let cm = self.sess.codemap();
match (cm.lookup_line(self.span.lo()), cm.lookup_line(sp.lo())) {
(Ok(ref a), Ok(ref b)) if a.line == b.line => {
// When the spans are in the same line, it means that the only content between
// them is whitespace, point at the found token in that case:
//
// X | () => { syntax error };
// | ^^^^^ expected one of 8 possible tokens here
//
// instead of having:
//
// X | () => { syntax error };
// | -^^^^^ unexpected token
// | |
// | expected one of 8 possible tokens here
err.span_label(self.span, label_exp);
} else {
}
_ => {
err.span_label(sp, label_exp);
err.span_label(self.span, "unexpected token");
}
}
Err(err)
}
}

4
src/test/ui/did_you_mean/issue-40006.stderr
View file

@ -48,9 +48,7 @@ error: expected one of `!` or `::`, found `(`
--> $DIR/issue-40006.rs:24:9
|
24 | ::Y (); //~ ERROR expected one of
| -^ unexpected token
| |
| expected one of `!` or `::` here
| ^ expected one of `!` or `::` here
error: missing `fn`, `type`, or `const` for impl-item declaration
--> $DIR/issue-40006.rs:28:8

8
src/test/ui/macro_backtrace/main.stderr
View file

@ -2,18 +2,14 @@ error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found
--> $DIR/main.rs:19:20
|
19 | () => { syntax error }; //~ ERROR expected one of
| -^^^^^ unexpected token
| |
| expected one of 8 possible tokens here
| ^^^^^ expected one of 8 possible tokens here
$DIR/main.rs:24:5: 24:13 note: in this expansion of pong! (defined in $DIR/main.rs)
error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error`
--> $DIR/main.rs:19:20
|
19 | () => { syntax error }; //~ ERROR expected one of
| -^^^^^ unexpected token
| |
| expected one of 8 possible tokens here
| ^^^^^ expected one of 8 possible tokens here
$DIR/main.rs:25:5: 25:13 note: in this expansion of ping! (defined in <ping macros>)
<ping macros>:1:11: 1:24 note: in this expansion of pong! (defined in $DIR/main.rs)