Ungate drain iterator (stable in Rust 1.6.0).

This commit is contained in:
Chris Morgan 2016-03-05 12:58:49 +11:00
parent 6d0a64dcc9
commit 548ee2a5f2

View file

@ -106,17 +106,14 @@ impl<A: ?Sized + UncheckedAnyExt> ExactSizeIterator for IntoIter<A> {
} }
/// RawMap drain iterator. /// RawMap drain iterator.
#[cfg(feature = "unstable")]
pub struct Drain<'a, A: ?Sized + UncheckedAnyExt> { pub struct Drain<'a, A: ?Sized + UncheckedAnyExt> {
inner: hash_map::Drain<'a, TypeId, Box<A>>, inner: hash_map::Drain<'a, TypeId, Box<A>>,
} }
#[cfg(feature = "unstable")]
impl<'a, A: ?Sized + UncheckedAnyExt> Iterator for Drain<'a, A> { impl<'a, A: ?Sized + UncheckedAnyExt> Iterator for Drain<'a, A> {
type Item = Box<A>; type Item = Box<A>;
#[inline] fn next(&mut self) -> Option<Box<A>> { self.inner.next().map(|x| x.1) } #[inline] fn next(&mut self) -> Option<Box<A>> { self.inner.next().map(|x| x.1) }
#[inline] fn size_hint(&self) -> (usize, Option<usize>) { self.inner.size_hint() } #[inline] fn size_hint(&self) -> (usize, Option<usize>) { self.inner.size_hint() }
} }
#[cfg(feature = "unstable")]
impl<'a, A: ?Sized + UncheckedAnyExt> ExactSizeIterator for Drain<'a, A> { impl<'a, A: ?Sized + UncheckedAnyExt> ExactSizeIterator for Drain<'a, A> {
#[inline] fn len(&self) -> usize { self.inner.len() } #[inline] fn len(&self) -> usize { self.inner.len() }
} }
@ -148,7 +145,6 @@ impl<A: ?Sized + UncheckedAnyExt> RawMap<A> {
/// ///
/// Keeps the allocated memory for reuse. /// Keeps the allocated memory for reuse.
#[inline] #[inline]
#[cfg(feature = "unstable")]
pub fn drain(&mut self) -> Drain<A> { pub fn drain(&mut self) -> Drain<A> {
Drain { Drain {
inner: self.inner.drain(), inner: self.inner.drain(),