OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #5098 : pkgw/rust/pr/issue4869, r=brson

Browse Source 
See issue #4869. I'm not quite sure what constitutes "consensus from the core team" (cf. discussion in the issue), but this at least demonstrates that the proposed change is pretty straightforward.

After this change, there are no new test failures. I've un-ignored the `to_str` vectors test; it's not at all obvious to me why it'd be problematic, and it passes on my Linux machine.
This commit is contained in:
bors 2013-02-27 20:39:39 -08:00
commit 6bff18ea0d
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/libcore/to_str.rs
View File

@ -1,4 +1,4 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
@ -137,15 +137,6 @@ impl<A:ToStr> ToStr for @[A] {
}
}
impl<A:ToStr> ToStr for @A {
#[inline(always)]
pure fn to_str(&self) -> ~str { ~"@" + (**self).to_str() }
}
impl<A:ToStr> ToStr for ~A {
#[inline(always)]
pure fn to_str(&self) -> ~str { ~"~" + (**self).to_str() }
}
#[cfg(test)]
#[allow(non_implicitly_copyable_typarams)]
mod tests {
@ -170,19 +161,12 @@ mod tests {
}
#[test]
#[ignore]
fn test_vectors() {
let x: ~[int] = ~[];
assert x.to_str() == ~"~[]";
assert (~[1]).to_str() == ~"~[1]";
assert (~[1, 2, 3]).to_str() == ~"~[1, 2, 3]";
assert x.to_str() == ~"[]";
assert (~[1]).to_str() == ~"[1]";
assert (~[1, 2, 3]).to_str() == ~"[1, 2, 3]";
assert (~[~[], ~[1], ~[1, 1]]).to_str() ==
~"~[~[], ~[1], ~[1, 1]]";
}
#[test]
fn test_pointer_types() {
assert (@1).to_str() == ~"@1";
assert (~(true, false)).to_str() == ~"~(true, false)";
~"[[], [1], [1, 1]]";
}
}