about summary refs log tree commit diff
path: root/src/libsyntax/ext
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-05-19 09:45:53 -0700
committerbors <bors@rust-lang.org>2016-05-19 09:45:53 -0700
commit764ef92ae7a26cbb9c2121de3812a0a17739f65f (patch)
treef3da197cb2dd98e06ec2c6937508f7f960d86b1a /src/libsyntax/ext
parent2fb6f8e2c94a7041877ed8460f2621974c5233f7 (diff)
parentacd2c11c5e8427c38471dd9d6aee8a347a612f27 (diff)
downloadrust-764ef92ae7a26cbb9c2121de3812a0a17739f65f.tar.gz
rust-764ef92ae7a26cbb9c2121de3812a0a17739f65f.zip
Auto merge of #33742 - Manishearth:rollup, r=Manishearth
Rollup of 10 pull requests

- Successful merges: #33353, #33611, #33696, #33698, #33705, #33708, #33712, #33720, #33721, #33730
- Failed merges:
Diffstat (limited to 'src/libsyntax/ext')
-rw-r--r--src/libsyntax/ext/expand.rs8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index 65df379781e..f243706eecb 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -70,15 +70,9 @@ pub fn expand_expr(e: P<ast::Expr>, fld: &mut MacroExpander) -> P<ast::Expr> {
 
             // Keep going, outside-in.
             let fully_expanded = fld.fold_expr(expanded_expr);
-            let span = fld.new_span(span);
             fld.cx.bt_pop();
 
-            fully_expanded.map(|e| ast::Expr {
-                id: ast::DUMMY_NODE_ID,
-                node: e.node,
-                span: span,
-                attrs: e.attrs,
-            })
+            fully_expanded
         }
 
         ast::ExprKind::InPlace(placer, value_expr) => {