more lints

Author: max-sixty

src/dimension/axes.rs

@@ -62,6 +62,9 @@ impl AxisDescription {
     pub fn stride(self) -> Ixs {
         self.2
     }
+    pub fn is_empty(self) -> bool {
+        self.len() == 0
+    }
 }
 
 copy_and_clone!(['a, D] Axes<'a, D>);

src/dimension/axis.rs

@@ -21,7 +21,7 @@ pub struct Axis(pub usize);
 impl Axis {
     /// Return the index of the axis.
     #[inline(always)]
-    pub fn index(&self) -> usize {
+    pub fn index(self) -> usize {
         self.0
     }
 }

src/dimension/dynindeximpl.rs

@@ -48,9 +48,7 @@ impl<T: Copy + Zero> IxDynRepr<T> {
     pub fn copy_from(x: &[T]) -> Self {
         if x.len() <= CAP {
             let mut arr = [T::zero(); CAP];
-            for i in 0..x.len() {
-                arr[i] = x[i];
-            }
+            arr[..x.len()].clone_from_slice(&x[..]);
             IxDynRepr::Inline(x.len() as _, arr)
         } else {
             Self::from(x)
@@ -121,7 +119,7 @@ impl IxDynImpl {
         IxDynImpl(if len < CAP {
             let mut out = [1; CAP];
             out[0..i].copy_from_slice(&self[0..i]);
-            out[i + 1..len + 1].copy_from_slice(&self[i..len]);
+            out[i + 1..=len].copy_from_slice(&self[i..len]);
             IxDynRepr::Inline((len + 1) as u32, out)
         } else {
             let mut out = Vec::with_capacity(len + 1);
@@ -206,7 +204,7 @@ impl<'a> IntoIterator for &'a IxDynImpl {
     type IntoIter = <&'a [Ix] as IntoIterator>::IntoIter;
     #[inline]
     fn into_iter(self) -> Self::IntoIter {
-        self[..].into_iter()
+        self[..].iter()
     }
 }
 

src/impl_1d.rs

@@ -23,6 +23,9 @@ where
         if let Some(slc) = self.as_slice() {
             slc.to_vec()
         } else {
+            // clippy suggests this but
+            // the trait `iterators::TrustedIterator` is not implemented for `std::iter::Cloned<iterators::Iter<'_, A, dimension::dim::Dim<[usize; 1]>>>`
+            // crate::iterators::to_vec(self.iter().cloned())
             crate::iterators::to_vec(self.iter().map(|x| x.clone()))
         }
     }

src/impl_methods.rs

@@ -375,8 +375,8 @@ where
         let mut new_strides = Do::zeros(out_ndim);
         izip!(self.dim.slice(), self.strides.slice(), indices)
             .filter_map(|(d, s, slice_or_index)| match slice_or_index {
-                &SliceOrIndex::Slice { .. } => Some((d, s)),
-                &SliceOrIndex::Index(_) => None,
+                SliceOrIndex::Slice { .. } => Some((d, s)),
+                SliceOrIndex::Index(_) => None,
             })
             .zip(izip!(new_dim.slice_mut(), new_strides.slice_mut()))
             .for_each(|((d, s), (new_d, new_s))| {
@@ -413,6 +413,7 @@ where
             .iter()
             .enumerate()
             .for_each(|(axis, slice_or_index)| match slice_or_index {
+                // Clippy insists we can remove the `&`, but this fails if we try
                 &SliceOrIndex::Slice { start, end, step } => {
                     self.slice_axis_inplace(Axis(axis), Slice { start, end, step })
                 }

src/impl_views.rs

@@ -135,6 +135,9 @@ where
         }
     }
 
+    // Should this be `to_slice` if taking a reference?
+    // https://rust-lang.github.io/rust-clippy/master/#wrong_self_convention
+
     /// Return the array’s data as a slice, if it is contiguous and in standard order.
     /// Return `None` otherwise.
     pub fn into_slice(&self) -> Option<&'a [A]> {

src/indexes.rs

@@ -140,6 +140,7 @@ impl<D: Dimension + Copy> NdProducer for Indices<D> {
     private_impl! {}
 
     #[doc(hidden)]
+    #[allow(clippy::clone_on_copy)]
     fn raw_dim(&self) -> Self::Dim {
         self.dim.clone()
     }

src/linalg/impl_linalg.rs

@@ -78,7 +78,7 @@ where
         let mut sum = A::zero();
         for i in 0..self.len() {
             unsafe {
-                sum = sum + self.uget(i).clone() * rhs.uget(i).clone();
+                sum = sum + *self.uget(i) * *rhs.uget(i);
             }
         }
         sum
@@ -586,6 +586,7 @@ pub fn general_mat_mul<A, S1, S2, S3>(
 /// ***Panics*** if array shapes are not compatible<br>
 /// *Note:* If enabled, uses blas `gemv` for elements of `f32, f64` when memory
 /// layout allows.
+#[allow(clippy::collapsible_if)]
 pub fn general_mat_vec_mul<A, S1, S2, S3>(
     alpha: A,
     a: &ArrayBase<S1, Ix2>,

src/numeric/impl_numeric.rs

@@ -184,7 +184,7 @@ where
             let axis_length =
                 A::from_usize(axis_length).expect("Converting axis length to `A` must not fail.");
             let sum = self.sum_axis(axis);
-            Some(sum / &aview0(&axis_length))
+            Some(sum / aview0(&axis_length))
         }
     }
 

src/numeric_util.rs

@@ -48,11 +48,11 @@ where
 
     // make it clear to the optimizer that this loop is short
     // and can not be autovectorized.
-    for i in 0..xs.len() {
+    for (i, x) in xs.iter().enumerate() {
         if i >= 7 {
             break;
         }
-        acc = f(acc.clone(), xs[i].clone())
+        acc = f(acc.clone(), x.clone())
     }
     acc
 }
@@ -99,13 +99,13 @@ where
     sum = sum + (p2 + p6);
     sum = sum + (p3 + p7);
 
-    for i in 0..xs.len() {
+    for (i, x) in xs.iter().enumerate() {
         if i >= 7 {
             break;
         }
         unsafe {
             // get_unchecked is needed to avoid the bounds check
-            sum = sum + xs[i] * *ys.get_unchecked(i);
+            sum = sum + *x * *ys.get_unchecked(i);
         }
     }
     sum