mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Force to use block for body of closure when it contains comment

Browse Source
This commit is contained in:
topecongiro 2017-10-27 15:41:42 +09:00
parent 9de9693a45
commit ab81011a5b
1 changed files with 1 additions and 4 deletions
Show Stats 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) 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| { _ => to_control_flow(expr, ExprType::SubExpression).and_then(|control_flow| {
let alt_block_sep = let alt_block_sep =
String::from("\n") + &shape.indent.block_only().to_string(context.config); String::from("\n") + &shape.indent.block_only().to_string(context.config);
@ -2219,7 +2216,7 @@ fn rewrite_last_closure(
) -> Option<String> { ) -> Option<String> {
if let ast::ExprKind::Closure(capture, ref fn_decl, ref body, _) = expr.node { if let ast::ExprKind::Closure(capture, ref fn_decl, ref body, _) = expr.node {
let body = match body.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) stmt_expr(&block.stmts[0]).unwrap_or(body)
} }
_ => body, _ => body,