From 9a8b4a1be684a62fb718618cc4e42db26bbb0c86 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Tue, 20 Sep 2011 13:57:04 -0700 Subject: [PATCH] Revert "rt: Rename rust_box to rust_box_legacy, as they're about to become self-describing" This reverts commit f6871e832c6d79d54f274d4ef4513c087ea7e36b. --- src/rt/rust_builtin.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index cf883577f5c..ac6ef22d1f8 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -224,15 +224,15 @@ debug_opaque(rust_task *task, type_desc *t, uint8_t *front) } } -struct rust_box_legacy { - RUST_REFCOUNTED(rust_box_legacy) +struct rust_box { + RUST_REFCOUNTED(rust_box) // FIXME `data` could be aligned differently from the actual box body data uint8_t data[]; }; extern "C" CDECL void -debug_box(rust_task *task, type_desc *t, rust_box_legacy *box) +debug_box(rust_task *task, type_desc *t, rust_box *box) { LOG(task, stdlib, "debug_box(0x%" PRIxPTR ")", box); debug_tydesc_helper(task, t); @@ -262,7 +262,7 @@ debug_tag(rust_task *task, type_desc *t, rust_tag *tag) struct rust_obj { uintptr_t *vtbl; - rust_box_legacy *body; + rust_box *body; }; extern "C" CDECL void @@ -284,7 +284,7 @@ debug_obj(rust_task *task, type_desc *t, rust_obj *obj, struct rust_fn { uintptr_t *thunk; - rust_box_legacy *closure; + rust_box *closure; }; extern "C" CDECL void @@ -364,8 +364,7 @@ extern "C" CDECL FILE* rust_get_stdout() {return stdout;} extern "C" CDECL FILE* rust_get_stderr() {return stderr;} extern "C" CDECL int -rust_ptr_eq(rust_task *task, type_desc *t, rust_box_legacy *a, - rust_box_legacy *b) { +rust_ptr_eq(rust_task *task, type_desc *t, rust_box *a, rust_box *b) { return a == b; }