bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

require gat substs to be invariant

Browse source
This commit is contained in:
Bastian Kauschke 2020-12-31 15:35:21 +01:00
parent 339e19697a
commit f32a6acdab
2 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_typeck/src/variance/constraints.rs
View file

@ -207,27 +207,13 @@ impl<'a, 'tcx> ConstraintContext<'a, 'tcx> {
}
}
fn add_constraints_from_trait_ref(
&mut self,
current: &CurrentItem,
trait_ref: ty::TraitRef<'tcx>,
variance: VarianceTermPtr<'a>,
) {
debug!("add_constraints_from_trait_ref: trait_ref={:?} variance={:?}", trait_ref, variance);
self.add_constraints_from_invariant_substs(current, trait_ref.substs, variance);
}
#[instrument(skip(self, current))]
fn add_constraints_from_invariant_substs(
&mut self,
current: &CurrentItem,
substs: SubstsRef<'tcx>,
variance: VarianceTermPtr<'a>,
) {
debug!(
"add_constraints_from_invariant_substs: substs={:?} variance={:?}",
substs, variance
);
// Trait are always invariant so we can take advantage of that.
let variance_i = self.invariant(variance);
@ -300,8 +286,7 @@ impl<'a, 'tcx> ConstraintContext<'a, 'tcx> {
}
ty::Projection(ref data) => {
let tcx = self.tcx();
self.add_constraints_from_trait_ref(current, data.trait_ref(tcx), variance);
self.add_constraints_from_invariant_substs(current, data.substs, variance);
}
ty::Opaque(_, substs) => {