---

yaml
---
r: 30511
b: refs/heads/incoming
c: df712ab
h: refs/heads/master
i:
  30509: a69a539
  30507: f440bcb
  30503: dea0a7f
  30495: ab210b5
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 45f5f8ec45da02700d77569b0ea470ae0fb430b0
+refs/heads/incoming: df712ab3d540affe0442763dc1841030bcab7698
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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.
     }
 }