Change names of the rank-related types

Author: akern40

src/dimension/dimension_trait.rs

@@ -17,7 +17,7 @@ use super::conversion::Convert;
 use super::ops::DimAdd;
 use super::{stride_offset, stride_offset_checked};
 use crate::itertools::{enumerate, zip};
-use crate::layout::dimensionality::*;
+use crate::layout::rank::*;
 use crate::layout::ranked::Ranked;
 use crate::IntoDimension;
 use crate::RemoveAxis;
@@ -79,12 +79,6 @@ pub trait Dimension:
     /// Next larger dimension
     type Larger: Dimension + RemoveAxis;
 
-    /// Returns the number of dimensions (number of axes).
-    fn ndim(&self) -> usize
-    {
-        self.rank()
-    }
-
     /// Convert the dimension into a pattern matching friendly value.
     fn into_pattern(self) -> Self::Pattern;
 
@@ -421,12 +415,12 @@ macro_rules! impl_insert_axis_array(
 );
 
 impl<const N: usize> Ranked for Dim<[Ix; N]>
-where NDim<N>: Dimensionality // Limit us to < 12, since Rank must impl Dimensionality
+where ConstRank<N>: Rank // Limit us to < 12, since Rank must impl Dimensionality
 {
-    type Rank = NDim<N>;
+    type NDim = ConstRank<N>;
 
     #[inline]
-    fn rank(&self) -> usize
+    fn ndim(&self) -> usize
     {
         N
     }
@@ -950,10 +944,10 @@ large_dim!(6, Ix6, (Ix, Ix, Ix, Ix, Ix, Ix), IxDyn, {
 
 impl Ranked for IxDyn
 {
-    type Rank = DDyn;
+    type NDim = DynRank;
 
     #[inline]
-    fn rank(&self) -> usize
+    fn ndim(&self) -> usize
     {
         self.ix().len()
     }

src/dimension/dynindeximpl.rs

@@ -1,4 +1,5 @@
 use crate::imp_prelude::*;
+use crate::layout::ranked::Ranked;
 #[cfg(not(feature = "std"))]
 use alloc::boxed::Box;
 use alloc::vec;

src/dimension/ndindex.rs

@@ -2,6 +2,7 @@ use std::fmt::Debug;
 
 use super::{stride_offset, stride_offset_checked};
 use crate::itertools::zip;
+use crate::layout::ranked::Ranked;
 use crate::{Dim, Dimension, IntoDimension, Ix, Ix0, Ix1, Ix2, Ix3, Ix4, Ix5, Ix6, IxDyn, IxDynImpl};
 
 /// Tuple or fixed size arrays that can be used to index an array.

src/dimension/remove_axis.rs

@@ -6,7 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use crate::{Axis, Dim, Dimension, Ix, Ix0, Ix1};
+use crate::{layout::ranked::Ranked, Axis, Dim, Dimension, Ix, Ix0, Ix1};
 
 /// Array shape with a next smaller dimension.
 ///

src/indexes.rs

@@ -7,6 +7,7 @@
 // except according to those terms.
 use super::Dimension;
 use crate::dimension::IntoDimension;
+use crate::layout::ranked::Ranked;
 use crate::split_at::SplitAt;
 use crate::zip::Offset;
 use crate::Axis;

src/layout/mod.rs

@@ -9,7 +9,7 @@
 //! flexible and expressive layout representations.
 
 mod bitset;
-pub mod dimensionality;
+pub mod rank;
 pub mod ranked;
 
 #[allow(deprecated)]