Fix handling of attribute in enum

src/items.rs

@@ -645,8 +645,14 @@ impl<'a> FmtVisitor<'a> {
         let mut items: Vec<_> = itemize_list_with(self.config.struct_variant_width());
 
         // If one of the variants use multiple lines, use multi-lined formatting for all variants.
-        fn is_multi_line_variant(item: &ListItem) -> bool {
+        let is_multi_line_variant = |item: &ListItem| -> bool {
             let variant_str = item.inner_as_ref();
+            if self.config.style_edition() < StyleEdition::Edition2024 {
+                // Fall back to previous naive implementation (#5662) because of
+                // rustfmt's stability guarantees
+                return variant_str.contains('\n');
+            }
+
             let mut first_line_is_read = false;
             for line in variant_str.split('\n') {
                 if first_line_is_read {
@@ -663,7 +669,7 @@ impl<'a> FmtVisitor<'a> {
             }
 
             true
-        }
+        };
         let has_multiline_variant = items.iter().any(is_multi_line_variant);
         let has_single_line_variant = items.iter().any(|item| !is_multi_line_variant(item));
         if has_multiline_variant && has_single_line_variant {

tests/target/attribute-in-enum/horizontal-no-doc.rs

@@ -1,3 +1,4 @@
+// rustfmt-style_edition: 2024
 enum MyType {
     A { field1: bool, field2: bool },
     B { field1: bool, field2: bool },

tests/target/attribute-in-enum/horizontal-with-doc.rs

@@ -1,3 +1,4 @@
+// rustfmt-style_edition: 2024
 enum MyType {
     A { field1: bool, field2: bool },
     B { field1: bool, field2: bool },

tests/target/attribute-in-enum/vertical-macro-one-line.rs

@@ -1,3 +1,4 @@
+// rustfmt-style_edition: 2024
 enum A {
     B {
         a: usize,

tests/target/attribute-in-enum/vertical-no-doc.rs

@@ -1,3 +1,4 @@
+// rustfmt-style_edition: 2024
 enum A {
     B {
         a: usize,

tests/target/attribute-in-enum/vertical-with-doc.rs

@@ -1,3 +1,4 @@
+// rustfmt-style_edition: 2024
 enum A {
     B {
         a: usize,

tests/target/enum.rs

@@ -68,7 +68,10 @@ pub enum EnumWithAttributes {
     SkippedItem(String,String,), // Post-comment
     #[another_attr]
     #[attr2]
-    ItemStruct { x: usize, y: usize }, /* Comment AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA */
+    ItemStruct {
+        x: usize,
+        y: usize,
+    }, /* Comment AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA */
     // And another
     ForcedPreflight, /* AAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                       * AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA */