Merge branch 'master' into more-slice-types

Author: bluss

src/slice.rs

@@ -35,18 +35,31 @@ pub struct Slice {
 }
 
 impl Slice {
+    /// Create a new `Slice` with the given extents.
+    ///
+    /// See also the `From` impls, converting from ranges; for example
+    /// `Slice::from(i..)` or `Slice::from(j..k)`.
+    ///
+    /// `step` must be nonzero.
+    /// (This method checks with a debug assertion that `step` is not zero.)
     pub fn new(start: isize, end: Option<isize>, step: isize) -> Slice {
+        debug_assert_ne!(step, 0, "Slice::new: step must be nonzero");
         Slice {
             start,
             end,
             step,
         }
     }
 
-    /// Returns a new `Slice` with the given step size.
+    /// Create a new `Slice` with the given step size (multiplied with the
+    /// previous step size).
+    ///
+    /// `step` must be nonzero.
+    /// (This method checks with a debug assertion that `step` is not zero.)
     #[inline]
     pub fn step_by(self, step: isize) -> Self {
-        Slice { step, ..self }
+        debug_assert_ne!(step, 0, "Slice::step_by: step must be nonzero");
+        Slice { step: self.step * step, ..self }
     }
 }