Skip to content

Commit 5b54ad7

Browse files
committed
---
yaml --- r: 32732 b: refs/heads/dist-snap c: 3e9284d h: refs/heads/master v: v3
1 parent a6cc3e5 commit 5b54ad7

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
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
10-
refs/heads/dist-snap: 3480986408b2a9ea07a3eaf849942ac3cb797b5d
10+
refs/heads/dist-snap: 3e9284d12873da6c7c4c6057f07856580422221c
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/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/dist-snap/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/dist-snap/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)