-
Notifications
You must be signed in to change notification settings - Fork 13.4k
Added to_str() method for HashMap and HashSet #6414
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
d807f00
Add to_str() for HashMaps, and some basic tests as well.
samebchase fd5a352
Removed test_hashmap() for the time, being. All tests pass with make …
samebchase 3c1e787
All tests, including newly added test_hashmap() pass. The empty Hash …
samebchase b8d0ebe
Remove extra space between key and value.
samebchase e2c73cc
Add str representation for HashSet.
samebchase 9ed9e8c
Add test: test_hashset()
samebchase 7d43b12
Use acc.push_str() instead of str::push_str(..)
samebchase 37bea2a
Fix errors in test_hashset().
samebchase 0acb6ab
Add use declaration for container::Set
samebchase File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,6 +15,10 @@ The `ToStr` trait for converting to strings | |
*/ | ||
|
||
use str; | ||
use hashmap::HashMap; | ||
use container::Map; | ||
use hash::Hash; | ||
use cmp::Eq; | ||
|
||
pub trait ToStr { | ||
fn to_str(&self) -> ~str; | ||
|
@@ -46,6 +50,26 @@ impl<A:ToStr> ToStr for (A,) { | |
} | ||
} | ||
|
||
impl<A:ToStr+Hash+Eq, B:ToStr+Hash+Eq> ToStr for HashMap<A, B> { | ||
#[inline(always)] | ||
fn to_str(&self) -> ~str { | ||
let mut acc = ~"{", first = true; | ||
for self.each |key, value| { | ||
if first { | ||
first = false; | ||
} | ||
else { | ||
str::push_str(&mut acc, ~", "); | ||
} | ||
str::push_str(&mut acc, key.to_str()); | ||
str::push_str(&mut acc, ~" : "); | ||
str::push_str(&mut acc, value.to_str()); | ||
} | ||
str::push_char(&mut acc, '}'); | ||
acc | ||
} | ||
} | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Change all the |
||
impl<A:ToStr,B:ToStr> ToStr for (A, B) { | ||
#[inline(always)] | ||
fn to_str(&self) -> ~str { | ||
|
@@ -120,6 +144,7 @@ impl<A:ToStr> ToStr for @[A] { | |
#[cfg(test)] | ||
#[allow(non_implicitly_copyable_typarams)] | ||
mod tests { | ||
use hashmap::HashMap; | ||
#[test] | ||
fn test_simple_types() { | ||
assert!(1i.to_str() == ~"1"); | ||
|
@@ -149,4 +174,18 @@ mod tests { | |
assert!((~[~[], ~[1], ~[1, 1]]).to_str() == | ||
~"[[], [1], [1, 1]]"); | ||
} | ||
} | ||
|
||
#[test] | ||
fn test_hashmap() { | ||
let mut table: HashMap<int, int> = HashMap::new(); | ||
let empty: HashMap<int, int> = HashMap::new(); | ||
|
||
table.insert(3, 4); | ||
table.insert(1, 2); | ||
|
||
let table_str = table.to_str(); | ||
|
||
assert!(table_str == ~"{1 : 2, 3 : 4}" || table_str == ~"{3 : 4, 1 : 2}"); | ||
assert!(empty.to_str() == ~"{}"); | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove the space before the
: