bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rebase

Browse source
This commit is contained in:
b-naber 2022-06-14 17:34:37 +02:00
parent e14b34c386
commit 15c1c06522
10 changed files with 36 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_trait_selection/src/traits/fulfill.rs
View file

@ -407,7 +407,7 @@ impl<'a, 'b, 'tcx> FulfillProcessor<'a, 'b, 'tcx> {
let pred =
ty::Binder::dummy(infcx.replace_bound_vars_with_placeholders(binder));
ProcessResult::Changed(mk_pending(vec![
obligation.with(pred.to_predicate(self.selcx.tcx()))
obligation.with(pred.to_predicate(self.selcx.tcx())),
]))
}
ty::PredicateKind::TypeWellFormedFromEnv(..) => {

6
compiler/rustc_trait_selection/src/traits/select/mod.rs
View file

@ -2578,11 +2578,7 @@ impl<'o, 'tcx> TraitObligationStackList<'o, 'tcx> {
}
fn depth(&self) -> usize {
if let Some(head) = self.head {
head.depth
} else {
0
}
if let Some(head) = self.head { head.depth } else { 0 }
}
}