1
Fork 0

libstd: rename vec::each(var) to var.each

This commit is contained in:
Youngmin Yoo 2013-05-08 17:49:00 +09:00
parent 472d9f33df
commit d4fa0f1485
11 changed files with 24 additions and 28 deletions

View file

@ -24,7 +24,6 @@ use cast;
use rt::io::Writer; use rt::io::Writer;
use to_bytes::IterBytes; use to_bytes::IterBytes;
use uint; use uint;
use vec;
// Alias `SipState` to `State`. // Alias `SipState` to `State`.
pub use State = hash::SipState; pub use State = hash::SipState;

View file

@ -484,7 +484,6 @@ mod tests {
use core::cell::Cell; use core::cell::Cell;
use core::task; use core::task;
use core::vec;
#[test] #[test]
fn manually_share_arc() { fn manually_share_arc() {
@ -683,7 +682,7 @@ mod tests {
} }
// Wait for children to pass their asserts // Wait for children to pass their asserts
for vec::each(children) |r| { for children.each |r| {
r.recv(); r.recv();
} }
@ -748,7 +747,7 @@ mod tests {
assert!(*state == 42); assert!(*state == 42);
*state = 31337; *state = 31337;
// send to other readers // send to other readers
for vec::each(reader_convos) |x| { for reader_convos.each |x| {
match *x { match *x {
(ref rc, _) => rc.send(()), (ref rc, _) => rc.send(()),
} }
@ -757,7 +756,7 @@ mod tests {
let read_mode = arc.downgrade(write_mode); let read_mode = arc.downgrade(write_mode);
do (&read_mode).read |state| { do (&read_mode).read |state| {
// complete handshake with other readers // complete handshake with other readers
for vec::each(reader_convos) |x| { for reader_convos.each |x| {
match *x { match *x {
(_, ref rp) => rp.recv(), (_, ref rp) => rp.recv(),
} }

View file

@ -368,7 +368,7 @@ pub fn opt_count(mm: &Matches, nm: &str) -> uint {
/// Returns true if any of several options were matched /// Returns true if any of several options were matched
pub fn opts_present(mm: &Matches, names: &[~str]) -> bool { 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)) { match find_opt(mm.opts, mkname(*nm)) {
Some(id) if !mm.vals[id].is_empty() => return true, 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 * option took an argument
*/ */
pub fn opts_str(mm: &Matches, names: &[~str]) -> ~str { pub fn opts_str(mm: &Matches, names: &[~str]) -> ~str {
for vec::each(names) |nm| { for names.each |nm| {
match opt_val(mm, *nm) { match opt_val(mm, *nm) {
Val(copy s) => return s, Val(copy s) => return s,
_ => () _ => ()

View file

@ -425,7 +425,7 @@ mod test {
let results = result::unwrap(ga_result); let results = result::unwrap(ga_result);
debug!("test_get_addr: Number of results for %s: %?", debug!("test_get_addr: Number of results for %s: %?",
localhost_name, vec::len(results)); localhost_name, vec::len(results));
for vec::each(results) |r| { for results.each |r| {
let ipv_prefix = match *r { let ipv_prefix = match *r {
Ipv4(_) => ~"IPv4", Ipv4(_) => ~"IPv4",
Ipv6(_) => ~"IPv6" Ipv6(_) => ~"IPv6"

View file

@ -250,7 +250,7 @@ pub fn sha1() -> @Sha1 {
fn result_str(&mut self) -> ~str { fn result_str(&mut self) -> ~str {
let rr = mk_result(self); let rr = mk_result(self);
let mut s = ~""; let mut s = ~"";
for vec::each(rr) |b| { for rr.each |b| {
let hex = uint::to_str_radix(*b as uint, 16u); let hex = uint::to_str_radix(*b as uint, 16u);
if hex.len() == 1 { if hex.len() == 1 {
s += "0"; s += "0";
@ -378,7 +378,7 @@ mod tests {
// Test that it works when accepting the message all at once // Test that it works when accepting the message all at once
let mut sh = sha1::sha1(); let mut sh = sha1::sha1();
for vec::each(tests) |t| { for tests.each |t| {
sh.input_str(t.input); sh.input_str(t.input);
let out = sh.result(); let out = sh.result();
check_vec_eq(t.output, out); check_vec_eq(t.output, out);
@ -392,7 +392,7 @@ mod tests {
// Test that it works when accepting the message in pieces // 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 len = str::len(t.input);
let mut left = len; let mut left = len;
while left > 0u { while left > 0u {

View file

@ -859,7 +859,7 @@ mod test_qsort {
let immut_names = names; let immut_names = names;
let pairs = vec::zip_slice(expected, immut_names); let pairs = vec::zip_slice(expected, immut_names);
for vec::each(pairs) |p| { for pairs.each |p| {
let (a, b) = *p; let (a, b) = *p;
debug!("%d %d", a, b); debug!("%d %d", a, b);
assert!((a == b)); assert!((a == b));

View file

@ -852,7 +852,7 @@ mod test_qsort {
let immut_names = names; let immut_names = names;
let pairs = vec::zip_slice(expected, immut_names); let pairs = vec::zip_slice(expected, immut_names);
for vec::each(pairs) |p| { for pairs.each |p| {
let (a, b) = *p; let (a, b) = *p;
debug!("%d %d", a, b); debug!("%d %d", a, b);
assert!((a == b)); assert!((a == b));

View file

@ -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 let _ = p.recv(); // wait for sibling to get in the mutex
} }
do m2.lock { } do m2.lock { }

View file

@ -13,7 +13,6 @@
use core::io; use core::io;
use core::option; use core::option;
use core::os; use core::os;
use core::vec;
// FIXME (#2807): Windows support. // FIXME (#2807): Windows support.
@ -50,7 +49,7 @@ pub fn color_supported() -> bool {
~"screen-bce", ~"xterm-256color"]; ~"screen-bce", ~"xterm-256color"];
return match os::getenv(~"TERM") { return match os::getenv(~"TERM") {
option::Some(ref env) => { option::Some(ref env) => {
for vec::each(supported_terms) |term| { for supported_terms.each |term| {
if *term == *env { return true; } if *term == *env { return true; }
} }
false false

View file

@ -355,7 +355,7 @@ fn print_failures(st: &ConsoleTestState) {
failures.push(name.to_str()); failures.push(name.to_str());
} }
sort::tim_sort(failures); sort::tim_sort(failures);
for vec::each(failures) |name| { for failures.each |name| {
st.out.write_line(fmt!(" %s", name.to_str())); st.out.write_line(fmt!(" %s", name.to_str()));
} }
} }
@ -928,7 +928,7 @@ mod tests {
{ {
fn testfn() { } fn testfn() { }
let mut tests = ~[]; let mut tests = ~[];
for vec::each(names) |name| { for names.each |name| {
let test = TestDescAndFn { let test = TestDescAndFn {
desc: TestDesc { desc: TestDesc {
name: DynTestName(*name), name: DynTestName(*name),
@ -954,7 +954,7 @@ mod tests {
let pairs = vec::zip(expected, filtered); let pairs = vec::zip(expected, filtered);
for vec::each(pairs) |p| { for pairs.each |p| {
match *p { match *p {
(ref a, ref b) => { (ref a, ref b) => {
assert!((*a == b.desc.name.to_str())); assert!((*a == b.desc.name.to_str()));

View file

@ -861,7 +861,6 @@ mod tests {
use core::result; use core::result;
use core::result::{Err, Ok}; use core::result::{Err, Ok};
use core::str; use core::str;
use core::vec;
fn test_get_time() { fn test_get_time() {
static some_recent_date: i64 = 1325376000i64; // 2012-01-01T00:00:00Z static some_recent_date: i64 = 1325376000i64; // 2012-01-01T00:00:00Z
@ -1028,7 +1027,7 @@ mod tests {
} }
} }
for vec::each([ for [
~"Sunday", ~"Sunday",
~"Monday", ~"Monday",
~"Tuesday", ~"Tuesday",
@ -1036,11 +1035,11 @@ mod tests {
~"Thursday", ~"Thursday",
~"Friday", ~"Friday",
~"Saturday" ~"Saturday"
]) |day| { ].each |day| {
assert!(test(*day, ~"%A")); assert!(test(*day, ~"%A"));
} }
for vec::each([ for [
~"Sun", ~"Sun",
~"Mon", ~"Mon",
~"Tue", ~"Tue",
@ -1048,11 +1047,11 @@ mod tests {
~"Thu", ~"Thu",
~"Fri", ~"Fri",
~"Sat" ~"Sat"
]) |day| { ].each |day| {
assert!(test(*day, ~"%a")); assert!(test(*day, ~"%a"));
} }
for vec::each([ for [
~"January", ~"January",
~"February", ~"February",
~"March", ~"March",
@ -1065,11 +1064,11 @@ mod tests {
~"October", ~"October",
~"November", ~"November",
~"December" ~"December"
]) |day| { ].each |day| {
assert!(test(*day, ~"%B")); assert!(test(*day, ~"%B"));
} }
for vec::each([ for [
~"Jan", ~"Jan",
~"Feb", ~"Feb",
~"Mar", ~"Mar",
@ -1082,7 +1081,7 @@ mod tests {
~"Oct", ~"Oct",
~"Nov", ~"Nov",
~"Dec" ~"Dec"
]) |day| { ].each |day| {
assert!(test(*day, ~"%b")); assert!(test(*day, ~"%b"));
} }