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

Adapt to latest master changes by using PredicateKind

Browse source
This commit is contained in:
Santiago Pastorino 2021-02-02 13:52:01 -03:00
parent 7b69987985
commit fd092557ce
No known key found for this signature in database
GPG key ID: 8131A24E0C79EFAF
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_infer/src/traits/util.rs
View file

@ -301,7 +301,7 @@ pub fn transitive_bounds_that_define_assoc_type<'tcx>(
let super_predicates = let super_predicates =
tcx.super_predicates_that_define_assoc_type((trait_ref.def_id(), Some(assoc_name))); tcx.super_predicates_that_define_assoc_type((trait_ref.def_id(), Some(assoc_name)));
for (super_predicate, _) in super_predicates.predicates { for (super_predicate, _) in super_predicates.predicates {
let bound_predicate = super_predicate.bound_atom(); let bound_predicate = super_predicate.kind();
let subst_predicate = super_predicate let subst_predicate = super_predicate
.subst_supertrait(tcx, &bound_predicate.rebind(trait_ref.skip_binder())); .subst_supertrait(tcx, &bound_predicate.rebind(trait_ref.skip_binder()));
if let Some(binder) = subst_predicate.to_opt_poly_trait_ref() { if let Some(binder) = subst_predicate.to_opt_poly_trait_ref() {

2
compiler/rustc_middle/src/ty/context.rs
View file

@ -2078,7 +2078,7 @@ impl<'tcx> TyCtxt<'tcx> {
let generic_predicates = self.super_predicates_of(trait_did); let generic_predicates = self.super_predicates_of(trait_did);
for (predicate, _) in generic_predicates.predicates { for (predicate, _) in generic_predicates.predicates {
if let ty::PredicateAtom::Trait(data, _) = predicate.skip_binders() { if let ty::PredicateKind::Trait(data, _) = predicate.kind().skip_binder() {
if set.insert(data.def_id()) { if set.insert(data.def_id()) {
stack.push(data.def_id()); stack.push(data.def_id());
} }

2
compiler/rustc_typeck/src/collect.rs
View file

@ -578,7 +578,7 @@ fn type_param_predicates(
) )
.into_iter() .into_iter()
.filter(|(predicate, _)| match predicate.kind().skip_binder() { .filter(|(predicate, _)| match predicate.kind().skip_binder() {
ty::PredicateAtom::Trait(data, _) => data.self_ty().is_param(index), ty::PredicateKind::Trait(data, _) => data.self_ty().is_param(index),
_ => false, _ => false,
}), }),
); );