bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Combine sub and eq

Browse source
This commit is contained in:
Michael Goulet 2024-02-22 17:18:35 +00:00
parent 3cb36317cd
commit c87b727a23
8 changed files with 356 additions and 492 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/rustc_borrowck/src/type_check/relate_tys.rs
View file

@ -349,12 +349,15 @@ impl<'bccx, 'tcx> TypeRelation<'tcx> for NllTypeRelating<'_, 'bccx, 'tcx> {
debug!(?self.ambient_variance);
// In a bivariant context this always succeeds.
let r =
if self.ambient_variance == ty::Variance::Bivariant { a } else { self.relate(a, b)? };
let r = if self.ambient_variance == ty::Variance::Bivariant {
Ok(a)
} else {
self.relate(a, b)
};
self.ambient_variance = old_ambient_variance;
Ok(r)
r
}
#[instrument(skip(self), level = "debug")]
@ -579,10 +582,6 @@ impl<'bccx, 'tcx> ObligationEmittingRelation<'tcx> for NllTypeRelating<'_, 'bccx
);
}
fn alias_relate_direction(&self) -> ty::AliasRelationDirection {
unreachable!("manually overridden to handle ty::Variance::Contravariant ambient variance")
}
fn register_type_relate_obligation(&mut self, a: Ty<'tcx>, b: Ty<'tcx>) {
self.register_predicates([ty::Binder::dummy(match self.ambient_variance {
ty::Variance::Covariant => ty::PredicateKind::AliasRelate(