address nits on new tests

Author: ExpHP

tests/array.rs

@@ -836,11 +836,6 @@ fn owned_array_discontiguous_drop() {
     use ::std::collections::BTreeSet;
 
     struct InsertOnDrop<T: Ord>(Rc<RefCell<BTreeSet<T>>>, Option<T>);
-    impl<T: Ord> InsertOnDrop<T> {
-        fn new(set: Rc<RefCell<BTreeSet<T>>>, value: T) -> Self {
-            InsertOnDrop(set, Some(value))
-        }
-    }
     impl<T: Ord> Drop for InsertOnDrop<T> {
         fn drop(&mut self) {
             let InsertOnDrop(ref set, ref mut value) = *self;
@@ -850,12 +845,12 @@ fn owned_array_discontiguous_drop() {
 
     let set = Rc::new(RefCell::new(BTreeSet::new()));
     {
-        let v: Vec<_> = (0..12).map(|x| InsertOnDrop::new(set.clone(), x)).collect();
+        let v: Vec<_> = (0..12).map(|x| InsertOnDrop(set.clone(), Some(x))).collect();
         let mut a = Array::from_shape_vec((2, 6), v).unwrap();
         // discontiguous and non-zero offset
         a.slice_inplace(s![.., 1..]);
     }
-    // each item was dropped
+    // each item was dropped exactly once
     itertools::assert_equal(set.borrow().iter().cloned(), 0..12);
 }
 
@@ -1433,8 +1428,7 @@ fn discontiguous_owned_to_owned() {
     let co = c.to_owned();
     assert_eq!(c.strides(), &[3, 2]);
     assert_eq!(co.strides(), &[2, 1]);
-    assert_eq!(c.shape(), co.shape());
-    itertools::assert_equal(c.iter(), co.iter());
+    assert_eq!(c, co);
 }
 
 #[test]