rustc: Box the tuples returned by hashmap.items() for now since we don't have alias iterators yet

2 files changed, 4 insertions, 4 deletions

diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs
index f06789f44e8..90a26cc56ef 100644
--- a/src/comp/middle/trans.rs
+++ b/src/comp/middle/trans.rs
@@ -5698,7 +5698,7 @@ fn find_main_fn(@crate_ctxt cx) -> ValueRef {
     auto e = sep() + "main";
     let ValueRef v = C_nil();
     let uint n = 0u;
-    for each (tup(str,ValueRef) i in cx.item_names.items()) {
+    for each (@tup(str,ValueRef) i in cx.item_names.items()) {
         if (_str.ends_with(i._0, e)) {
             n += 1u;
             v = i._1;
diff --git a/src/lib/map.rs b/src/lib/map.rs
index 61d5ccf637a..f22faaca719 100644
--- a/src/lib/map.rs
+++ b/src/lib/map.rs
@@ -14,7 +14,7 @@ abs state type hashmap[K, V] = state obj {
                                  fn find(&K key) -> option.t[V];
                                  fn remove(&K key) -> option.t[V];
                                  fn rehash();
-                                 iter items() -> tup(K,V);
+                                 iter items() -> @tup(K,V);
 };
 
 fn mk_hashmap[K, V](&hashfn[K] hasher, &eqfn[K] eqer) -> hashmap[K, V] {
@@ -216,11 +216,11 @@ fn mk_hashmap[K, V](&hashfn[K] hasher, &eqfn[K] eqer) -> hashmap[K, V] {
                 bkts = newbkts;
             }
 
-            iter items() -> tup(K,V) {
+            iter items() -> @tup(K,V) {
                 for (bucket[K,V] b in bkts) {
                     alt (b) {
                         case(some[K,V](?k,?v)) {
-                            put tup(k,v);
+                            put @tup(k,v);
                         }
                         case (_) { }
                     }