Merge multiline_closure_forces_block and multiline_match_arm_forces_block into force_...

[rust.git] / Configurations.md

diff --git a/Configurations.md b/Configurations.md
index ee4851eb2e5b2313aceec2c4c9b0f8b4e602b069..76589314e03c3d56a34af599688b8be63204b1b6 100644 (file)
--- a/Configurations.md
+++ b/Configurations.md
@@ -1172,9 +1172,9 @@ pub enum Foo {}
 pub enum Foo {}
 ```
 
-## `multiline_closure_forces_block`
+## `force_multiline_blocks`
 
-Force multiline closure bodies to be wrapped in a block
+Force multiline closure and match arm bodies to be wrapped in a block
 
 - **Default value**: `false`
 - **Possible values**: `false`, `true`
@@ -1186,6 +1186,13 @@ result.and_then(|maybe_value| match maybe_value {
     None => ...,
     Some(value) => ...,
 })
+
+match lorem {
+    None => if ipsum {
+        println!("Hello World");
+    },
+    Some(dolor) => ...,
+}
 ```
 
 #### `true`:
@@ -1198,29 +1205,7 @@ result.and_then(|maybe_value| {
         Some(value) => ...,
     }
 })
-```
-
-## `multiline_match_arm_forces_block`
-
-Force multiline match arm bodies to be wrapped in a block
-
-- **Default value**: `false`
-- **Possible values**: `false`, `true`
-
-#### `false` (default):
-
-```rust
-match lorem {
-    None => if ipsum {
-        println!("Hello World");
-    },
-    Some(dolor) => ...,
-}
-```
 
-#### `true`:
-
-```rust
 match lorem {
     None => {
         if ipsum {
@@ -1231,6 +1216,7 @@ match lorem {
 }
 ```
 
+
 ## `newline_style`
 
 Unix or Windows line endings