diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-06 14:47:55 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-09 15:58:13 -0800 |
| commit | 605225a366b62f29f5fd4b03cc298fff03bc3bdf (patch) | |
| tree | 50d9d4dc2b5c3e9aa552cb408a5dcc7e192beede | |
| parent | 64a4decec779ee0a30585a12352d20a54b722506 (diff) | |
| download | rust-605225a366b62f29f5fd4b03cc298fff03bc3bdf.tar.gz rust-605225a366b62f29f5fd4b03cc298fff03bc3bdf.zip | |
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]
| -rw-r--r-- | src/libcollections/binary_heap.rs | 4 | ||||
| -rw-r--r-- | src/libcollections/bit.rs | 4 | ||||
| -rw-r--r-- | src/libcollections/btree/map.rs | 6 | ||||
| -rw-r--r-- | src/libcollections/btree/set.rs | 4 | ||||
| -rw-r--r-- | src/libcollections/dlist.rs | 6 | ||||
| -rw-r--r-- | src/libcollections/enum_set.rs | 2 | ||||
| -rw-r--r-- | src/libcollections/ring_buf.rs | 6 | ||||
| -rw-r--r-- | src/libcollections/vec.rs | 6 | ||||
| -rw-r--r-- | src/libcollections/vec_map.rs | 6 | ||||
| -rw-r--r-- | src/libcore/array.rs | 4 | ||||
| -rw-r--r-- | src/libcore/iter.rs | 6 | ||||
| -rw-r--r-- | src/libcore/slice.rs | 4 | ||||
| -rw-r--r-- | src/libstd/collections/hash/map.rs | 6 | ||||
| -rw-r--r-- | src/libstd/collections/hash/set.rs | 4 |
14 files changed, 34 insertions, 34 deletions
diff --git a/src/libcollections/binary_heap.rs b/src/libcollections/binary_heap.rs index 275fc34f813..11576fbb00c 100644 --- a/src/libcollections/binary_heap.rs +++ b/src/libcollections/binary_heap.rs @@ -656,7 +656,7 @@ impl<T: Ord> FromIterator<T> for 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 @@ impl<T: Ord> IntoIterator for BinaryHeap<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 8ba0eb9b7ef..6d15a264172 100644 --- a/src/libcollections/bit.rs +++ b/src/libcollections/bit.rs @@ -1071,7 +1071,7 @@ impl<'a> RandomAccessIterator for Iter<'a> { } 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 aec50d53808..2cef08725a2 100644 --- a/src/libcollections/btree/map.rs +++ b/src/libcollections/btree/map.rs @@ -463,7 +463,7 @@ impl<K: Ord, V> BTreeMap<K, V> { } 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 @@ impl<K, V> IntoIterator for BTreeMap<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 @@ impl<'a, K, V> IntoIterator for &'a BTreeMap<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 c888a261f9d..7cb31ab1f6d 100644 --- a/src/libcollections/btree/set.rs +++ b/src/libcollections/btree/set.rs @@ -481,7 +481,7 @@ impl<T: Ord> FromIterator<T> for 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 @@ impl<T> IntoIterator for BTreeSet<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 748230c5d24..a080146e0ec 100644 --- a/src/libcollections/dlist.rs +++ b/src/libcollections/dlist.rs @@ -831,7 +831,7 @@ impl<A> FromIterator<A> for 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 @@ impl<T> IntoIterator for DList<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 @@ impl<'a, T> IntoIterator for &'a DList<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 da146506077..da533d34703 100644 --- a/src/libcollections/enum_set.rs +++ b/src/libcollections/enum_set.rs @@ -258,7 +258,7 @@ impl<E:CLike> FromIterator<E> for 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 76849e6ade8..5f1dc1d2ef4 100644 --- a/src/libcollections/ring_buf.rs +++ b/src/libcollections/ring_buf.rs @@ -1608,7 +1608,7 @@ impl<A> FromIterator<A> for 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 @@ impl<T> IntoIterator for RingBuf<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 @@ impl<'a, T> IntoIterator for &'a RingBuf<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 70097c956cd..1cd2a89ad60 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -1388,7 +1388,7 @@ impl<T> FromIterator<T> for 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 @@ impl<T> IntoIterator for Vec<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 @@ impl<'a, T> IntoIterator for &'a Vec<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 739b8d8ce19..93d02de9b55 100644 --- a/src/libcollections/vec_map.rs +++ b/src/libcollections/vec_map.rs @@ -669,7 +669,7 @@ impl<V> FromIterator<(usize, V)> for 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 @@ impl<T> IntoIterator for VecMap<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 @@ impl<'a, T> IntoIterator for &'a VecMap<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 5c4567e567b..a596fe4a588 100644 --- a/src/libcore/array.rs +++ b/src/libcore/array.rs @@ -49,7 +49,7 @@ macro_rules! array_impls { } 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 @@ macro_rules! array_impls { } 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 fcf46b81a57..2d240a53c4f 100644 --- 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 fc51920ec6b..459addb09fd 100644 --- a/src/libcore/slice.rs +++ b/src/libcore/slice.rs @@ -628,7 +628,7 @@ impl<'a, T> Default for &'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 @@ impl<'a, T> IntoIterator for &'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 710f021d912..18dd122891d 100644 --- 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 e40f17f29e8..de3c0424c9a 100644 --- 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() |
