---

yaml
---
r: 28518
b: refs/heads/try
c: 34cece9
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 6a3756b0ba3dbab0c1957a7c829e09e9505c7574
+refs/heads/try: 34cece99cce373546d62aed06a7ec55d04aaa124
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/libcore/send_map.rs

@@ -275,40 +275,31 @@ mod linear {
             }
         }
 
-        /*
-        FIXME(#3148)--region inference fails to capture needed deps
-
-        fn find_ref(&self, k: &K) -> option<&self/V> {
-            match self.bucket_for_key(self.buckets, k) {
-              FoundEntry(idx) => {
-                match check self.buckets[idx] {
-                  some(ref bkt) => some(&bkt.value)
-                }
-              }
-              TableFull | FoundHole(_) => {
-                none
-              }
-            }
-        }
-        */
-
-        fn with_find_ref<T>(&self, k: &K, blk: fn(Option<&V>) -> T) -> T {
+        fn find_ref(&self, k: &K) -> Option<&self/V> {
             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"
+                        Some(ref bkt) => {
+                            let ptr = unsafe {
+                                // FIXME(#3148)--region inference
+                                // fails to capture needed deps.
+                                // Here, the bucket value is known to
+                                // live as long as self, because self
+                                // is immutable.  But the region
+                                // inference stupidly infers a
+                                // lifetime for `ref bkt` that is
+                                // shorter than it needs to be.
+                                unsafe::copy_lifetime(self, &bkt.value)
+                            };
+                            Some(ptr)
+                        }
+                        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),
+                TableFull | FoundHole(_) => {
+                    None
                 }
             }
         }
@@ -451,10 +442,13 @@ mod test {
     }
 
     #[test]
-    fn with_find_ref() {
+    fn find_ref() {
         let mut m = ~LinearMap();
-        m.with_find_ref(&1, |v| assert v.is_none());
+        assert m.find_ref(&1).is_none();
         m.insert(1, 2);
-        m.with_find_ref(&1, |v| assert *v.get() == 2);
+        match m.find_ref(&1) {
+            None => fail,
+            Some(v) => assert *v == 2
+        }
     }
 }