diff --git a/src/librustc/middle/trans/meth.rs b/src/librustc/middle/trans/meth.rs index d4856de2184..bac7218f16a 100644 --- a/src/librustc/middle/trans/meth.rs +++ b/src/librustc/middle/trans/meth.rs @@ -70,7 +70,12 @@ pub fn trans_impl(ccx: @CrateContext, path: path, name: ast::ident, } } - trans_method(ccx, path, *method, param_substs_opt, self_ty, llfn, + trans_method(ccx, + path, + *method, + param_substs_opt, + self_ty, + llfn, ast_util::local_def(id)); } } @@ -106,11 +111,10 @@ pub fn trans_method(ccx: @CrateContext, _ => { // determine the (monomorphized) type that `self` maps to for // this method - let self_ty; - match base_self_ty { - None => self_ty = ty::node_id_to_type(ccx.tcx, method.self_id), - Some(provided_self_ty) => self_ty = provided_self_ty - } + let self_ty = match base_self_ty { + None => ty::node_id_to_type(ccx.tcx, method.self_id), + Some(provided_self_ty) => provided_self_ty, + }; let self_ty = match param_substs { None => self_ty, Some(@param_substs {tys: ref tys, _}) => { diff --git a/src/librustc/middle/trans/type_use.rs b/src/librustc/middle/trans/type_use.rs index c15c31055c3..ff375b21363 100644 --- a/src/librustc/middle/trans/type_use.rs +++ b/src/librustc/middle/trans/type_use.rs @@ -331,8 +331,7 @@ pub fn mark_for_expr(cx: Context, e: @expr) { node_type_needs(cx, use_tydesc, val.id); } expr_call(f, _, _) => { - for vec::each(ty::ty_fn_args(ty::node_id_to_type(cx.ccx.tcx, - f.id))) |a| { + for ty::ty_fn_args(ty::node_id_to_type(cx.ccx.tcx, f.id))).each |a| { type_needs(cx, use_repr, a.ty); } }