Override size_hint and implement ExactSizeIterator

sfackler · sfackler · commit 1a309b9dc901 · 2016-02-11T22:41:02.000-08:00
diff --git a/src/array.rs b/src/array.rs
@@ -273,6 +273,10 @@ impl<'a, T: 'a> Iterator for Iter<'a, T> {
     fn next(&mut self) -> Option<&'a T> {
         self.inner.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.inner.size_hint()
+    }
 }
 
 impl<'a, T: 'a> DoubleEndedIterator for Iter<'a, T> {
@@ -281,6 +285,12 @@ impl<'a, T: 'a> DoubleEndedIterator for Iter<'a, T> {
     }
 }
 
+impl<'a, T: 'a> ExactSizeIterator for Iter<'a, T> {
+    fn len(&self) -> usize {
+        self.inner.len()
+    }
+}
+
 /// An iterator over mutable references to values of an `Array` in the
 /// higher-dimensional equivalent of row-major order.
 pub struct IterMut<'a, T: 'a> {
@@ -293,6 +303,10 @@ impl<'a, T: 'a> Iterator for IterMut<'a, T> {
     fn next(&mut self) -> Option<&'a mut T> {
         self.inner.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.inner.size_hint()
+    }
 }
 
 impl<'a, T: 'a> DoubleEndedIterator for IterMut<'a, T> {
@@ -301,6 +315,12 @@ impl<'a, T: 'a> DoubleEndedIterator for IterMut<'a, T> {
     }
 }
 
+impl<'a, T: 'a> ExactSizeIterator for IterMut<'a, T> {
+    fn len(&self) -> usize {
+        self.inner.len()
+    }
+}
+
 /// An iterator over values of an `Array` in the higher-dimensional
 /// equivalent of row-major order.
 pub struct IntoIter<T> {
@@ -313,10 +333,20 @@ impl<T> Iterator for IntoIter<T> {
     fn next(&mut self) -> Option<T> {
         self.inner.next()
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.inner.size_hint()
+    }
 }
 
 impl<T> DoubleEndedIterator for IntoIter<T> {
     fn next_back(&mut self) -> Option<T> {
         self.inner.next_back()
     }
 }
+
+impl<T> ExactSizeIterator for IntoIter<T> {
+    fn len(&self) -> usize {
+        self.inner.len()
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -273,6 +273,10 @@ impl<'a, T: 'a> Iterator for Iter<'a, T> {`
`273`	`273`	`fn next(&mut self) -> Option<&'a T> {`
`274`	`274`	`self.inner.next()`
`275`	`275`	`}`
	`276`	`+`
	`277`	`+ fn size_hint(&self) -> (usize, Option<usize>) {`
	`278`	`+ self.inner.size_hint()`
	`279`	`+ }`
`276`	`280`	`}`
`277`	`281`
`278`	`282`	`impl<'a, T: 'a> DoubleEndedIterator for Iter<'a, T> {`
`@@ -281,6 +285,12 @@ impl<'a, T: 'a> DoubleEndedIterator for Iter<'a, T> {`
`281`	`285`	`}`
`282`	`286`	`}`
`283`	`287`
	`288`	`+impl<'a, T: 'a> ExactSizeIterator for Iter<'a, T> {`
	`289`	`+ fn len(&self) -> usize {`
	`290`	`+ self.inner.len()`
	`291`	`+ }`
	`292`	`+}`
	`293`	`+`
`284`	`294`	/// An iterator over mutable references to values of an `Array` in the
`285`	`295`	`/// higher-dimensional equivalent of row-major order.`
`286`	`296`	`pub struct IterMut<'a, T: 'a> {`
`@@ -293,6 +303,10 @@ impl<'a, T: 'a> Iterator for IterMut<'a, T> {`
`293`	`303`	`fn next(&mut self) -> Option<&'a mut T> {`
`294`	`304`	`self.inner.next()`
`295`	`305`	`}`
	`306`	`+`
	`307`	`+ fn size_hint(&self) -> (usize, Option<usize>) {`
	`308`	`+ self.inner.size_hint()`
	`309`	`+ }`
`296`	`310`	`}`
`297`	`311`
`298`	`312`	`impl<'a, T: 'a> DoubleEndedIterator for IterMut<'a, T> {`
`@@ -301,6 +315,12 @@ impl<'a, T: 'a> DoubleEndedIterator for IterMut<'a, T> {`
`301`	`315`	`}`
`302`	`316`	`}`
`303`	`317`
	`318`	`+impl<'a, T: 'a> ExactSizeIterator for IterMut<'a, T> {`
	`319`	`+ fn len(&self) -> usize {`
	`320`	`+ self.inner.len()`
	`321`	`+ }`
	`322`	`+}`
	`323`	`+`
`304`	`324`	/// An iterator over values of an `Array` in the higher-dimensional
`305`	`325`	`/// equivalent of row-major order.`
`306`	`326`	`pub struct IntoIter<T> {`
`@@ -313,10 +333,20 @@ impl<T> Iterator for IntoIter<T> {`
`313`	`333`	`fn next(&mut self) -> Option<T> {`
`314`	`334`	`self.inner.next()`
`315`	`335`	`}`
	`336`	`+`
	`337`	`+ fn size_hint(&self) -> (usize, Option<usize>) {`
	`338`	`+ self.inner.size_hint()`
	`339`	`+ }`
`316`	`340`	`}`
`317`	`341`
`318`	`342`	`impl<T> DoubleEndedIterator for IntoIter<T> {`
`319`	`343`	`fn next_back(&mut self) -> Option<T> {`
`320`	`344`	`self.inner.next_back()`
`321`	`345`	`}`
`322`	`346`	`}`
	`347`	`+`
	`348`	`+impl<T> ExactSizeIterator for IntoIter<T> {`
	`349`	`+ fn len(&self) -> usize {`
	`350`	`+ self.inner.len()`
	`351`	`+ }`
	`352`	`+}`