bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make VecMap::into_iter consume the VecMap

Browse source 
This is a breaking change. To fix it you should pass the VecMap by value
instead of by reference.

[breaking-change]
This commit is contained in:
Adolfo Ochagavía 2015-01-19 10:48:01 +01:00
parent bd8a43c668
commit 2366dee8e9
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libcollections/vec_map.rs
View file

@ -265,7 +265,7 @@ impl<V> VecMap<V> {
}
/// Returns an iterator visiting all key-value pairs in ascending order by
/// the keys, emptying (but not consuming) the original `VecMap`.
/// the keys, consuming the original `VecMap`.
/// The iterator's element type is `(uint, &'r V)`.
///
/// # Examples
@ -284,14 +284,13 @@ impl<V> VecMap<V> {
/// assert_eq!(vec, vec![(1, "a"), (2, "b"), (3, "c")]);
/// ```
#[stable]
pub fn into_iter(&mut self) -> IntoIter<V> {
pub fn into_iter(self) -> IntoIter<V> {
fn filter<A>((i, v): (uint, Option<A>)) -> Option<(uint, A)> {
v.map(|v| (i, v))
}
let filter: fn((uint, Option<V>)) -> Option<(uint, V)> = filter; // coerce to fn ptr
let values = replace(&mut self.v, vec!());
IntoIter { iter: values.into_iter().enumerate().filter_map(filter) }
IntoIter { iter: self.v.into_iter().enumerate().filter_map(filter) }
}
/// Return the number of elements in the map.