From d4fa0f148518aa30aa84b4194b9da7ab595dad56 Mon Sep 17 00:00:00 2001
From: Youngmin Yoo <youngmin.yoo@samsung.com>
Date: Wed, 8 May 2013 17:49:00 +0900
Subject: [PATCH] libstd: rename vec::each(var) to var.each
---
src/libcore/hash.rs | 1 -
src/libstd/arc.rs | 7 +++----
src/libstd/getopts.rs | 4 ++--
src/libstd/net_ip.rs | 2 +-
src/libstd/sha1.rs | 6 +++---
src/libstd/sort.rs | 2 +-
src/libstd/sort_stage0.rs | 2 +-
src/libstd/sync.rs | 2 +-
src/libstd/term.rs | 3 +--
src/libstd/test.rs | 6 +++---
src/libstd/time.rs | 17 ++++++++---------
11 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/src/libcore/hash.rs b/src/libcore/hash.rs
index e00fb33fad9..75b3b6bb566 100644
--- a/src/libcore/hash.rs
+++ b/src/libcore/hash.rs
@@ -24,7 +24,6 @@ use cast;
use rt::io::Writer;
use to_bytes::IterBytes;
use uint;
-use vec;
// Alias `SipState` to `State`.
pub use State = hash::SipState;
diff --git a/src/libstd/arc.rs b/src/libstd/arc.rs
index d69839faa64..08507fbf34e 100644
--- a/src/libstd/arc.rs
+++ b/src/libstd/arc.rs
@@ -484,7 +484,6 @@ mod tests {
use core::cell::Cell;
use core::task;
- use core::vec;
#[test]
fn manually_share_arc() {
@@ -683,7 +682,7 @@ mod tests {
}
// Wait for children to pass their asserts
- for vec::each(children) |r| {
+ for children.each |r| {
r.recv();
}
@@ -748,7 +747,7 @@ mod tests {
assert!(*state == 42);
*state = 31337;
// send to other readers
- for vec::each(reader_convos) |x| {
+ for reader_convos.each |x| {
match *x {
(ref rc, _) => rc.send(()),
}
@@ -757,7 +756,7 @@ mod tests {
let read_mode = arc.downgrade(write_mode);
do (&read_mode).read |state| {
// complete handshake with other readers
- for vec::each(reader_convos) |x| {
+ for reader_convos.each |x| {
match *x {
(_, ref rp) => rp.recv(),
}
diff --git a/src/libstd/getopts.rs b/src/libstd/getopts.rs
index c03042fe9c2..ea2a631ae99 100644
--- a/src/libstd/getopts.rs
+++ b/src/libstd/getopts.rs
@@ -368,7 +368,7 @@ pub fn opt_count(mm: &Matches, nm: &str) -> uint {
/// Returns true if any of several options were matched
pub fn opts_present(mm: &Matches, names: &[~str]) -> bool {
- for vec::each(names) |nm| {
+ for names.each |nm| {
match find_opt(mm.opts, mkname(*nm)) {
Some(id) if !mm.vals[id].is_empty() => return true,
_ => (),
@@ -395,7 +395,7 @@ pub fn opt_str(mm: &Matches, nm: &str) -> ~str {
* option took an argument
*/
pub fn opts_str(mm: &Matches, names: &[~str]) -> ~str {
- for vec::each(names) |nm| {
+ for names.each |nm| {
match opt_val(mm, *nm) {
Val(copy s) => return s,
_ => ()
diff --git a/src/libstd/net_ip.rs b/src/libstd/net_ip.rs
index 800144c0ca7..52803207da8 100644
--- a/src/libstd/net_ip.rs
+++ b/src/libstd/net_ip.rs
@@ -425,7 +425,7 @@ mod test {
let results = result::unwrap(ga_result);
debug!("test_get_addr: Number of results for %s: %?",
localhost_name, vec::len(results));
- for vec::each(results) |r| {
+ for results.each |r| {
let ipv_prefix = match *r {
Ipv4(_) => ~"IPv4",
Ipv6(_) => ~"IPv6"
diff --git a/src/libstd/sha1.rs b/src/libstd/sha1.rs
index a8e0f7d062a..cd5845ac544 100644
--- a/src/libstd/sha1.rs
+++ b/src/libstd/sha1.rs
@@ -250,7 +250,7 @@ pub fn sha1() -> @Sha1 {
fn result_str(&mut self) -> ~str {
let rr = mk_result(self);
let mut s = ~"";
- for vec::each(rr) |b| {
+ for rr.each |b| {
let hex = uint::to_str_radix(*b as uint, 16u);
if hex.len() == 1 {
s += "0";
@@ -378,7 +378,7 @@ mod tests {
// Test that it works when accepting the message all at once
let mut sh = sha1::sha1();
- for vec::each(tests) |t| {
+ for tests.each |t| {
sh.input_str(t.input);
let out = sh.result();
check_vec_eq(t.output, out);
@@ -392,7 +392,7 @@ mod tests {
// Test that it works when accepting the message in pieces
- for vec::each(tests) |t| {
+ for tests.each |t| {
let len = str::len(t.input);
let mut left = len;
while left > 0u {
diff --git a/src/libstd/sort.rs b/src/libstd/sort.rs
index 6994ca4aedb..ae474e0c394 100644
--- a/src/libstd/sort.rs
+++ b/src/libstd/sort.rs
@@ -859,7 +859,7 @@ mod test_qsort {
let immut_names = names;
let pairs = vec::zip_slice(expected, immut_names);
- for vec::each(pairs) |p| {
+ for pairs.each |p| {
let (a, b) = *p;
debug!("%d %d", a, b);
assert!((a == b));
diff --git a/src/libstd/sort_stage0.rs b/src/libstd/sort_stage0.rs
index f3d30ecd5cd..044c616dcd3 100644
--- a/src/libstd/sort_stage0.rs
+++ b/src/libstd/sort_stage0.rs
@@ -852,7 +852,7 @@ mod test_qsort {
let immut_names = names;
let pairs = vec::zip_slice(expected, immut_names);
- for vec::each(pairs) |p| {
+ for pairs.each |p| {
let (a, b) = *p;
debug!("%d %d", a, b);
assert!((a == b));
diff --git a/src/libstd/sync.rs b/src/libstd/sync.rs
index e86ec793188..17d051518a9 100644
--- a/src/libstd/sync.rs
+++ b/src/libstd/sync.rs
@@ -997,7 +997,7 @@ mod tests {
}
}
}
- for vec::each(sibling_convos) |p| {
+ for sibling_convos.each |p| {
let _ = p.recv(); // wait for sibling to get in the mutex
}
do m2.lock { }
diff --git a/src/libstd/term.rs b/src/libstd/term.rs
index a79b9f4c849..236c7f668c2 100644
--- a/src/libstd/term.rs
+++ b/src/libstd/term.rs
@@ -13,7 +13,6 @@
use core::io;
use core::option;
use core::os;
-use core::vec;
// FIXME (#2807): Windows support.
@@ -50,7 +49,7 @@ pub fn color_supported() -> bool {
~"screen-bce", ~"xterm-256color"];
return match os::getenv(~"TERM") {
option::Some(ref env) => {
- for vec::each(supported_terms) |term| {
+ for supported_terms.each |term| {
if *term == *env { return true; }
}
false
diff --git a/src/libstd/test.rs b/src/libstd/test.rs
index 7d24262aea6..1a864b09a35 100644
--- a/src/libstd/test.rs
+++ b/src/libstd/test.rs
@@ -355,7 +355,7 @@ fn print_failures(st: &ConsoleTestState) {
failures.push(name.to_str());
}
sort::tim_sort(failures);
- for vec::each(failures) |name| {
+ for failures.each |name| {
st.out.write_line(fmt!(" %s", name.to_str()));
}
}
@@ -928,7 +928,7 @@ mod tests {
{
fn testfn() { }
let mut tests = ~[];
- for vec::each(names) |name| {
+ for names.each |name| {
let test = TestDescAndFn {
desc: TestDesc {
name: DynTestName(*name),
@@ -954,7 +954,7 @@ mod tests {
let pairs = vec::zip(expected, filtered);
- for vec::each(pairs) |p| {
+ for pairs.each |p| {
match *p {
(ref a, ref b) => {
assert!((*a == b.desc.name.to_str()));
diff --git a/src/libstd/time.rs b/src/libstd/time.rs
index 8889abe6472..31d8eb20a67 100644
--- a/src/libstd/time.rs
+++ b/src/libstd/time.rs
@@ -861,7 +861,6 @@ mod tests {
use core::result;
use core::result::{Err, Ok};
use core::str;
- use core::vec;
fn test_get_time() {
static some_recent_date: i64 = 1325376000i64; // 2012-01-01T00:00:00Z
@@ -1028,7 +1027,7 @@ mod tests {
}
}
- for vec::each([
+ for [
~"Sunday",
~"Monday",
~"Tuesday",
@@ -1036,11 +1035,11 @@ mod tests {
~"Thursday",
~"Friday",
~"Saturday"
- ]) |day| {
+ ].each |day| {
assert!(test(*day, ~"%A"));
}
- for vec::each([
+ for [
~"Sun",
~"Mon",
~"Tue",
@@ -1048,11 +1047,11 @@ mod tests {
~"Thu",
~"Fri",
~"Sat"
- ]) |day| {
+ ].each |day| {
assert!(test(*day, ~"%a"));
}
- for vec::each([
+ for [
~"January",
~"February",
~"March",
@@ -1065,11 +1064,11 @@ mod tests {
~"October",
~"November",
~"December"
- ]) |day| {
+ ].each |day| {
assert!(test(*day, ~"%B"));
}
- for vec::each([
+ for [
~"Jan",
~"Feb",
~"Mar",
@@ -1082,7 +1081,7 @@ mod tests {
~"Oct",
~"Nov",
~"Dec"
- ]) |day| {
+ ].each |day| {
assert!(test(*day, ~"%b"));
}