From ab81011a5b4613d154bb31a98cd1d70afd705949 Mon Sep 17 00:00:00 2001 From: topecongiro Date: Fri, 27 Oct 2017 15:41:42 +0900 Subject: [PATCH] Force to use block for body of closure when it contains comment --- src/expr.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/expr.rs b/src/expr.rs index 4eaf52681ad..5cd2190f8e3 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -899,9 +899,6 @@ fn rewrite_cond(context: &RewriteContext, expr: &ast::Expr, shape: Shape) -> Opt }; cond.rewrite(context, cond_shape) } - ast::ExprKind::Block(ref block) if block.stmts.len() == 1 => { - stmt_expr(&block.stmts[0]).and_then(|e| rewrite_cond(context, e, shape)) - } _ => to_control_flow(expr, ExprType::SubExpression).and_then(|control_flow| { let alt_block_sep = String::from("\n") + &shape.indent.block_only().to_string(context.config); @@ -2219,7 +2216,7 @@ fn rewrite_last_closure( ) -> Option { if let ast::ExprKind::Closure(capture, ref fn_decl, ref body, _) = expr.node { let body = match body.node { - ast::ExprKind::Block(ref block) if block.stmts.len() == 1 => { + ast::ExprKind::Block(ref block) if is_simple_block(block, context.codemap) => { stmt_expr(&block.stmts[0]).unwrap_or(body) } _ => body,