FIX: Move LaneIter related items to iterators::lanes

Author: bluss

src/iterators/lanes.rs

@@ -1,9 +1,8 @@
 use std::marker::PhantomData;
 
-use super::LanesIter;
-use super::LanesIterMut;
 use crate::imp_prelude::*;
 use crate::{Layout, NdProducer};
+use crate::iterators::Baseiter;
 
 impl_ndproducer! {
     ['a, A, D: Dimension]
@@ -142,3 +141,91 @@ where
         }
     }
 }
+
+/// An iterator that traverses over all axes but one, and yields a view for
+/// each lane along that axis.
+///
+/// See [`.lanes()`](ArrayBase::lanes) for more information.
+pub struct LanesIter<'a, A, D> {
+    inner_len: Ix,
+    inner_stride: Ixs,
+    iter: Baseiter<A, D>,
+    life: PhantomData<&'a A>,
+}
+
+clone_bounds!(
+    ['a, A, D: Clone]
+    LanesIter['a, A, D] {
+        @copy {
+            inner_len,
+            inner_stride,
+            life,
+        }
+        iter,
+    }
+);
+
+impl<'a, A, D> Iterator for LanesIter<'a, A, D>
+where
+    D: Dimension,
+{
+    type Item = ArrayView<'a, A, Ix1>;
+    fn next(&mut self) -> Option<Self::Item> {
+        self.iter.next().map(|ptr| unsafe {
+            ArrayView::new_(ptr, Ix1(self.inner_len), Ix1(self.inner_stride as Ix))
+        })
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.iter.size_hint()
+    }
+}
+
+impl<'a, A, D> ExactSizeIterator for LanesIter<'a, A, D>
+where
+    D: Dimension,
+{
+    fn len(&self) -> usize {
+        self.iter.len()
+    }
+}
+
+// NOTE: LanesIterMut is a mutable iterator and must not expose aliasing
+// pointers. Due to this we use an empty slice for the raw data (it's unused
+// anyway).
+/// An iterator that traverses over all dimensions but the innermost,
+/// and yields each inner row (mutable).
+///
+/// See [`.lanes_mut()`](ArrayBase::lanes_mut) for more information.
+pub struct LanesIterMut<'a, A, D> {
+    inner_len: Ix,
+    inner_stride: Ixs,
+    iter: Baseiter<A, D>,
+    life: PhantomData<&'a mut A>,
+}
+
+impl<'a, A, D> Iterator for LanesIterMut<'a, A, D>
+where
+    D: Dimension,
+{
+    type Item = ArrayViewMut<'a, A, Ix1>;
+    fn next(&mut self) -> Option<Self::Item> {
+        self.iter.next().map(|ptr| unsafe {
+            ArrayViewMut::new_(ptr, Ix1(self.inner_len), Ix1(self.inner_stride as Ix))
+        })
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.iter.size_hint()
+    }
+}
+
+impl<'a, A, D> ExactSizeIterator for LanesIterMut<'a, A, D>
+where
+    D: Dimension,
+{
+    fn len(&self) -> usize {
+        self.iter.len()
+    }
+}
+

src/iterators/mod.rs

@@ -25,7 +25,7 @@ use crate::Ix1;
 use super::{NdProducer, RemoveAxis};
 
 pub use self::chunks::{ExactChunks, ExactChunksIter, ExactChunksIterMut, ExactChunksMut};
-pub use self::lanes::{Lanes, LanesMut};
+pub use self::lanes::{Lanes, LanesMut, LanesIter, LanesIterMut};
 pub use self::windows::Windows;
 pub use self::into_iter::IntoIter;
 pub(crate) use self::trusted::{TrustedIterator, to_vec, to_vec_mapped};
@@ -744,94 +744,6 @@ where
     }
 }
 
-/// An iterator that traverses over all axes but one, and yields a view for
-/// each lane along that axis.
-///
-/// See [`.lanes()`](ArrayBase::lanes) for more information.
-pub struct LanesIter<'a, A, D> {
-    inner_len: Ix,
-    inner_stride: Ixs,
-    iter: Baseiter<A, D>,
-    life: PhantomData<&'a A>,
-}
-
-clone_bounds!(
-    ['a, A, D: Clone]
-    LanesIter['a, A, D] {
-        @copy {
-            inner_len,
-            inner_stride,
-            life,
-        }
-        iter,
-    }
-);
-
-impl<'a, A, D> Iterator for LanesIter<'a, A, D>
-where
-    D: Dimension,
-{
-    type Item = ArrayView<'a, A, Ix1>;
-    fn next(&mut self) -> Option<Self::Item> {
-        self.iter.next().map(|ptr| unsafe {
-            ArrayView::new_(ptr, Ix1(self.inner_len), Ix1(self.inner_stride as Ix))
-        })
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.iter.size_hint()
-    }
-}
-
-impl<'a, A, D> ExactSizeIterator for LanesIter<'a, A, D>
-where
-    D: Dimension,
-{
-    fn len(&self) -> usize {
-        self.iter.len()
-    }
-}
-
-// NOTE: LanesIterMut is a mutable iterator and must not expose aliasing
-// pointers. Due to this we use an empty slice for the raw data (it's unused
-// anyway).
-/// An iterator that traverses over all dimensions but the innermost,
-/// and yields each inner row (mutable).
-///
-/// See [`.lanes_mut()`](ArrayBase::lanes_mut)
-/// for more information.
-pub struct LanesIterMut<'a, A, D> {
-    inner_len: Ix,
-    inner_stride: Ixs,
-    iter: Baseiter<A, D>,
-    life: PhantomData<&'a mut A>,
-}
-
-impl<'a, A, D> Iterator for LanesIterMut<'a, A, D>
-where
-    D: Dimension,
-{
-    type Item = ArrayViewMut<'a, A, Ix1>;
-    fn next(&mut self) -> Option<Self::Item> {
-        self.iter.next().map(|ptr| unsafe {
-            ArrayViewMut::new_(ptr, Ix1(self.inner_len), Ix1(self.inner_stride as Ix))
-        })
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.iter.size_hint()
-    }
-}
-
-impl<'a, A, D> ExactSizeIterator for LanesIterMut<'a, A, D>
-where
-    D: Dimension,
-{
-    fn len(&self) -> usize {
-        self.iter.len()
-    }
-}
-
 #[derive(Debug)]
 struct AxisIterCore<A, D> {
     /// Index along the axis of the value of `.next()`, relative to the start