Merge pull request #321 from rust-ndarray/clippy-fix

clippy fix

Author: termoshtt

lax/src/tridiagonal.rs

@@ -15,7 +15,7 @@ use std::ops::{Index, IndexMut};
 ///  ...           ...,  u{n-1},
 ///   0,  ...,  l{n-1},  d{n-1},]
 /// ```
-#[derive(Clone, PartialEq)]
+#[derive(Clone, PartialEq, Eq)]
 pub struct Tridiagonal<A: Scalar> {
     /// layout of raw matrix
     pub l: MatrixLayout,

ndarray-linalg/examples/eig.rs

@@ -3,7 +3,7 @@ use ndarray_linalg::*;
 
 fn main() {
     let a = arr2(&[[2.0, 1.0, 2.0], [-2.0, 2.0, 1.0], [1.0, 2.0, -2.0]]);
-    let (e, vecs) = a.clone().eig().unwrap();
+    let (e, vecs) = a.eig().unwrap();
     println!("eigenvalues = \n{:?}", e);
     println!("V = \n{:?}", vecs);
     let a_c: Array2<c64> = a.map(|f| c64::new(*f, 0.0));

ndarray-linalg/examples/eigh.rs

@@ -6,7 +6,7 @@ use ndarray_linalg::*;
 
 fn main() {
     let a = arr2(&[[3.0, 1.0, 1.0], [1.0, 3.0, 1.0], [1.0, 1.0, 3.0]]);
-    let (e, vecs) = a.clone().eigh(UPLO::Upper).unwrap();
+    let (e, vecs) = a.eigh(UPLO::Upper).unwrap();
     println!("eigenvalues = \n{:?}", e);
     println!("V = \n{:?}", vecs);
     let av = a.dot(&vecs);

ndarray-linalg/src/krylov/householder.rs

@@ -34,7 +34,7 @@ where
 {
     assert_eq!(w.len(), a.len());
     let n = a.len();
-    let c = A::from(2.0).unwrap() * w.inner(&a);
+    let c = A::from(2.0).unwrap() * w.inner(a);
     for l in 0..n {
         a[l] -= c * w[l];
     }

ndarray-linalg/src/krylov/mgs.rs

@@ -50,7 +50,7 @@ impl<A: Scalar + Lapack> Orthogonalizer for MGS<A> {
         let mut coef = Array1::zeros(self.len() + 1);
         for i in 0..self.len() {
             let q = &self.q[i];
-            let c = q.inner(&a);
+            let c = q.inner(a);
             azip!((a in &mut *a, &q in q) *a -= c * q);
             coef[i] = c;
         }
@@ -77,12 +77,12 @@ impl<A: Scalar + Lapack> Orthogonalizer for MGS<A> {
         self.div_append(&mut a)
     }
 
-    fn div_append<S>(&mut self, mut a: &mut ArrayBase<S, Ix1>) -> AppendResult<A>
+    fn div_append<S>(&mut self, a: &mut ArrayBase<S, Ix1>) -> AppendResult<A>
     where
         A: Lapack,
         S: DataMut<Elem = A>,
     {
-        let coef = self.decompose(&mut a);
+        let coef = self.decompose(a);
         let nrm = coef[coef.len() - 1].re();
         if nrm < self.tol {
             // Linearly dependent

ndarray-linalg/src/layout.rs

@@ -67,9 +67,8 @@ where
     }
 
     fn as_allocated(&self) -> Result<&[A]> {
-        Ok(self
-            .as_slice_memory_order()
-            .ok_or_else(|| LinalgError::MemoryNotCont)?)
+        self.as_slice_memory_order()
+            .ok_or(LinalgError::MemoryNotCont)
     }
 }
 
@@ -78,8 +77,7 @@ where
     S: DataMut<Elem = A>,
 {
     fn as_allocated_mut(&mut self) -> Result<&mut [A]> {
-        Ok(self
-            .as_slice_memory_order_mut()
-            .ok_or_else(|| LinalgError::MemoryNotCont)?)
+        self.as_slice_memory_order_mut()
+            .ok_or(LinalgError::MemoryNotCont)
     }
 }

ndarray-linalg/src/least_squares.rs

@@ -304,12 +304,12 @@ where
         a.layout()?,
         a.as_allocated_mut()?,
         rhs.as_slice_memory_order_mut()
-            .ok_or_else(|| LinalgError::MemoryNotCont)?,
+            .ok_or(LinalgError::MemoryNotCont)?,
     )?;
 
     let (m, n) = (a.shape()[0], a.shape()[1]);
     let solution = rhs.slice(s![0..n]).to_owned();
-    let residual_sum_of_squares = compute_residual_scalar(m, n, rank, &rhs);
+    let residual_sum_of_squares = compute_residual_scalar(m, n, rank, rhs);
     Ok(LeastSquaresResult {
         solution,
         singular_values: Array::from_shape_vec((singular_values.len(),), singular_values)?,
@@ -399,7 +399,7 @@ where
     let solution: Array2<E> = rhs.slice(s![..a.shape()[1], ..]).to_owned();
     let singular_values = Array::from_shape_vec((singular_values.len(),), singular_values)?;
     let (m, n) = (a.shape()[0], a.shape()[1]);
-    let residual_sum_of_squares = compute_residual_array1(m, n, rank, &rhs);
+    let residual_sum_of_squares = compute_residual_array1(m, n, rank, rhs);
     Ok(LeastSquaresResult {
         solution,
         singular_values,

ndarray-linalg/src/lobpcg/lobpcg.rs

@@ -83,12 +83,11 @@ fn apply_constraints<A: Scalar + Lapack>(
     let u = gram_yv
         .columns()
         .into_iter()
-        .map(|x| {
+        .flat_map(|x| {
             let res = cholesky_yy.solvec(&x).unwrap();
 
             res.to_vec()
         })
-        .flatten()
         .collect::<Vec<A>>();
 
     let rows = gram_yv.len_of(Axis(0));

ndarray-linalg/src/lobpcg/svd.rs

@@ -30,7 +30,7 @@ impl<A: Float + PartialOrd + DivAssign<A> + 'static + MagnitudeCorrection> Trunc
         let mut a = self.eigvals.iter().enumerate().collect::<Vec<_>>();
 
         // sort by magnitude
-        a.sort_by(|(_, x), (_, y)| x.partial_cmp(&y).unwrap().reverse());
+        a.sort_by(|(_, x), (_, y)| x.partial_cmp(y).unwrap().reverse());
 
         // calculate cut-off magnitude (borrowed from scipy)
         let cutoff = A::epsilon() * // float precision

ndarray-linalg/src/tridiagonal.rs

@@ -272,7 +272,7 @@ where
         Sb: DataMut<Elem = A>,
     {
         A::solve_tridiagonal(
-            &self,
+            self,
             rhs.layout()?,
             Transpose::No,
             rhs.as_slice_mut().unwrap(),
@@ -287,7 +287,7 @@ where
         Sb: DataMut<Elem = A>,
     {
         A::solve_tridiagonal(
-            &self,
+            self,
             rhs.layout()?,
             Transpose::Transpose,
             rhs.as_slice_mut().unwrap(),
@@ -302,7 +302,7 @@ where
         Sb: DataMut<Elem = A>,
     {
         A::solve_tridiagonal(
-            &self,
+            self,
             rhs.layout()?,
             Transpose::Hermite,
             rhs.as_slice_mut().unwrap(),
@@ -622,7 +622,7 @@ where
 {
     fn det_tridiagonal(&self) -> Result<A> {
         let n = self.d.len();
-        Ok(rec_rel(&self)[n])
+        Ok(rec_rel(self)[n])
     }
 }
 
@@ -671,7 +671,7 @@ where
     A: Scalar + Lapack,
 {
     fn rcond_tridiagonal(&self) -> Result<A::Real> {
-        Ok(A::rcond_tridiagonal(&self)?)
+        Ok(A::rcond_tridiagonal(self)?)
     }
 }