Ignoring empty statements in closures. Resolve rust-lang#6116

rscprof · Apr 9, 2024 · 83496fb · 83496fb
1 parent 7289391
commit 83496fb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/src/closures.rs b/src/closures.rs
@@ -107,7 107,10 @@ fn get_inner_expr<'a>(
  if !needs_block(block, prefix, context) {
  // block.stmts.len() == 1 except with `|| {{}}`;
  // https://github.com/rust-lang/rustfmt/issues/3844
- if let Some(expr) = block.stmts.first().and_then(stmt_expr) {
  if let Some(expr) = iter_stmts_without_empty(&block.stmts)
  .next()
  .and_then(stmt_expr)
  {
  return get_inner_expr(expr, prefix, context);
  }
  }
@@ -116,14 119,23 @@ 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,
  })
 }
 
 // Figure out if a block is necessary.
 fn needs_block(block: &ast::Block, prefix: &str, context: &RewriteContext<'_>) -> bool {
  let has_attributes = block.stmts.first().map_or(false, |first_stmt| {
  !get_attrs_from_stmt(first_stmt).is_empty()
  });
 
  is_unsafe_block(block)
- || block.stmts.len() > 1
  || iter_stmts_without_empty(&block.stmts).count() > 1
  || has_attributes
  || block_contains_comment(context, block)
  || prefix.contains('\n')

diff --git a/tests/source/issue-6116/main.rs b/tests/source/issue-6116/main.rs
@@ -0,0 1,7 @@
 fn foo() -> fn(i32) -> i32 {
  |a| {
  ;
  a
  }
 }
 
diff --git a/tests/target/issue-6116/main.rs b/tests/target/issue-6116/main.rs
@@ -0,0 1,3 @@
 fn foo() -> fn(i32) -> i32 {
  |a| a
 }