---

yaml
---
r: 40524
b: refs/heads/dist-snap
c: 7b13ef7
h: refs/heads/master
v: v3

Author: killerswan

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: a343e435d59e21188f6fc5918324c751a7eff6a9
+refs/heads/dist-snap: 7b13ef7d501daea5f56605659ae1f1e38371ab32
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libstd/map.rs

@@ -773,4 +773,25 @@ mod tests {
         assert map.get(~"b") == 2;
         assert map.get(~"c") == 3;
     }
+
+    #[test]
+    fn test_insert_with_key() {
+        let map = map::HashMap::<~str, uint>();
+
+        fn inc(k: ~str, v0: uint, v1: uint) -> uint {
+            v0 + v1
+        }
+
+        map.insert_with_key(inc, ~"cat", 1);
+        map.insert_with_key(inc, ~"mongoose", 1);
+        map.insert_with_key(inc, ~"cat", 7);
+        map.insert_with_key(inc, ~"ferret", 3);
+        map.insert_with_key(inc, ~"cat", 2);
+
+        assert 10 == option::get(map.find(~"cat"));
+        assert  3 == option::get(map.find(~"ferret"));
+        assert  1 == option::get(map.find(~"mongoose"));
+
+        assert None == map.find(~"unicorn");
+    }
 }

branches/dist-snap/src/test/bench/shootout-k-nucleotide-pipes.rs

@@ -69,10 +69,7 @@ fn find(mm: HashMap<~[u8], uint>, key: ~str) -> uint {
 // given a map, increment the counter for a key
 fn update_freq(mm: HashMap<~[u8], uint>, key: &[u8]) {
     let key = vec::slice(key, 0, key.len());
-    match mm.find(key) {
-      option::None      => { mm.insert(key, 1u      ); }
-      option::Some(val) => { mm.insert(key, 1u + val); }
-    }
+    mm.insert_with_key(|k,v,v1| {v + v1}, key, 1);
 }
 
 // given a ~[u8], for each window call a function

branches/dist-snap/src/test/bench/shootout-k-nucleotide.rs

@@ -66,10 +66,7 @@ fn find(mm: HashMap<~[u8], uint>, key: ~str) -> uint {
 // given a map, increment the counter for a key
 fn update_freq(mm: HashMap<~[u8], uint>, key: &[u8]) {
     let key = vec::slice(key, 0, key.len());
-    match mm.find(key) {
-      option::None      => { mm.insert(key, 1u      ); }
-      option::Some(val) => { mm.insert(key, 1u + val); }
-    }
+    mm.insert_with_key(|k,v,v1| {v + v1}, key, 1);
 }
 
 // given a ~[u8], for each window call a function