bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Change condition in binders to one that is more readable

Browse source
This commit is contained in:
Santiago Pastorino 2024-02-08 11:27:29 -03:00
parent 0479287a38
commit 4a2e3bc2b0
No known key found for this signature in database
GPG key ID: 8131A24E0C79EFAF
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_infer/src/infer/relate/equate.rs
View file

@ -7,7 +7,7 @@ use crate::traits::PredicateObligations;
use rustc_middle::ty::relate::{self, Relate, RelateResult, TypeRelation}; use rustc_middle::ty::relate::{self, Relate, RelateResult, TypeRelation};
use rustc_middle::ty::GenericArgsRef; use rustc_middle::ty::GenericArgsRef;
use rustc_middle::ty::TyVar; use rustc_middle::ty::TyVar;
use rustc_middle::ty::{self, Ty, TyCtxt, TypeVisitableExt}; use rustc_middle::ty::{self, Ty, TyCtxt};
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_span::Span; use rustc_span::Span;
@ -168,7 +168,10 @@ impl<'tcx> TypeRelation<'tcx> for Equate<'_, '_, 'tcx> {
return Ok(a); return Ok(a);
} }
if a.skip_binder().has_escaping_bound_vars() || b.skip_binder().has_escaping_bound_vars() { if let (Some(a), Some(b)) = (a.no_bound_vars(), b.no_bound_vars()) {
// Fast path for the common case.
self.relate(a, b)?;
} else {
// When equating binders, we check that there is a 1-to-1 // When equating binders, we check that there is a 1-to-1
// correspondence between the bound vars in both types. // correspondence between the bound vars in both types.
// //
@ -193,9 +196,6 @@ impl<'tcx> TypeRelation<'tcx> for Equate<'_, '_, 'tcx> {
let b = infcx.instantiate_binder_with_fresh_vars(span, HigherRankedType, b); let b = infcx.instantiate_binder_with_fresh_vars(span, HigherRankedType, b);
self.relate(a, b) self.relate(a, b)
})?; })?;
} else {
// Fast path for the common case.
self.relate(a.skip_binder(), b.skip_binder())?;
} }
Ok(a) Ok(a)
} }