std: Rename IntoIterator::Iter to IntoIter

This is in preparation for stabilization of the `IntoIterator` trait. All
implementations and references to `Iter` need to be renamed to `IntoIter`.

[breaking-change]

diff --git a/src/libcollections/binary_heap.rs b/src/libcollections/binary_heap.rs
index 275fc34f8132659c3c35bfc381d7755e45168bc7..11576fbb00c9b5dcb44710df6d51da75cc0efd02 100644 (file)
--- a/src/libcollections/binary_heap.rs
+++ b/src/libcollections/binary_heap.rs
@@ -656,7 +656,7 @@ fn from_iter<Iter: Iterator<Item=T>>(iter: Iter) -> BinaryHeap<T> {
 }
 
 impl<T: Ord> IntoIterator for BinaryHeap<T> {
-    type Iter = IntoIter<T>;
+    type IntoIter = IntoIter<T>;
 
     fn into_iter(self) -> IntoIter<T> {
         self.into_iter()
@@ -664,7 +664,7 @@ fn into_iter(self) -> IntoIter<T> {
 }
 
 impl<'a, T> IntoIterator for &'a BinaryHeap<T> where T: Ord {
-    type Iter = Iter<'a, T>;
+    type IntoIter = Iter<'a, T>;
 
     fn into_iter(self) -> Iter<'a, T> {
         self.iter()

diff --git a/src/libcollections/bit.rs b/src/libcollections/bit.rs
index 8ba0eb9b7efe5180e5e9d3236796b0af26ab1a03..6d15a264172a1c53f2b34f0d108a59ead8318c46 100644 (file)
--- a/src/libcollections/bit.rs
+++ b/src/libcollections/bit.rs
@@ -1071,7 +1071,7 @@ fn idx(&mut self, index: usize) -> Option<bool> {
 }
 
 impl<'a> IntoIterator for &'a Bitv {
-    type Iter = Iter<'a>;
+    type IntoIter = Iter<'a>;
 
     fn into_iter(self) -> Iter<'a> {
         self.iter()
@@ -1883,7 +1883,7 @@ impl<'a> Iterator for SymmetricDifference<'a> {
 }
 
 impl<'a> IntoIterator for &'a BitvSet {
-    type Iter = SetIter<'a>;
+    type IntoIter = SetIter<'a>;
 
     fn into_iter(self) -> SetIter<'a> {
         self.iter()

diff --git a/src/libcollections/btree/map.rs b/src/libcollections/btree/map.rs
index aec50d5380880e24891e760d5247a3fbaad862f1..2cef08725a2f6aa13294085eb6f56b66de535550 100644 (file)
--- a/src/libcollections/btree/map.rs
+++ b/src/libcollections/btree/map.rs
@@ -463,7 +463,7 @@ pub fn remove<Q: ?Sized>(&mut self, key: &Q) -> Option<V> where Q: BorrowFrom<K>
 }
 
 impl<K, V> IntoIterator for BTreeMap<K, V> {
-    type Iter = IntoIter<K, V>;
+    type IntoIter = IntoIter<K, V>;
 
     fn into_iter(self) -> IntoIter<K, V> {
         self.into_iter()
@@ -471,7 +471,7 @@ fn into_iter(self) -> IntoIter<K, V> {
 }
 
 impl<'a, K, V> IntoIterator for &'a BTreeMap<K, V> {
-    type Iter = Iter<'a, K, V>;
+    type IntoIter = Iter<'a, K, V>;
 
     fn into_iter(self) -> Iter<'a, K, V> {
         self.iter()
@@ -479,7 +479,7 @@ fn into_iter(self) -> Iter<'a, K, V> {
 }
 
 impl<'a, K, V> IntoIterator for &'a mut BTreeMap<K, V> {
-    type Iter = IterMut<'a, K, V>;
+    type IntoIter = IterMut<'a, K, V>;
 
     fn into_iter(mut self) -> IterMut<'a, K, V> {
         self.iter_mut()

diff --git a/src/libcollections/btree/set.rs b/src/libcollections/btree/set.rs
index c888a261f9d21851e426c654c687eca504b0a283..7cb31ab1f6dbec86664400dd1aca636980cc641f 100644 (file)
--- a/src/libcollections/btree/set.rs
+++ b/src/libcollections/btree/set.rs
@@ -481,7 +481,7 @@ fn from_iter<Iter: Iterator<Item=T>>(iter: Iter) -> BTreeSet<T> {
 }
 
 impl<T> IntoIterator for BTreeSet<T> {
-    type Iter = IntoIter<T>;
+    type IntoIter = IntoIter<T>;
 
     fn into_iter(self) -> IntoIter<T> {
         self.into_iter()
@@ -489,7 +489,7 @@ fn into_iter(self) -> IntoIter<T> {
 }
 
 impl<'a, T> IntoIterator for &'a BTreeSet<T> {
-    type Iter = Iter<'a, T>;
+    type IntoIter = Iter<'a, T>;
 
     fn into_iter(self) -> Iter<'a, T> {
         self.iter()

diff --git a/src/libcollections/dlist.rs b/src/libcollections/dlist.rs
index 748230c5d24cf9765a1dc9ba12fe5c0b64c0ab92..a080146e0ec508fe6c2d443de0f21809468d5e27 100644 (file)
--- a/src/libcollections/dlist.rs
+++ b/src/libcollections/dlist.rs
@@ -831,7 +831,7 @@ fn from_iter<T: Iterator<Item=A>>(iterator: T) -> DList<A> {
 }
 
 impl<T> IntoIterator for DList<T> {
-    type Iter = IntoIter<T>;
+    type IntoIter = IntoIter<T>;
 
     fn into_iter(self) -> IntoIter<T> {
         self.into_iter()
@@ -839,7 +839,7 @@ fn into_iter(self) -> IntoIter<T> {
 }
 
 impl<'a, T> IntoIterator for &'a DList<T> {
-    type Iter = Iter<'a, T>;
+    type IntoIter = Iter<'a, T>;
 
     fn into_iter(self) -> Iter<'a, T> {
         self.iter()
@@ -847,7 +847,7 @@ fn into_iter(self) -> Iter<'a, T> {
 }
 
 impl<'a, T> IntoIterator for &'a mut DList<T> {
-    type Iter = IterMut<'a, T>;
+    type IntoIter = IterMut<'a, T>;
 
     fn into_iter(mut self) -> IterMut<'a, T> {
         self.iter_mut()

diff --git a/src/libcollections/enum_set.rs b/src/libcollections/enum_set.rs
index da146506077478a22dd1ff58e56f17393cb785c2..da533d34703dd9574cf9b9a5c97d0af6b3863b3b 100644 (file)
--- a/src/libcollections/enum_set.rs
+++ b/src/libcollections/enum_set.rs
@@ -258,7 +258,7 @@ fn from_iter<I:Iterator<Item=E>>(iterator: I) -> EnumSet<E> {
 }
 
 impl<'a, E> IntoIterator for &'a EnumSet<E> where E: CLike {
-    type Iter = Iter<E>;
+    type IntoIter = Iter<E>;
 
     fn into_iter(self) -> Iter<E> {
         self.iter()

diff --git a/src/libcollections/ring_buf.rs b/src/libcollections/ring_buf.rs
index 76849e6ade85a23c5fcc7d1a74ae8ffca19294b0..5f1dc1d2ef4ffb0ef8cbf26d871485849c65497c 100644 (file)
--- a/src/libcollections/ring_buf.rs
+++ b/src/libcollections/ring_buf.rs
@@ -1608,7 +1608,7 @@ fn from_iter<T: Iterator<Item=A>>(iterator: T) -> RingBuf<A> {
 }
 
 impl<T> IntoIterator for RingBuf<T> {
-    type Iter = IntoIter<T>;
+    type IntoIter = IntoIter<T>;
 
     fn into_iter(self) -> IntoIter<T> {
         self.into_iter()
@@ -1616,7 +1616,7 @@ fn into_iter(self) -> IntoIter<T> {
 }
 
 impl<'a, T> IntoIterator for &'a RingBuf<T> {
-    type Iter = Iter<'a, T>;
+    type IntoIter = Iter<'a, T>;
 
     fn into_iter(self) -> Iter<'a, T> {
         self.iter()
@@ -1624,7 +1624,7 @@ fn into_iter(self) -> Iter<'a, T> {
 }
 
 impl<'a, T> IntoIterator for &'a mut RingBuf<T> {
-    type Iter = IterMut<'a, T>;
+    type IntoIter = IterMut<'a, T>;
 
     fn into_iter(mut self) -> IterMut<'a, T> {
         self.iter_mut()

diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs
index 70097c956cd0ef942f5515465691be8a6669f534..1cd2a89ad604e970bda2f690a1d4b0a7a40abb12 100644 (file)
--- a/src/libcollections/vec.rs
+++ b/src/libcollections/vec.rs
@@ -1388,7 +1388,7 @@ fn from_iter<I:Iterator<Item=T>>(iterator: I) -> Vec<T> {
 }
 
 impl<T> IntoIterator for Vec<T> {
-    type Iter = IntoIter<T>;
+    type IntoIter = IntoIter<T>;
 
     fn into_iter(self) -> IntoIter<T> {
         self.into_iter()
@@ -1396,7 +1396,7 @@ fn into_iter(self) -> IntoIter<T> {
 }
 
 impl<'a, T> IntoIterator for &'a Vec<T> {
-    type Iter = slice::Iter<'a, T>;
+    type IntoIter = slice::Iter<'a, T>;
 
     fn into_iter(self) -> slice::Iter<'a, T> {
         self.iter()
@@ -1404,7 +1404,7 @@ fn into_iter(self) -> slice::Iter<'a, T> {
 }
 
 impl<'a, T> IntoIterator for &'a mut Vec<T> {
-    type Iter = slice::IterMut<'a, T>;
+    type IntoIter = slice::IterMut<'a, T>;
 
     fn into_iter(mut self) -> slice::IterMut<'a, T> {
         self.iter_mut()

diff --git a/src/libcollections/vec_map.rs b/src/libcollections/vec_map.rs
index 739b8d8ce19c24899abcd9d06f2a25d62d848623..93d02de9b550e9aaecce48a15da6155f6ded66a6 100644 (file)
--- a/src/libcollections/vec_map.rs
+++ b/src/libcollections/vec_map.rs
@@ -669,7 +669,7 @@ fn from_iter<Iter: Iterator<Item=(usize, V)>>(iter: Iter) -> VecMap<V> {
 }
 
 impl<T> IntoIterator for VecMap<T> {
-    type Iter = IntoIter<T>;
+    type IntoIter = IntoIter<T>;
 
     fn into_iter(self) -> IntoIter<T> {
         self.into_iter()
@@ -677,7 +677,7 @@ fn into_iter(self) -> IntoIter<T> {
 }
 
 impl<'a, T> IntoIterator for &'a VecMap<T> {
-    type Iter = Iter<'a, T>;
+    type IntoIter = Iter<'a, T>;
 
     fn into_iter(self) -> Iter<'a, T> {
         self.iter()
@@ -685,7 +685,7 @@ fn into_iter(self) -> Iter<'a, T> {
 }
 
 impl<'a, T> IntoIterator for &'a mut VecMap<T> {
-    type Iter = IterMut<'a, T>;
+    type IntoIter = IterMut<'a, T>;
 
     fn into_iter(mut self) -> IterMut<'a, T> {
         self.iter_mut()

diff --git a/src/libcore/array.rs b/src/libcore/array.rs
index 5c4567e567b0daa9f880559994473760a69bbc2b..a596fe4a588098685c301244bbf9a9aea8b22b7e 100644 (file)
--- a/src/libcore/array.rs
+++ b/src/libcore/array.rs
@@ -49,7 +49,7 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
             }
 
             impl<'a, T> IntoIterator for &'a [T; $N] {
-                type Iter = Iter<'a, T>;
+                type IntoIter = Iter<'a, T>;
 
                 fn into_iter(self) -> Iter<'a, T> {
                     self.iter()
@@ -57,7 +57,7 @@ fn into_iter(self) -> Iter<'a, T> {
             }
 
             impl<'a, T> IntoIterator for &'a mut [T; $N] {
-                type Iter = IterMut<'a, T>;
+                type IntoIter = IterMut<'a, T>;
 
                 fn into_iter(self) -> IterMut<'a, T> {
                     self.iter_mut()

diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs
index fcf46b81a57af9939b7b91a7517c969ca210e1dc..2d240a53c4fea57dc76bfd85bd50e86ecebae02c 100644 (file)
--- a/src/libcore/iter.rs
+++ b/src/libcore/iter.rs
@@ -120,14 +120,14 @@ pub trait FromIterator<A> {
 
 /// Conversion into an `Iterator`
 pub trait IntoIterator {
-    type Iter: Iterator;
+    type IntoIter: Iterator;
 
     /// Consumes `Self` and returns an iterator over it
-    fn into_iter(self) -> Self::Iter;
+    fn into_iter(self) -> Self::IntoIter;
 }
 
 impl<I> IntoIterator for I where I: Iterator {
-    type Iter = I;
+    type IntoIter = I;
 
     fn into_iter(self) -> I {
         self

diff --git a/src/libcore/slice.rs b/src/libcore/slice.rs
index fc51920ec6b82de1941863fbb4a48849f69d709e..459addb09fd721ad78b4dbf1504c86b6f367214a 100644 (file)
--- a/src/libcore/slice.rs
+++ b/src/libcore/slice.rs
@@ -628,7 +628,7 @@ fn default() -> &'a [T] { &[] }
 //
 
 impl<'a, T> IntoIterator for &'a [T] {
-    type Iter = Iter<'a, T>;
+    type IntoIter = Iter<'a, T>;
 
     fn into_iter(self) -> Iter<'a, T> {
         self.iter()
@@ -636,7 +636,7 @@ fn into_iter(self) -> Iter<'a, T> {
 }
 
 impl<'a, T> IntoIterator for &'a mut [T] {
-    type Iter = IterMut<'a, T>;
+    type IntoIter = IterMut<'a, T>;
 
     fn into_iter(self) -> IterMut<'a, T> {
         self.iter_mut()

diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs
index 710f021d9125e6205e1149d2fe8ccc12da1ff697..18dd122891daee93c08c2d2e9ae06aeab6acf1f7 100644 (file)
--- a/src/libstd/collections/hash/map.rs
+++ b/src/libstd/collections/hash/map.rs
@@ -1377,7 +1377,7 @@ impl<'a, K, V, S, H> IntoIterator for &'a HashMap<K, V, S>
           S: HashState<Hasher=H>,
           H: hash::Hasher<Output=u64>
 {
-    type Iter = Iter<'a, K, V>;
+    type IntoIter = Iter<'a, K, V>;
 
     fn into_iter(self) -> Iter<'a, K, V> {
         self.iter()
@@ -1389,7 +1389,7 @@ impl<'a, K, V, S, H> IntoIterator for &'a mut HashMap<K, V, S>
           S: HashState<Hasher=H>,
           H: hash::Hasher<Output=u64>
 {
-    type Iter = IterMut<'a, K, V>;
+    type IntoIter = IterMut<'a, K, V>;
 
     fn into_iter(mut self) -> IterMut<'a, K, V> {
         self.iter_mut()
@@ -1401,7 +1401,7 @@ impl<K, V, S, H> IntoIterator for HashMap<K, V, S>
           S: HashState<Hasher=H>,
           H: hash::Hasher<Output=u64>
 {
-    type Iter = IntoIter<K, V>;
+    type IntoIter = IntoIter<K, V>;
 
     fn into_iter(self) -> IntoIter<K, V> {
         self.into_iter()

diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs
index e40f17f29e804d898c95390874922f788afe0c35..de3c0424c9a858073c2a07db44bf76d480921e25 100644 (file)
--- a/src/libstd/collections/hash/set.rs
+++ b/src/libstd/collections/hash/set.rs
@@ -840,7 +840,7 @@ impl<'a, T, S, H> IntoIterator for &'a HashSet<T, S>
           S: HashState<Hasher=H>,
           H: hash::Hasher<Output=u64>
 {
-    type Iter = Iter<'a, T>;
+    type IntoIter = Iter<'a, T>;
 
     fn into_iter(self) -> Iter<'a, T> {
         self.iter()
@@ -852,7 +852,7 @@ impl<T, S, H> IntoIterator for HashSet<T, S>
           S: HashState<Hasher=H>,
           H: hash::Hasher<Output=u64>
 {
-    type Iter = IntoIter<T>;
+    type IntoIter = IntoIter<T>;
 
     fn into_iter(self) -> IntoIter<T> {
         self.into_iter()