auto merge of #9065 : thestinger/rust/iter, r=alexcrichton

The trait will keep the `Iterator` naming, but a more concise module
name makes using the free functions less verbose. The module will define
iterables in addition to iterators, as it deals with iteration in
general.

6 files changed, 6 insertions, 6 deletions

diff --git a/src/libstd/rt/args.rs b/src/libstd/rt/args.rs
index e5075f8818a..afa8d3261fc 100644
--- a/src/libstd/rt/args.rs
+++ b/src/libstd/rt/args.rs
@@ -55,7 +55,7 @@ pub fn clone() -> Option<~[~str]> {
 mod imp {
     use libc;
     use option::{Option, Some, None};
-    use iterator::Iterator;
+    use iter::Iterator;
     use str;
     use unstable::finally::Finally;
     use util;
diff --git a/src/libstd/rt/io/extensions.rs b/src/libstd/rt/io/extensions.rs
index 15ac6544dee..e221f0ee94d 100644
--- a/src/libstd/rt/io/extensions.rs
+++ b/src/libstd/rt/io/extensions.rs
@@ -15,7 +15,7 @@
 
 use uint;
 use int;
-use iterator::Iterator;
+use iter::Iterator;
 use vec;
 use rt::io::{Reader, Writer, Decorator};
 use rt::io::{read_error, standard_error, EndOfFile, DEFAULT_BUF_SIZE};
diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs
index 14ff1fd5804..c9c3c4ec6da 100644
--- a/src/libstd/rt/mod.rs
+++ b/src/libstd/rt/mod.rs
@@ -59,7 +59,7 @@ Several modules in `core` are clients of `rt`:
 use cell::Cell;
 use clone::Clone;
 use container::Container;
-use iterator::Iterator;
+use iter::Iterator;
 use option::{Option, None, Some};
 use ptr::RawPtr;
 use rt::local::Local;
diff --git a/src/libstd/rt/sched.rs b/src/libstd/rt/sched.rs
index 6aa66a6ab6b..bcf9ae4a2a8 100644
--- a/src/libstd/rt/sched.rs
+++ b/src/libstd/rt/sched.rs
@@ -27,7 +27,7 @@ use rt::rtio::{RemoteCallback, PausibleIdleCallback};
 use borrow::{to_uint};
 use cell::Cell;
 use rand::{XorShiftRng, RngUtil};
-use iterator::{range};
+use iter::range;
 use vec::{OwnedVector};
 
 /// A scheduler is responsible for coordinating the execution of Tasks
diff --git a/src/libstd/rt/test.rs b/src/libstd/rt/test.rs
index 2c293af1eaf..f35fe1a1d04 100644
--- a/src/libstd/rt/test.rs
+++ b/src/libstd/rt/test.rs
@@ -14,7 +14,7 @@ use option::{Some, None};
 use cell::Cell;
 use clone::Clone;
 use container::Container;
-use iterator::{Iterator, range};
+use iter::{Iterator, range};
 use super::io::net::ip::{SocketAddr, Ipv4Addr, Ipv6Addr};
 use vec::{OwnedVector, MutableVector, ImmutableVector};
 use rt::sched::Scheduler;
diff --git a/src/libstd/rt/uv/uvio.rs b/src/libstd/rt/uv/uvio.rs
index c9b12e47f92..65910e5ad08 100644
--- a/src/libstd/rt/uv/uvio.rs
+++ b/src/libstd/rt/uv/uvio.rs
@@ -44,7 +44,7 @@ use task;
 #[cfg(test)] use rt::test::{spawntask,
                             next_test_ip4,
                             run_in_newsched_task};
-#[cfg(test)] use iterator::{Iterator, range};
+#[cfg(test)] use iter::{Iterator, range};
 
 // XXX we should not be calling uvll functions in here.