user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

handle user-self-type for def-ids

Browse source
This commit is contained in:
Niko Matsakis 2018-10-11 18:06:30 -04:00
parent 0e1d3624e9
commit 547182ea94
1 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/librustc_mir/borrow_check/nll/type_check/relate_tys.rs
View file

@ -15,7 +15,7 @@ use rustc::infer::{InferCtxt, NLLRegionVariableOrigin};
use rustc::mir::{ConstraintCategory, UserTypeAnnotation};
use rustc::traits::query::Fallible;
use rustc::ty::relate::TypeRelation;
use rustc::ty::subst::UserSubsts;
use rustc::ty::subst::{Subst, UserSelfTy, UserSubsts};
use rustc::ty::{self, Ty};
use syntax_pos::DUMMY_SP;
@ -98,9 +98,24 @@ pub(super) fn relate_type_and_user_type<'tcx>(
},
_,
) = infcx.instantiate_canonical_with_fresh_inference_vars(DUMMY_SP, &canonical_substs);
assert!(user_self_ty.is_none()); // TODO for now
let ty = infcx.tcx.mk_fn_def(def_id, substs);
type_relating.relate(&ty, &a)?;
if let Some(UserSelfTy {
impl_def_id,
self_ty,
}) = user_self_ty
{
let impl_self_ty = infcx.tcx.type_of(impl_def_id);
let impl_self_ty = impl_self_ty.subst(infcx.tcx, &substs);
type_relating.relate_with_variance(
ty::Variance::Invariant,
&self_ty,
&impl_self_ty,
)?;
}
Ok(ty)
}
UserTypeAnnotation::AdtDef(adt_def, canonical_substs) => {
@ -111,7 +126,10 @@ pub(super) fn relate_type_and_user_type<'tcx>(
},
_,
) = infcx.instantiate_canonical_with_fresh_inference_vars(DUMMY_SP, &canonical_substs);
assert!(user_self_ty.is_none()); // TODO for now
// We don't extract adt-defs with a self-type.
assert!(user_self_ty.is_none());
let ty = infcx.tcx.mk_adt(adt_def, substs);
type_relating.relate(&ty, &a)?;
Ok(ty)