fix(rustfmt): fix struct field formatting with doc comments present

Fixes rust-lang#5215
tharun208 · Feb 4, 2022 · 302a27c · 302a27c
1 parent 368a9b7
commit 302a27c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/src/items.rs b/src/items.rs
@@ -1733,7 +1733,7 @@ pub(crate) fn rewrite_struct_field(
         .offset_left(overhead + spacing.len())
         .and_then(|ty_shape| field.ty.rewrite(context, ty_shape));
     if let Some(ref ty) = orig_ty {
-        if !ty.contains('\n') {
+        if !ty.contains('\n') && !contains_comment(&attr_prefix) {
             return Some(attr_prefix + &spacing + ty);
         }
     }

diff --git a/tests/source/structs.rs b/tests/source/structs.rs
@@ -296,3 +296,13 @@ struct Test {
 // #2818
 struct Paren((i32)) where i32: Trait;
 struct Parens((i32, i32)) where i32: Trait;
+
+// #5215
+struct MyTuple(
+    /// Doc Comments
+    /* TODO note to add more to Doc Comments */
+    u32,
+    /// Doc Comments
+    // TODO note
+    u64,
+);
diff --git a/tests/target/configs/struct_field_align_threshold/20.rs b/tests/target/configs/struct_field_align_threshold/20.rs
@@ -43,7 +43,7 @@ pub struct Foo {
     #[AnAttribute]
     g:     SomeOtherType,
     /// A doc comment on a field
-    h:     AThirdType,
+    h: AThirdType,
     pub i: TypeForPublicField,
 }
 

diff --git a/tests/target/structs.rs b/tests/target/structs.rs
@@ -356,3 +356,13 @@ where
 struct Parens((i32, i32))
 where
     i32: Trait;
+
+// #5215
+struct MyTuple(
+    /// Doc Comments
+    // TODO note to add more to Doc Comments
+    u32,
+    /// Doc Comments
+    // TODO note
+    u64,
+);