New release (0.4.2)

CI: test all features

.appveyor.yml

@@ -1,23 +0,0 @@
-os: Visual Studio 2015
-
-version: "{build}"
-
-environment:
-  matrix:
-    - channel: stable
-      target: x86_64-pc-windows-msvc
-    - channel: nightly
-      target: x86_64-pc-windows-msvc
-
-install:
-  - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
-  - rustup-init -yv --default-toolchain %channel% --default-host %target%
-  - set PATH=%PATH%;%USERPROFILE%\.cargo\bin
-  - rustc -vV && cargo -vV
-
-build_script:
-  - cargo build --verbose
-
-test_script:
-  - cargo test --verbose
-

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
 
       - name: Check
         run: |
-          cargo check
+          cargo check --all --all-features
 
   test:
     name: cargo test

.travis.yml

@@ -1,33 +0,0 @@
-language: rust
-
-sudo: false
-os:
-  - linux
-  - osx
-rust:
-  - stable
-  - nightly
-
-matrix:
-  fast_finish: true
-
-branches:
-  only:
-    - master
-
-cache: cargo
-
-before_cache: |
-  if [[ "$TRAVIS_RUST_VERSION" = nightly ]]; then
-    RUSTFLAGS="--cfg procmacro2_semver_exempt" cargo install cargo-tarpaulin -f
-  fi
-
-script:
-  - cargo build --verbose
-  - cargo test --verbose
-
-after_script: |
-  if [[ "$TRAVIS_OS_NAME" = linux && "$TRAVIS_RUST_VERSION" = nightly ]]; then
-    cargo tarpaulin --out Xml
-    bash <(curl -s https://codecov.io/bash)
-  fi

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "findutils"
-version = "0.4.0"
+version = "0.4.2"
 homepage = "https://github.com/uutils/findutils"
 repository = "https://github.com/uutils/findutils"
 edition = "2018"
@@ -15,16 +15,16 @@ clap = "2.34"
 faccess = "0.2.4"
 walkdir = "2.3"
 regex = "1.7"
-once_cell = "1.17"
+once_cell = "1.18"
 onig = "6.4"
-uucore = { version = "0.0.12", features = ["entries", "fs", "fsext", "mode"] }
+uucore = { version = "0.0.20", features = ["entries", "fs", "fsext", "mode"] }
 
 [dev-dependencies]
 assert_cmd = "2"
 filetime = "0.2"
 nix = "0.26"
 predicates = "3"
-serial_test = "1.0"
+serial_test = "2.0"
 tempfile = "3"
 
 [[bin]]

src/find/matchers/glob.rs

@@ -169,7 +169,7 @@ impl Pattern {
         Self { regex }
     }
 
-    /// Test if this patern matches a string.
+    /// Test if this pattern matches a string.
     pub fn matches(&self, string: &str) -> bool {
         self.regex.is_match(string)
     }

src/find/matchers/lname.rs

@@ -73,15 +73,19 @@ mod tests {
     fn create_file_link() {
         #[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
+            );
         }
         #[cfg(windows)]
         if let Err(e) = symlink_file("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
+            );
         }
     }
 

src/find/matchers/logical_matchers.rs

