bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Inline WhereClause into Generics.

Browse source
This commit is contained in:
Camille GILLOT 2022-02-05 15:48:02 +01:00
parent 71b4e2d852
commit 05b29f9a92
24 changed files with 98 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

30
compiler/rustc_hir_pretty/src/lib.rs
View file

@ -445,7 +445,7 @@ impl<'a> State<'a> {
if let Some(bounds) = bounds {
self.print_bounds(":", bounds);
}
self.print_where_clause(&generics.where_clause);
self.print_where_clause(generics);
if let Some(ty) = ty {
self.space();
self.word_space("=");
@ -465,7 +465,7 @@ impl<'a> State<'a> {
self.print_generic_params(&generics.params);
self.end(); // end the inner ibox
self.print_where_clause(&generics.where_clause);
self.print_where_clause(generics);
self.space();
inner(self);
self.word(";");
@ -650,7 +650,7 @@ impl<'a> State<'a> {
}
self.print_type(&self_ty);
self.print_where_clause(&generics.where_clause);
self.print_where_clause(generics);
self.space();
self.bopen();
@ -678,7 +678,7 @@ impl<'a> State<'a> {
}
}
self.print_bounds(":", real_bounds);
self.print_where_clause(&generics.where_clause);
self.print_where_clause(generics);
self.word(" ");
self.bopen();
for trait_item in trait_items {
@ -703,7 +703,7 @@ impl<'a> State<'a> {
}
self.nbsp();
self.print_bounds("=", real_bounds);
self.print_where_clause(&generics.where_clause);
self.print_where_clause(generics);
self.word(";");
self.end(); // end inner head-block
self.end(); // end outer head-block
@ -739,7 +739,7 @@ impl<'a> State<'a> {
self.head("enum");
self.print_name(name);
self.print_generic_params(&generics.params);
self.print_where_clause(&generics.where_clause);
self.print_where_clause(generics);
self.space();
self.print_variants(&enum_definition.variants, span)
}
@ -787,7 +787,7 @@ impl<'a> State<'a> {
});
self.pclose();
}
self.print_where_clause(&generics.where_clause);
self.print_where_clause(generics);
if print_finalizer {
self.word(";");
}
@ -795,7 +795,7 @@ impl<'a> State<'a> {
self.end() // close the outer-box
}
hir::VariantData::Struct(..) => {
self.print_where_clause(&generics.where_clause);
self.print_where_clause(generics);
self.nbsp();
self.bopen();
self.hardbreak_if_not_bol();
@ -1995,7 +1995,7 @@ impl<'a> State<'a> {
self.pclose();
self.print_fn_output(decl);
self.print_where_clause(&generics.where_clause)
self.print_where_clause(generics)
}
fn print_closure_params(&mut self, decl: &hir::FnDecl<'_>, body_id: hir::BodyId) {
@ -2133,15 +2133,15 @@ impl<'a> State<'a> {
self.print_ident(lifetime.name.ident())
}
pub fn print_where_clause(&mut self, where_clause: &hir::WhereClause<'_>) {
if where_clause.predicates.is_empty() {
pub fn print_where_clause(&mut self, generics: &hir::Generics<'_>) {
if generics.predicates.is_empty() {
return;
}
self.space();
self.word_space("where");
for (i, predicate) in where_clause.predicates.iter().enumerate() {
for (i, predicate) in generics.predicates.iter().enumerate() {
if i != 0 {
self.word_space(",");
}
@ -2236,11 +2236,7 @@ impl<'a> State<'a> {
) {
self.ibox(INDENT_UNIT);
self.print_formal_generic_params(generic_params);
let generics = hir::Generics {
params: &[],
where_clause: hir::WhereClause { predicates: &[], span: rustc_span::DUMMY_SP },
span: rustc_span::DUMMY_SP,
};
let generics = hir::Generics::empty();
self.print_fn(
decl,
hir::FnHeader {