Auto merge of #85515 - jedel1043:fix-85480, r=petrochenkov

Fix ast pretty printing for anonymous types

Fixes #85480.

2 files changed, 30 insertions, 10 deletions

diff --git a/compiler/rustc_ast_pretty/src/pprust/state.rs b/compiler/rustc_ast_pretty/src/pprust/state.rs
index da9d89745a8..b7bb896f318 100644
--- a/compiler/rustc_ast_pretty/src/pprust/state.rs
+++ b/compiler/rustc_ast_pretty/src/pprust/state.rs
@@ -955,12 +955,12 @@ impl<'a> State<'a> {
                 self.pclose();
             }
             ast::TyKind::AnonymousStruct(ref fields, ..) => {
-                self.s.word("struct");
-                self.print_record_struct_body(fields, ty.span);
+                self.head("struct");
+                self.print_record_struct_body(&fields, ty.span);
             }
             ast::TyKind::AnonymousUnion(ref fields, ..) => {
-                self.s.word("union");
-                self.print_record_struct_body(fields, ty.span);
+                self.head("union");
+                self.print_record_struct_body(&fields, ty.span);
             }
             ast::TyKind::Paren(ref typ) => {
                 self.popen();
@@ -1397,12 +1397,7 @@ impl<'a> State<'a> {
         }
     }
 
-    crate fn print_record_struct_body(
-        &mut self,
-        fields: &Vec<ast::FieldDef>,
-        span: rustc_span::Span,
-    ) {
-        self.nbsp();
+    crate fn print_record_struct_body(&mut self, fields: &[ast::FieldDef], span: rustc_span::Span) {
         self.bopen();
         self.hardbreak_if_not_bol();
 
@@ -1451,6 +1446,7 @@ impl<'a> State<'a> {
             }
             ast::VariantData::Struct(ref fields, ..) => {
                 self.print_where_clause(&generics.where_clause);
+                self.nbsp();
                 self.print_record_struct_body(fields, span);
             }
         }
diff --git a/src/test/pretty/anonymous-types.rs b/src/test/pretty/anonymous-types.rs
new file mode 100644
index 00000000000..5ff452e8e43
--- /dev/null
+++ b/src/test/pretty/anonymous-types.rs
@@ -0,0 +1,24 @@
+// Test for issue 85480
+// Pretty print anonymous struct and union types
+
+// pp-exact
+// pretty-compare-only
+
+struct Foo {
+    _: union {
+           _: struct {
+                  a: u8,
+                  b: u16,
+              },
+           c: u32,
+       },
+    d: u64,
+    e: f32,
+}
+
+type A =
+ struct {
+     field: u8,
+ };
+
+fn main() { }