bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Revert "Fix ast expanded printing for anonymous types"

Browse source 
This reverts commit 5b4bc05fa5.
This commit is contained in:
Felix S. Klock II 2021-09-08 14:52:49 -04:00
parent 2041fb1a2d
commit 5560f6d90a
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_ast_pretty/src/pprust/state.rs
View file

@ -986,12 +986,12 @@ impl<'a> State<'a> {
self.pclose(); self.pclose();
} }
ast::TyKind::AnonymousStruct(ref fields, ..) => { ast::TyKind::AnonymousStruct(ref fields, ..) => {
self.head("struct"); self.s.word("struct");
self.print_record_struct_body(&fields, ty.span); self.print_record_struct_body(fields, ty.span);
} }
ast::TyKind::AnonymousUnion(ref fields, ..) => { ast::TyKind::AnonymousUnion(ref fields, ..) => {
self.head("union"); self.s.word("union");
self.print_record_struct_body(&fields, ty.span); self.print_record_struct_body(fields, ty.span);
} }
ast::TyKind::Paren(ref typ) => { ast::TyKind::Paren(ref typ) => {
self.popen(); self.popen();
@ -1413,7 +1413,12 @@ impl<'a> State<'a> {
} }
} }
crate fn print_record_struct_body(&mut self, fields: &[ast::FieldDef], span: rustc_span::Span) { crate fn print_record_struct_body(
&mut self,
fields: &Vec<ast::FieldDef>,
span: rustc_span::Span,
) {
self.nbsp();
self.bopen(); self.bopen();
self.hardbreak_if_not_bol(); self.hardbreak_if_not_bol();
@ -1462,7 +1467,6 @@ impl<'a> State<'a> {
} }
ast::VariantData::Struct(ref fields, ..) => { ast::VariantData::Struct(ref fields, ..) => {
self.print_where_clause(&generics.where_clause); self.print_where_clause(&generics.where_clause);
self.nbsp();
self.print_record_struct_body(fields, span); self.print_record_struct_body(fields, span);
} }
} }