fixed => () to => {} (#4226)

src/formatting/matches.rs

@@ -377,12 +377,14 @@ fn rewrite_match_body(
     let comma = arm_comma(context.config, body, is_last);
     let alt_block_sep = &shape.indent.to_string_with_newline(context.config);
 
-    let combine_orig_body = |body_str: &str| {
+    let combine_orig_body = |mut body_str: &str| {
         let block_sep = match context.config.control_brace_style() {
             ControlBraceStyle::AlwaysNextLine if is_block => alt_block_sep,
             _ => " ",
         };
-
+        if body_str == "()" {
+            body_str = "{}";
+        }
         Some(format!("{} =>{}{}{}", pats_str, block_sep, body_str, comma))
     };
 

tests/source/catch.rs

@@ -15,7 +15,7 @@ fn main() {
     let y = match (try {
         foo()?
     }) {
-        _ => (),
+        _ => {},
     };
 
     try {

tests/source/cfg_if/detect/os/linux/auxvec.rs

@@ -159,7 +159,7 @@ fn auxv_from_buf(buf: &[usize; 64]) -> Result<AuxVec, ()> {
         for el in buf.chunks(2) {
             match el[0] {
                 AT_HWCAP => return Ok(AuxVec { hwcap: el[1] }),
-                _ => (),
+                _ => {}
             }
         }
     }
@@ -172,7 +172,7 @@ fn auxv_from_buf(buf: &[usize; 64]) -> Result<AuxVec, ()> {
             match el[0] {
                 AT_HWCAP => hwcap = Some(el[1]),
                 AT_HWCAP2 => hwcap2 = Some(el[1]),
-                _ => (),
+                _ => {}
             }
         }
 

tests/source/chains-visual.rs

@@ -15,7 +15,7 @@ fn main() {
     // Test case where first chain element isn't a path, but is shorter than
     // the size of a tab.
     x()
-        .y(|| match cond() { true => (), false => () });
+        .y(|| match cond() { true => {}, false => {}, });
 
     loong_func()
         .quux(move || if true {

tests/source/chains.rs

@@ -16,7 +16,7 @@ fn main() {
     // Test case where first chain element isn't a path, but is shorter than
     // the size of a tab.
     x()
-        .y(|| match cond() { true => (), false => () });
+        .y(|| match cond() { true => {} false => {} });
 
     loong_func()
         .quux(move || if true {

tests/source/hard-tabs.rs

@@ -66,8 +66,8 @@ fn generic<T>(arg: T) -> &SomeType
 
     x().y(|| {
         match cond() {
-            true => (),
-            false => (),
+            true => {},
+            false => {},
         }
     });
 }

tests/source/issue-1021.rs

@@ -1,22 +1,22 @@
 // rustfmt-normalize_comments: true
 fn main() {
     match x {
-        S(true , .., true ) => (),
-        S(true , .. ) => (),
-        S(.., true ) => (),
-        S( .. ) => (),
-        S(_) => (),
-        S(/* .. */ .. ) => (),
-        S(/* .. */ .., true ) => (),
+        S(true , .., true ) => {},
+        S(true , .. ) => {},
+        S(.., true ) => {},
+        S( .. ) => {},
+        S(_) => {},
+        S(/* .. */ .. ) => {},
+        S(/* .. */ .., true ) => {},
     }
 
     match y {
-        (true , .., true ) => (),
-        (true , .. ) => (),
-        (.., true ) => (),
-        ( .. ) => (),
-        (_,) => (),
-        (/* .. */ .. ) => (),
-        (/* .. */ .., true ) => (),
+        (true , .., true ) => {},
+        (true , .. ) => {},
+        (.., true ) => {},
+        ( .. ) => {},
+        (_,) => {},
+        (/* .. */ .. ) => {},
+        (/* .. */ .., true ) => {},
     }
 }

tests/source/issue-1211.rs

@@ -6,10 +6,10 @@ fn main() {
                     Some(ip) => {
                         sock.send_to(&buf, (ip, 8765)).expect("foobar");
                     }
-                    _ => ()
+                    _ => {},
                 }
             }
-            _ => ()
+            _ => {},
         };
     }
 }

tests/source/issue-2955.rs

@@ -1,6 +1,6 @@
 // rustfmt-condense_wildcard_suffixes: true
 fn main() {
     match (1, 2, 3) {
-        (_, _, _) => (),
+        (_, _, _) => {},
     }
 }

tests/source/issue-4065.rs

@@ -0,0 +1,9 @@
+// rustfmt-match_block_trailing_comma: true
+
+fn main() {
+    let x = 1;
+    match x {
+        1 => (),
+        2 => (),
+    }
+}

tests/source/macros.rs

@@ -319,16 +319,16 @@ impl Foo {
 // #819
 fn macro_in_pattern_position () {
     let x = match y {
-        foo!(  ) => (),
+        foo!(  ) => {}
         bar!(            a, b,
-                         c) => (),
+                         c) => {}
         bar!(a
              , b
              , c
-             ,) => (),
+             ,) => {}
         baz!( 1 + 2 + 3, quux.kaas(  )
-        ) => (),
-        quux!(AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA, BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB) => (),
+        ) => {}
+        quux!(AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA, BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB) => {}
     };
 }
 
@@ -382,7 +382,7 @@ fn foo() {
 // #2591
 fn foo() {
     match 0u32 {
-        0 => (),
+        0 => {}
         _ => unreachable!(/* obviously */),
     }
 }

tests/source/match.rs

@@ -241,7 +241,7 @@ fn issue383() {
 fn issue507() {
     match 1 {
         1 => unsafe { std::intrinsics::abort() },
-        _ => (),
+        _ => {},
     }
 }
 
@@ -440,7 +440,7 @@ fn issue_2151() {
     match either {
         x => {
 
-        }y => ()
+        }y => {},
     }
 }
 

tests/target/catch.rs

@@ -11,7 +11,7 @@ fn main() {
     };
 
     let y = match (try { foo()? }) {
-        _ => (),
+        _ => {}
     };
 
     try {

tests/target/cfg_if/detect/os/linux/auxvec.rs

@@ -156,7 +156,7 @@ fn auxv_from_buf(buf: &[usize; 64]) -> Result<AuxVec, ()> {
         for el in buf.chunks(2) {
             match el[0] {
                 AT_HWCAP => return Ok(AuxVec { hwcap: el[1] }),
-                _ => (),
+                _ => {}
             }
         }
     }
@@ -169,7 +169,7 @@ fn auxv_from_buf(buf: &[usize; 64]) -> Result<AuxVec, ()> {
             match el[0] {
                 AT_HWCAP => hwcap = Some(el[1]),
                 AT_HWCAP2 => hwcap2 = Some(el[1]),
-                _ => (),
+                _ => {}
             }
         }
 

tests/target/chains-visual.rs

@@ -15,8 +15,8 @@ fn main() {
     // Test case where first chain element isn't a path, but is shorter than
     // the size of a tab.
     x().y(|| match cond() {
-           true => (),
-           false => (),
+           true => {}
+           false => {}
        });
 
     loong_func().quux(move || if true { 1 } else { 2 });

tests/target/chains.rs

@@ -17,8 +17,8 @@ fn main() {
     // Test case where first chain element isn't a path, but is shorter than
     // the size of a tab.
     x().y(|| match cond() {
-        true => (),
-        false => (),
+        true => {}
+        false => {}
     });
 
     loong_func().quux(move || {

tests/target/hard-tabs.rs

@@ -81,8 +81,8 @@ fn main() {
 	a.b.c.d();
 
 	x().y(|| match cond() {
-		true => (),
-		false => (),
+		true => {}
+		false => {}
 	});
 }
 

tests/target/issue-1021.rs

@@ -1,22 +1,22 @@
 // rustfmt-normalize_comments: true
 fn main() {
     match x {
-        S(true, .., true) => (),
-        S(true, ..) => (),
-        S(.., true) => (),
-        S(..) => (),
-        S(_) => (),
-        S(/* .. */ ..) => (),
-        S(/* .. */ .., true) => (),
+        S(true, .., true) => {}
+        S(true, ..) => {}
+        S(.., true) => {}
+        S(..) => {}
+        S(_) => {}
+        S(/* .. */ ..) => {}
+        S(/* .. */ .., true) => {}
     }
 
     match y {
-        (true, .., true) => (),
-        (true, ..) => (),
-        (.., true) => (),
-        (..) => (),
-        (_,) => (),
-        (/* .. */ ..) => (),
-        (/* .. */ .., true) => (),
+        (true, .., true) => {}
+        (true, ..) => {}
+        (.., true) => {}
+        (..) => {}
+        (_,) => {}
+        (/* .. */ ..) => {}
+        (/* .. */ .., true) => {}
     }
 }

tests/target/issue-1211.rs

@@ -5,9 +5,9 @@ fn main() {
                 Some(ip) => {
                     sock.send_to(&buf, (ip, 8765)).expect("foobar");
                 }
-                _ => (),
+                _ => {}
             },
-            _ => (),
+            _ => {}
         };
     }
 }

tests/target/issue-2554.rs

@@ -7,7 +7,7 @@ fn main() {
             //
         })
     }) {
-        Ok(()) => (),
-        Err(_) => (),
+        Ok(()) => {}
+        Err(_) => {}
     }
 }

tests/target/issue-2955.rs

@@ -1,6 +1,6 @@
 // rustfmt-condense_wildcard_suffixes: true
 fn main() {
     match (1, 2, 3) {
-        (..) => (),
+        (..) => {}
     }
 }

tests/target/issue-4065.rs

@@ -0,0 +1,9 @@
+// rustfmt-match_block_trailing_comma: true
+
+fn main() {
+    let x = 1;
+    match x {
+        1 => {},
+        2 => {},
+    }
+}

tests/target/macros.rs

@@ -896,14 +896,14 @@ impl Foo {
 // #819
 fn macro_in_pattern_position() {
     let x = match y {
-        foo!() => (),
-        bar!(a, b, c) => (),
-        bar!(a, b, c,) => (),
-        baz!(1 + 2 + 3, quux.kaas()) => (),
+        foo!() => {}
+        bar!(a, b, c) => {}
+        bar!(a, b, c,) => {}
+        baz!(1 + 2 + 3, quux.kaas()) => {}
         quux!(
             AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,
             BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-        ) => (),
+        ) => {}
     };
 }
 
@@ -956,7 +956,7 @@ fn foo() {
 // #2591
 fn foo() {
     match 0u32 {
-        0 => (),
+        0 => {}
         _ => unreachable!(/* obviously */),
     }
 }

tests/target/match.rs

@@ -246,7 +246,7 @@ fn issue507() {
         1 => unsafe {
             std::intrinsics::abort()
         },
-        _ => (),
+        _ => {}
     }
 }
 
@@ -466,7 +466,7 @@ impl<'tcx> Const<'tcx> {
 fn issue_2151() {
     match either {
         x => {}
-        y => (),
+        y => {}
     }
 }