Merge multiline_closure_forces_block and multiline_match_arm_forces_block into force_...

[rust.git] / src / config.rs

diff --git a/src/config.rs b/src/config.rs
index fe18f02d33e9bb431a72aed21e8e5784e55019fd..c622522223102f277c7aa0fc8f71795467f6adc3 100644 (file)
--- a/src/config.rs
+++ b/src/config.rs
@@ -621,8 +621,6 @@ pub fn get_toml_path(dir: &Path) -> Result<Option<PathBuf>, Error> {
     // Match
     wrap_match_arms: bool, true, false, "Wrap the body of arms in blocks when it does not fit on \
                                   the same line with the pattern of arms";
-    multiline_match_arm_forces_block: bool, false, false,
-        "Force multiline match arm bodies to be wrapped in a block";
     match_block_trailing_comma: bool, false, false,
         "Put a trailing comma after a block based match arm (non-block arms are not affected)";
 
@@ -645,8 +643,8 @@ pub fn get_toml_path(dir: &Path) -> Result<Option<PathBuf>, Error> {
         "Remove blank lines at start or end of a block";
     same_line_attributes: bool, true, false,
         "Try to put attributes on the same line as fields and variants.";
-    multiline_closure_forces_block: bool, false, false,
-        "Force multiline closure bodies to be wrapped in a block";
+    force_multiline_blocks: bool, false, false,
+        "Force multiline closure bodies and match arms to be wrapped in a block";
     fn_args_density: Density, Density::Tall, false, "Argument density in functions";
     brace_style: BraceStyle, BraceStyle::SameLineWhere, false, "Brace style for items";
     control_brace_style: ControlBraceStyle, ControlBraceStyle::AlwaysSameLine, false,