Remove the helper traits (for now) to make the diff smaller

Author: akern40

examples/functions_and_traits.rs

@@ -11,21 +11,7 @@
 //!
 //! Below, we illustrate how to write functions and traits for most variants of these types.
 
-use ndarray::{
-    ArrayBase,
-    ArrayRef,
-    AsLayoutRef,
-    AsMutLayoutRef,
-    AsMutRawRef,
-    AsRawRef,
-    Data,
-    DataMut,
-    Dimension,
-    LayoutRef,
-    RawData,
-    RawDataMut,
-    RawRef,
-};
+use ndarray::{ArrayBase, ArrayRef, Data, DataMut, Dimension, LayoutRef, RawData, RawDataMut, RawRef};
 
 /// Take an array with the most basic requirements.
 ///
@@ -153,19 +139,19 @@ fn takes_rawref_mut<A, D>(arr: &mut RawRef<A, D>)
 /// Immutable, take a generic that implements `AsRef` to `RawRef`
 #[allow(dead_code)]
 fn takes_rawref_asref<T, A, D>(_arr: &T)
-where T: AsRawRef<A, D> + ?Sized
+where T: AsRef<RawRef<A, D>> + ?Sized
 {
     takes_layout(_arr.as_ref());
-    takes_layout_asref(_arr);
+    takes_layout_asref(_arr.as_ref());
 }
 
 /// Mutable, take a generic that implements `AsMut` to `RawRef`
 #[allow(dead_code)]
 fn takes_rawref_asmut<T, A, D>(_arr: &mut T)
-where T: AsMutRawRef<A, D> + ?Sized
+where T: AsMut<RawRef<A, D>> + ?Sized
 {
     takes_layout_mut(_arr.as_mut());
-    takes_layout_asmut(_arr);
+    takes_layout_asmut(_arr.as_mut());
 }
 
 /// Finally, there's `LayoutRef`: this type provides read and write access to an array's *structure*, but not its *data*.
@@ -184,14 +170,14 @@ fn takes_layout_mut<A, D>(_arr: &mut LayoutRef<A, D>) {}
 /// Immutable, take a generic that implements `AsRef` to `LayoutRef`
 #[allow(dead_code)]
 fn takes_layout_asref<T, A, D>(_arr: &T)
-where T: AsLayoutRef<A, D> + ?Sized
+where T: AsRef<LayoutRef<A, D>> + ?Sized
 {
 }
 
 /// Mutable, take a generic that implements `AsMut` to `LayoutRef`
 #[allow(dead_code)]
 fn takes_layout_asmut<T, A, D>(_arr: &mut T)
-where T: AsMutLayoutRef<A, D> + ?Sized
+where T: AsMut<LayoutRef<A, D>> + ?Sized
 {
 }
 

src/arraytraits.rs

@@ -19,7 +19,6 @@ use std::{iter::FromIterator, slice};
 use crate::imp_prelude::*;
 use crate::Arc;
 
-use crate::AsLayoutRef;
 use crate::{
     dimension,
     iter::{Iter, IterMut},
@@ -42,7 +41,7 @@ pub fn debug_bounds_check<A, D, I, T>(_a: &T, _index: &I)
 where
     D: Dimension,
     I: NdIndex<D>,
-    T: AsLayoutRef<A, D> + ?Sized,
+    T: AsRef<LayoutRef<A, D>> + ?Sized,
 {
     let layout_ref = _a.as_ref();
     debug_bounds_check_ref!(layout_ref, *_index);

src/free_functions.rs

@@ -15,7 +15,7 @@ use std::compile_error;
 use std::mem::{forget, size_of};
 use std::ptr::NonNull;
 
-use crate::{dimension, ArcArray1, ArcArray2, ArrayParts};
+use crate::{dimension, ArcArray1, ArcArray2};
 use crate::{imp_prelude::*, ArrayPartsSized};
 
 /// Create an **[`Array`]** with one, two, three, four, five, or six dimensions.

src/impl_ref_types.rs

@@ -395,21 +395,6 @@ where S: RawData<Elem = A>
     }
 }
 
-macro_rules! blanket_ref_alias {
-    ($alias_name:ident, $alias_name_mut:ident, $target:ty) => {
-        pub trait $alias_name<A, D>: AsRef<$target> {}
-
-        impl<T: ?Sized, A, D> $alias_name<A, D> for T where T: AsRef<$target> {}
-
-        pub trait $alias_name_mut<A, D>: AsMut<$target> {}
-
-        impl<T: ?Sized, A, D> $alias_name_mut<A, D> for T where T: AsMut<$target> {}
-    };
-}
-
-blanket_ref_alias!(AsLayoutRef, AsMutLayoutRef, LayoutRef<A, D>);
-blanket_ref_alias!(AsRawRef, AsMutRawRef, LayoutRef<A, D>);
-
 /// Tests that a mem::swap can't compile by putting it into a doctest
 ///
 /// ```compile_fail

src/lib.rs

@@ -172,7 +172,6 @@ mod macro_utils;
 #[macro_use]
 mod private;
 mod impl_ref_types;
-pub use impl_ref_types::*;
 mod aliases;
 #[macro_use]
 mod itertools;