Merge pull request #7595 from thestinger/iterator

remove some method resolve workarounds

Author: thestinger

src/libextra/getopts.rs

@@ -176,7 +176,7 @@ fn name_str(nm: &Name) -> ~str {
 }
 
 fn find_opt(opts: &[Opt], nm: Name) -> Option<uint> {
-    opts.iter().position_(|opt| opt.name == nm)
+    opts.iter().position(|opt| opt.name == nm)
 }
 
 /**

src/libextra/json.rs

@@ -950,7 +950,7 @@ impl serialize::Decoder for Decoder {
             }
             ref json => fail!("invalid variant: %?", *json),
         };
-        let idx = match names.iter().position_(|n| str::eq_slice(*n, name)) {
+        let idx = match names.iter().position(|n| str::eq_slice(*n, name)) {
             Some(idx) => idx,
             None => fail!("Unknown variant name: %?", name),
         };

src/libextra/net/ip.rs

@@ -203,7 +203,7 @@ pub mod v4 {
         }).collect();
         if parts.len() != 4 {
             Err(fmt!("'%s' doesn't have 4 parts", ip))
-        } else if parts.iter().any_(|x| *x == 256u) {
+        } else if parts.iter().any(|x| *x == 256u) {
             Err(fmt!("invalid octal in addr '%s'", ip))
         } else {
             Ok(Ipv4Rep {

src/libextra/net/url.rs

@@ -522,7 +522,7 @@ fn get_authority(rawurl: &str) ->
     let host_is_end_plus_one: &fn() -> bool = || {
         let xs = ['?', '#', '/'];
         end+1 == len
-            && !xs.iter().any_(|x| *x == (rawurl[end] as char))
+            && !xs.iter().any(|x| *x == (rawurl[end] as char))
     };
 
     // finish up

src/libextra/par.rs

@@ -136,8 +136,8 @@ pub fn any<A:Copy + Send>(
     fn_factory: &fn() -> ~fn(&A) -> bool) -> bool {
     let mapped = map_slices(xs, || {
         let f = fn_factory();
-        let result: ~fn(uint, &[A]) -> bool = |_, slice| slice.iter().any_(f);
+        let result: ~fn(uint, &[A]) -> bool = |_, slice| slice.iter().any(f);
         result
     });
-    mapped.iter().any_(|&x| x)
+    mapped.iter().any(|&x| x)
 }

src/libextra/terminfo/parser/compiled.rs

@@ -294,7 +294,7 @@ pub fn parse(file: @Reader, longnames: bool) -> Result<~TermInfo, ~str> {
 
             // Find the offset of the NUL we want to go to
             let nulpos = string_table.slice(offset as uint, string_table_bytes as uint)
-                .iter().position_(|&b| b == 0);
+                .iter().position(|&b| b == 0);
             match nulpos {
                 Some(len) => {
                     string_map.insert(name.to_owned(),

src/libextra/treemap.rs

@@ -844,7 +844,7 @@ mod test_treemap {
             for 90.times {
                 let k = rng.gen();
                 let v = rng.gen();
-                if !ctrl.iter().any_(|x| x == &(k, v)) {
+                if !ctrl.iter().any(|x| x == &(k, v)) {
                     assert!(map.insert(k, v));
                     ctrl.push((k, v));
                     check_structure(&map);

src/librustc/front/config.rs

@@ -194,7 +194,7 @@ pub fn metas_in_cfg(cfg: &[@ast::meta_item],
 
     if cfg_metas.iter().all(|c| c.is_empty()) { return true; }
 
-    cfg_metas.iter().any_(|cfg_meta| {
+    cfg_metas.iter().any(|cfg_meta| {
         cfg_meta.iter().all(|cfg_mi| {
             match cfg_mi.node {
                 ast::meta_list(s, ref it) if "not" == s

src/librustc/metadata/cstore.rs

@@ -102,7 +102,7 @@ pub fn get_used_crate_files(cstore: &CStore) -> ~[Path] {
 pub fn add_used_library(cstore: &mut CStore, lib: @str) -> bool {
     assert!(!lib.is_empty());
 
-    if cstore.used_libraries.iter().any_(|x| x == &lib) { return false; }
+    if cstore.used_libraries.iter().any(|x| x == &lib) { return false; }
     cstore.used_libraries.push(lib);
     true
 }

src/librustc/middle/borrowck/move_data.rs

@@ -506,7 +506,7 @@ impl FlowedMoveData {
         for self.dfcx_moves.each_bit_on_entry_frozen(id) |index| {
             let move = &self.move_data.moves[index];
             let moved_path = move.path;
-            if base_indices.iter().any_(|x| x == &moved_path) {
+            if base_indices.iter().any(|x| x == &moved_path) {
                 // Scenario 1 or 2: `loan_path` or some base path of
                 // `loan_path` was moved.
                 if !f(move, self.move_data.path(moved_path).loan_path) {
@@ -535,7 +535,7 @@ impl FlowedMoveData {
                        -> bool {
         //! True if `id` is the id of the LHS of an assignment
 
-        self.move_data.assignee_ids.iter().any_(|x| x == &id)
+        self.move_data.assignee_ids.iter().any(|x| x == &id)
     }
 
     pub fn each_assignment_of(&self,