From cfed923600e2f7ad34241501200d595abccdeb54 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Wed, 19 Sep 2012 16:55:01 -0700
Subject: demode the each() method on vec and other iterables.

---
 src/libstd/json.rs        | 6 +++---
 src/libstd/net_url.rs     | 6 +++---
 src/libstd/smallintmap.rs | 2 +-
 src/libstd/timer.rs       | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index b10c40f634a..b66d69d442f 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -61,7 +61,7 @@ fn to_writer(wr: io::Writer, j: Json) {
                 wr.write_str(~", ");
             }
             first = false;
-            to_writer(wr, item);
+            to_writer(wr, *item);
         };
         wr.write_char(']');
       }
@@ -122,7 +122,7 @@ fn to_writer_pretty(wr: io::Writer, j: Json, indent: uint) {
                 wr.write_str(spaces(inner_indent));
             }
             first = false;
-            to_writer_pretty(wr, item, inner_indent);
+            to_writer_pretty(wr, *item, inner_indent);
         };
 
         // ]
@@ -156,7 +156,7 @@ fn to_writer_pretty(wr: io::Writer, j: Json, indent: uint) {
         //   k: v }
         let mut first = true;
         for sorted_pairs.each |kv| {
-            let (key, value) = kv;
+            let (key, value) = *kv;
             if !first {
                 wr.write_str(~",\n");
                 wr.write_str(spaces(inner_indent));
diff --git a/src/libstd/net_url.rs b/src/libstd/net_url.rs
index edd562fa1a7..493e0cc762c 100644
--- a/src/libstd/net_url.rs
+++ b/src/libstd/net_url.rs
@@ -199,7 +199,7 @@ fn encode_form_urlencoded(m: HashMap<~str, @DVec<@~str>>) -> ~str {
                 first = false;
             }
 
-            out += #fmt("%s=%s", key, encode_plus(*value));
+            out += #fmt("%s=%s", key, encode_plus(**value));
         }
     }
 
@@ -328,7 +328,7 @@ fn query_from_str(rawquery: &str) -> Query {
     let mut query: Query = ~[];
     if str::len(rawquery) != 0 {
         for str::split_char(rawquery, '&').each |p| {
-            let (k, v) = split_char_first(p, '=');
+            let (k, v) = split_char_first(*p, '=');
             vec::push(query, (decode_component(k), decode_component(v)));
         };
     }
@@ -338,7 +338,7 @@ fn query_from_str(rawquery: &str) -> Query {
 fn query_to_str(+query: Query) -> ~str {
     let mut strvec = ~[];
     for query.each |kv| {
-        let (k, v) = copy kv;
+        let (k, v) = copy *kv;
         strvec += ~[#fmt("%s=%s", encode_component(k), encode_component(v))];
     };
     return str::connect(strvec, ~"&");
diff --git a/src/libstd/smallintmap.rs b/src/libstd/smallintmap.rs
index 5366774db37..ffa5aeef31e 100644
--- a/src/libstd/smallintmap.rs
+++ b/src/libstd/smallintmap.rs
@@ -70,7 +70,7 @@ impl<V: Copy> SmallIntMap<V>: map::Map<uint, V> {
     pure fn size() -> uint {
         let mut sz = 0u;
         for self.v.each |item| {
-            match item {
+            match *item {
               Some(_) => sz += 1u,
               _ => ()
             }
diff --git a/src/libstd/timer.rs b/src/libstd/timer.rs
index 9b6a2b85852..eca9a1fc8a8 100644
--- a/src/libstd/timer.rs
+++ b/src/libstd/timer.rs
@@ -179,7 +179,7 @@ mod test {
         for iter::repeat(repeat) {
 
             for spec.each |spec| {
-                let (times, maxms) = spec;
+                let (times, maxms) = *spec;
                 do task::spawn {
                     use rand::*;
                     let rng = Rng();
-- 
cgit 1.4.1-3-g733a5