Skip to content

Commit 9a8b4a1

Browse files
committed
Revert "rt: Rename rust_box to rust_box_legacy, as they're about to become self-describing"
This reverts commit f6871e8.
1 parent d73a860 commit 9a8b4a1

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/rt/rust_builtin.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,15 +224,15 @@ debug_opaque(rust_task *task, type_desc *t, uint8_t *front)
224224
}
225225
}
226226

227-
struct rust_box_legacy {
228-
RUST_REFCOUNTED(rust_box_legacy)
227+
struct rust_box {
228+
RUST_REFCOUNTED(rust_box)
229229

230230
// FIXME `data` could be aligned differently from the actual box body data
231231
uint8_t data[];
232232
};
233233

234234
extern "C" CDECL void
235-
debug_box(rust_task *task, type_desc *t, rust_box_legacy *box)
235+
debug_box(rust_task *task, type_desc *t, rust_box *box)
236236
{
237237
LOG(task, stdlib, "debug_box(0x%" PRIxPTR ")", box);
238238
debug_tydesc_helper(task, t);
@@ -262,7 +262,7 @@ debug_tag(rust_task *task, type_desc *t, rust_tag *tag)
262262

263263
struct rust_obj {
264264
uintptr_t *vtbl;
265-
rust_box_legacy *body;
265+
rust_box *body;
266266
};
267267

268268
extern "C" CDECL void
@@ -284,7 +284,7 @@ debug_obj(rust_task *task, type_desc *t, rust_obj *obj,
284284

285285
struct rust_fn {
286286
uintptr_t *thunk;
287-
rust_box_legacy *closure;
287+
rust_box *closure;
288288
};
289289

290290
extern "C" CDECL void
@@ -364,8 +364,7 @@ extern "C" CDECL FILE* rust_get_stdout() {return stdout;}
364364
extern "C" CDECL FILE* rust_get_stderr() {return stderr;}
365365

366366
extern "C" CDECL int
367-
rust_ptr_eq(rust_task *task, type_desc *t, rust_box_legacy *a,
368-
rust_box_legacy *b) {
367+
rust_ptr_eq(rust_task *task, type_desc *t, rust_box *a, rust_box *b) {
369368
return a == b;
370369
}
371370

0 commit comments

Comments
 (0)