@@ -530,9 +530,9 @@ mod tests {
     #[test]
     fn not_has_side_effects_works() {
         let has_fx = NotMatcher::new(HasSideEffects);
-        let hasnt_fx = NotMatcher::new(FalseMatcher);
+        let has_no_fx = NotMatcher::new(FalseMatcher);
         assert!(has_fx.has_side_effects());
-        assert!(!hasnt_fx.has_side_effects());
+        assert!(!has_no_fx.has_side_effects());
     }
 
     #[test]

src/find/matchers/mod.rs

@@ -611,7 +611,7 @@ mod tests {
             let deps = FakeDependencies::new();
 
             let matcher =
-                build_top_level_matcher(&[arg, "-name", "doesntexist"], &mut config).unwrap();
+                build_top_level_matcher(&[arg, "-name", "does_not_exist"], &mut config).unwrap();
 
             assert!(matcher.matches(&abbbc_lower, &mut deps.new_matcher_io()));
             assert_eq!(
@@ -652,7 +652,8 @@ mod tests {
 
             config = Config::default();
             let matcher =
-                build_top_level_matcher(&[arg, arg, "-name", "doesntexist"], &mut config).unwrap();
+                build_top_level_matcher(&[arg, arg, "-name", "does_not_exist"], &mut config)
+                    .unwrap();
 
             assert!(!matcher.matches(&abbbc_lower, &mut deps.new_matcher_io()));
         }

src/find/matchers/name.rs

@@ -47,15 +47,19 @@ mod tests {
     fn create_file_link() {
         #[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
+            );
         }
         #[cfg(windows)]
         if let Err(e) = symlink_file("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
+            );
         }
     }
 

src/find/matchers/perm.rs

@@ -223,7 +223,7 @@ mod tests {
         PermMatcher::new("d=rwx,g=rx,o+r").expect_err("invalid category should fail");
         PermMatcher::new("u=dwx,g=rx,o+r").expect_err("invalid permission bit should fail");
         PermMatcher::new("u_rwx,g=rx,o+r")
-            .expect_err("invalid category/permissoin separator should fail");
+            .expect_err("invalid category/permission separator should fail");
         PermMatcher::new("77777777777777").expect_err("overflowing octal value should fail");
 
         // FIXME: uucore::mode shouldn't accept this

src/find/matchers/printf.rs

@@ -396,7 +396,7 @@ fn format_directive<'entry>(
     // NOTE ON QUOTING:
     // GNU find's man page claims that several directives that print names (like
     // %f) are quoted like ls; however, I could not reproduce this at all in
-    // pratice, thus the set of rules is undoubtedly very different (if this is
+    // practice, thus the set of rules is undoubtedly very different (if this is
     // still done at all).
 
     let res: Cow<'entry, str> = match directive {
@@ -463,11 +463,13 @@ fn format_directive<'entry>(
         #[cfg(unix)]
         FormatDirective::Filesystem => {
             let dev_id = meta()?.dev().to_string();
-            uucore::fsext::read_fs_list()
+            let fs_list =
+                uucore::fsext::read_fs_list().expect("Could not find the filesystem info");
+            fs_list
                 .into_iter()
                 .find(|fs| fs.dev_id == dev_id)
                 .map(|fs| fs.fs_type)
-                .unwrap_or_else(|| "".to_owned())
+                .unwrap_or_else(String::new)
                 .into()
         }
 
@@ -946,52 +948,70 @@ mod tests {
         #[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)]
         {
             if let Err(e) = symlink_file("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_dir("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_file("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_file("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
+                );
             }
         }
 

src/find/matchers/time.rs

@@ -261,7 +261,7 @@ mod tests {
         deps.set_time(files_mtime - Duration::new(1_u64, 0));
         assert!(
             !exactly_one_day_matcher.matches(&file, &mut deps.new_matcher_io()),
-            "future-modified file shouldn'1 match exactly 1 day old"
+            "future-modified file shouldn't match exactly 1 day old"
         );
         assert!(
             !more_than_one_day_matcher.matches(&file, &mut deps.new_matcher_io()),
@@ -311,14 +311,14 @@ mod tests {
         }
 
         thread::sleep(Duration::from_secs(2));
-        // read the file agaion - potentially changing accessed time
+        // read the file again - potentially changing accessed time
         {
             let mut f = File::open(&foo_path).expect("open temp file");
             let _ = f.read(&mut buffer);
         }
 
         // OK our modification time and creation time should definitely be different
-        // and depending on our platform and file system, our accessed time migh be
+        // and depending on our platform and file system, our accessed time might be
         // different too.
 
         let file_info = get_dir_entry_for(&temp_dir.path().to_string_lossy(), "foo");

src/find/matchers/type_matcher.rs

@@ -110,27 +110,35 @@ mod tests {
         #[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
+                );
             }
         };
         #[cfg(windows)]
         let _ = {
             if let Err(e) = symlink_file("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_dir("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
+                );
             }
         };
 

src/find/mod.rs

@@ -338,15 +338,19 @@ mod tests {
     fn create_file_link() {
         #[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
+            );
         }
         #[cfg(windows)]
         if let Err(e) = symlink_file("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
+            );
         }
     }
 

src/testing/commandline/main.rs

@@ -78,13 +78,14 @@ fn main() {
         usage();
     }
     let mut config = Config {
-        destination_dir: if args[1] != "-" {
-            Some(args[1].clone())
-        } else {
+        destination_dir: if args[1] == "-" {
             None
+        } else {
+            Some(args[1].clone())
         },
         ..Default::default()
     };
+
     for arg in &args[2..] {
         if arg.starts_with("--") {
             match arg.as_ref() {

tests/find_cmd_tests.rs

@@ -1,6 +1,6 @@
 // Copyright 2021 Chad Williamson <chad@dahc.us>
 //
-// Use of this source code is governed by an MIT-syle license that can be
+// Use of this source code is governed by an MIT-style license that can be
 // found in the LICENSE file or at https://opensource.org/licenses/MIT.
 
 // This file contains integration tests for the find command.
@@ -321,24 +321,32 @@ fn find_printf() {
     #[cfg(windows)]
     {
         if let Err(e) = symlink_file("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_dir("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_file("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_file("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
+            );
         }
     }
 
@@ -476,7 +484,7 @@ fn find_mount_xdev() {
 
 #[serial(working_dir)]
 #[test]
-fn find_accessable() {
+fn find_accessible() {
     Command::cargo_bin("find")
         .expect("found binary")
         .args(["test_data", "-readable"])