Rename do_sub to do_collapse_axis

Author: jturner314

src/dimension/mod.rs

@@ -197,13 +197,18 @@ impl<'a> DimensionExt for [Ix]
 ///
 /// **Panics** if `index` is larger than the size of the axis
 // FIXME: Move to Dimension trait
-pub fn do_sub<A, D: Dimension>(dims: &mut D, ptr: &mut *mut A, strides: &D,
-                               axis: usize, index: Ix) {
+pub fn do_collapse_axis<A, D: Dimension>(
+    dims: &mut D,
+    ptr: &mut *mut A,
+    strides: &D,
+    axis: usize,
+    index: usize,
+) {
     let dim = dims.slice()[axis];
     let stride = strides.slice()[axis];
     ndassert!(index < dim,
-              concat!("subview: Index {} must be less than axis length {} ",
-                      "for array with shape {:?}"),
+              "collapse_axis: Index {} must be less than axis length {} for \
+               array with shape {:?}",
              index, dim, *dims);
     dims.slice_mut()[axis] = 1;
     let off = stride_offset(index, stride);

src/impl_methods.rs

@@ -591,8 +591,13 @@ impl<A, S, D> ArrayBase<S, D> where S: Data<Elem=A>, D: Dimension
     ///
     /// **Panics** if `index` is past the length of the axis.
     pub fn collapse_axis(&mut self, axis: Axis, index: usize) {
-        dimension::do_sub(&mut self.dim, &mut self.ptr, &self.strides,
-                          axis.index(), index)
+        dimension::do_collapse_axis(
+            &mut self.dim,
+            &mut self.ptr,
+            &self.strides,
+            axis.index(),
+            index,
+        )
     }
 
     /// Along `axis`, select the subview `index` and return a