Merge pull request #7595 from thestinger/iterator

remove some method resolve workarounds

src/test/bench/core-std.rs

@@ -44,7 +44,7 @@ fn maybe_run_test(argv: &[~str], name: ~str, test: &fn()) {
     if os::getenv(~"RUST_BENCH").is_some() {
         run_test = true
     } else if argv.len() > 0 {
-        run_test = argv.iter().any_(|x| x == &~"all") || argv.iter().any_(|x| x == &name)
+        run_test = argv.iter().any(|x| x == &~"all") || argv.iter().any(|x| x == &name)
     }
 
     if !run_test {

src/test/bench/graph500-bfs.rs

@@ -111,7 +111,7 @@ fn gen_search_keys(graph: &[~[node_id]], n: uint) -> ~[node_id] {
     while keys.len() < n {
         let k = r.gen_uint_range(0u, graph.len());
 
-        if graph[k].len() > 0u && graph[k].iter().any_(|i| {
+        if graph[k].len() > 0u && graph[k].iter().any(|i| {
             *i != k as node_id
         }) {
             keys.insert(k as node_id);
@@ -187,7 +187,7 @@ fn bfs2(graph: graph, key: node_id) -> bfs_result {
     }
 
     let mut i = 0;
-    while colors.iter().any_(is_gray) {
+    while colors.iter().any(is_gray) {
         // Do the BFS.
         info!("PBFS iteration %?", i);
         i += 1;
@@ -402,7 +402,7 @@ fn validate(edges: ~[(node_id, node_id)],
             if *v == -1i64 || u == root {
                 true
             } else {
-                edges.iter().any_(|x| x == &(u, *v)) || edges.iter().any_(|x| x == &(*v, u))
+                edges.iter().any(|x| x == &(u, *v)) || edges.iter().any(|x| x == &(*v, u))
             }
         };
         result

src/test/run-pass/block-arg.rs

@@ -20,20 +20,20 @@ pub fn main() {
     }
 
     // Usable at all:
-    let mut any_negative = do v.iter().any_ |e| { e.is_negative() };
+    let mut any_negative = do v.iter().any |e| { e.is_negative() };
     assert!(any_negative);
 
     // Higher precedence than assignments:
-    any_negative = do v.iter().any_ |e| { e.is_negative() };
+    any_negative = do v.iter().any |e| { e.is_negative() };
     assert!(any_negative);
 
     // Higher precedence than unary operations:
     let abs_v = do v.iter().transform |e| { e.abs() }.collect::<~[float]>();
     assert!(do abs_v.iter().all |e| { e.is_positive() });
-    assert!(!do abs_v.iter().any_ |e| { e.is_negative() });
+    assert!(!do abs_v.iter().any |e| { e.is_negative() });
 
     // Usable in funny statement-like forms:
-    if !do v.iter().any_ |e| { e.is_positive() } {
+    if !do v.iter().any |e| { e.is_positive() } {
         assert!(false);
     }
     match do v.iter().all |e| { e.is_negative() } {
@@ -41,7 +41,7 @@ pub fn main() {
         false => { }
     }
     match 3 {
-      _ if do v.iter().any_ |e| { e.is_negative() } => {
+      _ if do v.iter().any |e| { e.is_negative() } => {
       }
       _ => {
         fail!("wrong answer.");
@@ -58,7 +58,7 @@ pub fn main() {
 
     // In the tail of a block
     let w =
-        if true { do abs_v.iter().any_ |e| { e.is_positive() } }
+        if true { do abs_v.iter().any |e| { e.is_positive() } }
       else { false };
     assert!(w);
 }

src/test/run-pass/test-ignore-cfg.rs

@@ -29,8 +29,8 @@ fn checktests() {
     let tests = __test::TESTS;
 
     assert!(
-        tests.iter().any_(|t| t.desc.name.to_str() == ~"shouldignore" && t.desc.ignore));
+        tests.iter().any(|t| t.desc.name.to_str() == ~"shouldignore" && t.desc.ignore));
 
     assert!(
-        tests.iter().any_(|t| t.desc.name.to_str() == ~"shouldnotignore" && !t.desc.ignore));
+        tests.iter().any(|t| t.desc.name.to_str() == ~"shouldnotignore" && !t.desc.ignore));
 }