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

lukebhan · web-flow · commit 9549c3bdfa8a · 2020-06-02T12:05:03.000+09:00
diff --git a/src/formatting/matches.rs b/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))
     };
 
diff --git a/tests/source/catch.rs b/tests/source/catch.rs
@@ -15,7 +15,7 @@ fn main() {
     let y = match (try {
         foo()?
     }) {
-        _ => (),
+        _ => {},
     };
 
     try {
diff --git a/tests/source/cfg_if/detect/os/linux/auxvec.rs b/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]),
-                _ => (),
+                _ => {}
             }
         }
 
diff --git a/tests/source/chains-visual.rs b/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 {
diff --git a/tests/source/chains.rs b/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 {
diff --git a/tests/source/hard-tabs.rs b/tests/source/hard-tabs.rs
@@ -66,8 +66,8 @@ fn generic<T>(arg: T) -> &SomeType
     
     x().y(|| {
         match cond() {
-            true => (),
-            false => (),
+            true => {},
+            false => {},
         }
     });
 }
diff --git a/tests/source/issue-1021.rs b/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 ) => {},
     }
 }
diff --git a/tests/source/issue-1211.rs b/tests/source/issue-1211.rs
@@ -6,10 +6,10 @@ fn main() {
                     Some(ip) => {
                         sock.send_to(&buf, (ip, 8765)).expect("foobar");
                     }
-                    _ => ()
+                    _ => {},
                 }
             }
-            _ => ()
+            _ => {},
         };
     }
 }
diff --git a/tests/source/issue-2955.rs b/tests/source/issue-2955.rs
@@ -1,6 +1,6 @@
 // rustfmt-condense_wildcard_suffixes: true
 fn main() {
     match (1, 2, 3) {
-        (_, _, _) => (),
+        (_, _, _) => {},
     }
 }
diff --git a/tests/source/issue-4065.rs b/tests/source/issue-4065.rs
@@ -0,0 +1,9 @@
+// rustfmt-match_block_trailing_comma: true
+
+fn main() {
+    let x = 1;
+    match x {
+        1 => (),
+        2 => (),
+    }
+}
diff --git a/tests/source/macros.rs b/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 */),
     }
 }
diff --git a/tests/source/match.rs b/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 => {},
     }
 }
 
diff --git a/tests/target/catch.rs b/tests/target/catch.rs
@@ -11,7 +11,7 @@ fn main() {
     };
 
     let y = match (try { foo()? }) {
-        _ => (),
+        _ => {}
     };
 
     try {
diff --git a/tests/target/cfg_if/detect/os/linux/auxvec.rs b/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]),
-                _ => (),
+                _ => {}
             }
         }
 
diff --git a/tests/target/chains-visual.rs b/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 });
diff --git a/tests/target/chains.rs b/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 || {
diff --git a/tests/target/hard-tabs.rs b/tests/target/hard-tabs.rs
@@ -81,8 +81,8 @@ fn main() {
 	a.b.c.d();
 
 	x().y(|| match cond() {
-		true => (),
-		false => (),
+		true => {}
+		false => {}
 	});
 }
 
diff --git a/tests/target/issue-1021.rs b/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) => {}
     }
 }
diff --git a/tests/target/issue-1211.rs b/tests/target/issue-1211.rs
@@ -5,9 +5,9 @@ fn main() {
                 Some(ip) => {
                     sock.send_to(&buf, (ip, 8765)).expect("foobar");
                 }
-                _ => (),
+                _ => {}
             },
-            _ => (),
+            _ => {}
         };
     }
 }
diff --git a/tests/target/issue-2554.rs b/tests/target/issue-2554.rs
@@ -7,7 +7,7 @@ fn main() {
             //
         })
     }) {
-        Ok(()) => (),
-        Err(_) => (),
+        Ok(()) => {}
+        Err(_) => {}
     }
 }
diff --git a/tests/target/issue-2955.rs b/tests/target/issue-2955.rs
@@ -1,6 +1,6 @@
 // rustfmt-condense_wildcard_suffixes: true
 fn main() {
     match (1, 2, 3) {
-        (..) => (),
+        (..) => {}
     }
 }
diff --git a/tests/target/issue-4065.rs b/tests/target/issue-4065.rs
@@ -0,0 +1,9 @@
+// rustfmt-match_block_trailing_comma: true
+
+fn main() {
+    let x = 1;
+    match x {
+        1 => {},
+        2 => {},
+    }
+}
diff --git a/tests/target/macros.rs b/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 */),
     }
 }
