Fix current warnings

zr40 · zr40 · commit 3216821c32f6 · 2015-03-28T07:56:56.000+01:00
diff --git a/src/impls/mod.rs b/src/impls/mod.rs
@@ -28,7 +28,7 @@ impl<T> FromSql for ArrayBase<Option<T>> where T: FromSql {
         let nele = if dim_info.len() == 0 {
             0
         } else {
-            dim_info.iter().map(|info| info.len as usize).product()
+            dim_info.iter().map(|info| info.len).product()
         };
 
         let mut elements = Vec::with_capacity(nele);
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,6 +1,6 @@
 //! Multi-dimensional arrays with per-dimension specifiable lower bounds
 #![doc(html_root_url="https://sfackler.github.io/rust-postgres-array/doc")]
-#![feature(core, io)]
+#![feature(core)]
 
 #[macro_use(to_sql_checked)]
 extern crate postgres;
@@ -362,23 +362,23 @@ mod tests {
     }
 
     #[test]
-    #[should_fail]
+    #[should_panic]
     fn test_get_2d_fail() {
         let mut a = ArrayBase::from_vec(vec!(0i32, 1, 2), -1);
         a.wrap(1);
         a.get(1);
     }
 
     #[test]
-    #[should_fail]
+    #[should_panic]
     fn test_2d_slice_range_fail_low() {
         let mut a = ArrayBase::from_vec(vec!(0i32, 1, 2), -1);
         a.wrap(1);
         a.slice(0);
     }
 
     #[test]
-    #[should_fail]
+    #[should_panic]
     fn test_2d_slice_range_fail_high() {
         let mut a = ArrayBase::from_vec(vec!(0i32, 1, 2), -1);
         a.wrap(1);
@@ -396,22 +396,22 @@ mod tests {
     }
 
     #[test]
-    #[should_fail]
+    #[should_panic]
     fn test_push_move_wrong_lower_bound() {
         let mut a = ArrayBase::from_vec(vec!(1i32), -1);
         a.push_move(ArrayBase::from_vec(vec!(2), 0));
     }
 
     #[test]
-    #[should_fail]
+    #[should_panic]
     fn test_push_move_wrong_dims() {
         let mut a = ArrayBase::from_vec(vec!(1i32), -1);
         a.wrap(1);
         a.push_move(ArrayBase::from_vec(vec!(1, 2), -1));
     }
 
     #[test]
-    #[should_fail]
+    #[should_panic]
     fn test_push_move_wrong_dim_count() {
         let mut a = ArrayBase::from_vec(vec!(1i32), -1);
         a.wrap(1);
@@ -472,14 +472,14 @@ mod tests {
     }
 
     #[test]
-    #[should_fail]
+    #[should_panic]
     fn test_base_overslice() {
         let a = ArrayBase::from_vec(vec!(1i32), 0);
         a.slice(0);
     }
 
     #[test]
-    #[should_fail]
+    #[should_panic]
     fn test_slice_overslice() {
         let mut a = ArrayBase::from_vec(vec!(1i32), 0);
         a.wrap(0);

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ impl<T> FromSql for ArrayBase<Option<T>> where T: FromSql {`
`28`	`28`	`let nele = if dim_info.len() == 0 {`
`29`	`29`	`0`
`30`	`30`	`} else {`
`31`		`- dim_info.iter().map(\|info\| info.len as usize).product()`
	`31`	`+ dim_info.iter().map(\|info\| info.len).product()`
`32`	`32`	`};`
`33`	`33`
`34`	`34`	`let mut elements = Vec::with_capacity(nele);`