---

yaml
---
r: 30563
b: refs/heads/incoming
c: 1834249
h: refs/heads/master
i:
  30561: 9e62d2a
  30559: 8f7b386
v: v3

Author: erickt

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 10e317de547851bdf714ada4d21b41f5b989d4ed
+refs/heads/incoming: 1834249e8dff3419f33ee8595a4bf347e50c3c62
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/send_map.rs

@@ -22,8 +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;
+    fn find_ref(&self, k: &K) -> Option<&self/V>;
+    fn get_ref(&self, k: &K) -> &self/V;
 }
 
 /// Open addressing with linear probing.
@@ -304,6 +304,13 @@ mod linear {
             }
         }
 
+        fn get_ref(&self, k: &K) -> &self/V {
+            match self.find_ref(k) {
+                Some(v) => 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;