Remove PredicateKind::Atom

2020-12-21 22:49:03 -05:00
parent 8a6518427e
commit 8278314a8b
12 changed files with 73 additions and 101 deletions
--- a/compiler/rustc_traits/src/implied_outlives_bounds.rs
+++ b/compiler/rustc_traits/src/implied_outlives_bounds.rs
@@ -95,8 +95,12 @@ fn compute_implied_outlives_bounds<'tcx>(
        implied_bounds.extend(obligations.into_iter().flat_map(|obligation| {
            assert!(!obligation.has_escaping_bound_vars());
            match obligation.predicate.kind() {
-                &ty::PredicateKind::ForAll(..) => vec![],
-                &ty::PredicateKind::Atom(atom) => match atom {
+                &ty::PredicateKind::ForAll(binder)
+                    if binder.skip_binder().has_escaping_bound_vars() =>
+                {
+                    vec![]
+                }
+                &ty::PredicateKind::ForAll(binder) => match binder.skip_binder() {
                    ty::PredicateAtom::Trait(..)
                    | ty::PredicateAtom::Subtype(..)
                    | ty::PredicateAtom::Projection(..)