---

yaml
---
r: 28541
b: refs/heads/try
c: 1834249
h: refs/heads/master
i:
  28539: 07e6783
v: v3

Author: erickt

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 10e317de547851bdf714ada4d21b41f5b989d4ed
+refs/heads/try: 1834249e8dff3419f33ee8595a4bf347e50c3c62
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/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;