auto merge of #7078 : thestinger/rust/iterator, r=brson

The annoying method resolve bug with generic implementations is still around (#5898), but the conflicts ended up being resolved by adding underscores as a hack, in previous commits.

Author: bors

doc/tutorial-tasks.md

@@ -13,7 +13,6 @@ use core::prelude::*;
 use common::config;
 use common;
 
-use core::iterator::IteratorUtil;
 use core::io;
 use core::os;
 

src/compiletest/header.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 use core::prelude::*;
-use core::iterator::IteratorUtil;
 
 use core::os;
 use core::run;

src/compiletest/procsrv.rs

@@ -22,7 +22,6 @@ use procsrv;
 use util;
 use util::logv;
 
-use core::iterator::IteratorUtil;
 use core::io;
 use core::os;
 use core::str;

src/compiletest/runtest.rs

@@ -37,7 +37,7 @@ impl<T> Container for Deque<T> {
 impl<T> Mutable for Deque<T> {
     /// Clear the deque, removing all values.
     fn clear(&mut self) {
-        for self.elts.each_mut |x| { *x = None }
+        for self.elts.mut_iter().advance |x| { *x = None }
         self.nelts = 0;
         self.lo = 0;
         self.hi = 0;

src/libextra/deque.rs

@@ -20,7 +20,6 @@ Do not use ==, !=, <, etc on doubly-linked lists -- it may not terminate.
 
 use core::prelude::*;
 
-use core::iterator::IteratorUtil;
 use core::managed;
 use core::old_iter;
 use core::vec;

src/libextra/dlist.rs

@@ -414,7 +414,6 @@ mod test {
 
     use super::{FileInput, pathify, input_vec, input_vec_state};
 
-    use core::iterator::IteratorUtil;
     use core::io;
     use core::uint;
     use core::vec;

src/libextra/fileinput.rs

@@ -83,7 +83,6 @@
 
 use core::prelude::*;
 
-use core::iterator::IteratorUtil;
 use core::cmp::Eq;
 use core::result::{Err, Ok};
 use core::result;

src/libextra/getopts.rs

@@ -18,7 +18,6 @@
 
 use core::prelude::*;
 
-use core::iterator::IteratorUtil;
 use core::char;
 use core::float;
 use core::hashmap::HashMap;

src/libextra/json.rs

@@ -12,7 +12,6 @@
 
 use core::prelude::*;
 
-use core::iterator::IteratorUtil;
 
 #[deriving(Eq)]
 pub enum List<T> {

src/libextra/list.rs

@@ -14,7 +14,6 @@
 
 use core::prelude::*;
 
-use core::iterator::IteratorUtil;
 use core::libc;
 use core::comm::{stream, SharedChan};
 use core::ptr;

src/libextra/net_ip.rs

@@ -14,7 +14,6 @@
 
 use core::prelude::*;
 
-use core::iterator::IteratorUtil;
 use core::cmp::Eq;
 use core::io::{Reader, ReaderUtil};
 use core::io;

src/libextra/net_url.rs

@@ -19,7 +19,6 @@ A BigInt is a combination of BigUint and Sign.
 #[allow(missing_doc)];
 
 use core::prelude::*;
-use core::iterator::IteratorUtil;
 use core::cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
 use core::int;
 use core::num::{IntConvertible, Zero, One, ToStrRadix, FromStrRadix, Orderable};

src/libextra/num/bigint.rs

@@ -12,7 +12,6 @@
 
 use core::prelude::*;
 
-use core::iterator::IteratorUtil;
 use core::cmp;
 use core::from_str::FromStr;
 use core::num::{Zero,One,ToStrRadix,FromStrRadix,Round};

src/libextra/num/rational.rs

@@ -10,7 +10,6 @@
 
 use core::prelude::*;
 
-use core::iterator::IteratorUtil;
 use core::cast;
 use core::ptr;
 use core::sys;

src/libextra/par.rs

@@ -37,7 +37,6 @@
 
 use core::prelude::*;
 
-use core::iterator::IteratorUtil;
 use core::uint;
 use core::vec;
 use core::str;

src/libextra/rope.rs

@@ -14,7 +14,6 @@
 
 use core::prelude::*;
 
-use core::iterator::IteratorUtil;
 use core::char;
 use core::cmp;
 use core::io::{ReaderUtil};

src/libextra/semver.rs

@@ -24,7 +24,7 @@
 
 use core::prelude::*;
 
-use core::iterator::IteratorUtil;
+use core::str;
 use core::uint;
 use core::vec;
 

src/libextra/sha1.rs

@@ -12,7 +12,7 @@
 
 use core::prelude::*;
 
-use core::iterator::*;
+use core::vec;
 use core::f64;
 use core::cmp;
 use core::num;

src/libextra/stats.rs

@@ -14,7 +14,6 @@ use core::prelude::*;
 
 use core::{vec, int, str};
 use core::io::Reader;
-use core::iterator::IteratorUtil;
 use core::hashmap::HashMap;
 use super::super::TermInfo;
 

src/libextra/terminfo/parser/compiled.rs

@@ -15,7 +15,6 @@ use core::prelude::*;
 use core::{os, str};
 use core::os::getenv;
 use core::io::{file_reader, Reader};
-use core::iterator::IteratorUtil;
 use path = core::path::Path;
 
 /// Return path to database entry for `term`

src/libextra/terminfo/searcher.rs

@@ -16,7 +16,6 @@ use core::i32;
 use core::int;
 use core::io;
 use core::str;
-use core::iterator::IteratorUtil;
 
 static NSEC_PER_SEC: i32 = 1_000_000_000_i32;
 

src/libextra/time.rs

@@ -14,7 +14,6 @@
 
 use core::prelude::*;
 
-use core::iterator::*;
 use core::uint;
 use core::util::{swap, replace};
 
@@ -709,7 +708,6 @@ mod test_treemap {
 
     use super::*;
 
-    use core::iterator::*;
     use core::rand::RngUtil;
     use core::rand;
     use core::str;
@@ -1030,7 +1028,6 @@ mod test_treemap {
 #[cfg(test)]
 mod test_set {
     use core::prelude::*;
-    use core::iterator::*;
 
     use super::*;
 

src/libextra/treemap.rs

@@ -30,7 +30,6 @@ extern mod rusti;
 extern mod rustc;
 
 use core::prelude::*;
-use core::iterator::IteratorUtil;
 
 use core::io;
 use core::os;

src/librust/rust.rc

@@ -22,7 +22,6 @@ use middle::trans::common::CrateContext;
 use middle::ty;
 use util::ppaux;
 
-use core::iterator::IteratorUtil;
 use core::char;
 use core::hash::Streaming;
 use core::hash;

src/librustc/back/link.rs

@@ -24,7 +24,6 @@ use middle;
 use util::common::time;
 use util::ppaux;
 
-use core::iterator::IteratorUtil;
 use core::hashmap::HashMap;
 use core::int;
 use core::io;

src/librustc/driver/driver.rs

@@ -17,7 +17,6 @@ use core::prelude::*;
 use metadata::cstore;
 use metadata::decoder;
 
-use core::iterator::IteratorUtil;
 use core::hashmap::HashMap;
 use core::vec;
 use extra;

src/librustc/metadata/cstore.rs

@@ -22,7 +22,6 @@ use middle::ty;
 use middle;
 use util::ppaux::ty_to_str;
 
-use core::iterator::IteratorUtil;
 use core::hash::HashUtil;
 use core::hashmap::HashMap;
 use core::int;

src/librustc/metadata/encoder.rs

@@ -25,7 +25,6 @@ use middle::{ty, typeck, moves};
 use middle;
 use util::ppaux::ty_to_str;
 
-use core::iterator::IteratorUtil;
 use core::at_vec;
 use core::uint;
 use extra::ebml::reader;

src/librustc/middle/astencode.rs

@@ -18,7 +18,6 @@
 // 4. moves do not affect things loaned out in any way
 
 use core::prelude::*;
-use core::iterator::IteratorUtil;
 
 use core::hashmap::HashSet;
 use core::uint;

src/librustc/middle/borrowck/check_loans.rs

@@ -17,7 +17,6 @@
 // sure that all of these loans are honored.
 
 use core::prelude::*;
-use core::iterator::IteratorUtil;
 
 use middle::borrowck::*;
 use middle::borrowck::move_data::MoveData;

src/librustc/middle/borrowck/gather_loans/mod.rs

@@ -16,7 +16,6 @@ comments in the section "Moves and initialization" and in `doc.rs`.
 */
 
 use core::prelude::*;
-use core::iterator::IteratorUtil;
 
 use core::hashmap::{HashMap, HashSet};
 use core::uint;

src/librustc/middle/borrowck/move_data.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::iterator::IteratorUtil;
 use core::prelude::*;
 
 use driver::session::Session;

src/librustc/middle/check_const.rs

@@ -19,7 +19,6 @@ use middle::typeck::method_map;
 use middle::moves;
 use util::ppaux::ty_to_str;
 
-use core::iterator::IteratorUtil;
 use core::uint;
 use core::vec;
 use extra::sort;

src/librustc/middle/check_match.rs

@@ -18,7 +18,6 @@ use middle;
 use syntax::{ast, ast_map, ast_util, visit};
 use syntax::ast::*;
 
-use core::iterator::IteratorUtil;
 use core::float;
 use core::hashmap::{HashMap, HashSet};
 use core::vec;

src/librustc/middle/const_eval.rs

@@ -18,7 +18,6 @@
 
 use core::prelude::*;
 
-use core::iterator::IteratorUtil;
 use core::cast;
 use core::io;
 use core::uint;

src/librustc/middle/dataflow.rs

@@ -17,7 +17,6 @@ use middle::typeck;
 use util::ppaux::{Repr, ty_to_str};
 use util::ppaux::UserString;
 
-use core::iterator::IteratorUtil;
 use core::vec;
 use syntax::ast::*;
 use syntax::attr::attrs_contains_name;

src/librustc/middle/kind.rs

@@ -15,7 +15,6 @@ use middle::ty;
 use middle::pat_util;
 use util::ppaux::{ty_to_str};
 
-use core::iterator::IteratorUtil;
 use core::char;
 use core::cmp;
 use core::hashmap::HashMap;

src/librustc/middle/lint.rs

@@ -110,7 +110,6 @@ use middle::ty;
 use middle::typeck;
 use middle::moves;
 
-use core::iterator::IteratorUtil;
 use core::cast::transmute;
 use core::hashmap::HashMap;
 use core::io;

src/librustc/middle/liveness.rs

@@ -47,7 +47,6 @@
  */
 
 use core::prelude::*;
-use core::iterator::IteratorUtil;
 
 use middle::ty;
 use middle::typeck;

src/librustc/middle/mem_categorization.rs

@@ -127,7 +127,6 @@ and so on.
 */
 
 use core::prelude::*;
-use core::iterator::IteratorUtil;
 
 use middle::pat_util::{pat_bindings};
 use middle::freevars;

src/librustc/middle/moves.rs

@@ -26,7 +26,6 @@ use middle::ty::{region_variance, rv_covariant, rv_invariant};
 use middle::ty::{rv_contravariant, FreeRegion};
 use middle::ty;
 
-use core::iterator::IteratorUtil;
 use core::hashmap::{HashMap, HashSet};
 use syntax::ast_map;
 use syntax::codemap::span;

src/librustc/middle/region.rs

@@ -40,7 +40,6 @@ use syntax::visit::{visit_foreign_item, visit_item};
 use syntax::visit::{visit_mod, visit_ty, vt};
 use syntax::opt_vec::OptVec;
 
-use core::iterator::IteratorUtil;
 use core::str;
 use core::uint;
 use core::vec;

src/librustc/middle/resolve.rs

@@ -172,7 +172,6 @@ use middle::trans::type_of;
 use middle::ty;
 use util::common::indenter;
 
-use core::iterator::IteratorUtil;
 use core::hashmap::HashMap;
 use core::vec;
 use syntax::ast;

src/librustc/middle/trans/_match.rs

@@ -44,7 +44,6 @@
  *   taken to it, implementing them for Rust seems difficult.
  */
 
-use core::iterator::IteratorUtil;
 use core::container::Map;
 use core::libc::c_ulonglong;
 use core::option::{Option, Some, None};

src/librustc/middle/trans/adt.rs

@@ -64,7 +64,6 @@ use middle::ty;
 use util::common::indenter;
 use util::ppaux::{Repr, ty_to_str};
 
-use core::iterator::IteratorUtil;
 use core::hash;
 use core::hashmap::{HashMap, HashSet};
 use core::int;