mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #6975 : artagnon/rust/tuple-tostr, r=bstrie

Browse Source 
[1/2] fixes a couple of comments.
[2/2] uses fmt! instead of hand-concatenating strings in a couple of places.

No functional changes.
This commit is contained in:
bors 2013-06-06 09:13:44 -07:00
commit 021e6d38f0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libstd/to_str.rs
View File

@ -44,7 +44,7 @@ impl<A:ToStr> ToStr for (A,) {
fn to_str(&self) -> ~str {
match *self {
(ref a,) => {
~"(" + a.to_str() + ",)"
fmt!("(%s,)", (*a).to_str())
}
}
}
@ -91,11 +91,11 @@ impl<A:ToStr+Hash+Eq> ToStr for HashSet<A> {
impl<A:ToStr,B:ToStr> ToStr for (A, B) {
#[inline(always)]
fn to_str(&self) -> ~str {
// FIXME(#4760): this causes an llvm assertion
// FIXME(#4653): this causes an llvm assertion
//let &(ref a, ref b) = self;
match *self {
(ref a, ref b) => {
~"(" + a.to_str() + ", " + b.to_str() + ")"
fmt!("(%s, %s)", (*a).to_str(), (*b).to_str())
}
}
}
@ -104,7 +104,7 @@ impl<A:ToStr,B:ToStr> ToStr for (A, B) {
impl<A:ToStr,B:ToStr,C:ToStr> ToStr for (A, B, C) {
#[inline(always)]
fn to_str(&self) -> ~str {
// FIXME(#4760): this causes an llvm assertion
// FIXME(#4653): this causes an llvm assertion
//let &(ref a, ref b, ref c) = self;
match *self {
(ref a, ref b, ref c) => {