Skip to content

Commit c26bc4e

Browse files
committed
---
yaml --- r: 28489 b: refs/heads/try c: df712ab h: refs/heads/master i: 28487: c58772c v: v3
1 parent d1ec962 commit c26bc4e

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
5-
refs/heads/try: 45f5f8ec45da02700d77569b0ea470ae0fb430b0
5+
refs/heads/try: df712ab3d540affe0442763dc1841030bcab7698
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/libcore/sys.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ struct Closure {
3232
env: *(),
3333
}
3434

35-
#[abi = "cdecl"]
36-
extern mod rustrt {
37-
pure fn shape_log_str(t: *sys::TypeDesc, data: *()) -> ~str;
38-
}
39-
4035
#[abi = "rust-intrinsic"]
4136
extern mod rusti {
4237
fn get_tydesc<T>() -> *();
@@ -104,8 +99,10 @@ pure fn refcount<T>(+t: @T) -> uint {
10499

105100
pure fn log_str<T>(t: T) -> ~str {
106101
unsafe {
107-
let data_ptr: *() = unsafe::reinterpret_cast(&ptr::addr_of(t));
108-
rustrt::shape_log_str(get_type_desc::<T>(), data_ptr)
102+
let buffer = io::mem_buffer();
103+
let writer = io::mem_buffer_writer(buffer);
104+
repr::write_repr(writer, &t);
105+
return io::mem_buffer_str(buffer); // XXX: Extra malloc and copy.
109106
}
110107
}
111108

0 commit comments

Comments
 (0)