diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs index 762f6953bb2..659872be25e 100644 --- a/src/librustc/middle/trans/base.rs +++ b/src/librustc/middle/trans/base.rs @@ -2406,12 +2406,7 @@ pub fn fill_fn_pair(bcx: @mut Block, pair: ValueRef, llfn: ValueRef, } pub fn item_path(ccx: &CrateContext, id: &ast::NodeId) -> path { - match ccx.tcx.items.get_copy(id) { - ast_map::node_item(i, p) => - vec::append((*p).clone(), [path_name(i.ident)]), - // separate map for paths? - _ => fail!("item_path") - } + ty::item_path(ccx.tcx, ast_util::local_def(*id)) } fn exported_name(ccx: @mut CrateContext, path: path, ty: ty::t, attrs: &[ast::Attribute]) -> ~str { diff --git a/src/librustc/middle/trans/common.rs b/src/librustc/middle/trans/common.rs index 61ec4b2fedb..bf3dea06ee2 100644 --- a/src/librustc/middle/trans/common.rs +++ b/src/librustc/middle/trans/common.rs @@ -687,7 +687,6 @@ pub fn tuplify_box_ty(tcx: ty::ctxt, t: ty::t) -> ty::t { t]); } - // LLVM constant constructors. pub fn C_null(t: Type) -> ValueRef { unsafe { diff --git a/src/librustc/middle/trans/foreign.rs b/src/librustc/middle/trans/foreign.rs index b1e600b9d73..76d97daceb6 100644 --- a/src/librustc/middle/trans/foreign.rs +++ b/src/librustc/middle/trans/foreign.rs @@ -839,8 +839,6 @@ pub fn trans_intrinsic(ccx: @mut CrateContext, "visit_tydesc" => { let td = get_param(decl, first_real_arg); let visitor = get_param(decl, first_real_arg + 1u); - //let llvisitorptr = alloca(bcx, val_ty(visitor)); - //Store(bcx, visitor, llvisitorptr); let td = PointerCast(bcx, td, ccx.tydesc_type.ptr_to()); glue::call_tydesc_glue_full(bcx, visitor, td, abi::tydesc_field_visit_glue, None);