Skip to content

Commit 8939ed9

Browse files
authored
chore: fix clippy warnings from Rust release 1.69 (#263)
* chore: fix clippy warnings from Rust release 1.69 * chore: run `cargo fmt` * refactor: remove unused type parameter --------- Co-authored-by: Luis Moreno <morenol@users.noreply.github.com>
1 parent 9cd7348 commit 8939ed9

File tree

3 files changed

+11
-21
lines changed

3 files changed

+11
-21
lines changed

src/linalg/basic/matrix.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -431,9 +431,9 @@ impl<T: Number + RealNumber> SVDDecomposable<T> for DenseMatrix<T> {}
431431
impl<'a, T: Debug + Display + Copy + Sized> Array<T, (usize, usize)> for DenseMatrixView<'a, T> {
432432
fn get(&self, pos: (usize, usize)) -> &T {
433433
if self.column_major {
434-
&self.values[(pos.0 + pos.1 * self.stride)]
434+
&self.values[pos.0 + pos.1 * self.stride]
435435
} else {
436-
&self.values[(pos.0 * self.stride + pos.1)]
436+
&self.values[pos.0 * self.stride + pos.1]
437437
}
438438
}
439439

@@ -495,9 +495,9 @@ impl<'a, T: Debug + Display + Copy + Sized> ArrayView1<T> for DenseMatrixView<'a
495495
impl<'a, T: Debug + Display + Copy + Sized> Array<T, (usize, usize)> for DenseMatrixMutView<'a, T> {
496496
fn get(&self, pos: (usize, usize)) -> &T {
497497
if self.column_major {
498-
&self.values[(pos.0 + pos.1 * self.stride)]
498+
&self.values[pos.0 + pos.1 * self.stride]
499499
} else {
500-
&self.values[(pos.0 * self.stride + pos.1)]
500+
&self.values[pos.0 * self.stride + pos.1]
501501
}
502502
}
503503

@@ -519,9 +519,9 @@ impl<'a, T: Debug + Display + Copy + Sized> MutArray<T, (usize, usize)>
519519
{
520520
fn set(&mut self, pos: (usize, usize), x: T) {
521521
if self.column_major {
522-
self.values[(pos.0 + pos.1 * self.stride)] = x;
522+
self.values[pos.0 + pos.1 * self.stride] = x;
523523
} else {
524-
self.values[(pos.0 * self.stride + pos.1)] = x;
524+
self.values[pos.0 * self.stride + pos.1] = x;
525525
}
526526
}
527527

src/model_selection/kfold.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,7 @@ mod tests {
283283
(vec![0, 1, 2, 3, 7, 8, 9], vec![4, 5, 6]),
284284
(vec![0, 1, 2, 3, 4, 5, 6], vec![7, 8, 9]),
285285
];
286-
for ((train, test), (expected_train, expected_test)) in
287-
k.split(&x).into_iter().zip(expected)
288-
{
286+
for ((train, test), (expected_train, expected_test)) in k.split(&x).zip(expected) {
289287
assert_eq!(test, expected_test);
290288
assert_eq!(train, expected_train);
291289
}
@@ -307,9 +305,7 @@ mod tests {
307305
(vec![0, 1, 2, 3, 7, 8, 9], vec![4, 5, 6]),
308306
(vec![0, 1, 2, 3, 4, 5, 6], vec![7, 8, 9]),
309307
];
310-
for ((train, test), (expected_train, expected_test)) in
311-
k.split(&x).into_iter().zip(expected)
312-
{
308+
for ((train, test), (expected_train, expected_test)) in k.split(&x).zip(expected) {
313309
assert_eq!(test.len(), expected_test.len());
314310
assert_eq!(train.len(), expected_train.len());
315311
}

src/readers/csv.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ where
8383
Matrix: Array2<T>,
8484
{
8585
let csv_text = read_string_from_source(source)?;
86-
let rows: Vec<Vec<T>> = extract_row_vectors_from_csv_text::<T, RowVector, Matrix>(
86+
let rows: Vec<Vec<T>> = extract_row_vectors_from_csv_text(
8787
&csv_text,
8888
&definition,
8989
detect_row_format(&csv_text, &definition)?,
@@ -103,12 +103,7 @@ where
103103

104104
/// Given a string containing the contents of a csv file, extract its value
105105
/// into row-vectors.
106-
fn extract_row_vectors_from_csv_text<
107-
'a,
108-
T: Number + RealNumber + std::str::FromStr,
109-
RowVector: Array1<T>,
110-
Matrix: Array2<T>,
111-
>(
106+
fn extract_row_vectors_from_csv_text<'a, T: Number + RealNumber + std::str::FromStr>(
112107
csv_text: &'a str,
113108
definition: &'a CSVDefinition<'_>,
114109
row_format: CSVRowFormat<'_>,
@@ -305,12 +300,11 @@ mod tests {
305300
}
306301
mod extract_row_vectors_from_csv_text {
307302
use super::super::{extract_row_vectors_from_csv_text, CSVDefinition, CSVRowFormat};
308-
use crate::linalg::basic::matrix::DenseMatrix;
309303

310304
#[test]
311305
fn read_default_csv() {
312306
assert_eq!(
313-
extract_row_vectors_from_csv_text::<f64, Vec<_>, DenseMatrix<_>>(
307+
extract_row_vectors_from_csv_text::<f64>(
314308
"column 1, column 2, column3\n1.0,2.0,3.0\n4.0,5.0,6.0",
315309
&CSVDefinition::default(),
316310
CSVRowFormat {

0 commit comments

Comments
 (0)