bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

typeck: Use TyFnDef for methods.

Browse source
This commit is contained in:
Eduard Burtescu 2016-02-18 15:19:11 +02:00
parent 847f00738b
commit 644d6390be
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/librustc_typeck/check/method/confirm.rs
View file

@ -98,27 +98,29 @@ impl<'a,'tcx> ConfirmContext<'a,'tcx> {
let InstantiatedMethodSig {
method_sig, all_substs, method_predicates
} = self.instantiate_method_sig(&pick, all_substs);
let all_substs = self.tcx().mk_substs(all_substs);
let method_self_ty = method_sig.inputs[0];
// Unify the (adjusted) self type with what the method expects.
self.unify_receivers(self_ty, method_self_ty);
// Create the method type
let def_id = pick.item.def_id();
let method_ty = pick.item.as_opt_method().unwrap();
let fty = self.tcx().mk_fn_ptr(ty::BareFnTy {
let fty = self.tcx().mk_fn_def(def_id, all_substs, ty::BareFnTy {
sig: ty::Binder(method_sig),
unsafety: method_ty.fty.unsafety,
abi: method_ty.fty.abi.clone(),
});
// Add any trait/regions obligations specified on the method's type parameters.
self.add_obligations(fty, &all_substs, &method_predicates);
self.add_obligations(fty, all_substs, &method_predicates);
// Create the final `MethodCallee`.
let callee = ty::MethodCallee {
def_id: pick.item.def_id(),
def_id: def_id,
ty: fty,
substs: self.tcx().mk_substs(all_substs)
substs: all_substs
};
// If this is an `&mut self` method, bias the receiver
// expression towards mutability (this will switch
@ -457,7 +459,7 @@ impl<'a,'tcx> ConfirmContext<'a,'tcx> {
fn fixup_derefs_on_method_receiver_if_necessary(&self,
method_callee: &ty::MethodCallee) {
let sig = match method_callee.ty.sty {
ty::TyFnPtr(ref f) => f.sig.clone(),
ty::TyFnDef(_, _, ref f) => f.sig.clone(),
_ => return,
};

5
src/librustc_typeck/check/method/mod.rs
View file

@ -230,7 +230,8 @@ pub fn lookup_in_trait_adjusted<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>,
&method_ty.fty.sig).0;
let fn_sig = fcx.instantiate_type_scheme(span, trait_ref.substs, &fn_sig);
let transformed_self_ty = fn_sig.inputs[0];
let fty = tcx.mk_fn_ptr(ty::BareFnTy {
let def_id = method_item.def_id();
let fty = tcx.mk_fn_def(def_id, trait_ref.substs, ty::BareFnTy {
sig: ty::Binder(fn_sig),
unsafety: method_ty.fty.unsafety,
abi: method_ty.fty.abi.clone(),
@ -318,7 +319,7 @@ pub fn lookup_in_trait_adjusted<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>,
}
let callee = ty::MethodCallee {
def_id: method_item.def_id(),
def_id: def_id,
ty: fty,
substs: trait_ref.substs
};

2
src/librustc_typeck/check/mod.rs
View file

@ -2340,7 +2340,7 @@ fn check_method_argument_types<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>,
ty::FnConverging(fcx.tcx().types.err)
} else {
match method_fn_ty.sty {
ty::TyFnPtr(ref fty) => {
ty::TyFnDef(_, _, ref fty) => {
// HACK(eddyb) ignore self in the definition (see above).
let expected_arg_tys = expected_types_for_fn_args(fcx,
sp,