diff --git a/src/rustc/middle/trans/closure.rs b/src/rustc/middle/trans/closure.rs index 7f58053165d..0de416e89f7 100644 --- a/src/rustc/middle/trans/closure.rs +++ b/src/rustc/middle/trans/closure.rs @@ -116,7 +116,7 @@ fn ev_to_str(ccx: @crate_ctxt, ev: environment_value) -> str { } fn mk_tuplified_uniq_cbox_ty(tcx: ty::ctxt, cdata_ty: ty::t) -> ty::t { - let cbox_ty = tuplify_cbox_ty(tcx, cdata_ty, ty::mk_type(tcx)); + let cbox_ty = tuplify_box_ty(tcx, cdata_ty); ret ty::mk_imm_uniq(tcx, cbox_ty); } diff --git a/src/rustc/middle/trans/common.rs b/src/rustc/middle/trans/common.rs index c0994192a4e..fb7df08206d 100644 --- a/src/rustc/middle/trans/common.rs +++ b/src/rustc/middle/trans/common.rs @@ -654,15 +654,8 @@ fn T_opaque_vec(targ_cfg: @session::config) -> TypeRef { // representation of @T as a tuple (i.e., the ty::t version of what T_box() // returns). fn tuplify_box_ty(tcx: ty::ctxt, t: ty::t) -> ty::t { - ret tuplify_cbox_ty(tcx, t, ty::mk_type(tcx)); -} - -// As tuplify_box_ty(), but allows the caller to specify what type of type -// descr is embedded in the box (ty::type vs ty::send_type). This is useful -// for unique closure boxes, hence the name "cbox_ty" (closure box type). -fn tuplify_cbox_ty(tcx: ty::ctxt, t: ty::t, tydesc_t: ty::t) -> ty::t { let ptr = ty::mk_ptr(tcx, {ty: ty::mk_nil(tcx), mutbl: ast::m_imm}); - ret ty::mk_tup(tcx, [ty::mk_uint(tcx), tydesc_t, + ret ty::mk_tup(tcx, [ty::mk_uint(tcx), ty::mk_type(tcx), ptr, ptr, t]); }