---

yaml
---
r: 709
b: refs/heads/master
c: 4d17283
h: refs/heads/master
i:
  707: 017242b
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2880ecd73ff7443ad72eb7af3c85e673024fc7fd
+refs/heads/master: 4d172833710f580c777cb5c1938a8991cc38cd08

trunk/src/lib/map.rs

@@ -20,6 +20,7 @@ type hashmap[K, V] = obj {
                      fn find(&K key) -> util.option[V];
                      fn remove(&K key) -> util.option[V];
                      fn rehash();
+                     iter items() -> tup(K,V);
 };
 
 fn mk_hashmap[K, V](&hashfn[K] hasher, &eqfn[K] eqer) -> hashmap[K, V] {
@@ -216,6 +217,17 @@ fn mk_hashmap[K, V](&hashfn[K] hasher, &eqfn[K] eqer) -> hashmap[K, V] {
                 rehash[K, V](hasher, eqer, bkts, nbkts, newbkts, nbkts);
                 bkts = newbkts;
             }
+
+            iter items() -> tup(K,V) {
+                for (bucket[K,V] b in bkts) {
+                    alt (b) {
+                        case(some[K,V](?k,?v)) {
+                            put tup(k,v);
+                        }
+                        case (_) { }
+                    }
+                }
+            }
         }
 
     let vec[mutable bucket[K, V]] bkts =