---

yaml
---
r: 175278
b: refs/heads/master
c: a13e721
h: refs/heads/master
v: v3

Author: Stebalien

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8ea6f78cf6779a933e2dd859efee995932ef1371
+refs/heads/master: a13e7212025e5339133126d129e64fe8e7aff84b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 777435990e0e91df6b72ce80c9b6fa485eeb5daa
 refs/heads/try: 08f6380a9f0b866796080094f44fe25ea5636547

trunk/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<T, I> Iterator for Peekable<T, I> where I: Iterator<Item=T> {
 }
 
 #[stable]
-impl<T, I> ExactSizeIterator for Peekable<T, I> where I: ExactSizeIterator<Item = T> {
-    #[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<T, I> ExactSizeIterator for Peekable<T, I> where I: ExactSizeIterator<Item = T> {}
 
 #[stable]
 impl<T, I> Peekable<T, I> where I: Iterator<Item=T> {
@@ -1999,10 +1989,7 @@ impl<I> RandomAccessIterator for Skip<I> where I: RandomAccessIterator{
 }
 
 #[stable]
-impl<I> ExactSizeIterator for Skip<I> where I: ExactSizeIterator {
-    #[inline]
-    fn len(&self) -> uint { self.iter.len().saturating_sub(self.n) }
-}
+impl<I> ExactSizeIterator for Skip<I> where I: ExactSizeIterator {}
 
 /// An iterator that only iterates over the first `n` iterations of `iter`.
 #[derive(Clone)]
@@ -2060,10 +2047,7 @@ impl<I> RandomAccessIterator for Take<I> where I: RandomAccessIterator{
 }
 
 #[stable]
-impl<I> ExactSizeIterator for Take<I> where I: ExactSizeIterator {
-    #[inline]
-    fn len(&self) -> uint { cmp::min(self.iter.len(), self.n) }
-}
+impl<I> ExactSizeIterator for Take<I> where I: ExactSizeIterator {}
 
 
 /// An iterator to maintain state while iterating another iterator
@@ -2275,10 +2259,7 @@ impl<I> RandomAccessIterator for Fuse<I> where I: RandomAccessIterator {
 }
 
 #[stable]
-impl<I> ExactSizeIterator for Fuse<I> where I: ExactSizeIterator {
-    #[inline]
-    fn len(&self) -> uint { self.iter.len() }
-}
+impl<I> ExactSizeIterator for Fuse<I> where I: ExactSizeIterator {}
 
 impl<I> Fuse<I> {
     /// Resets the fuse such that the next call to .next() or .next_back() will