From 6919cf5fe14701621437fcb57f3a0c38fb394c65 Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Sun, 8 Sep 2013 11:01:16 -0400
Subject: rename `std::iterator` to `std::iter`

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.
---
 src/libstd/vec.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/libstd/vec.rs')

diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs
index 4cc5c4f14ff..138a1cab5a0 100644
--- a/src/libstd/vec.rs
+++ b/src/libstd/vec.rs
@@ -63,7 +63,7 @@ use clone::{Clone, DeepClone};
 use container::{Container, Mutable};
 use cmp::{Eq, TotalOrd, Ordering, Less, Equal, Greater};
 use cmp;
-use iterator::*;
+use iter::*;
 use libc::c_void;
 use num::{Integer, Zero, CheckedAdd, Saturating};
 use option::{None, Option, Some};
@@ -592,7 +592,7 @@ pub mod traits {
 
     use clone::Clone;
     use cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Equiv};
-    use iterator::order;
+    use iter::order;
     use ops::Add;
 
     impl<'self,T:Eq> Eq for &'self [T] {
@@ -3241,7 +3241,7 @@ mod tests {
 
     #[test]
     fn test_iterator() {
-        use iterator::*;
+        use iter::*;
         let xs = [1, 2, 5, 10, 11];
         let mut it = xs.iter();
         assert_eq!(it.size_hint(), (5, Some(5)));
@@ -3260,7 +3260,7 @@ mod tests {
 
     #[test]
     fn test_random_access_iterator() {
-        use iterator::*;
+        use iter::*;
         let xs = [1, 2, 5, 10, 11];
         let mut it = xs.iter();
 
@@ -3299,7 +3299,7 @@ mod tests {
 
     #[test]
     fn test_iter_size_hints() {
-        use iterator::*;
+        use iter::*;
         let mut xs = [1, 2, 5, 10, 11];
         assert_eq!(xs.iter().size_hint(), (5, Some(5)));
         assert_eq!(xs.rev_iter().size_hint(), (5, Some(5)));
@@ -3320,7 +3320,7 @@ mod tests {
 
     #[test]
     fn test_mut_iterator() {
-        use iterator::*;
+        use iter::*;
         let mut xs = [1, 2, 3, 4, 5];
         for x in xs.mut_iter() {
             *x += 1;
@@ -3330,7 +3330,7 @@ mod tests {
 
     #[test]
     fn test_rev_iterator() {
-        use iterator::*;
+        use iter::*;
 
         let xs = [1, 2, 5, 10, 11];
         let ys = [11, 10, 5, 2, 1];
@@ -3344,7 +3344,7 @@ mod tests {
 
     #[test]
     fn test_mut_rev_iterator() {
-        use iterator::*;
+        use iter::*;
         let mut xs = [1u, 2, 3, 4, 5];
         for (i,x) in xs.mut_rev_iter().enumerate() {
             *x += i;
@@ -3354,14 +3354,14 @@ mod tests {
 
     #[test]
     fn test_move_iterator() {
-        use iterator::*;
+        use iter::*;
         let xs = ~[1u,2,3,4,5];
         assert_eq!(xs.move_iter().fold(0, |a: uint, b: uint| 10*a + b), 12345);
     }
 
     #[test]
     fn test_move_rev_iterator() {
-        use iterator::*;
+        use iter::*;
         let xs = ~[1u,2,3,4,5];
         assert_eq!(xs.move_rev_iter().fold(0, |a: uint, b: uint| 10*a + b), 54321);
     }
-- 
cgit 1.4.1-3-g733a5