review patch issue-6116

Author: Alexander Glusker

src/closures.rs

@@ -1,3 +1,4 @@
+use rustc_ast::ast::StmtKind;
 use rustc_ast::{ast, ptr};
 use rustc_span::Span;
 use thin_vec::thin_vec;
@@ -119,13 +120,8 @@ fn get_inner_expr<'a>(
     expr
 }
 
-fn iter_stmts_without_empty(
-    stmts: &thin_vec::ThinVec<ast::Stmt>,
-) -> impl Iterator<Item = &ast::Stmt> {
-    stmts.iter().filter(|x| match x.kind {
-        crate::ast::StmtKind::Empty => false,
-        _ => true,
-    })
+fn iter_stmts_without_empty(stmts: &[ast::Stmt]) -> impl Iterator<Item = &ast::Stmt> {
+    stmts.iter().filter(|x| !matches!(x.kind, StmtKind::Empty))
 }
 
 // Figure out if a block is necessary.

tests/source/issue-6116/main2.rs

@@ -0,0 +1,8 @@
+fn bar() -> fn(i32) -> i32 {
+    |a| {
+        ;
+        a;
+        b
+    }
+}
+

tests/source/issue-6116/main3.rs

@@ -0,0 +1,8 @@
+fn foo() -> fn(i32) -> i32 {
+    |a| {
+        ;
+	;
+	;;;;
+        a
+    }
+}

tests/source/issue-6116/main4.rs

@@ -0,0 +1,7 @@
+fn foo() -> fn(i32) -> i32 {
+    |a| {
+        /*comment before empty statement */;
+        a
+    }
+}
+

tests/target/issue-6116/main2.rs

@@ -0,0 +1,6 @@
+fn bar() -> fn(i32) -> i32 {
+    |a| {
+        a;
+        b
+    }
+}

tests/target/issue-6116/main3.rs

@@ -0,0 +1,3 @@
+fn foo() -> fn(i32) -> i32 {
+    |a| a
+}

tests/target/issue-6116/main4.rs

@@ -0,0 +1,6 @@
+fn foo() -> fn(i32) -> i32 {
+    |a| {
+        /*comment before empty statement */
+        a
+    }
+}