about summary refs log tree commit diff
path: root/src/lib/map.rs
diff options
context:
space:
mode:
authorMarijn Haverbeke <marijnh@gmail.com>2011-07-26 14:06:02 +0200
committerMarijn Haverbeke <marijnh@gmail.com>2011-07-26 14:06:02 +0200
commitaea537779e01359cf8da6944218362d44bfaee83 (patch)
tree235edf688d4fb4928ff766c063dcac779548f34d /src/lib/map.rs
parente123366bffa69ee3877335b9ca979b0cc301d07c (diff)
Remove all uses of tuples from the compiler and stdlib
Diffstat (limited to 'src/lib/map.rs')
-rw-r--r--src/lib/map.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/map.rs b/src/lib/map.rs
index 1e00c26fb6d..195f180a61f 100644
--- a/src/lib/map.rs
+++ b/src/lib/map.rs
@@ -14,7 +14,7 @@ type hashmap[K, V] =
         fn find(&K) -> option::t[V] ;
         fn remove(&K) -> option::t[V] ;
         fn rehash() ;
-        iter items() -> @tup(K, V) ;
+        iter items() -> @rec(K key, V val);
         iter keys() -> K ;
     };
 type hashset[K] = hashmap[K, ()];
@@ -185,10 +185,10 @@ 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) {
+        iter items() -> @rec(K key, V val) {
             for (bucket[K, V] b in bkts) {
                 alt (b) {
-                    case (some(?k, ?v)) { put @tup(k, v); }
+                    case (some(?k, ?v)) { put @rec(key=k, val=v); }
                     case (_) { }
                 }
             }