bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Use more precise span when reporting semicolon hint

Browse source 
When reporting "consider removing this semicolon" hint message, the
offending semicolon may come from macro call site instead of macro
itself. Using the more appropriate span makes the hint more helpful.

Closes #13428.
This commit is contained in:
Edward Wang 2014-04-10 04:42:25 +08:00
parent ce2bab68d6
commit cc5be28b32
5 changed files with 54 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3260,9 +3260,14 @@ impl<'a> Parser<'a> {
match self.token {
token::SEMI => {
self.bump();
let span_with_semi = Span {
lo: stmt.span.lo,
hi: self.last_span.hi,
expn_info: stmt.span.expn_info,
};
stmts.push(@codemap::Spanned {
node: StmtSemi(e, stmt_id),
span: stmt.span,
span: span_with_semi,
});
}
token::RBRACE => {
@ -3275,33 +3280,26 @@ impl<'a> Parser<'a> {
}
StmtMac(ref m, _) => {
// statement macro; might be an expr
let has_semi;
match self.token {
token::SEMI => {
has_semi = true;
self.bump();
stmts.push(@codemap::Spanned {
node: StmtMac((*m).clone(), true),
span: stmt.span,
});
}
token::RBRACE => {
// if a block ends in `m!(arg)` without
// a `;`, it must be an expr
has_semi = false;
expr = Some(
self.mk_mac_expr(stmt.span.lo,
stmt.span.hi,
m.node.clone()));
}
_ => {
has_semi = false;
stmts.push(stmt);
}
}
if has_semi {
self.bump();
stmts.push(@codemap::Spanned {
node: StmtMac((*m).clone(), true),
span: stmt.span,
});
}
}
_ => { // all other kinds of statements:
stmts.push(stmt);