---

yaml
---
r: 41915
b: refs/heads/master
c: dbeef1d
h: refs/heads/master
i:
  41913: 92ea82c
  41911: acad4f9
v: v3

Author: thestinger

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 45c9f6a0999fa69bb6c60f6b2c432f84dca7be87
+refs/heads/master: dbeef1d6574a8b4fe033d1188643c4f90a95e043
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/libcore/hashmap.rs

@@ -413,14 +413,6 @@ pub mod linear {
                 }
             }
         }
-
-        pure fn get_copy(&const self, k: &K) -> V {
-            let value = self.find_copy(k);
-            if value.is_none() {
-                fail fmt!("No entry found for key: %?", k);
-            }
-            option::unwrap(move value)
-        }
     }
 
     impl<K:Hash IterBytes Eq, V: Eq> LinearMap<K, V>: Eq {
@@ -503,17 +495,17 @@ pub mod test {
         let mut m = ~LinearMap();
         assert m.insert(1, 2);
         assert m.insert(2, 4);
-        assert m.get_copy(&1) == 2;
-        assert m.get_copy(&2) == 4;
+        assert *m.get(&1) == 2;
+        assert *m.get(&2) == 4;
     }
 
     #[test]
     pub fn overwrite() {
         let mut m = ~LinearMap();
         assert m.insert(1, 2);
-        assert m.get_copy(&1) == 2;
+        assert *m.get(&1) == 2;
         assert !m.insert(1, 3);
-        assert m.get_copy(&1) == 3;
+        assert *m.get(&1) == 3;
     }
 
     #[test]
@@ -522,9 +514,9 @@ pub mod test {
         assert m.insert(1, 2);
         assert m.insert(5, 3);
         assert m.insert(9, 4);
-        assert m.get_copy(&9) == 4;
-        assert m.get_copy(&5) == 3;
-        assert m.get_copy(&1) == 2;
+        assert *m.get(&9) == 4;
+        assert *m.get(&5) == 3;
+        assert *m.get(&1) == 2;
     }
 
     #[test]
@@ -534,8 +526,8 @@ pub mod test {
         assert m.insert(5, 3);
         assert m.insert(9, 4);
         assert m.remove(&1);
-        assert m.get_copy(&9) == 4;
-        assert m.get_copy(&5) == 3;
+        assert *m.get(&9) == 4;
+        assert *m.get(&5) == 3;
     }
 
     #[test]