rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki 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
parent 377decc352 fe89740957
commit f9b0897c5d
4 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -660,11 +660,28 @@ impl<'a> Parser<'a> {
} else {
label_sp
};
if self.span.contains(sp) {
err.span_label(self.span, label_exp);
} else {
err.span_label(sp, label_exp);
err.span_label(self.span, "unexpected token");
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);
}
_ => {
err.span_label(sp, label_exp);
err.span_label(self.span, "unexpected token");
}
}
Err(err)
}