---

yaml
---
r: 20763
b: refs/heads/snap-stage3
c: ea568f3
h: refs/heads/master
i:
  20761: e9f0b34
  20759: 7181113
v: v3

Author: bblum

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 0bd6371155d187ce8d8ad5c0a45ea344804f6813
+refs/heads/snap-stage3: ea568f38ff97520e3631495371223a0dd9f58299
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/send_map.rs

@@ -289,7 +289,7 @@ mod linear {
         }
         */
 
-        fn each(blk: fn(k: &K, v: &V) -> bool) {
+        fn each_ref(blk: fn(k: &K, v: &V) -> bool) {
             for vec::each(self.buckets) |slot| {
                 let mut broke = false;
                 do slot.iter |bucket| {
@@ -300,11 +300,27 @@ mod linear {
                 if broke { break; }
             }
         }
-        fn each_key(blk: fn(k: &K) -> bool) {
-            self.each(|k, _v| blk(k))
+        fn each_key_ref(blk: fn(k: &K) -> bool) {
+            self.each_ref(|k, _v| blk(k))
         }
-        fn each_value(blk: fn(v: &V) -> bool) {
-            self.each(|_k, v| blk(v))
+        fn each_value_ref(blk: fn(v: &V) -> bool) {
+            self.each_ref(|_k, v| blk(v))
+        }
+    }
+
+    impl public_methods<K: copy, V: copy> for &linear_map<K,V> {
+        fn each(blk: fn(+K,+V) -> bool) {
+            self.each_ref(|k,v| blk(copy *k, copy *v));
+        }
+    }
+    impl public_methods<K: copy, V> for &linear_map<K,V> {
+        fn each_key(blk: fn(+K) -> bool) {
+            self.each_key_ref(|k| blk(copy *k));
+        }
+    }
+    impl public_methods<K, V: copy> for &linear_map<K,V> {
+        fn each_value(blk: fn(+V) -> bool) {
+            self.each_value_ref(|v| blk(copy *v));
         }
     }
 }
@@ -360,4 +376,18 @@ mod test {
         assert m.get(&9) == 4;
         assert m.get(&5) == 3;
     }
+
+    #[test]
+    fn iterate() {
+        let mut m = linear::linear_map_with_capacity(uint_hash, uint_eq, 4);
+        for uint::range(0, 32) |i| {
+            assert (&mut m).insert(i, i*2);
+        }
+        let mut observed = 0;
+        for (&m).each |k, v| {
+            assert v == k*2;
+            observed |= (1 << k);
+        }
+        assert observed == 0xFFFF_FFFF;
+    }
 }