Rollup merge of rust-lang#24248 - nrc:macro-span, r=sfackler

Author: Manishearth

src/libsyntax/parse/parser.rs

@@ -2162,13 +2162,13 @@ impl<'a> Parser<'a> {
                             &token::CloseDelim(delim),
                             seq_sep_none(),
                             |p| p.parse_token_tree()));
-                        let hi = self.span.hi;
+                        let hi = self.last_span.hi;
 
                         return Ok(self.mk_mac_expr(lo,
-                                                hi,
-                                                MacInvocTT(pth,
-                                                           tts,
-                                                           EMPTY_CTXT)));
+                                                   hi,
+                                                   MacInvocTT(pth,
+                                                              tts,
+                                                              EMPTY_CTXT)));
                     }
                     if self.check(&token::OpenDelim(token::Brace)) {
                         // This is a struct literal, unless we're prohibited
@@ -3449,7 +3449,7 @@ impl<'a> Parser<'a> {
                 seq_sep_none(),
                 |p| p.parse_token_tree()
             ));
-            let hi = self.span.hi;
+            let hi = self.last_span.hi;
 
             let style = if delim == token::Brace {
                 MacStmtWithBraces