mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use can_eq instead of Ty<'_> == Ty<'_>

Browse Source
This commit is contained in:
Esteban Küber 2024-03-02 01:52:27 +00:00
parent 89a3c19832
commit 40f9dccad6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/rustc_trait_selection/src/traits/error_reporting/type_err_ctxt_ext.rs
View File

@ -426,17 +426,25 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
let (main_trait_predicate, o) = if let ty::PredicateKind::Clause( let (main_trait_predicate, o) = if let ty::PredicateKind::Clause(
ty::ClauseKind::Trait(root_pred) ty::ClauseKind::Trait(root_pred)
) = root_obligation.predicate.kind().skip_binder() ) = root_obligation.predicate.kind().skip_binder()
&& !trait_predicate.self_ty().skip_binder().has_escaping_bound_vars()
&& !root_pred.self_ty().has_escaping_bound_vars()
// The type of the leaf predicate is (roughly) the same as the type // The type of the leaf predicate is (roughly) the same as the type
// from the root predicate, as a proxy for "we care about the root" // from the root predicate, as a proxy for "we care about the root"
// FIXME: this doesn't account for trivial derefs, but works as a first // FIXME: this doesn't account for trivial derefs, but works as a first
// approximation. // approximation.
&& ( && (
// `T: Trait` && `&&T: OtherTrait`, we want `OtherTrait` // `T: Trait` && `&&T: OtherTrait`, we want `OtherTrait`
trait_predicate.self_ty().skip_binder() self.can_eq(
== root_pred.self_ty().peel_refs() obligation.param_env,
trait_predicate.self_ty().skip_binder(),
root_pred.self_ty().peel_refs(),
)
// `&str: Iterator` && `&str: IntoIterator`, we want `IntoIterator` // `&str: Iterator` && `&str: IntoIterator`, we want `IntoIterator`
|| trait_predicate.self_ty().skip_binder() || self.can_eq(
== root_pred.self_ty() obligation.param_env,
trait_predicate.self_ty().skip_binder(),
root_pred.self_ty(),
)
) )
// The leaf trait and the root trait are different, so as to avoid // The leaf trait and the root trait are different, so as to avoid
// talking about `&mut T: Trait` and instead remain talking about // talking about `&mut T: Trait` and instead remain talking about