summary refs log tree commit diff
path: root/src/rustc/middle
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-05-08 16:30:00 -0700
committerBrian Anderson <banderson@mozilla.com>2012-05-30 21:23:33 -0700
commit6d37c90ce638f6bbf2b9abdc6625fcb1d8887bfe (patch)
tree98f33328efca8e943ef8d292825892d758a16612 /src/rustc/middle
parent02dde781eb71b9acc42447edcba12a3c380c3269 (diff)
downloadrust-6d37c90ce638f6bbf2b9abdc6625fcb1d8887bfe.tar.gz
rust-6d37c90ce638f6bbf2b9abdc6625fcb1d8887bfe.zip
rustc: Remove tuplify_cbox_ty. Unused
Diffstat (limited to 'src/rustc/middle')
-rw-r--r--src/rustc/middle/trans/closure.rs2
-rw-r--r--src/rustc/middle/trans/common.rs9
2 files changed, 2 insertions, 9 deletions
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]);
 }