don't use trait obj for SliceInfo

Author: pmarks

hdf5-rs/src/hl/container.rs

@@ -60,9 +60,10 @@ impl<'a> Reader<'a> {
     /// the slice, after singleton dimensions are dropped. 
     /// Use the multi-dimensional slice macro `s![]` from `ndarray` to conveniently create
     /// a multidimensional slice.
-    pub fn read_slice<T, D>(&self, slice: &AsRef<[SliceOrIndex]>) -> Result<Array<T, D>>
+    pub fn read_slice<T, S, D>(&self, slice: &SliceInfo<S, D>) -> Result<Array<T, D>>
     where
         T: H5Type,
+        S: AsRef<[SliceOrIndex]>,
         D: ndarray::Dimension,
     {
         ensure!(!self.obj.is_attr(), "slicing cannot be used on attribute datasets");
@@ -160,11 +161,11 @@ impl<'a> Reader<'a> {
     }
 
     /// Reads the given `slice` of the dataset into a 1-dimensional array.
-    ///
-    /// The dataset must be 1-dimensional.
-    pub fn read_slice_1d<T>(&self, slice: &AsRef<[SliceOrIndex]>) -> Result<Array1<T>>
+    /// The slice must yield a 1-dimensional result.
+    pub fn read_slice_1d<T, S>(&self, slice: &SliceInfo<S, ndarray::Ix1>) -> Result<Array1<T>>
     where
         T: H5Type,
+        S: AsRef<[SliceOrIndex]>,
     {
         self.read_slice(slice)
     }
@@ -176,12 +177,13 @@ impl<'a> Reader<'a> {
         self.read()
     }
 
+
     /// Reads the given `slice` of the dataset into a 2-dimensional array.
-    ///
-    /// The dataset must be 2-dimensional.
-    pub fn read_slice_2d<T>(&self, slice: &AsRef<[SliceOrIndex]>) -> Result<Array2<T>>
+    /// The slice must yield a 2-dimensional result.
+    pub fn read_slice_2d<T, S>(&self, slice: &SliceInfo<S, ndarray::Ix2>) -> Result<Array2<T>>
     where
         T: H5Type,
+        S: AsRef<[SliceOrIndex]>,
     {
         self.read_slice(slice)
     }
@@ -250,10 +252,11 @@ impl<'a> Writer<'a> {
     /// If the array has a fixed number of dimensions, it must match the dimensionality of
     /// dataset. Use the multi-dimensional slice macro `s![]` from `ndarray` to conveniently create
     /// a multidimensional slice.
-    pub fn write_slice<'b, A, T, D>(&self, arr: A, slice: &AsRef<[SliceOrIndex]>) -> Result<()>
+    pub fn write_slice<'b, A, T, S, D>(&self, arr: A, slice: &SliceInfo<S, D>) -> Result<()>
     where
         A: Into<ArrayView<'b, T, D>>,
         T: H5Type,
+        S: AsRef<[SliceOrIndex]>,
         D: ndarray::Dimension,
     {
         ensure!(!self.obj.is_attr(), "slicing cannot be used on attribute datasets");
@@ -494,11 +497,11 @@ impl Container {
     }
 
     /// Reads the given `slice` of the dataset into a 1-dimensional array.
-    ///
-    /// The dataset must be 1-dimensional.
-    pub fn read_slice_1d<T>(&self, slice: &AsRef<[SliceOrIndex]>) -> Result<Array1<T>>
+    /// The slice must yield a 1-dimensional result.
+    pub fn read_slice_1d<T, S>(&self, slice: &SliceInfo<S, ndarray::Ix1>) -> Result<Array1<T>>
     where
-        T: H5Type
+        T: H5Type,
+        S: AsRef<[SliceOrIndex]>,
     {
         self.as_reader().read_slice_1d(slice)
     }
@@ -510,12 +513,12 @@ impl Container {
         self.as_reader().read_2d()
     }
 
-    /// Reads the given `slice` of the dataset into a 2-dimensional array.
-    ///
-    /// The dataset must be 2-dimensional.
-    pub fn read_slice_2d<T>(&self, slice: &AsRef<[SliceOrIndex]>) -> Result<Array2<T>>
+    /// Reads the given `slice` of the dataset into a 1-dimensional array.
+    /// The slice must yield a 2-dimensional result.
+    pub fn read_slice_2d<T, S>(&self, slice: &SliceInfo<S, ndarray::Ix2>) -> Result<Array2<T>>
     where
-        T: H5Type
+        T: H5Type,
+        S: AsRef<[SliceOrIndex]>,
     {
         self.as_reader().read_slice_2d(slice)
     }
@@ -530,9 +533,10 @@ impl Container {
     /// the slice, after singleton dimensions are dropped. 
     /// Use the multi-dimensional slice macro `s![]` from `ndarray` to conveniently create
     /// a multidimensional slice.
-    pub fn read_slice<T, D>(&self, slice: &AsRef<[SliceOrIndex]>) -> Result<Array<T, D>>
+    pub fn read_slice<T, S, D>(&self, slice: &SliceInfo<S, D>) -> Result<Array<T, D>>
     where
         T: H5Type,
+        S: AsRef<[SliceOrIndex]>,
         D: ndarray::Dimension,
     {
         self.as_reader().read_slice(slice)
@@ -574,10 +578,11 @@ impl Container {
     /// If the array has a fixed number of dimensions, it must match the dimensionality of
     /// dataset. Use the multi-dimensional slice macro `s![]` from `ndarray` to conveniently create
     /// a multidimensional slice.
-    pub fn write_slice<'b, A, T, D>(&self, arr: A, slice: &AsRef<[SliceOrIndex]>) -> Result<()>
+    pub fn write_slice<'b, A, T, S, D>(&self, arr: A, slice: &SliceInfo<S, D>) -> Result<()>
     where
         A: Into<ArrayView<'b, T, D>>,
         T: H5Type,
+        S: AsRef<[SliceOrIndex]>,
         D: ndarray::Dimension,
     {
         self.as_writer().write_slice(arr, slice)