Use i32 throughout for indexing

sfackler · sfackler · commit 749df7a2b336 · 2016-10-08T21:07:53.000-07:00
diff --git a/src/array.rs b/src/array.rs
@@ -19,7 +19,7 @@ impl<T: fmt::Display> fmt::Display for Array<T> {
                 try!(write!(fmt,
                             "[{}:{}]",
                             dim.lower_bound,
-                            dim.lower_bound as isize + dim.len as isize - 1));
+                            dim.lower_bound + dim.len - 1));
             }
             try!(write!(fmt, "="));
         }
@@ -61,7 +61,7 @@ impl<T> Array<T> {
     /// elements specified by the dimensions.
     pub fn from_parts(data: Vec<T>, dimensions: Vec<Dimension>) -> Array<T> {
         assert!((data.is_empty() && dimensions.is_empty()) ||
-                data.len() == dimensions.iter().fold(1, |acc, i| acc * i.len as usize),
+                data.len() as i32 == dimensions.iter().fold(1, |acc, i| acc * i.len),
                 "size mismatch");
         Array {
             dims: dimensions,
@@ -120,15 +120,15 @@ impl<T> Array<T> {
         &self.dims
     }
 
-    fn shift_idx(&self, indices: &[isize]) -> usize {
+    fn shift_idx(&self, indices: &[i32]) -> i32 {
         assert_eq!(self.dims.len(), indices.len());
         self.dims
             .iter()
             .zip(indices.iter().cloned())
             .rev()
             .fold((0, 1), |(acc, stride), (dim, idx)| {
                 let shifted = dim.shift(idx);
-                (acc + shifted * stride, dim.len as usize * stride)
+                (acc + shifted * stride, dim.len * stride)
             })
             .0
     }
@@ -161,51 +161,51 @@ pub trait ArrayIndex {
     ///
     /// Panics if the value of `self` does not correspond to an in-bounds
     /// element of the `Array`.
-    fn index<T>(&self, array: &Array<T>) -> usize;
+    fn index<T>(&self, array: &Array<T>) -> i32;
 }
 
-impl<'a> ArrayIndex for &'a [isize] {
-    fn index<T>(&self, array: &Array<T>) -> usize {
+impl<'a> ArrayIndex for &'a [i32] {
+    fn index<T>(&self, array: &Array<T>) -> i32 {
         array.shift_idx(*self)
     }
 }
 
-impl ArrayIndex for isize {
-    fn index<T>(&self, array: &Array<T>) -> usize {
-        let slice: &[isize] = &[*self];
+impl ArrayIndex for i32 {
+    fn index<T>(&self, array: &Array<T>) -> i32 {
+        let slice: &[i32] = &[*self];
         ArrayIndex::index(&slice, array)
     }
 }
 
 macro_rules! tuple_impl {
     ($($name:ident : $t:ty),+) => {
         impl ArrayIndex for ($($t,)+) {
-            fn index<T>(&self, array: &Array<T>) -> usize {
+            fn index<T>(&self, array: &Array<T>) -> i32 {
                 let ($($name,)+) = *self;
-                let slice: &[isize] = &[$($name),+];
+                let slice: &[i32] = &[$($name),+];
                 ArrayIndex::index(&slice, array)
             }
         }
     }
 }
 
-tuple_impl!(a: isize);
-tuple_impl!(a: isize, b: isize);
-tuple_impl!(a: isize, b: isize, c: isize);
-tuple_impl!(a: isize, b: isize, c: isize, d: isize);
-tuple_impl!(a: isize, b: isize, c: isize, d: isize, e: isize);
-tuple_impl!(a: isize, b: isize, c: isize, d: isize, e: isize, f: isize);
-tuple_impl!(a: isize, b: isize, c: isize, d: isize, e: isize, f: isize, g: isize);
-tuple_impl!(a: isize, b: isize, c: isize, d: isize, e: isize, f: isize, g: isize, h: isize);
-tuple_impl!(a: isize, b: isize, c: isize, d: isize, e: isize, f: isize, g: isize, h: isize, i: isize);
+tuple_impl!(a: i32);
+tuple_impl!(a: i32, b: i32);
+tuple_impl!(a: i32, b: i32, c: i32);
+tuple_impl!(a: i32, b: i32, c: i32, d: i32);
+tuple_impl!(a: i32, b: i32, c: i32, d: i32, e: i32);
+tuple_impl!(a: i32, b: i32, c: i32, d: i32, e: i32, f: i32);
+tuple_impl!(a: i32, b: i32, c: i32, d: i32, e: i32, f: i32, g: i32);
+tuple_impl!(a: i32, b: i32, c: i32, d: i32, e: i32, f: i32, g: i32, h: i32);
+tuple_impl!(a: i32, b: i32, c: i32, d: i32, e: i32, f: i32, g: i32, h: i32, i: i32);
 
 /// Indexes into the `Array`, retrieving a reference to the contained
 /// value.
 ///
 /// Since `Array`s can be multi-dimensional, the `Index` trait is
 /// implemented for a variety of index types. In the most generic case, a
-/// `&[isize]` can be used. In addition, a bare `isize` as well as tuples
-/// of up to 10 `isize` values may be used for convenience.
+/// `&[i32]` can be used. In addition, a bare `i32` as well as tuples
+/// of up to 10 `i32` values may be used for convenience.
 ///
 /// # Panics
 ///
@@ -228,14 +228,14 @@ impl<T, I: ArrayIndex> Index<I> for Array<T> {
     type Output = T;
     fn index(&self, idx: I) -> &T {
         let idx = idx.index(self);
-        &self.data[idx]
+        &self.data[idx as usize]
     }
 }
 
 impl<T, I: ArrayIndex> IndexMut<I> for Array<T> {
     fn index_mut(&mut self, idx: I) -> &mut T {
         let idx = idx.index(self);
-        &mut self.data[idx]
+        &mut self.data[idx as usize]
     }
 }
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -22,14 +22,15 @@ pub struct Dimension {
 }
 
 impl Dimension {
-    fn shift(&self, idx: isize) -> usize {
-        let offset = self.lower_bound as isize;
+    fn shift(&self, idx: i32) -> i32 {
+        let offset = self.lower_bound;
         assert!(idx >= offset, "out of bounds array access");
-        assert!(offset >= 0 || idx <= 0 || usize::max_value() - (-offset) as usize >= idx as usize,
+        assert!(offset >= 0 || idx <= 0 || i32::max_value() - (-offset) >= idx,
                 "out of bounds array access");
-        let shifted = idx.wrapping_sub(offset) as usize;
-        assert!(shifted < self.len as usize, "out of bounds array access");
-        shifted
+        match idx.checked_sub(offset) {
+            Some(shifted) => shifted,
+            None => panic!("out of bounds array access"),
+        }
     }
 }
 
