rustc_typeck: support functions in variance computation.

Author: eddyb

src/librustc/ty/relate.rs

@@ -291,7 +291,7 @@ impl<'tcx> Relate<'tcx> for ty::TraitRef<'tcx> {
  if a.def_id != b.def_id {
  Err(TypeError::Traits(expected_found(relation, &a.def_id, &b.def_id)))
  } else {
- let substs = relation.relate_item_substs(a.def_id, a.substs, b.substs)?;
+ let substs = relate_substs(relation, None, a.substs, b.substs)?;
  Ok(ty::TraitRef { def_id: a.def_id, substs: substs })
  }
  }
@@ -308,7 +308,7 @@ impl<'tcx> Relate<'tcx> for ty::ExistentialTraitRef<'tcx> {
  if a.def_id != b.def_id {
  Err(TypeError::Traits(expected_found(relation, &a.def_id, &b.def_id)))
  } else {
- let substs = relation.relate_item_substs(a.def_id, a.substs, b.substs)?;
+ let substs = relate_substs(relation, None, a.substs, b.substs)?;
  Ok(ty::ExistentialTraitRef { def_id: a.def_id, substs: substs })
  }
  }
@@ -443,7 +443,7 @@ pub fn super_relate_tys<'a, 'gcx, 'tcx, R>(relation: &mut R,
  (&ty::TyFnDef(a_def_id, a_substs), &ty::TyFnDef(b_def_id, b_substs))
  if a_def_id == b_def_id =>
  {
- let substs = relate_substs(relation, None, a_substs, b_substs)?;
+ let substs = relation.relate_item_substs(a_def_id, a_substs, b_substs)?;
  Ok(tcx.mk_fn_def(a_def_id, substs))
  }
 

src/librustc_metadata/encoder.rs

@@ -524,7 +524,11 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> {
 
  ty: Some(self.encode_item_type(def_id)),
  inherent_impls: LazySeq::empty(),
- variances: LazySeq::empty(),
+ variances: if variant.ctor_kind == CtorKind::Fn {
+ self.encode_variances_of(def_id)
+ } else {
+ LazySeq::empty()
+ },
  generics: Some(self.encode_generics(def_id)),
  predicates: Some(self.encode_predicates(def_id)),
 
@@ -652,7 +656,11 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> {
 
  ty: Some(self.encode_item_type(def_id)),
  inherent_impls: LazySeq::empty(),
- variances: LazySeq::empty(),
+ variances: if variant.ctor_kind == CtorKind::Fn {
+ self.encode_variances_of(def_id)
+ } else {
+ LazySeq::empty()
+ },
  generics: Some(self.encode_generics(def_id)),
  predicates: Some(self.encode_predicates(def_id)),
 
@@ -744,7 +752,11 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> {
  }
  },
  inherent_impls: LazySeq::empty(),
- variances: LazySeq::empty(),
+ variances: if trait_item.kind == ty::AssociatedKind::Method {
+ self.encode_variances_of(def_id)
+ } else {
+ LazySeq::empty()
+ },
  generics: Some(self.encode_generics(def_id)),
  predicates: Some(self.encode_predicates(def_id)),
 
@@ -821,7 +833,11 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> {
 
  ty: Some(self.encode_item_type(def_id)),
  inherent_impls: LazySeq::empty(),
- variances: LazySeq::empty(),
+ variances: if impl_item.kind == ty::AssociatedKind::Method {
+ self.encode_variances_of(def_id)
+ } else {
+ LazySeq::empty()
+ },
  generics: Some(self.encode_generics(def_id)),
  predicates: Some(self.encode_predicates(def_id)),
 
@@ -1055,7 +1071,7 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> {
  hir::ItemEnum(..) |
  hir::ItemStruct(..) |
  hir::ItemUnion(..) |
- hir::ItemTrait(..) => self.encode_variances_of(def_id),
+ hir::ItemFn(..) => self.encode_variances_of(def_id),
  _ => LazySeq::empty(),
  },
  generics: match item.node {
@@ -1400,7 +1416,10 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> {
 
  ty: Some(self.encode_item_type(def_id)),
  inherent_impls: LazySeq::empty(),
- variances: LazySeq::empty(),
+ variances: match nitem.node {
+ hir::ForeignItemFn(..) => self.encode_variances_of(def_id),
+ _ => LazySeq::empty(),
+ },
  generics: Some(self.encode_generics(def_id)),
  predicates: Some(self.encode_predicates(def_id)),