mirror of
https://github.com/rust-lang/rust.git
synced 2024-12-15 01:55:03 +00:00
auto merge of #6654 : sanxiyn/rust/accurate-span-2, r=bstrie
This commit is contained in:
commit
808aada1fb
@ -5125,7 +5125,7 @@ pub impl Resolver {
|
|||||||
view_path_simple(_, _, id) | view_path_glob(_, id) => {
|
view_path_simple(_, _, id) | view_path_glob(_, id) => {
|
||||||
if !self.used_imports.contains(&id) {
|
if !self.used_imports.contains(&id) {
|
||||||
self.session.add_lint(unused_imports,
|
self.session.add_lint(unused_imports,
|
||||||
id, vi.span,
|
id, p.span,
|
||||||
~"unused import");
|
~"unused import");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1311,7 +1311,7 @@ pub impl Parser {
|
|||||||
ex = expr_vec(~[first_expr], mutbl);
|
ex = expr_vec(~[first_expr], mutbl);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
hi = self.span.hi;
|
hi = self.last_span.hi;
|
||||||
} else if self.eat_keyword("__log") {
|
} else if self.eat_keyword("__log") {
|
||||||
// LOG expression
|
// LOG expression
|
||||||
self.expect(&token::LPAREN);
|
self.expect(&token::LPAREN);
|
||||||
|
Loading…
Reference in New Issue
Block a user