Add move iterator + reference intoiter impl for ArrayBase

sfackler · sfackler · commit 691ddef1c0c6 · 2015-05-19T00:08:38.000-07:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -7,6 +7,7 @@ extern crate byteorder;
 
 use std::mem;
 use std::slice;
+use std::vec;
 
 mod impls;
 
@@ -157,6 +158,26 @@ impl<T> ArrayBase<T> {
     }
 }
 
+impl<T> IntoIterator for ArrayBase<T> {
+    type Item = T;
+    type IntoIter = ArrayBaseIntoIter<T>;
+
+    fn into_iter(self) -> ArrayBaseIntoIter<T> {
+        ArrayBaseIntoIter {
+            inner: self.data.into_iter()
+        }
+    }
+}
+
+impl<'a, T> IntoIterator for &'a ArrayBase<T> {
+    type Item = &'a T;
+    type IntoIter = slice::Iter<'a, T>;
+
+    fn into_iter(self) -> slice::Iter<'a, T> {
+        self.values()
+    }
+}
+
 impl<T> Array<T> for ArrayBase<T> {
     fn dimension_info<'a>(&'a self) -> &'a [DimensionInfo] {
         &*self.info
@@ -208,6 +229,26 @@ impl<T> InternalMutableArray<T> for ArrayBase<T> {
     }
 }
 
+/// An iterator over values of an `ArrayBase` in the higher-dimensional
+/// equivalent of row major order.
+pub struct ArrayBaseIntoIter<T> {
+    inner: vec::IntoIter<T>,
+}
+
+impl<T> Iterator for ArrayBaseIntoIter<T> {
+    type Item = T;
+
+    fn next(&mut self) -> Option<T> {
+        self.inner.next()
+    }
+}
+
+impl<T> DoubleEndedIterator for ArrayBaseIntoIter<T> {
+    fn next_back(&mut self) -> Option<T> {
+        self.inner.next_back()
+    }
+}
+
 enum ArrayParent<'parent, T:'static> {
     Slice(&'parent ArraySlice<'static, T>),
     MutSlice(&'parent MutArraySlice<'static, T>),
