rollup merge of #17314 : eddyb/span-no-gc

2014-09-19 10:00:21 -07:00
parent 129aff7d97 f1a8f53cf1
commit b94075c9ce
21 changed files with 145 additions and 134 deletions
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -3591,7 +3591,7 @@ impl<'a> Parser<'a> {
                                    let span_with_semi = Span {
                                        lo: span.lo,
                                        hi: self.last_span.hi,
-                                        expn_info: span.expn_info,
+                                        expn_id: span.expn_id,
                                    };
                                    stmts.push(P(Spanned {
                                        node: StmtSemi(e, stmt_id),