Skip to content

Commit 50200f7

Browse files
committed
---
yaml --- r: 58335 b: refs/heads/auto c: b8d0ebe h: refs/heads/master i: 58333: aa80971 58331: 93fe285 58327: 62bf04d 58319: d81768e 58303: 91f1ef9 v: v3
1 parent 0ba7a74 commit 50200f7

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 3c1e78788423f6036d370c4ea37718f3494868e7
17+
refs/heads/auto: b8d0ebe124a574a55d9df7daf2b704802443aa2c
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libcore/to_str.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ The `ToStr` trait for converting to strings
1515
*/
1616

1717
use str;
18+
use str::OwnedStr;
1819
use hashmap::HashMap;
20+
use hashmap::HashSet;
1921
use container::Map;
2022
use hash::Hash;
2123
use cmp::Eq;
@@ -59,13 +61,13 @@ impl<A:ToStr+Hash+Eq, B:ToStr+Hash+Eq> ToStr for HashMap<A, B> {
5961
first = false;
6062
}
6163
else {
62-
str::push_str(&mut acc, ~", ");
64+
acc.push_str(", ");
6365
}
64-
str::push_str(&mut acc, key.to_str());
65-
str::push_str(&mut acc, ~" : ");
66-
str::push_str(&mut acc, value.to_str());
66+
acc.push_str(key.to_str());
67+
acc.push_str(": ");
68+
acc.push_str(value.to_str());
6769
}
68-
str::push_char(&mut acc, '}');
70+
acc.push_char('}');
6971
acc
7072
}
7173
}
@@ -82,6 +84,7 @@ impl<A:ToStr,B:ToStr> ToStr for (A, B) {
8284
}
8385
}
8486
}
87+
8588
impl<A:ToStr,B:ToStr,C:ToStr> ToStr for (A, B, C) {
8689
#[inline(always)]
8790
fn to_str(&self) -> ~str {
@@ -185,7 +188,7 @@ mod tests {
185188
186189
let table_str = table.to_str();
187190
188-
assert!(table_str == ~"{1 : 2, 3 : 4}" || table_str == ~"{3 : 4, 1 : 2}");
191+
assert!(table_str == ~"{1: 2, 3: 4}" || table_str == ~"{3: 4, 1: 2}");
189192
assert!(empty.to_str() == ~"{}");
190193
}
191194
}

0 commit comments

Comments
 (0)