Merge multiline_closure_forces_block and multiline_match_arm_forces_block into force_...

[rust.git] / src / expr.rs

diff --git a/src/expr.rs b/src/expr.rs
index 14913fef9e7a2fc1d120a60df564ef63e1e06e41..9d29425a5ddc7fd914dab963b9a51c88b1dfa947 100644 (file)
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -1499,8 +1499,7 @@ fn flatten_arm_body<'a>(context: &'a RewriteContext, body: &'a ast::Expr) -> (bo
         {
             if let ast::StmtKind::Expr(ref expr) = block.stmts[0].node {
                 (
-                    !context.config.multiline_match_arm_forces_block()
-                        && expr.can_be_overflowed(context, 1),
+                    !context.config.force_multiline_blocks() && expr.can_be_overflowed(context, 1),
                     &**expr,
                 )
             } else {
@@ -1508,8 +1507,7 @@ fn flatten_arm_body<'a>(context: &'a RewriteContext, body: &'a ast::Expr) -> (bo
             }
         }
         _ => (
-            !context.config.multiline_match_arm_forces_block()
-                && body.can_be_overflowed(context, 1),
+            !context.config.force_multiline_blocks() && body.can_be_overflowed(context, 1),
             &*body,
         ),
     }