Skip to content

Commit

Permalink
remove tywf relation
Browse files Browse the repository at this point in the history
  • Loading branch information
BoxyUwU committed Aug 5, 2021
1 parent b1d14ef commit fa46715
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions compiler/rustc_typeck/src/check/dropck.rs
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,9 @@ fn ensure_drop_predicates_are_implied_by_item_defn<'tcx>(
// repeated `.iter().any(..)` calls.

// This closure is a more robust way to check `Predicate` equality
// than simple `==` checks (which were the previous implementation). It relies on
// `ty::relate` for `TraitPredicate`, `ProjectionPredicate`, `ConstEvaluatable`
// `TypeOutlives` and `TypeWellFormedFromEnv` (which implement the Relate trait),
// than simple `==` checks (which were the previous implementation).
// It relies on `ty::relate` for `TraitPredicate`, `ProjectionPredicate`,
// `ConstEvaluatable` and `TypeOutlives` (which implement the Relate trait),
// while delegating on simple equality for the other `Predicate`.
// This implementation solves (Issue #59497) and (Issue #58311).
// It is unclear to me at the moment whether the approach based on `relate`
Expand All @@ -242,10 +242,6 @@ fn ensure_drop_predicates_are_implied_by_item_defn<'tcx>(
(ty::PredicateKind::TypeOutlives(a), ty::PredicateKind::TypeOutlives(b)) => {
relator.relate(predicate.rebind(a.0), p.rebind(b.0)).is_ok()
}
(
ty::PredicateKind::TypeWellFormedFromEnv(a),
ty::PredicateKind::TypeWellFormedFromEnv(b),
) => relator.relate(predicate.rebind(a), p.rebind(b)).is_ok(),
_ => predicate == p,
}
};
Expand Down

0 comments on commit fa46715

Please sign in to comment.