diff options
| -rw-r--r-- | src/rt/rust_shape.h | 16 | ||||
| -rw-r--r-- | src/rt/rust_upcall.cpp | 2 | ||||
| -rw-r--r-- | src/rustc/middle/trans/shape.rs | 2 |
3 files changed, 0 insertions, 20 deletions
diff --git a/src/rt/rust_shape.h b/src/rt/rust_shape.h index 77a253d2bb7..c6442add9d7 100644 --- a/src/rt/rust_shape.h +++ b/src/rt/rust_shape.h @@ -45,14 +45,12 @@ const uint8_t SHAPE_F64 = 9u; const uint8_t SHAPE_BOX = 10u; const uint8_t SHAPE_VEC = 11u; const uint8_t SHAPE_TAG = 12u; -const uint8_t SHAPE_BOX_OLD = 13u; // remove after snapshot const uint8_t SHAPE_STRUCT = 17u; const uint8_t SHAPE_BOX_FN = 18u; const uint8_t SHAPE_OBJ = 19u; const uint8_t SHAPE_RES = 20u; const uint8_t SHAPE_VAR = 21u; const uint8_t SHAPE_UNIQ = 22u; -const uint8_t SHAPE_IFACE_OLD = 24u; const uint8_t SHAPE_UNIQ_FN = 25u; const uint8_t SHAPE_STACK_FN = 26u; const uint8_t SHAPE_BARE_FN = 27u; @@ -372,12 +370,10 @@ ctxt<T>::walk() { case SHAPE_VEC: walk_vec0(); break; case SHAPE_TAG: walk_tag0(); break; case SHAPE_BOX: walk_box0(); break; - case SHAPE_BOX_OLD: walk_box_old0(); break; case SHAPE_STRUCT: walk_struct0(); break; case SHAPE_RES: walk_res0(); break; case SHAPE_VAR: walk_var0(); break; case SHAPE_UNIQ: walk_uniq0(); break; - case SHAPE_IFACE_OLD: WALK_SIMPLE(walk_iface1); break; case SHAPE_BOX_FN: case SHAPE_UNIQ_FN: case SHAPE_STACK_FN: @@ -489,18 +485,6 @@ ctxt<T>::walk_box0() { template<typename T> void -ctxt<T>::walk_box_old0() { - // remove after snapshot - uint16_t sp_size = get_u16_bump(sp); - const uint8_t *end_sp = sp + sp_size; - - static_cast<T *>(this)->walk_box1(); - - sp = end_sp; -} - -template<typename T> -void ctxt<T>::walk_uniq0() { uint16_t sp_size = get_u16_bump(sp); const uint8_t *end_sp = sp + sp_size; diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index 11f52df70ba..f523f82a4f5 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -330,8 +330,6 @@ upcall_str_new_uniq(const char *cstr, size_t len) { return args.retval; } -// FIXME: this is an old compatibility-name for upcall_str_new_uniq -// can remove after next snapshot. extern "C" CDECL rust_str* upcall_str_new(const char *cstr, size_t len) { s_str_new_uniq_args args = { cstr, len, 0 }; diff --git a/src/rustc/middle/trans/shape.rs b/src/rustc/middle/trans/shape.rs index 03960fb48f4..72eda246db2 100644 --- a/src/rustc/middle/trans/shape.rs +++ b/src/rustc/middle/trans/shape.rs @@ -81,10 +81,8 @@ const shape_f64: u8 = 9u8; const shape_box: u8 = 10u8; const shape_vec: u8 = 11u8; const shape_enum: u8 = 12u8; -const shape_box_old: u8 = 13u8; // deprecated, remove after snapshot const shape_struct: u8 = 17u8; const shape_box_fn: u8 = 18u8; -const shape_UNUSED: u8 = 19u8; const shape_res: u8 = 20u8; const shape_var: u8 = 21u8; const shape_uniq: u8 = 22u8; |