Merge pull request #2454 from radix/issue-2446

Don't generate V: { f: u8, // comment }

Author: topecongiro

rustfmt-core/src/items.rs

@@ -1203,7 +1203,9 @@ pub fn format_struct_struct(
         one_line_budget,
     )?;
 
-    if !items_str.contains('\n') && !result.contains('\n') && items_str.len() <= one_line_budget {
+    if !items_str.contains('\n') && !result.contains('\n') && items_str.len() <= one_line_budget
+        && !last_line_contains_single_line_comment(&items_str)
+    {
         Some(format!("{} {} }}", result, items_str))
     } else {
         Some(format!(

rustfmt-core/tests/source/issue-2446.rs

@@ -0,0 +1,11 @@
+enum Issue2446 {
+    V {
+        f: u8, // x
+    },
+}
+
+enum Issue2446TrailingCommentsOnly {
+    V {
+        f: u8, /* */
+    }
+}

rustfmt-core/tests/target/issue-2446.rs

@@ -0,0 +1,9 @@
+enum Issue2446 {
+    V {
+        f: u8, // x
+    },
+}
+
+enum Issue2446TrailingCommentsOnly {
+    V { f: u8 /* */ },
+}