Make sure we don't lose default struct value when formatting struct

4 files changed, 42 insertions, 0 deletions

diff --git a/src/tools/rustfmt/src/items.rs b/src/tools/rustfmt/src/items.rs
index c3debc2f4f0..e7d0fba048b 100644
--- a/src/tools/rustfmt/src/items.rs
+++ b/src/tools/rustfmt/src/items.rs
@@ -1944,6 +1944,11 @@ pub(crate) fn rewrite_struct_field(
     shape: Shape,
     lhs_max_width: usize,
 ) -> RewriteResult {
+    // FIXME(default_field_values): Implement formatting.
+    if field.default.is_some() {
+        return Err(RewriteError::Unknown);
+    }
+
     if contains_skip(&field.attrs) {
         return Ok(context.snippet(field.span()).to_owned());
     }
diff --git a/src/tools/rustfmt/src/spanned.rs b/src/tools/rustfmt/src/spanned.rs
index db7c3486e71..6b3e40b9115 100644
--- a/src/tools/rustfmt/src/spanned.rs
+++ b/src/tools/rustfmt/src/spanned.rs
@@ -144,6 +144,7 @@ impl Spanned for ast::GenericParam {
 
 impl Spanned for ast::FieldDef {
     fn span(&self) -> Span {
+        // FIXME(default_field_values): This needs to be adjusted.
         span_with_attrs_lo_hi!(self, self.span.lo(), self.ty.span.hi())
     }
 }
diff --git a/src/tools/rustfmt/tests/source/default-field-values.rs b/src/tools/rustfmt/tests/source/default-field-values.rs
new file mode 100644
index 00000000000..622f9640d0d
--- /dev/null
+++ b/src/tools/rustfmt/tests/source/default-field-values.rs
@@ -0,0 +1,18 @@
+#![feature(default_struct_values)]
+
+// Test for now that nightly default field values are left alone for now.
+
+struct Foo {
+    default_field:    Spacing =    /* uwu */ 0,
+}
+
+struct Foo2 {
+    #[rustfmt::skip]
+    default_field:    Spacing =    /* uwu */ 0,
+}
+
+a_macro!(
+    struct Foo2 {
+        default_field:    Spacing =    /* uwu */ 0,
+    }
+);
diff --git a/src/tools/rustfmt/tests/target/default-field-values.rs b/src/tools/rustfmt/tests/target/default-field-values.rs
new file mode 100644
index 00000000000..622f9640d0d
--- /dev/null
+++ b/src/tools/rustfmt/tests/target/default-field-values.rs
@@ -0,0 +1,18 @@
+#![feature(default_struct_values)]
+
+// Test for now that nightly default field values are left alone for now.
+
+struct Foo {
+    default_field:    Spacing =    /* uwu */ 0,
+}
+
+struct Foo2 {
+    #[rustfmt::skip]
+    default_field:    Spacing =    /* uwu */ 0,
+}
+
+a_macro!(
+    struct Foo2 {
+        default_field:    Spacing =    /* uwu */ 0,
+    }
+);