user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2089 from topecongiro/closure-block-body-with-comment

Browse source 
Fix rustfmt failing to format closure block body with comment
This commit is contained in:
Nick Cameron 2017-10-27 15:17:38 +05:30 • committed by GitHub
commit f159d32c1f
3 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/expr.rs
View file

@ -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);
@ -2228,7 +2225,7 @@ fn rewrite_last_closure(
) -> Option<String> {
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,