---

brson · brson · commit d7e6171535e0 · 2012-11-25T16:10:37.000-08:00
yaml --- r: 39099 b: refs/heads/incoming c: 3ac90ec h: refs/heads/master i: 39097: 321f94d 39095: 175b9cd v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 3acf4a2a9cbad952250543a3a9d3a8bd6d2eccf1
+refs/heads/incoming: 3ac90ec9f8eb1ad74c73f15268b19e472fc96b76
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/test/bench/shootout-k-nucleotide-pipes.rs b/branches/incoming/src/test/bench/shootout-k-nucleotide-pipes.rs
@@ -69,7 +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());
-    mm.insert_with(key, 1, |v,v1| { v+v1 });
+    mm.update(key, 1, |v,v1| { v+v1 });
 }
 
 // given a ~[u8], for each window call a function
diff --git a/branches/incoming/src/test/bench/shootout-k-nucleotide.rs b/branches/incoming/src/test/bench/shootout-k-nucleotide.rs
@@ -66,7 +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());
-    mm.insert_with(key, 1, |v,v1| { v+v1 });
+    mm.update(key, 1, |v,v1| { v+v1 });
 }
 
 // given a ~[u8], for each window call a function

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ fn find(mm: HashMap<~[u8], uint>, key: ~str) -> uint {`
`69`	`69`	`// given a map, increment the counter for a key`
`70`	`70`	`fn update_freq(mm: HashMap<~[u8], uint>, key: &[u8]) {`
`71`	`71`	`let key = vec::slice(key, 0, key.len());`
`72`		`- mm.insert_with(key, 1, \|v,v1\| { v+v1 });`
	`72`	`+ mm.update(key, 1, \|v,v1\| { v+v1 });`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`// given a ~[u8], for each window call a function`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ fn find(mm: HashMap<~[u8], uint>, key: ~str) -> uint {`
`66`	`66`	`// given a map, increment the counter for a key`
`67`	`67`	`fn update_freq(mm: HashMap<~[u8], uint>, key: &[u8]) {`
`68`	`68`	`let key = vec::slice(key, 0, key.len());`
`69`		`- mm.insert_with(key, 1, \|v,v1\| { v+v1 });`
	`69`	`+ mm.update(key, 1, \|v,v1\| { v+v1 });`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`// given a ~[u8], for each window call a function`