From 981b031c9fe695b169be79a7f53402d84f35ebee Mon Sep 17 00:00:00 2001
From: Nick Cameron <ncameron@mozilla.com>
Date: Tue, 7 Mar 2017 14:30:01 +1300
Subject: [PATCH] Treat new blocks like existing ones in closures

Fixes #1355
---
 src/expr.rs          | 2 +-
 tests/target/expr.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/expr.rs b/src/expr.rs
index 7f5d88d3f68..e540965fd8c 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -494,7 +494,7 @@ fn rewrite_closure(capture: ast::CaptureBy,
         rules: ast::BlockCheckMode::Default,
         span: body.span,
     };
-    return rewrite_closure_block(&block, prefix, context, body_shape.block());
+    return rewrite_closure_block(&block, prefix, context, body_shape);
 
     fn rewrite_closure_expr(expr: &ast::Expr,
                             prefix: &str,
diff --git a/tests/target/expr.rs b/tests/target/expr.rs
index 2d9f0e6ad10..d05870086e3 100644
--- a/tests/target/expr.rs
+++ b/tests/target/expr.rs
@@ -292,6 +292,6 @@ fn issue1106() {
     }
 
     for entry in WalkDir::new(path).into_iter().filter_entry(|entry| {
-        exclusions.filter_entry(entry)
-    }) {}
+                                                                 exclusions.filter_entry(entry)
+                                                             }) {}
 }