Merge pull request #1732 from olson-sean-k/issue-1377

Keep brace on same line as `match` when using `ClosingNextLine`.

src/expr.rs

@@ -1461,8 +1461,8 @@ fn rewrite_match(
     let cond_str = try_opt!(cond.rewrite(context, cond_shape));
     let alt_block_sep = String::from("\n") + &shape.indent.block_only().to_string(context.config);
     let block_sep = match context.config.control_brace_style() {
-        ControlBraceStyle::AlwaysSameLine => " ",
+        ControlBraceStyle::AlwaysNextLine => alt_block_sep.as_str(),
-        _ => alt_block_sep.as_str(),
+        _ => " ",
     };
     let mut result = format!("match {}{}{{", cond_str, block_sep);
 

tests/source/configs-control_brace_style-always_next_line.rs

@@ -3,4 +3,8 @@
 
 fn main() {
     if lorem { println!("ipsum!"); } else { println!("dolor!"); }
+    match magi {
+        Homura => "Akemi",
+        Madoka => "Kaname",
+    }
 }

tests/source/configs-control_brace_style-always_same_line.rs

@@ -3,4 +3,8 @@
 
 fn main() {
     if lorem { println!("ipsum!"); } else { println!("dolor!"); }
+    match magi {
+        Homura => "Akemi",
+        Madoka => "Kaname",
+    }
 }

tests/source/configs-control_brace_style-closing_next_line.rs

@@ -3,4 +3,8 @@
 
 fn main() {
     if lorem { println!("ipsum!"); } else { println!("dolor!"); }
+    match magi {
+        Homura => "Akemi",
+        Madoka => "Kaname",
+    }
 }

tests/target/configs-control_brace_style-always_next_line.rs

@@ -10,4 +10,9 @@ fn main() {
     {
         println!("dolor!");
     }
+    match magi
+    {
+        Homura => "Akemi",
+        Madoka => "Kaname",
+    }
 }

tests/target/configs-control_brace_style-always_same_line.rs

@@ -7,4 +7,8 @@ fn main() {
     } else {
         println!("dolor!");
     }
+    match magi {
+        Homura => "Akemi",
+        Madoka => "Kaname",
+    }
 }

tests/target/configs-control_brace_style-closing_next_line.rs

@@ -8,4 +8,8 @@ fn main() {
     else {
         println!("dolor!");
     }
+    match magi {
+        Homura => "Akemi",
+        Madoka => "Kaname",
+    }
 }