---

yaml
---
r: 11621
b: refs/heads/master
c: 6c87c34
h: refs/heads/master
i:
  11619: 9ad76f4
v: v3

Author: graydon

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 15df3950ad4a1d2e9deb30d0ebdcb8dc7da00b63
+refs/heads/master: 6c87c342775e4e4e4cef927adac5fc625d1faa31
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libstd/dbg.rs

@@ -14,8 +14,6 @@ native mod rustrt {
     fn debug_opaque<T>(td: *sys::type_desc, x: T);
     fn debug_box<T>(td: *sys::type_desc, x: @T);
     fn debug_tag<T>(td: *sys::type_desc, x: T);
-    fn debug_obj<T>(td: *sys::type_desc, x: T,
-                    nmethods: ctypes::size_t, nbytes: ctypes::size_t);
     fn debug_fn<T>(td: *sys::type_desc, x: T);
     fn debug_ptrcast<T, U>(td: *sys::type_desc, x: @T) -> @U;
 }
@@ -36,20 +34,6 @@ fn debug_tag<T>(x: T) {
     rustrt::debug_tag::<T>(sys::get_type_desc::<T>(), x);
 }
 
-
-/**
- * `nmethods` is the number of methods we expect the object to have.  The
- * runtime will print this many words of the obj vtbl).
- *
- * `nbytes` is the number of bytes of body data we expect the object to have.
- * The runtime will print this many bytes of the obj body.  You probably want
- * this to at least be 4u, since an implicit captured tydesc pointer sits in
- * the front of any obj's data tuple.x
- */
-fn debug_obj<T>(x: T, nmethods: uint, nbytes: uint) {
-    rustrt::debug_obj::<T>(sys::get_type_desc::<T>(), x, nmethods, nbytes);
-}
-
 fn debug_fn<T>(x: T) {
     rustrt::debug_fn::<T>(sys::get_type_desc::<T>(), x);
 }

trunk/src/rt/rust_builtin.cpp

@@ -268,28 +268,6 @@ debug_tag(type_desc *t, rust_tag *tag) {
             tag->variant[i]);
 }
 
-struct rust_obj {
-    uintptr_t *vtbl;
-    rust_box *body;
-};
-
-extern "C" CDECL void
-debug_obj(type_desc *t, rust_obj *obj, size_t nmethods, size_t nbytes) {
-    rust_task *task = rust_task_thread::get_task();
-
-    LOG(task, stdlib, "debug_obj with %" PRIdPTR " methods", nmethods);
-    debug_tydesc_helper(t);
-    LOG(task, stdlib, "  vtbl at 0x%" PRIxPTR, obj->vtbl);
-    LOG(task, stdlib, "  body at 0x%" PRIxPTR, obj->body);
-
-    for (uintptr_t *p = obj->vtbl; p < obj->vtbl + nmethods; ++p)
-        LOG(task, stdlib, "  vtbl word: 0x%" PRIxPTR, *p);
-
-    for (uintptr_t i = 0; i < nbytes; ++i)
-        LOG(task, stdlib, "  body byte %" PRIdPTR ": 0x%" PRIxPTR,
-            i, obj->body->data[i]);
-}
-
 struct rust_fn {
     uintptr_t *thunk;
     rust_box *closure;

trunk/src/rt/rust_shape.h

@@ -274,25 +274,6 @@ struct rust_fn {
     void *env;
 };
 
-struct rust_closure {
-    type_desc *tydesc;
-    uint32_t target_0;
-    uint32_t target_1;
-    uint32_t bindings[0];
-
-    uint8_t *get_bindings() const { return (uint8_t *)bindings; }
-};
-
-struct rust_obj_box {
-    type_desc *tydesc;
-
-    uint8_t *get_bindings() const { return (uint8_t *)this; }
-};
-
-struct rust_vtable {
-    CDECL void (*dtor)(void *rv, rust_task *task, rust_obj obj);
-};
-
 struct rust_obj {
     rust_vtable *vtable;
     void *box;

trunk/src/rt/rustrt.def.in

@@ -2,7 +2,6 @@ chan_id_send
 check_claims
 debug_box
 debug_fn
-debug_obj
 debug_opaque
 del_port
 debug_ptrcast