diff --git a/src/libcore/sys.rs b/src/libcore/sys.rs index cff945ad069..1adadc5eba6 100644 --- a/src/libcore/sys.rs +++ b/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() -> *(); @@ -104,8 +99,10 @@ pure fn refcount(+t: @T) -> uint { pure fn log_str(t: T) -> ~str { unsafe { - let data_ptr: *() = unsafe::reinterpret_cast(&ptr::addr_of(t)); - rustrt::shape_log_str(get_type_desc::(), 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. } }