Merge pull request #222 from sylvestre/fix-release

Various clippy fixes + precommit

.pre-commit-config.yaml

@@ -0,0 +1,17 @@
+repos:
+-   repo: local
+    hooks:
+    -   id: rust-linting
+        name: Rust linting
+        description: Run cargo fmt on files included in the commit.
+        entry: cargo +nightly fmt --
+        pass_filenames: true
+        types: [file, rust]
+        language: system
+    -   id: rust-clippy
+        name: Rust clippy
+        description: Run cargo clippy on files included in the commit.
+        entry: cargo +nightly clippy --workspace --all-targets --all-features --
+        pass_filenames: false
+        types: [file, rust]
+        language: system

src/find/main.rs

@@ -6,7 +6,7 @@
 
 fn main() {
     let args = std::env::args().collect::<Vec<String>>();
-    let strs: Vec<&str> = args.iter().map(|s| s.as_ref()).collect();
+    let strs: Vec<&str> = args.iter().map(std::convert::AsRef::as_ref).collect();
     let deps = findutils::find::StandardDependencies::new();
     std::process::exit(findutils::find::find_main(&strs, &deps));
 }

src/find/matchers/type_matcher.rs

@@ -87,7 +87,7 @@ mod tests {
         let dir = get_dir_entry_for("test_data", "simple");
         let deps = FakeDependencies::new();
 
-        let matcher = TypeMatcher::new(&"f".to_string()).unwrap();
+        let matcher = TypeMatcher::new("f").unwrap();
         assert!(!matcher.matches(&dir, &mut deps.new_matcher_io()));
         assert!(matcher.matches(&file, &mut deps.new_matcher_io()));
     }
@@ -98,7 +98,7 @@ mod tests {
         let dir = get_dir_entry_for("test_data", "simple");
         let deps = FakeDependencies::new();
 
-        let matcher = TypeMatcher::new(&"d".to_string()).unwrap();
+        let matcher = TypeMatcher::new("d").unwrap();
         assert!(matcher.matches(&dir, &mut deps.new_matcher_io()));
         assert!(!matcher.matches(&file, &mut deps.new_matcher_io()));
     }
@@ -108,7 +108,7 @@ mod tests {
     #[test]
     fn link_type_matcher() {
         #[cfg(unix)]
-        let _ = {
+        {
             if let Err(e) = symlink("abbbc", "test_data/links/link-f") {
                 if e.kind() != ErrorKind::AlreadyExists {
                     panic!("Failed to create sym link: {:?}", e);
@@ -140,7 +140,7 @@ mod tests {
         let dir = get_dir_entry_for("test_data", "links");
         let deps = FakeDependencies::new();
 
-        let matcher = TypeMatcher::new(&"l".to_string()).unwrap();
+        let matcher = TypeMatcher::new("l").unwrap();
         assert!(!matcher.matches(&dir, &mut deps.new_matcher_io()));
         assert!(!matcher.matches(&file, &mut deps.new_matcher_io()));
         assert!(matcher.matches(&link_f, &mut deps.new_matcher_io()));
@@ -155,15 +155,15 @@ mod tests {
         let deps = FakeDependencies::new();
 
         for typ in &["b", "c", "p", "s"] {
-            let matcher = TypeMatcher::new(&typ.to_string()).unwrap();
+            let matcher = TypeMatcher::new(typ.as_ref()).unwrap();
             assert!(!matcher.matches(&dir, &mut deps.new_matcher_io()));
             assert!(!matcher.matches(&file, &mut deps.new_matcher_io()));
         }
     }
 
     #[test]
     fn cant_create_with_invalid_pattern() {
-        let result = TypeMatcher::new(&"xxx".to_string());
+        let result = TypeMatcher::new("xxx");
         assert!(result.is_err());
     }
 }

src/find/mod.rs

@@ -638,7 +638,7 @@ mod tests {
         assert_eq!(rc, 0);
         assert_eq!(
             deps.get_output_as_string(),
-            (&new_dir).path().to_string_lossy().to_string() + "\n"
+            new_dir.path().to_string_lossy().to_string() + "\n"
         );
 
         // now do it the other way around, and nothing should be output

src/testing/commandline/main.rs

@@ -37,7 +37,7 @@ fn open_file(destination_dir: &str) -> File {
     loop {
         file_number += 1;
         let mut file_path: PathBuf = PathBuf::from(destination_dir);
-        file_path.push(format!("{}.txt", file_number));
+        file_path.push(format!("{file_number}.txt"));
         if let Ok(f) = OpenOptions::new()
             .write(true)
             .create_new(true)
@@ -68,7 +68,7 @@ fn write_content(mut f: impl Write, config: &Config, args: &[String]) {
     // the destination_dir we want to write to. Don't write either of those
     // as they'll be non-deterministic.
     for arg in &args[2..] {
-        writeln!(f, "{}", arg).expect("failed to write to file");
+        writeln!(f, "{arg}").expect("failed to write to file");
     }
 }
 

src/xargs/main.rs

@@ -7,6 +7,9 @@
 fn main() {
     let args = std::env::args().collect::<Vec<String>>();
     std::process::exit(findutils::xargs::xargs_main(
-        &args.iter().map(|s| s.as_ref()).collect::<Vec<&str>>(),
+        &args
+            .iter()
+            .map(std::convert::AsRef::as_ref)
+            .collect::<Vec<&str>>(),
     ))
 }

tests/common/test_helpers.rs

@@ -14,7 +14,7 @@ use walkdir::{DirEntry, WalkDir};
 use findutils::find::matchers::MatcherIO;
 use findutils::find::Dependencies;
 
-/// A copy of find::tests::FakeDependencies.
+/// A copy of `find::tests::FakeDependencies`.
 /// TODO: find out how to share #[cfg(test)] functions/structs between unit
 /// and integration tests.
 pub struct FakeDependencies {
@@ -81,7 +81,7 @@ pub fn fix_up_slashes(path: &str) -> String {
     path.to_string()
 }
 
-/// A copy of find::tests::FakeDependencies.
+/// A copy of `find::tests::FakeDependencies`.
 /// TODO: find out how to share #[cfg(test)] functions/structs between unit
 /// and integration tests.
 pub fn get_dir_entry_for(directory: &str, filename: &str) -> DirEntry {

tests/exec_unit_tests.rs

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-/// ! This file contains what would be normally be unit tests for find::matchers::exec.
+/// ! This file contains what would be normally be unit tests for `find::matchers::exec`.
 /// ! But as the tests require running an external executable, they need to be run
 /// ! as integration tests so we can ensure that our testing-commandline binary
 /// ! has been built.
@@ -17,8 +17,10 @@ use std::io::Read;
 use tempfile::Builder;
 use walkdir::WalkDir;
 
-use common::test_helpers::*;
-use findutils::find::matchers::exec::*;
+use common::test_helpers::{
+    fix_up_slashes, get_dir_entry_for, path_to_testing_commandline, FakeDependencies,
+};
+use findutils::find::matchers::exec::SingleExecMatcher;
 use findutils::find::matchers::Matcher;
 
 mod common;