Skip to content

Commit c7353d0

Browse files
authored
Run cargo clippy --fix (#250)
* Run `cargo clippy --fix` * Run `cargo clippy --all-features --fix` * Fix other clippy warnings * cargo fmt Co-authored-by: Luis Moreno <morenol@users.noreply.github.com>
1 parent 83dcf9a commit c7353d0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+146
-222
lines changed

src/algorithm/neighbour/fastpair.rs

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ mod tests_fastpair {
260260
let distances = fastpair.distances;
261261
let neighbours = fastpair.neighbours;
262262

263-
assert!(distances.len() != 0);
264-
assert!(neighbours.len() != 0);
263+
assert!(!distances.is_empty());
264+
assert!(!neighbours.is_empty());
265265

266266
assert_eq!(10, neighbours.len());
267267
assert_eq!(10, distances.len());
@@ -276,17 +276,13 @@ mod tests_fastpair {
276276
// We expect an error when we run `FastPair` on this dataset,
277277
// becuase `FastPair` currently only works on a minimum of 3
278278
// points.
279-
let _fastpair = FastPair::new(&dataset);
279+
let fastpair = FastPair::new(&dataset);
280+
assert!(fastpair.is_err());
280281

281-
match _fastpair {
282-
Err(e) => {
283-
let expected_error =
284-
Failed::because(FailedError::FindFailed, "min number of rows should be 3");
285-
assert_eq!(e, expected_error)
286-
}
287-
_ => {
288-
assert!(false);
289-
}
282+
if let Err(e) = fastpair {
283+
let expected_error =
284+
Failed::because(FailedError::FindFailed, "min number of rows should be 3");
285+
assert_eq!(e, expected_error)
290286
}
291287
}
292288

@@ -582,7 +578,7 @@ mod tests_fastpair {
582578
};
583579
for p in dissimilarities.iter() {
584580
if p.distance.unwrap() < min_dissimilarity.distance.unwrap() {
585-
min_dissimilarity = p.clone()
581+
min_dissimilarity = *p
586582
}
587583
}
588584

src/cluster/dbscan.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,6 @@ mod tests {
511511
.and_then(|dbscan| dbscan.predict(&x))
512512
.unwrap();
513513

514-
println!("{:?}", labels);
514+
println!("{labels:?}");
515515
}
516516
}

src/cluster/kmeans.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,8 @@ mod tests {
498498

499499
let y: Vec<usize> = kmeans.predict(&x).unwrap();
500500

501-
for i in 0..y.len() {
502-
assert_eq!(y[i] as usize, kmeans._y[i]);
501+
for (i, _y_i) in y.iter().enumerate() {
502+
assert_eq!({ y[i] }, kmeans._y[i]);
503503
}
504504
}
505505

src/dataset/boston.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use crate::dataset::Dataset;
3131
pub fn load_dataset() -> Dataset<f32, f32> {
3232
let (x, y, num_samples, num_features) = match deserialize_data(std::include_bytes!("boston.xy"))
3333
{
34-
Err(why) => panic!("Can't deserialize boston.xy. {}", why),
34+
Err(why) => panic!("Can't deserialize boston.xy. {why}"),
3535
Ok((x, y, num_samples, num_features)) => (x, y, num_samples, num_features),
3636
};
3737

src/dataset/breast_cancer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use crate::dataset::Dataset;
3333
pub fn load_dataset() -> Dataset<f32, u32> {
3434
let (x, y, num_samples, num_features) =
3535
match deserialize_data(std::include_bytes!("breast_cancer.xy")) {
36-
Err(why) => panic!("Can't deserialize breast_cancer.xy. {}", why),
36+
Err(why) => panic!("Can't deserialize breast_cancer.xy. {why}"),
3737
Ok((x, y, num_samples, num_features)) => (
3838
x,
3939
y.into_iter().map(|x| x as u32).collect(),

src/dataset/diabetes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use crate::dataset::Dataset;
2626
pub fn load_dataset() -> Dataset<f32, u32> {
2727
let (x, y, num_samples, num_features) =
2828
match deserialize_data(std::include_bytes!("diabetes.xy")) {
29-
Err(why) => panic!("Can't deserialize diabetes.xy. {}", why),
29+
Err(why) => panic!("Can't deserialize diabetes.xy. {why}"),
3030
Ok((x, y, num_samples, num_features)) => (
3131
x,
3232
y.into_iter().map(|x| x as u32).collect(),

src/dataset/digits.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use crate::dataset::Dataset;
1616
pub fn load_dataset() -> Dataset<f32, f32> {
1717
let (x, y, num_samples, num_features) = match deserialize_data(std::include_bytes!("digits.xy"))
1818
{
19-
Err(why) => panic!("Can't deserialize digits.xy. {}", why),
19+
Err(why) => panic!("Can't deserialize digits.xy. {why}"),
2020
Ok((x, y, num_samples, num_features)) => (x, y, num_samples, num_features),
2121
};
2222

src/dataset/iris.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use crate::dataset::Dataset;
2222
pub fn load_dataset() -> Dataset<f32, u32> {
2323
let (x, y, num_samples, num_features): (Vec<f32>, Vec<u32>, usize, usize) =
2424
match deserialize_data(std::include_bytes!("iris.xy")) {
25-
Err(why) => panic!("Can't deserialize iris.xy. {}", why),
25+
Err(why) => panic!("Can't deserialize iris.xy. {why}"),
2626
Ok((x, y, num_samples, num_features)) => (
2727
x,
2828
y.into_iter().map(|x| x as u32).collect(),

src/dataset/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ pub(crate) fn serialize_data<X: Number + RealNumber, Y: RealNumber>(
7878
.collect();
7979
file.write_all(&y)?;
8080
}
81-
Err(why) => panic!("couldn't create {}: {}", filename, why),
81+
Err(why) => panic!("couldn't create {filename}: {why}"),
8282
}
8383
Ok(())
8484
}

src/decomposition/pca.rs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,7 @@ impl<T: Number + RealNumber, X: Array2<T> + SVDDecomposable<T> + EVDDecomposable
231231

232232
if parameters.n_components > n {
233233
return Err(Failed::fit(&format!(
234-
"Number of components, n_components should be <= number of attributes ({})",
235-
n
234+
"Number of components, n_components should be <= number of attributes ({n})"
236235
)));
237236
}
238237

@@ -374,21 +373,20 @@ mod tests {
374373
let parameters = PCASearchParameters {
375374
n_components: vec![2, 4],
376375
use_correlation_matrix: vec![true, false],
377-
..Default::default()
378376
};
379377
let mut iter = parameters.into_iter();
380378
let next = iter.next().unwrap();
381379
assert_eq!(next.n_components, 2);
382-
assert_eq!(next.use_correlation_matrix, true);
380+
assert!(next.use_correlation_matrix);
383381
let next = iter.next().unwrap();
384382
assert_eq!(next.n_components, 4);
385-
assert_eq!(next.use_correlation_matrix, true);
383+
assert!(next.use_correlation_matrix);
386384
let next = iter.next().unwrap();
387385
assert_eq!(next.n_components, 2);
388-
assert_eq!(next.use_correlation_matrix, false);
386+
assert!(!next.use_correlation_matrix);
389387
let next = iter.next().unwrap();
390388
assert_eq!(next.n_components, 4);
391-
assert_eq!(next.use_correlation_matrix, false);
389+
assert!(!next.use_correlation_matrix);
392390
assert!(iter.next().is_none());
393391
}
394392

@@ -572,8 +570,8 @@ mod tests {
572570
epsilon = 1e-4
573571
));
574572

575-
for i in 0..pca.eigenvalues.len() {
576-
assert!((pca.eigenvalues[i].abs() - expected_eigenvalues[i].abs()).abs() < 1e-8);
573+
for (i, pca_eigenvalues_i) in pca.eigenvalues.iter().enumerate() {
574+
assert!((pca_eigenvalues_i.abs() - expected_eigenvalues[i].abs()).abs() < 1e-8);
577575
}
578576

579577
let us_arrests_t = pca.transform(&us_arrests).unwrap();
@@ -694,8 +692,8 @@ mod tests {
694692
epsilon = 1e-4
695693
));
696694

697-
for i in 0..pca.eigenvalues.len() {
698-
assert!((pca.eigenvalues[i].abs() - expected_eigenvalues[i].abs()).abs() < 1e-8);
695+
for (i, pca_eigenvalues_i) in pca.eigenvalues.iter().enumerate() {
696+
assert!((pca_eigenvalues_i.abs() - expected_eigenvalues[i].abs()).abs() < 1e-8);
699697
}
700698

701699
let us_arrests_t = pca.transform(&us_arrests).unwrap();

0 commit comments

Comments
 (0)