hacky solution that makes the tests pass but should really be better

rust-lang · Feb 16, 2018 · f5c4655 · f5c4655
1 parent 4528a57
commit f5c4655
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/rustfmt-core/src/items.rs b/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
+        && !items_str.contains("//")
+    {
         Some(format!("{} {} }}", result, items_str))
     } else {
         Some(format!(

diff --git a/rustfmt-core/tests/source/issue-2446.rs b/rustfmt-core/tests/source/issue-2446.rs
@@ -1,5 +1,5 @@
 enum Issue2446 {
     V {
-        f: u8, //
+        f: u8, // x
     },
 }
diff --git a/rustfmt-core/tests/target/issue-2446.rs b/rustfmt-core/tests/target/issue-2446.rs
@@ -1,5 +1,5 @@
 enum Issue2446 {
     V {
-        f: u8, //
+        f: u8, // x
     },
 }