bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Do not skip_binders

Browse source
This commit is contained in:
Esteban Küber 2022-12-12 11:53:39 -08:00
parent 348386985d
commit f4ed2d1cca
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
View file

@ -3133,18 +3133,21 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
if let ObligationCauseCode::ExprBindingObligation(def_id, _, _, idx) = parent_code.deref() if let ObligationCauseCode::ExprBindingObligation(def_id, _, _, idx) = parent_code.deref()
&& let predicates = self.tcx.predicates_of(def_id).instantiate_identity(self.tcx) && let predicates = self.tcx.predicates_of(def_id).instantiate_identity(self.tcx)
&& let Some(pred) = predicates.predicates.get(*idx) && let Some(pred) = predicates.predicates.get(*idx)
&& let ty::PredicateKind::Clause(ty::Clause::Trait(trait_pred)) = pred.kind().skip_binder() && let Ok(trait_pred) = pred.kind().try_map_bound(|pred| match pred {
ty::PredicateKind::Clause(ty::Clause::Trait(trait_pred)) => Ok(trait_pred),
_ => Err(()),
})
{ {
let mut c = CollectAllMismatches { let mut c = CollectAllMismatches {
infcx: self.infcx, infcx: self.infcx,
param_env, param_env,
errors: vec![], errors: vec![],
}; };
if let ty::PredicateKind::Clause(ty::Clause::Trait( if let Ok(trait_predicate) = predicate.kind().try_map_bound(|pred| match pred {
predicate ty::PredicateKind::Clause(ty::Clause::Trait(trait_pred)) => Ok(trait_pred),
)) = predicate.kind().skip_binder() _ => Err(()),
{ }) {
if let Ok(_) = c.relate(trait_pred, predicate) { if let Ok(_) = c.relate(trait_pred, trait_predicate) {
type_diffs = c.errors; type_diffs = c.errors;
} }
} }