---

yaml
---
r: 27938
b: refs/heads/try
c: 182814e
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: 9440f8e9b86de3c6166a875b8aee29448580e7ea
+refs/heads/try: 182814ef8191e2b153806380f8d3d46069c69a8d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/libcore/send_map.rs

@@ -58,12 +58,6 @@ mod linear {
             buckets: vec::from_fn(initial_capacity, |_i| none)})
     }
 
-    // FIXME(#2979) would allow us to use region type for k
-    unsafe fn borrow<K>(&&k: K) -> &K {
-        let p: *K = ptr::addr_of(k);
-        unsafe::reinterpret_cast(p)
-    }
-
     priv impl<K, V> &const LinearMap<K,V> {
         #[inline(always)]
         pure fn to_bucket(h: uint) -> uint {
@@ -155,8 +149,7 @@ mod linear {
         /// Assumes that there will be a bucket.
         /// True if there was no previous entry with that key
         fn insert_internal(hash: uint, +k: K, +v: V) -> bool {
-            match self.bucket_for_key_with_hash(self.buckets, hash,
-                                              unsafe{borrow(k)}) {
+            match self.bucket_for_key_with_hash(self.buckets, hash, &k) {
               TableFull => {fail ~"Internal logic error";}
               FoundHole(idx) => {
                 debug!{"insert fresh (%?->%?) at idx %?, hash %?",
@@ -187,7 +180,7 @@ mod linear {
                 self.expand();
             }
 
-            let hash = self.hashfn(unsafe{borrow(k)});
+            let hash = self.hashfn(&k);
             self.insert_internal(hash, k, v)
         }
 
@@ -279,11 +272,19 @@ mod linear {
 
     impl<K,V> &LinearMap<K,V> {
         /*
-        FIXME --- #2979 must be fixed to typecheck this
-        fn find_ptr(k: K) -> option<&V> {
-            //XXX this should not type check as written, but it should
-            //be *possible* to typecheck it...
-            self.with_ptr(k, |v| v)
+        FIXME(#3148)--region inference fails to capture needed deps
+
+        fn find_ref(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
+              }
+            }
         }
         */