mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustc: minor cleanup

Browse Source
This commit is contained in:
Erick Tryzelaar 2013-04-26 19:10:28 -07:00
parent 2fc6b0998b
commit 191fdda46a
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/librustc/middle/trans/meth.rs
View File

@ -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, _}) => {

3
src/librustc/middle/trans/type_use.rs
View File

@ -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);
}
}