diff --git a/tests/target/match.rs b/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 => {}
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ fn auxv_from_buf(buf: &[usize; 64]) -> Result<AuxVec, ()> {`
`159`	`159`	`for el in buf.chunks(2) {`
`160`	`160`	`match el[0] {`
`161`	`161`	`AT_HWCAP => return Ok(AuxVec { hwcap: el[1] }),`
`162`		`- _ => (),`
	`162`	`+ _ => {}`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`	`}`
`@@ -172,7 +172,7 @@ fn auxv_from_buf(buf: &[usize; 64]) -> Result<AuxVec, ()> {`
`172`	`172`	`match el[0] {`
`173`	`173`	`AT_HWCAP => hwcap = Some(el[1]),`
`174`	`174`	`AT_HWCAP2 => hwcap2 = Some(el[1]),`
`175`		`- _ => (),`
	`175`	`+ _ => {}`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`
Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ fn generic<T>(arg: T) -> &SomeType`
`66`	`66`
`67`	`67`	`x().y(\|\| {`
`68`	`68`	`match cond() {`
`69`		`- true => (),`
`70`		`- false => (),`
	`69`	`+ true => {},`
	`70`	`+ false => {},`
`71`	`71`	`}`
`72`	`72`	`});`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,10 @@ fn main() {`
`6`	`6`	`Some(ip) => {`
`7`	`7`	`sock.send_to(&buf, (ip, 8765)).expect("foobar");`
`8`	`8`	`}`
`9`		`- _ => ()`
	`9`	`+ _ => {},`
`10`	`10`	`}`
`11`	`11`	`}`
`12`		`- _ => ()`
	`12`	`+ _ => {},`
`13`	`13`	`};`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// rustfmt-condense_wildcard_suffixes: true`
`2`	`2`	`fn main() {`
`3`	`3`	`match (1, 2, 3) {`
`4`		`- (_, _, _) => (),`
	`4`	`+ (_, _, _) => {},`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ fn issue383() {`
`241`	`241`	`fn issue507() {`
`242`	`242`	`match 1 {`
`243`	`243`	`1 => unsafe { std::intrinsics::abort() },`
`244`		`- _ => (),`
	`244`	`+ _ => {},`
`245`	`245`	`}`
`246`	`246`	`}`
`247`	`247`
`@@ -440,7 +440,7 @@ fn issue_2151() {`
`440`	`440`	`match either {`
`441`	`441`	`x => {`
`442`	`442`
`443`		`- }y => ()`
	`443`	`+ }y => {},`
`444`	`444`	`}`
`445`	`445`	`}`
`446`	`446`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ fn auxv_from_buf(buf: &[usize; 64]) -> Result<AuxVec, ()> {`
`156`	`156`	`for el in buf.chunks(2) {`
`157`	`157`	`match el[0] {`
`158`	`158`	`AT_HWCAP => return Ok(AuxVec { hwcap: el[1] }),`
`159`		`- _ => (),`
	`159`	`+ _ => {}`
`160`	`160`	`}`
`161`	`161`	`}`
`162`	`162`	`}`
`@@ -169,7 +169,7 @@ fn auxv_from_buf(buf: &[usize; 64]) -> Result<AuxVec, ()> {`
`169`	`169`	`match el[0] {`
`170`	`170`	`AT_HWCAP => hwcap = Some(el[1]),`
`171`	`171`	`AT_HWCAP2 => hwcap2 = Some(el[1]),`
`172`		`- _ => (),`
	`172`	`+ _ => {}`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@ fn main() {`
`81`	`81`	`a.b.c.d();`
`82`	`82`
`83`	`83`	`x().y(\|\| match cond() {`
`84`		`- true => (),`
`85`		`- false => (),`
	`84`	`+ true => {}`
	`85`	`+ false => {}`
`86`	`86`	`});`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ fn main() {`
`5`	`5`	`Some(ip) => {`
`6`	`6`	`sock.send_to(&buf, (ip, 8765)).expect("foobar");`
`7`	`7`	`}`
`8`		`- _ => (),`
	`8`	`+ _ => {}`
`9`	`9`	`},`
`10`		`- _ => (),`
	`10`	`+ _ => {}`
`11`	`11`	`};`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ fn main() {`
`7`	`7`	`//`
`8`	`8`	`})`
`9`	`9`	`}) {`
`10`		`- Ok(()) => (),`
`11`		`- Err(_) => (),`
	`10`	`+ Ok(()) => {}`
	`11`	`+ Err(_) => {}`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ fn issue507() {`
`246`	`246`	`1 => unsafe {`
`247`	`247`	`std::intrinsics::abort()`
`248`	`248`	`},`
`249`		`- _ => (),`
	`249`	`+ _ => {}`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`
`@@ -466,7 +466,7 @@ impl<'tcx> Const<'tcx> {`
`466`	`466`	`fn issue_2151() {`
`467`	`467`	`match either {`
`468`	`468`	`x => {}`
`469`		`- y => (),`
	`469`	`+ y => {}`
`470`	`470`	`}`
`471`	`471`	`}`
`472`	`472`