version 0.4.0

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

Cargo.lock

@@ -29,6 +29,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "anstyle"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2"
+
 [[package]]
 name = "assert_cmd"
 version = "2.0.8"
@@ -37,7 +43,7 @@ checksum = "9834fcc22e0874394a010230586367d4a3e9f11b560f469262678547e1d2575e"
 dependencies = [
  "bstr",
  "doc-comment",
- "predicates",
+ "predicates 2.1.5",
  "predicates-core",
  "predicates-tree",
  "wait-timeout",
@@ -264,7 +270,7 @@ dependencies = [
 
 [[package]]
 name = "findutils"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "assert_cmd",
  "chrono",
@@ -274,7 +280,7 @@ dependencies = [
  "nix 0.26.2",
  "once_cell",
  "onig",
- "predicates",
+ "predicates 3.0.2",
  "regex",
  "serial_test",
  "tempfile",
@@ -672,6 +678,18 @@ version = "2.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd"
 dependencies = [
+ "difflib",
+ "itertools",
+ "predicates-core",
+]
+
+[[package]]
+name = "predicates"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c575290b64d24745b6c57a12a31465f0a66f3a4799686a6921526a33b0797965"
+dependencies = [
+ "anstyle",
  "difflib",
  "float-cmp",
  "itertools",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "findutils"
-version = "0.3.0"
+version = "0.4.0"
 homepage = "https://github.com/uutils/findutils"
 repository = "https://github.com/uutils/findutils"
 edition = "2018"
@@ -23,7 +23,7 @@ uucore = { version = "0.0.12", features = ["entries", "fs", "fsext", "mode"] }
 assert_cmd = "2"
 filetime = "0.2"
 nix = "0.26"
-predicates = "2"
+predicates = "3"
 serial_test = "1.0"
 tempfile = "3"
 

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,7 +155,7 @@ 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()));
         }
@@ -163,7 +163,7 @@ mod tests {
 
     #[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;

tests/find_cmd_tests.rs

@@ -22,7 +22,7 @@ use std::os::unix::fs::symlink;
 #[cfg(windows)]
 use std::os::windows::fs::{symlink_dir, symlink_file};
 
-use common::test_helpers::*;
+use common::test_helpers::fix_up_slashes;
 
 mod common;
 
@@ -54,7 +54,7 @@ fn no_args() {
 fn two_matchers_both_match() {
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&["-type", "d", "-name", "test_data"])
+        .args(["-type", "d", "-name", "test_data"])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
@@ -66,7 +66,7 @@ fn two_matchers_both_match() {
 fn two_matchers_one_matches() {
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&["-type", "f", "-name", "test_data"])
+        .args(["-type", "f", "-name", "test_data"])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
@@ -83,7 +83,7 @@ fn matcher_with_side_effects_at_end() {
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&[&temp_dir_path, "-name", "test", "-delete"])
+        .args([&temp_dir_path, "-name", "test", "-delete"])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
@@ -103,7 +103,7 @@ fn matcher_with_side_effects_in_front() {
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&[&temp_dir_path, "-delete", "-name", "test"])
+        .args([&temp_dir_path, "-delete", "-name", "test"])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
@@ -123,12 +123,12 @@ fn matcher_with_side_effects_in_front() {
 fn delete_on_dot_dir() {
     let temp_dir = Builder::new().prefix("example").tempdir().unwrap();
     let original_dir = env::current_dir().unwrap();
-    env::set_current_dir(&temp_dir.path()).expect("working dir changed");
+    env::set_current_dir(temp_dir.path()).expect("working dir changed");
 
     // "." should be matched (confirmed by the print), but not deleted.
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&[".", "-delete", "-print"])
+        .args([".", "-delete", "-print"])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
@@ -145,11 +145,11 @@ fn regex_types() {
 
     let temp_dir_path = temp_dir.path().to_string_lossy();
     let test_file = temp_dir.path().join("teeest");
-    File::create(&test_file).expect("created test file");
+    File::create(test_file).expect("created test file");
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&[&temp_dir_path, "-regex", &fix_up_regex_slashes(".*/tE+st")])
+        .args([&temp_dir_path, "-regex", &fix_up_regex_slashes(".*/tE+st")])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
@@ -157,7 +157,7 @@ fn regex_types() {
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&[&temp_dir_path, "-iregex", &fix_up_regex_slashes(".*/tE+st")])
+        .args([&temp_dir_path, "-iregex", &fix_up_regex_slashes(".*/tE+st")])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
@@ -165,7 +165,7 @@ fn regex_types() {
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&[
+        .args([
             &temp_dir_path,
             "-regextype",
             "posix-basic",
@@ -179,7 +179,7 @@ fn regex_types() {
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&[
+        .args([
             &temp_dir_path,
             "-regextype",
             "posix-extended",
@@ -193,7 +193,7 @@ fn regex_types() {
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&[
+        .args([
             &temp_dir_path,
             "-regextype",
             "ed",
@@ -207,7 +207,7 @@ fn regex_types() {
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&[
+        .args([
             &temp_dir_path,
             "-regextype",
             "sed",
@@ -227,18 +227,18 @@ fn empty_files() {
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&[&temp_dir_path, "-empty"])
+        .args([&temp_dir_path, "-empty"])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
-        .stdout(fix_up_slashes(&format!("{}\n", temp_dir_path)));
+        .stdout(fix_up_slashes(&format!("{temp_dir_path}\n")));
 
     let test_file_path = temp_dir.path().join("test");
     let mut test_file = File::create(&test_file_path).unwrap();
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&[&temp_dir_path, "-empty"])
+        .args([&temp_dir_path, "-empty"])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
@@ -252,7 +252,7 @@ fn empty_files() {
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&[&temp_dir_path, "-empty", "-sorted"])
+        .args([&temp_dir_path, "-empty", "-sorted"])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
@@ -267,7 +267,7 @@ fn empty_files() {
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&[&temp_dir_path, "-empty", "-sorted"])
+        .args([&temp_dir_path, "-empty", "-sorted"])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
@@ -283,29 +283,39 @@ fn find_printf() {
     #[cfg(unix)]
     {
         if let Err(e) = symlink("abbbc", "test_data/links/link-f") {
-            if e.kind() != ErrorKind::AlreadyExists {
-                panic!("Failed to create sym link: {:?}", e);
-            }
+            assert!(
+                e.kind() == ErrorKind::AlreadyExists,
+                "Failed to create sym link: {:?}",
+                e
+            );
         }
         if let Err(e) = symlink("subdir", "test_data/links/link-d") {
-            if e.kind() != ErrorKind::AlreadyExists {
-                panic!("Failed to create sym link: {:?}", e);
-            }
+            assert!(
+                e.kind() == ErrorKind::AlreadyExists,
+                "Failed to create sym link: {:?}",
+                e
+            );
         }
         if let Err(e) = symlink("missing", "test_data/links/link-missing") {
-            if e.kind() != ErrorKind::AlreadyExists {
-                panic!("Failed to create sym link: {:?}", e);
-            }
+            assert!(
+                e.kind() == ErrorKind::AlreadyExists,
+                "Failed to create sym link: {:?}",
+                e
+            );
         }
         if let Err(e) = symlink("abbbc/x", "test_data/links/link-notdir") {
-            if e.kind() != ErrorKind::AlreadyExists {
-                panic!("Failed to create sym link: {:?}", e);
-            }
+            assert!(
+                e.kind() == ErrorKind::AlreadyExists,
+                "Failed to create sym link: {:?}",
+                e
+            );
         }
         if let Err(e) = symlink("link-loop", "test_data/links/link-loop") {
-            if e.kind() != ErrorKind::AlreadyExists {
-                panic!("Failed to create sym link: {:?}", e);
-            }
+            assert!(
+                e.kind() == ErrorKind::AlreadyExists,
+                "Failed to create sym link: {:?}",
+                e
+            );
         }
     }
     #[cfg(windows)]
@@ -334,7 +344,7 @@ fn find_printf() {
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&[
+        .args([
             &fix_up_slashes("./test_data/simple"),
             "-sorted",
             "-printf",
@@ -356,7 +366,7 @@ fn find_printf() {
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&[
+        .args([
             &fix_up_slashes("./test_data/links"),
             "-sorted",
             "-type",
@@ -390,19 +400,19 @@ fn find_printf() {
 fn find_perm() {
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&["-perm", "+rwx"])
+        .args(["-perm", "+rwx"])
         .assert()
         .success();
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&["-perm", "u+rwX"])
+        .args(["-perm", "u+rwX"])
         .assert()
         .success();
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&["-perm", "u=g"])
+        .args(["-perm", "u=g"])
         .assert()
         .success();
 }
@@ -421,7 +431,7 @@ fn find_inum() {
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&["test_data", "-inum", &inum])
+        .args(["test_data", "-inum", &inum])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
@@ -434,7 +444,7 @@ fn find_inum() {
 fn find_links() {
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&["test_data", "-links", "1"])
+        .args(["test_data", "-links", "1"])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
@@ -449,7 +459,7 @@ fn find_mount_xdev() {
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&["test_data", "-mount"])
+        .args(["test_data", "-mount"])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
@@ -457,7 +467,7 @@ fn find_mount_xdev() {
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&["test_data", "-xdev"])
+        .args(["test_data", "-xdev"])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
@@ -469,7 +479,7 @@ fn find_mount_xdev() {
 fn find_accessable() {
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&["test_data", "-readable"])
+        .args(["test_data", "-readable"])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
@@ -477,7 +487,7 @@ fn find_accessable() {
 
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&["test_data", "-writable"])
+        .args(["test_data", "-writable"])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
@@ -486,7 +496,7 @@ fn find_accessable() {
     #[cfg(unix)]
     Command::cargo_bin("find")
         .expect("found binary")
-        .args(&["test_data", "-executable"])
+        .args(["test_data", "-executable"])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())

tests/find_exec_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::find_main
+/// ! This file contains what would be normally be unit tests for `find::find_main`
 /// ! related to -exec[dir] and ok[dir] clauses.
 /// ! 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
@@ -18,7 +18,7 @@ use std::fs::File;
 use std::io::Read;
 use tempfile::Builder;
 
-use common::test_helpers::*;
+use common::test_helpers::{fix_up_slashes, path_to_testing_commandline, FakeDependencies};
 use findutils::find::find_main;
 
 mod common;

tests/xargs_tests.rs

@@ -14,7 +14,7 @@ use std::io::{Seek, SeekFrom, Write};
 use assert_cmd::Command;
 use predicates::prelude::*;
 
-use common::test_helpers::*;
+use common::test_helpers::path_to_testing_commandline;
 
 mod common;
 
@@ -33,7 +33,7 @@ fn xargs_basics() {
 fn xargs_null() {
     Command::cargo_bin("xargs")
         .expect("found binary")
-        .args(&["-0n1"])
+        .args(["-0n1"])
         .write_stdin("ab c\0d\tef\0")
         .assert()
         .success()
@@ -45,7 +45,7 @@ fn xargs_null() {
 fn xargs_delim() {
     Command::cargo_bin("xargs")
         .expect("found binary")
-        .args(&["-d1"])
+        .args(["-d1"])
         .write_stdin("ab1cd1ef")
         .assert()
         .success()
@@ -54,7 +54,7 @@ fn xargs_delim() {
 
     Command::cargo_bin("xargs")
         .expect("found binary")
-        .args(&["-d\\t", "-n1"])
+        .args(["-d\\t", "-n1"])
         .write_stdin("a\nb\td e\tfg")
         .assert()
         .success()
@@ -63,7 +63,7 @@ fn xargs_delim() {
 
     Command::cargo_bin("xargs")
         .expect("found binary")
-        .args(&["-dabc"])
+        .args(["-dabc"])
         .assert()
         .failure()
         .code(1)
@@ -75,7 +75,7 @@ fn xargs_delim() {
 fn xargs_null_conflict() {
     Command::cargo_bin("xargs")
         .expect("found binary")
-        .args(&["-d\t", "-0n1"])
+        .args(["-d\t", "-0n1"])
         .write_stdin("ab c\0d\tef\0")
         .assert()
         .success()
@@ -95,7 +95,7 @@ fn xargs_if_empty() {
 
     Command::cargo_bin("xargs")
         .expect("found binary")
-        .args(&["--no-run-if-empty"])
+        .args(["--no-run-if-empty"])
         .assert()
         .success()
         .stderr(predicate::str::is_empty())
@@ -256,7 +256,7 @@ fn xargs_exec_stdin_open() {
 fn xargs_exec_failure() {
     Command::cargo_bin("xargs")
         .expect("found binary")
-        .args(&[
+        .args([
             "-n1",
             &path_to_testing_commandline(),
             "-",
@@ -278,7 +278,7 @@ fn xargs_exec_failure() {
 fn xargs_exec_urgent_failure() {
     Command::cargo_bin("xargs")
         .expect("found binary")
-        .args(&[
+        .args([
             "-n1",
             &path_to_testing_commandline(),
             "-",
@@ -298,7 +298,7 @@ fn xargs_exec_urgent_failure() {
 fn xargs_exec_with_signal() {
     Command::cargo_bin("xargs")
         .expect("found binary")
-        .args(&[
+        .args([
             "-n1",
             &path_to_testing_commandline(),
             "-",
@@ -317,7 +317,7 @@ fn xargs_exec_with_signal() {
 fn xargs_exec_not_found() {
     Command::cargo_bin("xargs")
         .expect("found binary")
-        .args(&["this-file-does-not-exist"])
+        .args(["this-file-does-not-exist"])
         .assert()
         .failure()
         .code(127)