Auto merge of #28116 - nrc:closure-expand, r=alexcrichton

2 files changed, 1 insertions, 6 deletions

diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs
index e07cd7b5847..56a15ce895c 100644
--- a/src/libsyntax/codemap.rs
+++ b/src/libsyntax/codemap.rs
@@ -275,7 +275,6 @@ pub enum CompilerExpansionFormat {
     PlacementIn,
     WhileLet,
     ForLoop,
-    Closure,
 }
 
 impl CompilerExpansionFormat {
@@ -285,7 +284,6 @@ impl CompilerExpansionFormat {
             CompilerExpansionFormat::PlacementIn => "placement-in expansion",
             CompilerExpansionFormat::WhileLet => "while let expansion",
             CompilerExpansionFormat::ForLoop => "for loop expansion",
-            CompilerExpansionFormat::Closure => "closure expansion",
         }
     }
 }
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index 3459caecb26..c1c6918aba7 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -459,15 +459,12 @@ pub fn expand_expr(e: P<ast::Expr>, fld: &mut MacroExpander) -> P<ast::Expr> {
         }
 
         ast::ExprClosure(capture_clause, fn_decl, block) => {
-            push_compiler_expansion(fld, span, CompilerExpansionFormat::Closure);
             let (rewritten_fn_decl, rewritten_block)
                 = expand_and_rename_fn_decl_and_block(fn_decl, block, fld);
             let new_node = ast::ExprClosure(capture_clause,
                                             rewritten_fn_decl,
                                             rewritten_block);
-            let result = P(ast::Expr{id:id, node: new_node, span: fld.new_span(span)});
-            fld.cx.bt_pop();
-            result
+            P(ast::Expr{id:id, node: new_node, span: fld.new_span(span)})
         }
 
         _ => {