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 /src/libstd | |
| 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]
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/collections/hash/map.rs | 6 | ||||
| -rw-r--r-- | src/libstd/collections/hash/set.rs | 4 |
2 files changed, 5 insertions, 5 deletions
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() |