---

yaml
---
r: 21803
b: refs/heads/snap-stage3
c: df712ab
h: refs/heads/master
i:
  21801: 80dd31d
  21799: 2f20e00
v: v3

Author: pcwalton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 45f5f8ec45da02700d77569b0ea470ae0fb430b0
+refs/heads/snap-stage3: df712ab3d540affe0442763dc1841030bcab7698
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/sys.rs

@@ -32,11 +32,6 @@ struct Closure {
     env: *(),
 }
 
-#[abi = "cdecl"]
-extern mod rustrt {
-    pure fn shape_log_str(t: *sys::TypeDesc, data: *()) -> ~str;
-}
-
 #[abi = "rust-intrinsic"]
 extern mod rusti {
     fn get_tydesc<T>() -> *();
@@ -104,8 +99,10 @@ pure fn refcount<T>(+t: @T) -> uint {
 
 pure fn log_str<T>(t: T) -> ~str {
     unsafe {
-        let data_ptr: *() = unsafe::reinterpret_cast(&ptr::addr_of(t));
-        rustrt::shape_log_str(get_type_desc::<T>(), data_ptr)
+        let buffer = io::mem_buffer();
+        let writer = io::mem_buffer_writer(buffer);
+        repr::write_repr(writer, &t);
+        return io::mem_buffer_str(buffer);  // XXX: Extra malloc and copy.
     }
 }