---

yaml
---
r: 136185
b: refs/heads/try
c: fb58109
h: refs/heads/master
i:
  136183: 2276d3c
v: v3

Author: eddyb

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: b5ba2f5517b1f90d07969ca3facdf5132e42436c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 749ff5e76a0d08837964e44c66654679a3a88bb8
-refs/heads/try: 8b1d3e6c1c0a7d24d1c77b567e5fad6e1be6baca
+refs/heads/try: fb58109070f96766cbc0d74fef6e66892a787321
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libdebug/reflect.rs

@@ -18,7 +18,6 @@ Runtime type reflection
 
 use std::intrinsics::{Disr, Opaque, TyDesc, TyVisitor};
 use std::mem;
-use std::gc::Gc;
 
 /**
  * Trait for visitor that wishes to reflect on data.
@@ -194,9 +193,9 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
     }
 
     fn visit_box(&mut self, mtbl: uint, inner: *const TyDesc) -> bool {
-        self.align_to::<Gc<u8>>();
+        self.align_to::<Box<u8>>();
         if ! self.inner.visit_box(mtbl, inner) { return false; }
-        self.bump_past::<Gc<u8>>();
+        self.bump_past::<Box<u8>>();
         true
     }
 

branches/try/src/libdebug/repr.rs

@@ -274,13 +274,9 @@ impl<'a> TyVisitor for ReprVisitor<'a> {
         self.get::<&str>(|this, s| this.write_escaped_slice(*s))
     }
 
-    fn visit_box(&mut self, mtbl: uint, inner: *const TyDesc) -> bool {
-        try!(self, self.writer.write("box(GC) ".as_bytes()));
-        self.write_mut_qualifier(mtbl);
-        self.get::<&raw::GcBox<()>>(|this, b| {
-            let p = &b.data as *const () as *const u8;
-            this.visit_ptr_inner(p, inner)
-        })
+    fn visit_box(&mut self, _mtbl: uint, _inner: *const TyDesc) -> bool {
+        try!(self, self.writer.write("box(GC) ???".as_bytes()));
+        true
     }
 
     fn visit_uniq(&mut self, _mtbl: uint, inner: *const TyDesc) -> bool {