Skip to content

Commit b6e7773

Browse files
committed
---
yaml --- r: 60221 b: refs/heads/master c: b8d0ebe h: refs/heads/master i: 60219: 50a9660 v: v3
1 parent 9bc8afb commit b6e7773

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
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 3c1e78788423f6036d370c4ea37718f3494868e7
2+
refs/heads/master: b8d0ebe124a574a55d9df7daf2b704802443aa2c
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
55
refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589

trunk/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)