clippy and lint

Author: johnlees

src/distances.rs

@@ -137,7 +137,7 @@ impl<'a> Distances<'a> for DistanceMatrix<'a> {
     }
 }
 
-impl<'a> fmt::Display for DistanceMatrix<'a> {
+impl fmt::Display for DistanceMatrix<'_> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let mut dist_idx = 0;
         if let Some(queries) = &self.query_names {
@@ -267,7 +267,7 @@ impl<'a> Distances<'a> for SparseDistanceMatrix<'a> {
     }
 }
 
-impl<'a> fmt::Display for SparseDistanceMatrix<'a> {
+impl fmt::Display for SparseDistanceMatrix<'_> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let mut ref_name_iter = self.ref_names.iter();
         let mut ref_name = ref_name_iter.next().unwrap();

src/multisketch.rs

@@ -15,7 +15,6 @@ use serde::{Deserialize, Serialize};
 use crate::hashing::HashType;
 use crate::sketch::{Sketch, BBITS};
 use crate::sketch_datafile::SketchArrayFile;
-use crate::utils::get_progress_bar;
 
 use std::collections::HashSet;
 #[derive(Serialize, Deserialize)]

src/structures.rs

@@ -1,7 +1,10 @@
 //! Support for .pdb files and the 3di alphabet
+#[cfg(feature = "3di")]
 use crate::io::InputFastx;
+#[cfg(feature = "3di")]
 use anyhow::Error;
 
+#[cfg(feature = "3di")]
 use indicatif::{ProgressIterator, ProgressStyle};
 #[cfg(feature = "3di")]
 use pyo3::prelude::*;

tests/common/mod.rs

@@ -115,11 +115,7 @@ impl TestSetup {
             writeln!(
                 rfile,
                 "{}",
-                &format!(
-                    "{}\t{}",
-                    file,
-                    self.file_string(file, TestDir::Input),
-                )
+                &format!("{}\t{}", file, self.file_string(file, TestDir::Input),)
             )
             .unwrap();
         }

tests/delete.rs

@@ -16,7 +16,12 @@ mod tests {
     fn test_delete_sketches() {
         let sandbox = TestSetup::setup();
 
-        let rfile1 = sandbox.create_rfile(&vec!["14412_3#82.contigs_velvet.fa.gz", "14412_3#84.contigs_velvet.fa.gz", "R6.fa.gz", "TIGR4.fa.gz"]);
+        let rfile1 = sandbox.create_rfile(&vec![
+            "14412_3#82.contigs_velvet.fa.gz",
+            "14412_3#84.contigs_velvet.fa.gz",
+            "R6.fa.gz",
+            "TIGR4.fa.gz",
+        ]);
         Command::new(cargo_bin("sketchlib"))
             .current_dir(sandbox.get_wd())
             .arg("sketch")
@@ -27,7 +32,10 @@ mod tests {
             .assert()
             .success();
 
-        let rfile2 = sandbox.create_rfile(&vec!["14412_3#82.contigs_velvet.fa.gz", "14412_3#84.contigs_velvet.fa.gz"]);
+        let rfile2 = sandbox.create_rfile(&vec![
+            "14412_3#82.contigs_velvet.fa.gz",
+            "14412_3#84.contigs_velvet.fa.gz",
+        ]);
         Command::new(cargo_bin("sketchlib"))
             .current_dir(sandbox.get_wd())
             .arg("sketch")

tests/sketch.rs

@@ -36,7 +36,9 @@ mod tests {
             .arg("info")
             .arg("assembly")
             .assert()
-            .stdout_matches_path(sandbox.file_string("assembly_sketch_info.stdout", TestDir::Correct));
+            .stdout_matches_path(
+                sandbox.file_string("assembly_sketch_info.stdout", TestDir::Correct),
+            );
 
         Command::new(cargo_bin("sketchlib"))
             .current_dir(sandbox.get_wd())
@@ -45,7 +47,9 @@ mod tests {
             .arg("assembly")
             .arg("-v")
             .assert()
-            .stdout_matches_path(sandbox.file_string("assembly_sketch_full_info.stdout", TestDir::Correct));
+            .stdout_matches_path(
+                sandbox.file_string("assembly_sketch_full_info.stdout", TestDir::Correct),
+            );
     }
 
     #[test]
@@ -82,6 +86,8 @@ mod tests {
             .arg("reads")
             .arg("-v")
             .assert()
-            .stdout_matches_path(sandbox.file_string("read_sketch_full_info.stdout", TestDir::Correct));
+            .stdout_matches_path(
+                sandbox.file_string("read_sketch_full_info.stdout", TestDir::Correct),
+            );
     }
 }