---

yaml
---
r: 32571
b: refs/heads/dist-snap
c: 8299f3a
h: refs/heads/master
i:
  32569: f6c3c50
  32567: e474e83
v: v3

Author: erickt

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 35a418eb88fbb9f8868d87dca5e5858ddf5f9b9f
+refs/heads/dist-snap: 8299f3a447ca6416b23c20871172d784a28762bd
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libcore/send_map.rs

@@ -22,6 +22,8 @@ trait SendMap<K:Eq Hash, V: Copy> {
     fn each_value_ref(&self, blk: fn(v: &V) -> bool);
     fn find(&const self, k: &K) -> Option<V>;
     fn get(&const self, k: &K) -> V;
+    fn with_find_ref<T>(&const self, k: &K, blk: fn(Option<&V>) -> T) -> T;
+    fn with_get_ref<T>(&const self, k: &K, blk: fn(v: &V) -> T) -> T;
 }
 
 /// Open addressing with linear probing.
@@ -290,6 +292,27 @@ mod linear {
         }
         */
 
+        fn with_find_ref<T>(&self, k: &K, blk: fn(Option<&V>) -> T) -> T {
+            match self.bucket_for_key(self.buckets, k) {
+                FoundEntry(idx) => {
+                    match self.buckets[idx] {
+                        Some(bkt) => blk(Some(&bkt.value)),
+                        None => fail ~"LinearMap::find: internal logic error"
+                    }
+                }
+                TableFull | FoundHole(_) => blk(None),
+            }
+        }
+
+        fn with_get_ref<T>(&self, k: &K, blk: fn(v: &V) -> T) -> T {
+            do self.with_find_ref(k) |v| {
+                match v {
+                    Some(v) => blk(v),
+                    None => fail fmt!("No entry found for key: %?", k),
+                }
+            }
+        }
+
         fn each_ref(&self, blk: fn(k: &K, v: &V) -> bool) {
             for vec::each(self.buckets) |slot| {
                 let mut broke = false;
@@ -426,4 +449,12 @@ mod test {
         }
         assert observed == 0xFFFF_FFFF;
     }
+
+    #[test]
+    fn with_find_ref() {
+        let mut m = ~LinearMap();
+        m.with_find_ref(&1, |v| assert v.is_none());
+        m.insert(1, 2);
+        m.with_find_ref(&1, |v| assert *v.get() == 2);
+    }
 }