Skip to content

Commit b99632c

Browse files
committed
---
yaml --- r: 47322 b: refs/heads/try c: 6bff18e h: refs/heads/master v: v3
1 parent 2deaddf commit b99632c

File tree

2 files changed

+6
-22
lines changed

2 files changed

+6
-22
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: 3bbcac322669cff3abde5be937cc4ec3860f3985
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
5-
refs/heads/try: 292e946163c5acbca6b90f64133921752b0ed963
5+
refs/heads/try: 6bff18ea0de2f96a4103c11bc183b380f6d2c83a
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/to_str.rs

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -137,15 +137,6 @@ impl<A:ToStr> ToStr for @[A] {
137137
}
138138
}
139139
140-
impl<A:ToStr> ToStr for @A {
141-
#[inline(always)]
142-
pure fn to_str(&self) -> ~str { ~"@" + (**self).to_str() }
143-
}
144-
impl<A:ToStr> ToStr for ~A {
145-
#[inline(always)]
146-
pure fn to_str(&self) -> ~str { ~"~" + (**self).to_str() }
147-
}
148-
149140
#[cfg(test)]
150141
#[allow(non_implicitly_copyable_typarams)]
151142
mod tests {
@@ -170,19 +161,12 @@ mod tests {
170161
}
171162

172163
#[test]
173-
#[ignore]
174164
fn test_vectors() {
175165
let x: ~[int] = ~[];
176-
assert x.to_str() == ~"~[]";
177-
assert (~[1]).to_str() == ~"~[1]";
178-
assert (~[1, 2, 3]).to_str() == ~"~[1, 2, 3]";
166+
assert x.to_str() == ~"[]";
167+
assert (~[1]).to_str() == ~"[1]";
168+
assert (~[1, 2, 3]).to_str() == ~"[1, 2, 3]";
179169
assert (~[~[], ~[1], ~[1, 1]]).to_str() ==
180-
~"~[~[], ~[1], ~[1, 1]]";
181-
}
182-
183-
#[test]
184-
fn test_pointer_types() {
185-
assert (@1).to_str() == ~"@1";
186-
assert (~(true, false)).to_str() == ~"~(true, false)";
170+
~"[[], [1], [1, 1]]";
187171
}
188172
}

0 commit comments

Comments
 (0)