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

auto merge of #6654 : sanxiyn/rust/accurate-span-2, r=bstrie

Browse source
This commit is contained in:
bors 2013-05-21 05:37:17 -07:00
commit 808aada1fb
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc/middle/resolve.rs
View file

@ -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");
} }
} }

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

@ -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);