diff options
| author | Santiago Pastorino <spastorino@gmail.com> | 2021-02-02 13:52:01 -0300 |
|---|---|---|
| committer | Santiago Pastorino <spastorino@gmail.com> | 2021-02-05 18:56:57 -0300 |
| commit | fd092557ceb36998dc93aa46a797745c58f1969f (patch) | |
| tree | 1a2b83026dc948576cf58e502f0bd8119b0c44e5 | |
| parent | 7b6998798548a4b87a0c65655522802d81387fba (diff) | |
| download | rust-fd092557ceb36998dc93aa46a797745c58f1969f.tar.gz rust-fd092557ceb36998dc93aa46a797745c58f1969f.zip | |
Adapt to latest master changes by using PredicateKind
| -rw-r--r-- | compiler/rustc_infer/src/traits/util.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_middle/src/ty/context.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_typeck/src/collect.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_infer/src/traits/util.rs b/compiler/rustc_infer/src/traits/util.rs index 9b928f55c02..8a1035707fe 100644 --- a/compiler/rustc_infer/src/traits/util.rs +++ b/compiler/rustc_infer/src/traits/util.rs @@ -301,7 +301,7 @@ pub fn transitive_bounds_that_define_assoc_type<'tcx>( let super_predicates = tcx.super_predicates_that_define_assoc_type((trait_ref.def_id(), Some(assoc_name))); 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 .subst_supertrait(tcx, &bound_predicate.rebind(trait_ref.skip_binder())); if let Some(binder) = subst_predicate.to_opt_poly_trait_ref() { diff --git a/compiler/rustc_middle/src/ty/context.rs b/compiler/rustc_middle/src/ty/context.rs index ea1484aa37c..f83056ebe2a 100644 --- a/compiler/rustc_middle/src/ty/context.rs +++ b/compiler/rustc_middle/src/ty/context.rs @@ -2078,7 +2078,7 @@ impl<'tcx> TyCtxt<'tcx> { let generic_predicates = self.super_predicates_of(trait_did); 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()) { stack.push(data.def_id()); } diff --git a/compiler/rustc_typeck/src/collect.rs b/compiler/rustc_typeck/src/collect.rs index 1d2449baee4..e5045f906df 100644 --- a/compiler/rustc_typeck/src/collect.rs +++ b/compiler/rustc_typeck/src/collect.rs @@ -578,7 +578,7 @@ fn type_param_predicates( ) .into_iter() .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, }), ); |