(1st issue) Port uutests

.github/workflows/release.yml

@@ -47,7 +47,7 @@ on:
 jobs:
   # Run 'dist plan' (or host) to determine what tasks we need to do
   plan:
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-latest"
     outputs:
       val: ${{ steps.plan.outputs.manifest }}
       tag: ${{ !github.event.pull_request && github.ref_name || '' }}
@@ -129,7 +129,7 @@ jobs:
         run: ${{ matrix.install_dist.run }}
       # Get the dist-manifest
       - name: Fetch local artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           pattern: artifacts-*
           path: target/distrib/
@@ -168,7 +168,7 @@ jobs:
     needs:
       - plan
       - build-local-artifacts
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-latest"
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
@@ -177,14 +177,14 @@ jobs:
         with:
           submodules: recursive
       - name: Install cached dist
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: cargo-dist-cache
           path: ~/.cargo/bin/
       - run: chmod +x ~/.cargo/bin/dist
       # Get all the local artifacts for the global tasks to use (for e.g. checksums)
       - name: Fetch local artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           pattern: artifacts-*
           path: target/distrib/
@@ -218,22 +218,22 @@ jobs:
     if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-latest"
     outputs:
       val: ${{ steps.host.outputs.manifest }}
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Install cached dist
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: cargo-dist-cache
           path: ~/.cargo/bin/
       - run: chmod +x ~/.cargo/bin/dist
       # Fetch artifacts from scratch-storage
       - name: Fetch artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           pattern: artifacts-*
           path: target/distrib/
@@ -253,7 +253,7 @@ jobs:
           path: dist-manifest.json
       # Create a GitHub Release while uploading all files to it
       - name: "Download GitHub Artifacts"
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           pattern: artifacts-*
           path: artifacts
@@ -282,7 +282,7 @@ jobs:
     # still allowing individual publish jobs to skip themselves (for prereleases).
     # "host" however must run to completion, no skipping allowed!
     if: ${{ always() && needs.host.result == 'success' }}
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-latest"
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:

CONTRIBUTING.md

@@ -180,7 +180,7 @@ To ensure easy collaboration, we have guidelines for using Git and GitHub.
 ### Commit messages
 
 You can read this section in the Git book to learn how to write good commit
-messages: https://git-scm.com/book/ch5-2.html.
+messages: https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project.
 
 In addition, here are a few examples for a summary line when committing to
 uutils:

Cargo.toml

@@ -10,12 +10,12 @@ description = "Rust implementation of GNU findutils"
 authors = ["uutils developers"]
 
 [dependencies]
-chrono = "0.4.40"
+chrono = "0.4.41"
 clap = "4.5"
 faccess = "0.2.4"
 walkdir = "2.5"
 regex = "1.11"
-onig = { version = "6.4", default-features = false }
+onig = { version = "6.5", default-features = false }
 uucore = { version = "0.0.30", features = ["entries", "fs", "fsext", "mode"] }
 nix = { version = "0.29", features = ["fs", "user"] }
 argmax = "0.3.1"
@@ -25,7 +25,7 @@ ctor = "0.4.1"
 [dev-dependencies]
 assert_cmd = "2"
 filetime = "0.2"
-nix = { version = "0.29", features = ["fs"] }
+nix = { version = "0.30", features = ["fs"] }
 predicates = "3"
 serial_test = "3.2"
 tempfile = "3"

README.md

@@ -20,8 +20,8 @@ bash util/build-gnu.sh tests/misc/help-version.sh
 
 ## Comparing with GNU
 
-![Evolution over time - GNU testsuite](https://github.com/uutils/findutils-tracking/blob/main/gnu-results.png?raw=true)
-![Evolution over time - BFS testsuite](https://github.com/uutils/findutils-tracking/blob/main/bfs-results.png?raw=true)
+![Evolution over time - GNU testsuite](https://github.com/uutils/findutils-tracking/blob/main/gnu-results.svg?raw=true)
+![Evolution over time - BFS testsuite](https://github.com/uutils/findutils-tracking/blob/main/bfs-results.svg?raw=true)
 
 ## Build/run with BFS
 
@@ -35,3 +35,4 @@ bash util/build-bfs.sh posix/basic
 ```
 
 For more details, see https://github.com/uutils/findutils-tracking/
+

dist-workspace.toml

@@ -17,3 +17,8 @@ pr-run-mode = "plan"
 install-path = "CARGO_HOME"
 # Whether to install an updater program
 install-updater = false
+# Ignore out-of-date contents
+allow-dirty = ["ci"]
+
+[dist.github-custom-runners]
+x86_64-unknown-linux-gnu = "ubuntu-latest"

src/find/matchers/entry.rs

@@ -24,7 +24,7 @@ enum Entry {
 }
 
 /// File types.
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
 pub enum FileType {
     Unknown,
     Fifo,

src/find/matchers/fs.rs

@@ -53,7 +53,8 @@ pub fn get_file_system_type(path: &Path, cache: &RefCell<Option<Cache>>) -> URes
     let fs_list = uucore::fsext::read_fs_list()?;
     let result = fs_list
         .into_iter()
-        .find(|fs| fs.dev_id == dev_id)
+        .filter(|fs| fs.dev_id == dev_id)
+        .next_back()
         .map_or_else(String::new, |fs| fs.fs_type);
 
     // cache the latest query if not a match before

src/find/matchers/mod.rs

@@ -720,7 +720,9 @@ fn build_matcher_tree(
                 i += 1;
                 let matcher = UserMatcher::from_user_name(user)
                     .or_else(|| Some(UserMatcher::from_uid(user.parse::<u32>().ok()?)))
-                    .ok_or_else(|| format!("{user} is not the name of a known user"))?;
+                    .ok_or_else(|| {
+                        format!("invalid user name or UID argument to -user: '{user}'")
+                    })?;
                 Some(matcher.into_box())
             }
             "-nouser" => Some(NoUserMatcher {}.into_box()),
@@ -749,7 +751,9 @@ fn build_matcher_tree(
                 i += 1;
                 let matcher = GroupMatcher::from_group_name(group)
                     .or_else(|| Some(GroupMatcher::from_gid(group.parse::<u32>().ok()?)))
-                    .ok_or_else(|| format!("{group} is not the name of an existing group"))?;
+                    .ok_or_else(|| {
+                        format!("invalid group name or GID argument to -group: '{group}'")
+                    })?;
                 Some(matcher.into_box())
             }
             "-nogroup" => Some(NoGroupMatcher {}.into_box()),

src/find/matchers/printf.rs

@@ -446,7 +446,8 @@ fn format_directive<'entry>(
                 uucore::fsext::read_fs_list().expect("Could not find the filesystem info");
             fs_list
                 .into_iter()
-                .find(|fs| fs.dev_id == dev_id)
+                .filter(|fs| fs.dev_id == dev_id)
+                .next_back()
                 .map_or_else(String::new, |fs| fs.fs_type)
                 .into()
         }