Skip to content

WIP: Incorporate variance into typeck #12828

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 1 commit into from
Closed

WIP: Incorporate variance into typeck #12828

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/librustc/middle/typeck/variance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,8 +674,19 @@ impl<'a> ConstraintContext<'a> {
substs, variance);
}

ty::ty_trait(~ty::TyTrait { def_id, ref substs, .. }) => {
ty::ty_trait(~ty::TyTrait { def_id, ref substs, store, mutability, .. }) => {
match store {
ty::RegionTraitStore(region) => {
let contra = self.contravariant(variance);
self.add_constraints_from_region(region, contra);
}
ty::UniqTraitStore => {},
}
let trait_def = ty::lookup_trait_def(self.tcx(), def_id);
let variance = match mutability {
ast::MutMutable => self.invariant(variance),
ast::MutImmutable => variance,
};
self.add_constraints_from_substs(def_id, &trait_def.generics,
substs, variance);
}
Expand Down Expand Up @@ -781,6 +792,8 @@ impl<'a> ConstraintContext<'a> {
fn add_constraints_from_region(&mut self,
region: ty::Region,
variance: VarianceTermPtr<'a>) {
debug!("add_constraints_from_region(region={}, variance={})",
region.repr(self.tcx()), variance.to_str());
match region {
ty::ReEarlyBound(param_id, _, _) => {
let index = self.inferred_index(param_id);
Expand Down