Skip to content

Commit d4fa0f1

Browse files
committed
libstd: rename vec::each(var) to var.each
1 parent 472d9f3 commit d4fa0f1

File tree

11 files changed

+24
-28
lines changed

11 files changed

+24
-28
lines changed

src/libcore/hash.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ use cast;
2424
use rt::io::Writer;
2525
use to_bytes::IterBytes;
2626
use uint;
27-
use vec;
2827

2928
// Alias `SipState` to `State`.
3029
pub use State = hash::SipState;

src/libstd/arc.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,6 @@ mod tests {
484484

485485
use core::cell::Cell;
486486
use core::task;
487-
use core::vec;
488487

489488
#[test]
490489
fn manually_share_arc() {
@@ -683,7 +682,7 @@ mod tests {
683682
}
684683

685684
// Wait for children to pass their asserts
686-
for vec::each(children) |r| {
685+
for children.each |r| {
687686
r.recv();
688687
}
689688

@@ -748,7 +747,7 @@ mod tests {
748747
assert!(*state == 42);
749748
*state = 31337;
750749
// send to other readers
751-
for vec::each(reader_convos) |x| {
750+
for reader_convos.each |x| {
752751
match *x {
753752
(ref rc, _) => rc.send(()),
754753
}
@@ -757,7 +756,7 @@ mod tests {
757756
let read_mode = arc.downgrade(write_mode);
758757
do (&read_mode).read |state| {
759758
// complete handshake with other readers
760-
for vec::each(reader_convos) |x| {
759+
for reader_convos.each |x| {
761760
match *x {
762761
(_, ref rp) => rp.recv(),
763762
}

src/libstd/getopts.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ pub fn opt_count(mm: &Matches, nm: &str) -> uint {
368368

369369
/// Returns true if any of several options were matched
370370
pub fn opts_present(mm: &Matches, names: &[~str]) -> bool {
371-
for vec::each(names) |nm| {
371+
for names.each |nm| {
372372
match find_opt(mm.opts, mkname(*nm)) {
373373
Some(id) if !mm.vals[id].is_empty() => return true,
374374
_ => (),
@@ -395,7 +395,7 @@ pub fn opt_str(mm: &Matches, nm: &str) -> ~str {
395395
* option took an argument
396396
*/
397397
pub fn opts_str(mm: &Matches, names: &[~str]) -> ~str {
398-
for vec::each(names) |nm| {
398+
for names.each |nm| {
399399
match opt_val(mm, *nm) {
400400
Val(copy s) => return s,
401401
_ => ()

src/libstd/net_ip.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ mod test {
425425
let results = result::unwrap(ga_result);
426426
debug!("test_get_addr: Number of results for %s: %?",
427427
localhost_name, vec::len(results));
428-
for vec::each(results) |r| {
428+
for results.each |r| {
429429
let ipv_prefix = match *r {
430430
Ipv4(_) => ~"IPv4",
431431
Ipv6(_) => ~"IPv6"

src/libstd/sha1.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ pub fn sha1() -> @Sha1 {
250250
fn result_str(&mut self) -> ~str {
251251
let rr = mk_result(self);
252252
let mut s = ~"";
253-
for vec::each(rr) |b| {
253+
for rr.each |b| {
254254
let hex = uint::to_str_radix(*b as uint, 16u);
255255
if hex.len() == 1 {
256256
s += "0";
@@ -378,7 +378,7 @@ mod tests {
378378
// Test that it works when accepting the message all at once
379379

380380
let mut sh = sha1::sha1();
381-
for vec::each(tests) |t| {
381+
for tests.each |t| {
382382
sh.input_str(t.input);
383383
let out = sh.result();
384384
check_vec_eq(t.output, out);
@@ -392,7 +392,7 @@ mod tests {
392392

393393

394394
// Test that it works when accepting the message in pieces
395-
for vec::each(tests) |t| {
395+
for tests.each |t| {
396396
let len = str::len(t.input);
397397
let mut left = len;
398398
while left > 0u {

src/libstd/sort.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@ mod test_qsort {
859859
let immut_names = names;
860860
861861
let pairs = vec::zip_slice(expected, immut_names);
862-
for vec::each(pairs) |p| {
862+
for pairs.each |p| {
863863
let (a, b) = *p;
864864
debug!("%d %d", a, b);
865865
assert!((a == b));

src/libstd/sort_stage0.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ mod test_qsort {
852852
let immut_names = names;
853853
854854
let pairs = vec::zip_slice(expected, immut_names);
855-
for vec::each(pairs) |p| {
855+
for pairs.each |p| {
856856
let (a, b) = *p;
857857
debug!("%d %d", a, b);
858858
assert!((a == b));

src/libstd/sync.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,7 @@ mod tests {
997997
}
998998
}
999999
}
1000-
for vec::each(sibling_convos) |p| {
1000+
for sibling_convos.each |p| {
10011001
let _ = p.recv(); // wait for sibling to get in the mutex
10021002
}
10031003
do m2.lock { }

src/libstd/term.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
use core::io;
1414
use core::option;
1515
use core::os;
16-
use core::vec;
1716

1817
// FIXME (#2807): Windows support.
1918

@@ -50,7 +49,7 @@ pub fn color_supported() -> bool {
5049
~"screen-bce", ~"xterm-256color"];
5150
return match os::getenv(~"TERM") {
5251
option::Some(ref env) => {
53-
for vec::each(supported_terms) |term| {
52+
for supported_terms.each |term| {
5453
if *term == *env { return true; }
5554
}
5655
false

src/libstd/test.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ fn print_failures(st: &ConsoleTestState) {
355355
failures.push(name.to_str());
356356
}
357357
sort::tim_sort(failures);
358-
for vec::each(failures) |name| {
358+
for failures.each |name| {
359359
st.out.write_line(fmt!(" %s", name.to_str()));
360360
}
361361
}
@@ -928,7 +928,7 @@ mod tests {
928928
{
929929
fn testfn() { }
930930
let mut tests = ~[];
931-
for vec::each(names) |name| {
931+
for names.each |name| {
932932
let test = TestDescAndFn {
933933
desc: TestDesc {
934934
name: DynTestName(*name),
@@ -954,7 +954,7 @@ mod tests {
954954

955955
let pairs = vec::zip(expected, filtered);
956956

957-
for vec::each(pairs) |p| {
957+
for pairs.each |p| {
958958
match *p {
959959
(ref a, ref b) => {
960960
assert!((*a == b.desc.name.to_str()));

src/libstd/time.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,6 @@ mod tests {
861861
use core::result;
862862
use core::result::{Err, Ok};
863863
use core::str;
864-
use core::vec;
865864

866865
fn test_get_time() {
867866
static some_recent_date: i64 = 1325376000i64; // 2012-01-01T00:00:00Z
@@ -1028,31 +1027,31 @@ mod tests {
10281027
}
10291028
}
10301029
1031-
for vec::each([
1030+
for [
10321031
~"Sunday",
10331032
~"Monday",
10341033
~"Tuesday",
10351034
~"Wednesday",
10361035
~"Thursday",
10371036
~"Friday",
10381037
~"Saturday"
1039-
]) |day| {
1038+
].each |day| {
10401039
assert!(test(*day, ~"%A"));
10411040
}
10421041
1043-
for vec::each([
1042+
for [
10441043
~"Sun",
10451044
~"Mon",
10461045
~"Tue",
10471046
~"Wed",
10481047
~"Thu",
10491048
~"Fri",
10501049
~"Sat"
1051-
]) |day| {
1050+
].each |day| {
10521051
assert!(test(*day, ~"%a"));
10531052
}
10541053
1055-
for vec::each([
1054+
for [
10561055
~"January",
10571056
~"February",
10581057
~"March",
@@ -1065,11 +1064,11 @@ mod tests {
10651064
~"October",
10661065
~"November",
10671066
~"December"
1068-
]) |day| {
1067+
].each |day| {
10691068
assert!(test(*day, ~"%B"));
10701069
}
10711070
1072-
for vec::each([
1071+
for [
10731072
~"Jan",
10741073
~"Feb",
10751074
~"Mar",
@@ -1082,7 +1081,7 @@ mod tests {
10821081
~"Oct",
10831082
~"Nov",
10841083
~"Dec"
1085-
]) |day| {
1084+
].each |day| {
10861085
assert!(test(*day, ~"%b"));
10871086
}
10881087

0 commit comments

Comments
 (0)