Merge pull request #1282 from waywardmonkeys/clippy-needless-borrow
clippy: Fix needless_borrow warnings.
This commit is contained in:
commit
1987ca29bb
|
@ -366,7 +366,7 @@ pub fn mix_vec<T: Number, const D: usize>(
|
||||||
y: &TVec<T, D>,
|
y: &TVec<T, D>,
|
||||||
a: &TVec<T, D>,
|
a: &TVec<T, D>,
|
||||||
) -> TVec<T, D> {
|
) -> TVec<T, D> {
|
||||||
x.component_mul(&(TVec::<T, D>::repeat(T::one()) - a)) + y.component_mul(&a)
|
x.component_mul(&(TVec::<T, D>::repeat(T::one()) - a)) + y.component_mul(a)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Returns `x * (1.0 - a) + y * a`, i.e., the linear blend of the scalars x and y using the scalar value a.
|
/// Returns `x * (1.0 - a) + y * a`, i.e., the linear blend of the scalars x and y using the scalar value a.
|
||||||
|
|
|
@ -200,17 +200,16 @@ where
|
||||||
eigenvalues.push(self.eigenvalues_re[c].clone());
|
eigenvalues.push(self.eigenvalues_re[c].clone());
|
||||||
|
|
||||||
if eigenvectors.is_some() {
|
if eigenvectors.is_some() {
|
||||||
eigenvectors.as_mut().unwrap().push(
|
eigenvectors
|
||||||
(&self.eigenvectors.as_ref())
|
.as_mut()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.column(c)
|
.push(self.eigenvectors.as_ref().unwrap().column(c).into_owned());
|
||||||
.into_owned(),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if left_eigenvectors.is_some() {
|
if left_eigenvectors.is_some() {
|
||||||
left_eigenvectors.as_mut().unwrap().push(
|
left_eigenvectors.as_mut().unwrap().push(
|
||||||
(&self.left_eigenvectors.as_ref())
|
self.left_eigenvectors
|
||||||
|
.as_ref()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.column(c)
|
.column(c)
|
||||||
.into_owned(),
|
.into_owned(),
|
||||||
|
@ -285,12 +284,12 @@ where
|
||||||
|
|
||||||
for r in 0..number_of_elements_value {
|
for r in 0..number_of_elements_value {
|
||||||
vec[r] = Complex::<T>::new(
|
vec[r] = Complex::<T>::new(
|
||||||
(&self.eigenvectors.as_ref()).unwrap()[(r, c)].clone(),
|
self.eigenvectors.as_ref().unwrap()[(r, c)].clone(),
|
||||||
(&self.eigenvectors.as_ref()).unwrap()[(r, c + 1)].clone(),
|
self.eigenvectors.as_ref().unwrap()[(r, c + 1)].clone(),
|
||||||
);
|
);
|
||||||
vec_conj[r] = Complex::<T>::new(
|
vec_conj[r] = Complex::<T>::new(
|
||||||
(&self.eigenvectors.as_ref()).unwrap()[(r, c)].clone(),
|
self.eigenvectors.as_ref().unwrap()[(r, c)].clone(),
|
||||||
(&self.eigenvectors.as_ref()).unwrap()[(r, c + 1)].clone(),
|
self.eigenvectors.as_ref().unwrap()[(r, c + 1)].clone(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -310,12 +309,12 @@ where
|
||||||
|
|
||||||
for r in 0..number_of_elements_value {
|
for r in 0..number_of_elements_value {
|
||||||
vec[r] = Complex::<T>::new(
|
vec[r] = Complex::<T>::new(
|
||||||
(&self.left_eigenvectors.as_ref()).unwrap()[(r, c)].clone(),
|
self.left_eigenvectors.as_ref().unwrap()[(r, c)].clone(),
|
||||||
(&self.left_eigenvectors.as_ref()).unwrap()[(r, c + 1)].clone(),
|
self.left_eigenvectors.as_ref().unwrap()[(r, c + 1)].clone(),
|
||||||
);
|
);
|
||||||
vec_conj[r] = Complex::<T>::new(
|
vec_conj[r] = Complex::<T>::new(
|
||||||
(&self.left_eigenvectors.as_ref()).unwrap()[(r, c)].clone(),
|
self.left_eigenvectors.as_ref().unwrap()[(r, c)].clone(),
|
||||||
(&self.left_eigenvectors.as_ref()).unwrap()[(r, c + 1)].clone(),
|
self.left_eigenvectors.as_ref().unwrap()[(r, c + 1)].clone(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -306,7 +306,7 @@ where
|
||||||
|val| sorted_vals.push(val),
|
|val| sorted_vals.push(val),
|
||||||
&idx_workspace[..count],
|
&idx_workspace[..count],
|
||||||
&values_workspace[..count],
|
&values_workspace[..count],
|
||||||
&Add::add,
|
Add::add,
|
||||||
);
|
);
|
||||||
|
|
||||||
let new_col_count = sorted_minor_idx.len() - sorted_ja_current_len;
|
let new_col_count = sorted_minor_idx.len() - sorted_ja_current_len;
|
||||||
|
|
|
@ -653,9 +653,9 @@ where
|
||||||
if !monotonic && sort {
|
if !monotonic && sort {
|
||||||
let range_size = range_end - range_start;
|
let range_size = range_end - range_start;
|
||||||
minor_index_permutation.resize(range_size, 0);
|
minor_index_permutation.resize(range_size, 0);
|
||||||
compute_sort_permutation(&mut minor_index_permutation, &minor_idx_in_lane);
|
compute_sort_permutation(&mut minor_index_permutation, minor_idx_in_lane);
|
||||||
minor_idx_buffer.clear();
|
minor_idx_buffer.clear();
|
||||||
minor_idx_buffer.extend_from_slice(&minor_idx_in_lane);
|
minor_idx_buffer.extend_from_slice(minor_idx_in_lane);
|
||||||
apply_permutation(
|
apply_permutation(
|
||||||
&mut minor_indices[range_start..range_end],
|
&mut minor_indices[range_start..range_end],
|
||||||
&minor_idx_buffer,
|
&minor_idx_buffer,
|
||||||
|
|
|
@ -149,8 +149,8 @@ impl<T> Op<T> {
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn as_ref(&self) -> Op<&T> {
|
pub fn as_ref(&self) -> Op<&T> {
|
||||||
match self {
|
match self {
|
||||||
Op::NoOp(obj) => Op::NoOp(&obj),
|
Op::NoOp(obj) => Op::NoOp(obj),
|
||||||
Op::Transpose(obj) => Op::Transpose(&obj),
|
Op::Transpose(obj) => Op::Transpose(obj),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -88,7 +88,7 @@ where
|
||||||
use Op::NoOp;
|
use Op::NoOp;
|
||||||
|
|
||||||
match (&a, &b) {
|
match (&a, &b) {
|
||||||
(NoOp(ref a), NoOp(ref b)) => {
|
(NoOp(a), NoOp(b)) => {
|
||||||
// Note: We have to reverse the order for CSC matrices
|
// Note: We have to reverse the order for CSC matrices
|
||||||
spmm_cs_prealloc(beta, &mut c.cs, alpha, &b.cs, &a.cs)
|
spmm_cs_prealloc(beta, &mut c.cs, alpha, &b.cs, &a.cs)
|
||||||
}
|
}
|
||||||
|
@ -116,7 +116,7 @@ where
|
||||||
use Op::NoOp;
|
use Op::NoOp;
|
||||||
|
|
||||||
match (&a, &b) {
|
match (&a, &b) {
|
||||||
(NoOp(ref a), NoOp(ref b)) => {
|
(NoOp(a), NoOp(b)) => {
|
||||||
// Note: We have to reverse the order for CSC matrices
|
// Note: We have to reverse the order for CSC matrices
|
||||||
spmm_cs_prealloc_unchecked(beta, &mut c.cs, alpha, &b.cs, &a.cs)
|
spmm_cs_prealloc_unchecked(beta, &mut c.cs, alpha, &b.cs, &a.cs)
|
||||||
}
|
}
|
||||||
|
@ -152,9 +152,9 @@ where
|
||||||
use Cow::*;
|
use Cow::*;
|
||||||
match (&a, &b) {
|
match (&a, &b) {
|
||||||
(NoOp(_), NoOp(_)) => unreachable!(),
|
(NoOp(_), NoOp(_)) => unreachable!(),
|
||||||
(Transpose(ref a), NoOp(_)) => (Owned(a.transpose()), Borrowed(b_ref)),
|
(Transpose(a), NoOp(_)) => (Owned(a.transpose()), Borrowed(b_ref)),
|
||||||
(NoOp(_), Transpose(ref b)) => (Borrowed(a_ref), Owned(b.transpose())),
|
(NoOp(_), Transpose(b)) => (Borrowed(a_ref), Owned(b.transpose())),
|
||||||
(Transpose(ref a), Transpose(ref b)) => (Owned(a.transpose()), Owned(b.transpose())),
|
(Transpose(a), Transpose(b)) => (Owned(a.transpose()), Owned(b.transpose())),
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
spmm_kernel(beta, c, alpha, NoOp(a.as_ref()), NoOp(b.as_ref()))
|
spmm_kernel(beta, c, alpha, NoOp(a.as_ref()), NoOp(b.as_ref()))
|
||||||
|
|
|
@ -82,7 +82,7 @@ where
|
||||||
use Op::NoOp;
|
use Op::NoOp;
|
||||||
|
|
||||||
match (&a, &b) {
|
match (&a, &b) {
|
||||||
(NoOp(ref a), NoOp(ref b)) => spmm_cs_prealloc(beta, &mut c.cs, alpha, &a.cs, &b.cs),
|
(NoOp(a), NoOp(b)) => spmm_cs_prealloc(beta, &mut c.cs, alpha, &a.cs, &b.cs),
|
||||||
_ => spmm_csr_transposed(beta, c, alpha, a, b, spmm_csr_prealloc),
|
_ => spmm_csr_transposed(beta, c, alpha, a, b, spmm_csr_prealloc),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -107,9 +107,7 @@ where
|
||||||
use Op::NoOp;
|
use Op::NoOp;
|
||||||
|
|
||||||
match (&a, &b) {
|
match (&a, &b) {
|
||||||
(NoOp(ref a), NoOp(ref b)) => {
|
(NoOp(a), NoOp(b)) => spmm_cs_prealloc_unchecked(beta, &mut c.cs, alpha, &a.cs, &b.cs),
|
||||||
spmm_cs_prealloc_unchecked(beta, &mut c.cs, alpha, &a.cs, &b.cs)
|
|
||||||
}
|
|
||||||
_ => spmm_csr_transposed(beta, c, alpha, a, b, spmm_csr_prealloc_unchecked),
|
_ => spmm_csr_transposed(beta, c, alpha, a, b, spmm_csr_prealloc_unchecked),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -142,9 +140,9 @@ where
|
||||||
use Cow::*;
|
use Cow::*;
|
||||||
match (&a, &b) {
|
match (&a, &b) {
|
||||||
(NoOp(_), NoOp(_)) => unreachable!(),
|
(NoOp(_), NoOp(_)) => unreachable!(),
|
||||||
(Transpose(ref a), NoOp(_)) => (Owned(a.transpose()), Borrowed(b_ref)),
|
(Transpose(a), NoOp(_)) => (Owned(a.transpose()), Borrowed(b_ref)),
|
||||||
(NoOp(_), Transpose(ref b)) => (Borrowed(a_ref), Owned(b.transpose())),
|
(NoOp(_), Transpose(b)) => (Borrowed(a_ref), Owned(b.transpose())),
|
||||||
(Transpose(ref a), Transpose(ref b)) => (Owned(a.transpose()), Owned(b.transpose())),
|
(Transpose(a), Transpose(b)) => (Owned(a.transpose()), Owned(b.transpose())),
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
spmm_kernel(beta, c, alpha, NoOp(a.as_ref()), NoOp(b.as_ref()))
|
spmm_kernel(beta, c, alpha, NoOp(a.as_ref()), NoOp(b.as_ref()))
|
||||||
|
|
|
@ -598,7 +598,7 @@ impl<T: Scalar, R: Dim, C: Dim, S: Storage<T, R, C>> Matrix<T, R, C, S> {
|
||||||
if nremove.value() != 0 {
|
if nremove.value() != 0 {
|
||||||
unsafe {
|
unsafe {
|
||||||
compress_rows(
|
compress_rows(
|
||||||
&mut m.as_mut_slice(),
|
m.as_mut_slice(),
|
||||||
nrows.value(),
|
nrows.value(),
|
||||||
ncols.value(),
|
ncols.value(),
|
||||||
i,
|
i,
|
||||||
|
@ -796,7 +796,7 @@ impl<T: Scalar, R: Dim, C: Dim, S: Storage<T, R, C>> Matrix<T, R, C, S> {
|
||||||
|
|
||||||
if ninsert.value() != 0 {
|
if ninsert.value() != 0 {
|
||||||
extend_rows(
|
extend_rows(
|
||||||
&mut res.as_mut_slice(),
|
res.as_mut_slice(),
|
||||||
nrows.value(),
|
nrows.value(),
|
||||||
ncols.value(),
|
ncols.value(),
|
||||||
i,
|
i,
|
||||||
|
@ -909,7 +909,7 @@ impl<T: Scalar, R: Dim, C: Dim, S: Storage<T, R, C>> Matrix<T, R, C, S> {
|
||||||
unsafe {
|
unsafe {
|
||||||
if new_nrows.value() < nrows {
|
if new_nrows.value() < nrows {
|
||||||
compress_rows(
|
compress_rows(
|
||||||
&mut data.as_mut_slice(),
|
data.as_mut_slice(),
|
||||||
nrows,
|
nrows,
|
||||||
ncols,
|
ncols,
|
||||||
new_nrows.value(),
|
new_nrows.value(),
|
||||||
|
@ -923,7 +923,7 @@ impl<T: Scalar, R: Dim, C: Dim, S: Storage<T, R, C>> Matrix<T, R, C, S> {
|
||||||
new_nrows, new_ncols, data.data,
|
new_nrows, new_ncols, data.data,
|
||||||
));
|
));
|
||||||
extend_rows(
|
extend_rows(
|
||||||
&mut res.as_mut_slice(),
|
res.as_mut_slice(),
|
||||||
nrows,
|
nrows,
|
||||||
new_ncols.value(),
|
new_ncols.value(),
|
||||||
nrows,
|
nrows,
|
||||||
|
|
|
@ -83,7 +83,7 @@ add_sub_impl!(Mul, mul, ClosedMul;
|
||||||
(Const<D>, U1), (Const<D>, U1) -> (Const<D>, U1)
|
(Const<D>, U1), (Const<D>, U1) -> (Const<D>, U1)
|
||||||
const D; for; where;
|
const D; for; where;
|
||||||
self: &'a Scale<T, D>, right: &'b SVector<T, D>, Output = SVector<T, D>;
|
self: &'a Scale<T, D>, right: &'b SVector<T, D>, Output = SVector<T, D>;
|
||||||
SVector::from(self.vector.component_mul(&right));
|
SVector::from(self.vector.component_mul(right));
|
||||||
'a, 'b);
|
'a, 'b);
|
||||||
|
|
||||||
add_sub_impl!(Mul, mul, ClosedMul;
|
add_sub_impl!(Mul, mul, ClosedMul;
|
||||||
|
@ -97,7 +97,7 @@ add_sub_impl!(Mul, mul, ClosedMul;
|
||||||
(Const<D>, U1), (Const<D>, U1) -> (Const<D>, U1)
|
(Const<D>, U1), (Const<D>, U1) -> (Const<D>, U1)
|
||||||
const D; for; where;
|
const D; for; where;
|
||||||
self: Scale<T, D>, right: &'b SVector<T, D>, Output = SVector<T, D>;
|
self: Scale<T, D>, right: &'b SVector<T, D>, Output = SVector<T, D>;
|
||||||
SVector::from(self.vector.component_mul(&right));
|
SVector::from(self.vector.component_mul(right));
|
||||||
'b);
|
'b);
|
||||||
|
|
||||||
add_sub_impl!(Mul, mul, ClosedMul;
|
add_sub_impl!(Mul, mul, ClosedMul;
|
||||||
|
|
|
@ -64,8 +64,8 @@ where
|
||||||
if not_zero {
|
if not_zero {
|
||||||
let refl = Reflection::new(Unit::new_unchecked(axis), T::zero());
|
let refl = Reflection::new(Unit::new_unchecked(axis), T::zero());
|
||||||
let sign = reflection_norm.clone().signum();
|
let sign = reflection_norm.clone().signum();
|
||||||
if let Some(mut work) = bilateral {
|
if let Some(work) = bilateral {
|
||||||
refl.reflect_rows_with_sign(&mut right, &mut work, sign.clone());
|
refl.reflect_rows_with_sign(&mut right, work, sign.clone());
|
||||||
}
|
}
|
||||||
refl.reflect_with_sign(&mut right.rows_range_mut(icol + shift..), sign.conjugate());
|
refl.reflect_with_sign(&mut right.rows_range_mut(icol + shift..), sign.conjugate());
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ pub fn svd_ordered3<T: RealField>(
|
||||||
eps: T,
|
eps: T,
|
||||||
niter: usize,
|
niter: usize,
|
||||||
) -> Option<SVD<T, U3, U3>> {
|
) -> Option<SVD<T, U3, U3>> {
|
||||||
let s = m.tr_mul(&m);
|
let s = m.tr_mul(m);
|
||||||
let mut v = s.try_symmetric_eigen(eps, niter)?.eigenvectors;
|
let mut v = s.try_symmetric_eigen(eps, niter)?.eigenvectors;
|
||||||
let mut b = m * &v;
|
let mut b = m * &v;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue