auto merge of rust-lang#11599 : sanxiyn/rust/accurate-span-3, r=luqmana

indirect · Jan 16, 2014 · 9434e7c · 9434e7c
2 parents fa91446 + 1f5dc55
commit 9434e7c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
@@ -2023,7 +2023,7 @@ impl Parser {
                     seq_sep_trailing_disallowed(token::COMMA),
                     |p| p.parse_expr()
                 );
-                hi = self.span.hi;
+                hi = self.last_span.hi;
 
                 let nd = self.mk_call(e, es, NoSugar);
                 e = self.mk_expr(lo, hi, nd);
@@ -2033,7 +2033,7 @@ impl Parser {
               token::LBRACKET => {
                 self.bump();
                 let ix = self.parse_expr();
-                hi = ix.span.hi;
+                hi = self.span.hi;
                 self.commit_expr_expecting(ix, token::RBRACKET);
                 let index = self.mk_index(e, ix);
                 e = self.mk_expr(lo, hi, index)