Skip to content

Commit f147e00

Browse files
committed
---
yaml --- r: 21962 b: refs/heads/snap-stage3 c: 3e9284d h: refs/heads/master v: v3
1 parent cd34513 commit f147e00

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 3480986408b2a9ea07a3eaf849942ac3cb797b5d
4+
refs/heads/snap-stage3: 3e9284d12873da6c7c4c6057f07856580422221c
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ mod rt {
349349
return unsafe { pad(cv, s, PadFloat) };
350350
}
351351
pure fn conv_poly<T>(cv: Conv, v: T) -> ~str {
352-
let s = sys::log_str(v);
352+
let s = sys::log_str(&v);
353353
return conv_str(cv, s);
354354
}
355355
@@ -555,7 +555,7 @@ mod rt2 {
555555
return unsafe { pad(cv, s, PadFloat) };
556556
}
557557
pure fn conv_poly<T>(cv: Conv, v: T) -> ~str {
558-
let s = sys::log_str(v);
558+
let s = sys::log_str(&v);
559559
return conv_str(cv, s);
560560
}
561561

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
//! Misc low level stuff
22
3+
// NB: transitionary, de-mode-ing.
4+
#[forbid(deprecated_mode)];
5+
#[forbid(deprecated_pattern)];
6+
37
use cmp::{Eq, Ord};
48
use libc::c_void;
59

@@ -97,10 +101,10 @@ pure fn refcount<T>(+t: @T) -> uint {
97101
}
98102
}
99103

100-
pure fn log_str<T>(t: T) -> ~str {
104+
pure fn log_str<T>(t: &T) -> ~str {
101105
unsafe {
102106
do io::with_str_writer |wr| {
103-
repr::write_repr(wr, &t)
107+
repr::write_repr(wr, t)
104108
}
105109
}
106110
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
fn main() {
22
let arr = [1,2,3]/3;
33
let struc = {a: 13u8, b: arr, c: 42};
4-
let s = sys::log_str(struc);
4+
let s = sys::log_str(&struc);
55
assert(s == ~"{ a: 13, b: [ 1, 2, 3 ], c: 42 }");
66
}

branches/snap-stage3/src/test/run-pass/log-str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fn main() {
2-
let act = sys::log_str(~[1, 2, 3]);
2+
let act = sys::log_str(&~[1, 2, 3]);
33
assert ~"~[ 1, 2, 3 ]" == act;
44

55
let act = fmt!("%?/%6?", ~[1, 2, 3], ~"hi");

0 commit comments

Comments
 (0)