nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 23:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove tywf relation

Browse Source
This commit is contained in:
Ellen 2021-08-05 03:09:01 +01:00
parent b1d14ef08f
commit fa46715002
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_typeck/src/check/dropck.rs
View File

@ -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`
@ -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,
}
};