bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Migrate predicates_of and caller_bounds to Clause

Browse source
This commit is contained in:
Michael Goulet 2023-06-22 18:17:13 +00:00
parent 36fb58e433
commit fbdef58414
77 changed files with 478 additions and 705 deletions
Download patch file Download diff file Expand all files Collapse all files

21
compiler/rustc_privacy/src/lib.rs
View file

@ -112,13 +112,13 @@ trait DefIdVisitor<'tcx> {
&mut self,
predicates: ty::GenericPredicates<'tcx>,
) -> ControlFlow<Self::BreakTy> {
self.skeleton().visit_predicates(predicates)
self.skeleton().visit_clauses(predicates.predicates)
}
fn visit_clauses(
&mut self,
predicates: &[(ty::Clause<'tcx>, Span)],
clauses: &[(ty::Clause<'tcx>, Span)],
) -> ControlFlow<Self::BreakTy> {
self.skeleton().visit_clauses(predicates)
self.skeleton().visit_clauses(clauses)
}
}
@ -185,21 +185,8 @@ where
}
}
fn visit_predicates(
&mut self,
predicates: ty::GenericPredicates<'tcx>,
) -> ControlFlow<V::BreakTy> {
let ty::GenericPredicates { parent: _, predicates } = predicates;
predicates.iter().try_for_each(|&(predicate, _span)| {
let clause = predicate
.as_clause()
.unwrap_or_else(|| bug!("unexpected predicate: {:?}", predicate));
self.visit_clause(clause)
})
}
fn visit_clauses(&mut self, clauses: &[(ty::Clause<'tcx>, Span)]) -> ControlFlow<V::BreakTy> {
clauses.iter().try_for_each(|&(clause, _span)| self.visit_clause(clause))
clauses.into_iter().try_for_each(|&(clause, _span)| self.visit_clause(clause))
}
}