rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename insert_with functions to update, update_with_key

Browse Source
This commit is contained in:
Brian Anderson
2012-11-25 12:45:18 -08:00
parent ff4075e553
commit 5c0206a1e4
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libstd/smallintmap.rs
View File

@@ -103,15 +103,15 @@ impl<V: Copy> SmallIntMap<V>: map::Map<uint, V> {
pure fn find(key: uint) -> Option<V> { find(self, key) }
fn rehash() { fail }
fn insert_with_key(key: uint, val: V, ff: fn(uint, V, V) -> V) -> bool {
fn update_with_key(key: uint, val: V, ff: fn(uint, V, V) -> V) -> bool {
match self.find(key) {
None => return self.insert(key, val),
Some(copy orig) => return self.insert(key, ff(key, orig, val)),
}
}
fn insert_with(key: uint, newval: V, ff: fn(V, V) -> V) -> bool {
return self.insert_with_key(key, newval, |_k, v, v1| ff(v,v1));
fn update(key: uint, newval: V, ff: fn(V, V) -> V) -> bool {
return self.update_with_key(key, newval, |_k, v, v1| ff(v,v1));
}
pure fn each(it: fn(key: uint, value: V) -> bool) {
@@ -172,11 +172,11 @@ mod tests {
}
// count integers
map.insert_with(3, 1, addMoreToCount_simple);
map.insert_with_key(9, 1, addMoreToCount);
map.insert_with(3, 7, addMoreToCount_simple);
map.insert_with_key(5, 3, addMoreToCount);
map.insert_with_key(3, 2, addMoreToCount);
map.update(3, 1, addMoreToCount_simple);
map.update_with_key(9, 1, addMoreToCount);
map.update(3, 7, addMoreToCount_simple);
map.update_with_key(5, 3, addMoreToCount);
map.update_with_key(3, 2, addMoreToCount);
// check the total counts
assert 10 == option::get(map.find(3));