rename file and remove unecessary file and add testcase

Febriananda Wida Pramudita · ytmimi · commit 23c11f3a081b · 2024-04-26T07:21:32.000-06:00
diff --git a/src/matches.rs b/src/matches.rs
@@ -103,9 +103,15 @@ pub(crate) fn rewrite_match(
     let inner_attrs_str = if inner_attrs.is_empty() {
         String::new()
     } else {
-        inner_attrs
-            .rewrite(context, shape.block_indent(context.config.tab_spaces()))
-            .map(|s| format!("{}{}\n", nested_indent_str, s))?
+        if context.config.version() == Version::One {
+            inner_attrs
+                .rewrite(context, shape)
+                .map(|s| format!("{}{}\n", nested_indent_str, s))?
+        } else {
+            inner_attrs
+                .rewrite(context, shape.block_indent(context.config.tab_spaces()))
+                .map(|s| format!("{}{}\n", nested_indent_str, s))?
+        }
     };
 
     let open_brace_pos = if inner_attrs.is_empty() {
diff --git a/tests/source/issue-6147/case_rustfmt_v1.rs b/tests/source/issue-6147/case_rustfmt_v1.rs
@@ -1,3 +1,5 @@
+// rustfmt-version: One
+
 pub fn main() {
 let a = Some(12);
 match a {
diff --git a/tests/source/issue-6147/case_rustfmt_v2.rs b/tests/source/issue-6147/case_rustfmt_v2.rs
@@ -0,0 +1,20 @@
+// rustfmt-version: Two
+
+pub fn main() {
+let a = Some(12);
+match a {
+#![attr1]
+#![attr2]
+#![attr3]
+_ => None,
+}
+
+{
+match a {
+#![attr1]
+#![attr2]
+#![attr3]
+_ => None,
+}
+}
+}
diff --git a/tests/target/issue-6147/case_rustfmt_v1.rs b/tests/target/issue-6147/case_rustfmt_v1.rs
@@ -1,17 +1,19 @@
+// rustfmt-version: One
+
 pub fn main() {
     let a = Some(12);
     match a {
         #![attr1]
-        #![attr2]
-        #![attr3]
+    #![attr2]
+    #![attr3]
         _ => None,
     }
 
     {
         match a {
             #![attr1]
-            #![attr2]
-            #![attr3]
+        #![attr2]
+        #![attr3]
             _ => None,
         }
     }
diff --git a/tests/target/issue-6147/case_rustfmt_v2.rs b/tests/target/issue-6147/case_rustfmt_v2.rs
@@ -1,3 +1,5 @@
+// rustfmt-version: Two
+
 pub fn main() {
     let a = Some(12);
     match a {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// rustfmt-version: One`
	`2`	`+`
`1`	`3`	`pub fn main() {`
`2`	`4`	`let a = Some(12);`
`3`	`5`	`match a {`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,19 @@`
	`1`	`+// rustfmt-version: One`
	`2`	`+`
`1`	`3`	`pub fn main() {`
`2`	`4`	`let a = Some(12);`
`3`	`5`	`match a {`
`4`	`6`	`#![attr1]`
`5`		`- #![attr2]`
`6`		`- #![attr3]`
	`7`	`+ #![attr2]`
	`8`	`+ #![attr3]`
`7`	`9`	`_ => None,`
`8`	`10`	`}`
`9`	`11`
`10`	`12`	`{`
`11`	`13`	`match a {`
`12`	`14`	`#![attr1]`
`13`		`- #![attr2]`
`14`		`- #![attr3]`
	`15`	`+ #![attr2]`
	`16`	`+ #![attr3]`
`15`	`17`	`_ => None,`
`16`	`18`	`}`
`17`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// rustfmt-version: Two`
	`2`	`+`
`1`	`3`	`pub fn main() {`
`2`	`4`	`let a = Some(12);`
`3`	`5`	`match a {`