summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorEric Reed <ereed@mozilla.com>2013-07-08 14:19:39 -0700
committerEric Reed <ereed@mozilla.com>2013-07-08 14:19:39 -0700
commit5e0be468528fdcf977aa1de6ba553b55303ec56a (patch)
tree21276b51bc4ec98b4555f785f8a0728ed98b98ee /src/libstd
parent6b2abcaa0f4b8f0fdbd0f8dcac5089159f0051da (diff)
downloadrust-5e0be468528fdcf977aa1de6ba553b55303ec56a.tar.gz
rust-5e0be468528fdcf977aa1de6ba553b55303ec56a.zip
changed .each() to .iter().advance()
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/rt/uv/net.rs20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/libstd/rt/uv/net.rs b/src/libstd/rt/uv/net.rs
index 72a9a6cdd5c..2707b9ce7d7 100644
--- a/src/libstd/rt/uv/net.rs
+++ b/src/libstd/rt/uv/net.rs
@@ -106,16 +106,16 @@ fn uv_ip_as_ip<T>(addr: UvIpAddr, f: &fn(IpAddr) -> T) -> T {
         },
         UvIpv6(*) => {
             let ip: ~[u16] = {
-                let read_hex_segment = |s: &str| -> u16 {
-                    num::FromStrRadix::from_str_radix(s, 16u).unwrap()
-                };
-                let convert_each_segment = |s: &str| -> ~[u16] {
-                    match s {
-                        "" => ~[],
-                        s => s.split_iter(':').transform(read_hex_segment).collect(),
-                    }
-                };
                 let expand_shorthand_and_convert = |s: &str| -> ~[~[u16]] {
+                    let convert_each_segment = |s: &str| -> ~[u16] {
+                        let read_hex_segment = |s: &str| -> u16 {
+                            num::FromStrRadix::from_str_radix(s, 16u).unwrap()
+                        };
+                        match s {
+                            "" => ~[],
+                            s => s.split_iter(':').transform(read_hex_segment).collect(),
+                        }
+                    };
                     s.split_str_iter("::").transform(convert_each_segment).collect()
                 };
                 match expand_shorthand_and_convert(ip_str) {
@@ -662,7 +662,7 @@ mod test {
                     if status.is_none() {
                         rtdebug!("got %d bytes", nread);
                         let buf = buf.unwrap();
-                        for buf.slice(0, nread as uint).each |byte| {
+                        for buf.slice(0, nread as uint).iter().advance() |byte| {
                             assert!(*byte == count as u8);
                             rtdebug!("%u", *byte as uint);
                             count += 1;