diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs index cfbccef2a722..e39c60a4006e 100644 --- a/src/libcore/iter.rs +++ b/src/libcore/iter.rs @@ -1088,10 +1088,7 @@ impl<'a, I> DoubleEndedIterator for ByRef<'a, I> where I: 'a + DoubleEndedIterat } #[stable] -impl<'a, I> ExactSizeIterator for ByRef<'a, I> where I: 'a + ExactSizeIterator { - #[inline] - fn len(&self) -> uint { self.iter.len() } -} +impl<'a, I> ExactSizeIterator for ByRef<'a, I> where I: 'a + ExactSizeIterator {} /// A trait for iterators over elements which can be added together #[unstable = "needs to be re-evaluated as part of numerics reform"] @@ -1797,14 +1794,7 @@ impl Iterator for Peekable where I: Iterator { } #[stable] -impl ExactSizeIterator for Peekable where I: ExactSizeIterator { - #[inline] - fn len(&self) -> usize { - // This is guarenteed to not overflow because `len()` must have been able to return a valid - // value before we peeked. - self.iter.len() + if self.peeked.is_some() { 1 } else { 0 } - } -} +impl ExactSizeIterator for Peekable where I: ExactSizeIterator {} #[stable] impl Peekable where I: Iterator { @@ -1999,10 +1989,7 @@ impl RandomAccessIterator for Skip where I: RandomAccessIterator{ } #[stable] -impl ExactSizeIterator for Skip where I: ExactSizeIterator { - #[inline] - fn len(&self) -> uint { self.iter.len().saturating_sub(self.n) } -} +impl ExactSizeIterator for Skip where I: ExactSizeIterator {} /// An iterator that only iterates over the first `n` iterations of `iter`. #[derive(Clone)] @@ -2060,10 +2047,7 @@ impl RandomAccessIterator for Take where I: RandomAccessIterator{ } #[stable] -impl ExactSizeIterator for Take where I: ExactSizeIterator { - #[inline] - fn len(&self) -> uint { cmp::min(self.iter.len(), self.n) } -} +impl ExactSizeIterator for Take where I: ExactSizeIterator {} /// An iterator to maintain state while iterating another iterator @@ -2275,10 +2259,7 @@ impl RandomAccessIterator for Fuse where I: RandomAccessIterator { } #[stable] -impl ExactSizeIterator for Fuse where I: ExactSizeIterator { - #[inline] - fn len(&self) -> uint { self.iter.len() } -} +impl ExactSizeIterator for Fuse where I: ExactSizeIterator {} impl Fuse { /// Resets the fuse such that the next call to .next() or .next_back() will