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

Author: bors

src/librustc/middle/resolve.rs

@@ -5125,7 +5125,7 @@ pub impl Resolver {
                         view_path_simple(_, _, id) | view_path_glob(_, id) => {
                             if !self.used_imports.contains(&id) {
                                 self.session.add_lint(unused_imports,
-                                                      id, vi.span,
+                                                      id, p.span,
                                                       ~"unused import");
                             }
                         }

src/libsyntax/parse/parser.rs

@@ -1311,7 +1311,7 @@ pub impl Parser {
                     ex = expr_vec(~[first_expr], mutbl);
                 }
             }
-            hi = self.span.hi;
+            hi = self.last_span.hi;
         } else if self.eat_keyword("__log") {
             // LOG expression
             self.expect(&token::LPAREN);