diff --git a/src/macros/matrix.rs b/src/macros/matrix.rs index 8da8ec5..3ea9f16 100644 --- a/src/macros/matrix.rs +++ b/src/macros/matrix.rs @@ -56,8 +56,8 @@ macro_rules! matrix { let data_as_nested_array = [ $( [ $($x),* ] ),* ]; let rows = data_as_nested_array.len(); let cols = data_as_nested_array[0].len(); - let data_as_flat_array: Vec<_> = data_as_nested_array.into_iter() - .flat_map(|row| row.into_iter()) + let data_as_flat_array: Vec<_> = data_as_nested_array.iter() + .flat_map(|row| row.iter()) .cloned() .collect(); Matrix::new(rows, cols, data_as_flat_array) diff --git a/src/matrix/base/mod.rs b/src/matrix/base/mod.rs index 591ecae..d811414 100644 --- a/src/matrix/base/mod.rs +++ b/src/matrix/base/mod.rs @@ -1408,7 +1408,7 @@ pub trait BaseMatrixMut: BaseMatrix { isize), self.cols()); - for (x, y) in row_a.into_iter().zip(row_b.into_iter()) { + for (x, y) in row_a.iter_mut().zip(row_b.iter_mut()) { mem::swap(x, y); } } diff --git a/src/matrix/decomposition/mod.rs b/src/matrix/decomposition/mod.rs index d2f9d93..b70c621 100644 --- a/src/matrix/decomposition/mod.rs +++ b/src/matrix/decomposition/mod.rs @@ -193,7 +193,7 @@ impl Matrix entry is 0.")); } - let mut v = column.into_iter().map(|&x| x / denom).collect::>(); + let mut v = column.iter().map(|&x| x / denom).collect::>(); // Ensure first element is fixed to 1. v[0] = T::one(); let v = Vector::new(v); @@ -220,7 +220,7 @@ impl Matrix entry is 0.")); } - let mut v = column.into_iter().map(|&x| x / denom).collect::>(); + let mut v = column.iter().map(|&x| x / denom).collect::>(); // Ensure first element is fixed to 1. v[0] = T::one(); let v = Matrix::new(size, 1, v); diff --git a/src/matrix/impl_mat.rs b/src/matrix/impl_mat.rs index 91f105e..f087e03 100644 --- a/src/matrix/impl_mat.rs +++ b/src/matrix/impl_mat.rs @@ -134,7 +134,7 @@ impl Matrix { let size = diag.len(); let mut data = vec![T::zero(); size * size]; - for (i, item) in diag.into_iter().enumerate().take(size) { + for (i, item) in diag.iter().enumerate().take(size) { data[i * (size + 1)] = item.clone(); } diff --git a/src/matrix/iter.rs b/src/matrix/iter.rs index 9e569ba..25641ce 100644 --- a/src/matrix/iter.rs +++ b/src/matrix/iter.rs @@ -734,13 +734,13 @@ mod tests { let mut col_iter = a.col_iter(); - let mut nth0 = col_iter.nth(0).unwrap().into_iter(); + let mut nth0 = col_iter.nth(0).unwrap().iter(); assert_eq!(0, *nth0.next().unwrap()); assert_eq!(4, *nth0.next().unwrap()); assert_eq!(8, *nth0.next().unwrap()); - let mut nth1 = col_iter.nth(2).unwrap().into_iter(); + let mut nth1 = col_iter.nth(2).unwrap().iter(); assert_eq!(3, *nth1.next().unwrap()); assert_eq!(7, *nth1.next().unwrap()); @@ -755,7 +755,7 @@ mod tests { 4, 5, 6, 7; 8, 9, 10, 11]; - let mut col_iter = a.col_iter().last().unwrap().into_iter(); + let mut col_iter = a.col_iter().last().unwrap().iter(); assert_eq!(3, *col_iter.next().unwrap()); assert_eq!(7, *col_iter.next().unwrap()); @@ -765,7 +765,7 @@ mod tests { col_iter.next(); - let mut last_col_iter = col_iter.last().unwrap().into_iter(); + let mut last_col_iter = col_iter.last().unwrap().iter(); assert_eq!(3, *last_col_iter.next().unwrap()); assert_eq!(7, *last_col_iter.next().unwrap()); diff --git a/src/vector/impl_vec.rs b/src/vector/impl_vec.rs index 8cba075..7b7139b 100644 --- a/src/vector/impl_vec.rs +++ b/src/vector/impl_vec.rs @@ -250,7 +250,7 @@ impl Vector { pub fn select(&self, idxs: &[usize]) -> Vector { let mut new_data = Vec::with_capacity(idxs.len()); - for idx in idxs.into_iter() { + for idx in idxs.iter() { new_data.push(self[*idx]); }