Revert #1563 and #1567 to prepare for patch release (#1570)

Both #1563 and #1567 were done in preparation for new code to address #1506. However, those PRs introduce deprecations, which will require a minor version bump to adhere to SemVer. Instead of having them on master, we have created the refactor branch where they will continue to live.

Author: akern40

src/indexes.rs

@@ -10,7 +10,7 @@ use crate::dimension::IntoDimension;
 use crate::split_at::SplitAt;
 use crate::zip::Offset;
 use crate::Axis;
-use crate::LayoutBitset;
+use crate::Layout;
 use crate::NdProducer;
 use crate::{ArrayBase, Data};
 
@@ -193,12 +193,12 @@ impl<D: Dimension + Copy> NdProducer for Indices<D>
         IndexPtr { index: self.start }
     }
 
-    fn layout(&self) -> LayoutBitset
+    fn layout(&self) -> Layout
     {
         if self.dim.ndim() <= 1 {
-            LayoutBitset::one_dimensional()
+            Layout::one_dimensional()
         } else {
-            LayoutBitset::none()
+            Layout::none()
         }
     }
 

src/iterators/chunks.rs

@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 use crate::imp_prelude::*;
 use crate::Baseiter;
 use crate::IntoDimension;
-use crate::{LayoutBitset, NdProducer};
+use crate::{Layout, NdProducer};
 
 impl_ndproducer! {
     ['a, A, D: Dimension]

src/iterators/lanes.rs

@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 use super::LanesIter;
 use super::LanesIterMut;
 use crate::imp_prelude::*;
-use crate::{LayoutBitset, NdProducer};
+use crate::{Layout, NdProducer};
 
 impl_ndproducer! {
     ['a, A, D: Dimension]

src/iterators/macros.rs

@@ -67,7 +67,7 @@ impl<$($typarm)*> NdProducer for $fulltype {
         self.$base.raw_dim()
     }
 
-    fn layout(&self) -> LayoutBitset {
+    fn layout(&self) -> Layout {
         self.$base.layout()
     }
 

src/iterators/mod.rs

@@ -1191,9 +1191,9 @@ impl<A, D: Dimension> NdProducer for AxisIter<'_, A, D>
     type Ptr = *mut A;
     type Stride = isize;
 
-    fn layout(&self) -> crate::LayoutBitset
+    fn layout(&self) -> crate::Layout
     {
-        crate::LayoutBitset::one_dimensional()
+        crate::Layout::one_dimensional()
     }
 
     fn raw_dim(&self) -> Self::Dim
@@ -1250,9 +1250,9 @@ impl<A, D: Dimension> NdProducer for AxisIterMut<'_, A, D>
     type Ptr = *mut A;
     type Stride = isize;
 
-    fn layout(&self) -> crate::LayoutBitset
+    fn layout(&self) -> crate::Layout
     {
-        crate::LayoutBitset::one_dimensional()
+        crate::Layout::one_dimensional()
     }
 
     fn raw_dim(&self) -> Self::Dim

src/iterators/windows.rs

@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 use super::Baseiter;
 use crate::imp_prelude::*;
 use crate::IntoDimension;
-use crate::LayoutBitset;
+use crate::Layout;
 use crate::NdProducer;
 use crate::Slice;
 
@@ -176,7 +176,7 @@ impl<'a, A, D: Dimension> NdProducer for AxisWindows<'a, A, D>
         Ix1(self.base.raw_dim()[self.axis_idx])
     }
 
-    fn layout(&self) -> LayoutBitset
+    fn layout(&self) -> Layout
     {
         self.base.layout()
     }

src/layout/bitset.rs

@@ -0,0 +1,32 @@
+// Copyright 2017 bluss and ndarray developers.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use super::Layout;
+
+const LAYOUT_NAMES: &[&str] = &["C", "F", "c", "f"];
+
+use std::fmt;
+
+impl fmt::Debug for Layout
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result
+    {
+        if self.0 == 0 {
+            write!(f, "Custom")?
+        } else {
+            (0..32).filter(|&i| self.is(1 << i)).try_fold((), |_, i| {
+                if let Some(name) = LAYOUT_NAMES.get(i) {
+                    write!(f, "{}", name)
+                } else {
+                    write!(f, "{:#x}", i)
+                }
+            })?;
+        };
+        write!(f, " ({:#x})", self.0)
+    }
+}