rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix unclosed boxes in pretty printing of TraitAlias

Browse Source
This commit is contained in:
David Tolnay
2022-01-01 17:52:15 -08:00
parent dd3ac41495
commit a18f43f25d
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_ast_pretty/src/pprust/state.rs
View File

@@ -1354,9 +1354,7 @@ impl<'a> State<'a> {
self.bclose(item.span, empty); self.bclose(item.span, empty);
} }
ast::ItemKind::TraitAlias(ref generics, ref bounds) => { ast::ItemKind::TraitAlias(ref generics, ref bounds) => {
self.head(""); self.head(visibility_qualified(&item.vis, "trait"));
self.print_visibility(&item.vis);
self.word_nbsp("trait");
self.print_ident(item.ident); self.print_ident(item.ident);
self.print_generic_params(&generics.params); self.print_generic_params(&generics.params);
let mut real_bounds = Vec::with_capacity(bounds.len()); let mut real_bounds = Vec::with_capacity(bounds.len());
@@ -1374,6 +1372,8 @@ impl<'a> State<'a> {
self.print_type_bounds("=", &real_bounds); self.print_type_bounds("=", &real_bounds);
self.print_where_clause(&generics.where_clause); self.print_where_clause(&generics.where_clause);
self.word(";"); self.word(";");
self.end(); // end inner head-block
self.end(); // end outer head-block
} }
ast::ItemKind::MacCall(ref mac) => { ast::ItemKind::MacCall(ref mac) => {
self.print_mac(mac); self.print_mac(mac);

6
compiler/rustc_hir_pretty/src/lib.rs
View File

@@ -705,9 +705,7 @@ impl<'a> State<'a> {
self.bclose(item.span); self.bclose(item.span);
} }
hir::ItemKind::TraitAlias(ref generics, ref bounds) => { hir::ItemKind::TraitAlias(ref generics, ref bounds) => {
self.head(""); self.head(visibility_qualified(&item.vis, "trait"));
self.print_visibility(&item.vis);
self.word_nbsp("trait");
self.print_ident(item.ident); self.print_ident(item.ident);
self.print_generic_params(&generics.params); self.print_generic_params(&generics.params);
let mut real_bounds = Vec::with_capacity(bounds.len()); let mut real_bounds = Vec::with_capacity(bounds.len());
@@ -725,6 +723,8 @@ impl<'a> State<'a> {
self.print_bounds("=", real_bounds); self.print_bounds("=", real_bounds);
self.print_where_clause(&generics.where_clause); self.print_where_clause(&generics.where_clause);
self.word(";"); self.word(";");
self.end(); // end inner head-block
self.end(); // end outer head-block
} }
} }
self.ann.post(self, AnnNode::Item(item)) self.ann.post(self, AnnNode::Item(item))

2
src/test/ui/macros/stringify.rs
View File

@@ -589,7 +589,7 @@ fn test_item() {
stringify_item!( stringify_item!(
pub trait Trait<T> = Sized where T: 'a; pub trait Trait<T> = Sized where T: 'a;
), ),
"", // FIXME "pub trait Trait<T> = Sized where T: 'a;",
); );
// ItemKind::Impl // ItemKind::Impl