Merge pull request rust-lang#3250 from scampi/issue3229

version-gate the trailing semicolon change of return statements inside a match arm

Author: topecongiro

rustfmt.toml

@@ -1,3 +1,4 @@
 error_on_line_overflow = true
 error_on_unformatted = true
+version = "Two"
 edition = "2018"

src/matches.rs

@@ -17,7 +17,7 @@ use syntax::source_map::{BytePos, Span};
 use syntax::{ast, ptr};
 
 use comment::{combine_strs_with_missing_comments, rewrite_comment};
-use config::{Config, ControlBraceStyle, IndentStyle};
+use config::{Config, ControlBraceStyle, IndentStyle, Version};
 use expr::{
     format_expr, is_empty_block, is_simple_block, is_unsafe_block, prefer_next_line, rewrite_cond,
     rewrite_multiple_patterns, ExprType, RhsTactics,
@@ -413,11 +413,12 @@ fn rewrite_match_body(
             } else {
                 ""
             };
-            let semicolon = if semicolon_for_expr(context, body) {
-                ";"
-            } else {
-                ""
-            };
+            let semicolon =
+                if context.config.version() == Version::Two && semicolon_for_expr(context, body) {
+                    ";"
+                } else {
+                    ""
+                };
             ("{", format!("{}{}}}{}", semicolon, indent_str, comma))
         } else {
             ("", String::from(","))

tests/source/issue-3213.rs renamed to tests/source/issue-3213/version_one.rs

@@ -1,3 +1,5 @@
+// rustfmt-version: One
+
 fn foo() {
     match 0 {
         0 => return AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,

tests/source/issue-3213/version_two.rs

@@ -0,0 +1,9 @@
+// rustfmt-version: Two
+
+fn foo() {
+    match 0 {
+        0 => return AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,
+        1 => AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,
+        _ => "",
+    };
+}

tests/target/issue-3213/version_one.rs

@@ -0,0 +1,13 @@
+// rustfmt-version: One
+
+fn foo() {
+    match 0 {
+        0 => {
+            return AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        }
+        1 => {
+            AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        }
+        _ => "",
+    };
+}

tests/target/issue-3213.rs renamed to tests/target/issue-3213/version_two.rs

@@ -1,3 +1,5 @@
+// rustfmt-version: Two
+
 fn foo() {
     match 0 {
         0 => {