diff options
| author | Huon Wilson <dbau.pp+github@gmail.com> | 2014-12-11 21:01:28 -0700 |
|---|---|---|
| committer | Huon Wilson <dbau.pp+github@gmail.com> | 2014-12-29 23:55:25 +1100 |
| commit | d442f7756161eb36531772ed905680385f87f1a4 (patch) | |
| tree | 8c9ff7113c02be1e77991d3de25f656e6206ef23 /src/libsyntax | |
| parent | 4f7e5ed6601186b26a9e9f142cc07e18cd318d59 (diff) | |
| download | rust-d442f7756161eb36531772ed905680385f87f1a4.tar.gz rust-d442f7756161eb36531772ed905680385f87f1a4.zip | |
Rebase fixes.
I've totally mangled the history with these rebases; sorry, future programmer!
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 15b92b2edbf..a2e2abab03e 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3746,9 +3746,9 @@ impl<'a> Parser<'a> { if id.name == token::special_idents::invalid.name { P(spanned(lo, hi, - StmtMac(spanned(lo, + StmtMac(P(spanned(lo, hi, - MacInvocTT(pth, tts, EMPTY_CTXT)), + MacInvocTT(pth, tts, EMPTY_CTXT))), style))) } else { // if it has a special ident, it's definitely an item @@ -3911,7 +3911,7 @@ impl<'a> Parser<'a> { _ => { let e = self.mk_mac_expr(span.lo, span.hi, - macro.node); + macro.and_then(|m| m.node)); let e = self.parse_dot_or_call_expr_with(e); self.handle_expression_like_statement( |