Skip to content

Commit 45cc95f

Browse files
committed
Remove a bunch of old "remove after snapshot" code.
1 parent bf0d6a7 commit 45cc95f

File tree

3 files changed

+0
-20
lines changed

3 files changed

+0
-20
lines changed

src/rt/rust_shape.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,12 @@ const uint8_t SHAPE_F64 = 9u;
4545
const uint8_t SHAPE_BOX = 10u;
4646
const uint8_t SHAPE_VEC = 11u;
4747
const uint8_t SHAPE_TAG = 12u;
48-
const uint8_t SHAPE_BOX_OLD = 13u; // remove after snapshot
4948
const uint8_t SHAPE_STRUCT = 17u;
5049
const uint8_t SHAPE_BOX_FN = 18u;
5150
const uint8_t SHAPE_OBJ = 19u;
5251
const uint8_t SHAPE_RES = 20u;
5352
const uint8_t SHAPE_VAR = 21u;
5453
const uint8_t SHAPE_UNIQ = 22u;
55-
const uint8_t SHAPE_IFACE_OLD = 24u;
5654
const uint8_t SHAPE_UNIQ_FN = 25u;
5755
const uint8_t SHAPE_STACK_FN = 26u;
5856
const uint8_t SHAPE_BARE_FN = 27u;
@@ -372,12 +370,10 @@ ctxt<T>::walk() {
372370
case SHAPE_VEC: walk_vec0(); break;
373371
case SHAPE_TAG: walk_tag0(); break;
374372
case SHAPE_BOX: walk_box0(); break;
375-
case SHAPE_BOX_OLD: walk_box_old0(); break;
376373
case SHAPE_STRUCT: walk_struct0(); break;
377374
case SHAPE_RES: walk_res0(); break;
378375
case SHAPE_VAR: walk_var0(); break;
379376
case SHAPE_UNIQ: walk_uniq0(); break;
380-
case SHAPE_IFACE_OLD: WALK_SIMPLE(walk_iface1); break;
381377
case SHAPE_BOX_FN:
382378
case SHAPE_UNIQ_FN:
383379
case SHAPE_STACK_FN:
@@ -487,18 +483,6 @@ ctxt<T>::walk_box0() {
487483
static_cast<T *>(this)->walk_box1();
488484
}
489485

490-
template<typename T>
491-
void
492-
ctxt<T>::walk_box_old0() {
493-
// remove after snapshot
494-
uint16_t sp_size = get_u16_bump(sp);
495-
const uint8_t *end_sp = sp + sp_size;
496-
497-
static_cast<T *>(this)->walk_box1();
498-
499-
sp = end_sp;
500-
}
501-
502486
template<typename T>
503487
void
504488
ctxt<T>::walk_uniq0() {

src/rt/rust_upcall.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,6 @@ upcall_str_new_uniq(const char *cstr, size_t len) {
330330
return args.retval;
331331
}
332332

333-
// FIXME: this is an old compatibility-name for upcall_str_new_uniq
334-
// can remove after next snapshot.
335333
extern "C" CDECL rust_str*
336334
upcall_str_new(const char *cstr, size_t len) {
337335
s_str_new_uniq_args args = { cstr, len, 0 };

src/rustc/middle/trans/shape.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,8 @@ const shape_f64: u8 = 9u8;
8181
const shape_box: u8 = 10u8;
8282
const shape_vec: u8 = 11u8;
8383
const shape_enum: u8 = 12u8;
84-
const shape_box_old: u8 = 13u8; // deprecated, remove after snapshot
8584
const shape_struct: u8 = 17u8;
8685
const shape_box_fn: u8 = 18u8;
87-
const shape_UNUSED: u8 = 19u8;
8886
const shape_res: u8 = 20u8;
8987
const shape_var: u8 = 21u8;
9088
const shape_uniq: u8 = 22u8;

0 commit comments

Comments
 (0)