Merge branch 'main' into fold

Author: lavafroth

.github/workflows/CICD.yml

@@ -3,9 +3,9 @@ name: CICD
 # spell-checker:ignore (abbrev/names) CACHEDIR CICD CodeCOV MacOS MinGW MSVC musl taiki
 # spell-checker:ignore (env/flags) Awarnings Ccodegen Coverflow Cpanic Dwarnings RUSTDOCFLAGS RUSTFLAGS Zpanic CARGOFLAGS CLEVEL nodocs
 # spell-checker:ignore (jargon) SHAs deps dequote softprops subshell toolchain fuzzers dedupe devel profdata
-# spell-checker:ignore (people) Peltoche rivy dtolnay Anson dawidd
+# spell-checker:ignore (people) Peltoche rivy Anson dawidd
 # spell-checker:ignore (shell/tools) binutils choco clippy dmake esac fakeroot fdesc fdescfs gmake grcov halium lcov libclang libfuse libssl limactl nextest nocross pacman popd printf pushd redoxer rsync rustc rustfmt rustup shopt sccache utmpdump xargs zstd
-# spell-checker:ignore (misc) aarch alnum armhf bindir busytest coreutils defconfig DESTDIR gecos getenforce gnueabihf issuecomment maint manpages msys multisize noconfirm nofeatures nullglob onexitbegin onexitend pell runtest Swatinem tempfile testsuite toybox uutils libsystemd codspeed wasip
+# spell-checker:ignore (misc) aarch alnum armhf bindir busytest coreutils defconfig DESTDIR gecos getenforce gnueabihf issuecomment maint manpages msys multisize noconfirm nofeatures nullglob onexitbegin onexitend pell runtest tempfile testsuite toybox uutils libsystemd codspeed wasip libexecinfo
 
 env:
   PROJECT_NAME: coreutils
@@ -102,7 +102,7 @@ jobs:
 # for now, don't build it on mac & windows because the doc is only published from linux
 # + it needs a bunch of duplication for build
 # and I don't want to add a doc step in the regular build to avoid long builds
-#          - { os: macos-latest   , features: feat_os_macos }
+#          - { os: macos-latest   , features: feat_os_unix }
 #          - { os: windows-latest , features: feat_os_windows }
     steps:
     - uses: actions/checkout@v6
@@ -152,7 +152,7 @@ jobs:
       shell: bash
       run: |
         RUSTDOCFLAGS="-Dwarnings" cargo doc  ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} --no-deps --workspace --document-private-items
-    - uses: DavidAnson/markdownlint-cli2-action@v22
+    - uses: DavidAnson/markdownlint-cli2-action@v23
       with:
         fix: "true"
         globs: |
@@ -237,7 +237,7 @@ jobs:
         RUST_BACKTRACE: "1"
     - name: Upload test results to Codecov
       if: ${{ !cancelled() }}
-      uses: codecov/codecov-action@v5
+      uses: codecov/codecov-action@v6
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         report_type: test_results
@@ -277,7 +277,7 @@ jobs:
       matrix:
         job:
           - { os: ubuntu-latest  , features: feat_os_unix }
-          - { os: macos-latest   , features: feat_os_macos }
+          - { os: macos-latest   , features: feat_os_unix }
           - { os: windows-latest , features: feat_os_windows }
     steps:
     - uses: actions/checkout@v6
@@ -301,7 +301,7 @@ jobs:
         RUST_BACKTRACE: "1"
     - name: Upload test results to Codecov
       if: ${{ !cancelled() }}
-      uses: codecov/codecov-action@v5
+      uses: codecov/codecov-action@v6
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         report_type: test_results
@@ -320,7 +320,7 @@ jobs:
       matrix:
         job:
           - { os: ubuntu-latest  , features: feat_os_unix }
-          - { os: macos-latest   , features: feat_os_macos }
+          - { os: macos-latest   , features: feat_os_unix }
           - { os: windows-latest , features: feat_os_windows }
     steps:
     - uses: actions/checkout@v6
@@ -344,7 +344,7 @@ jobs:
         RUST_BACKTRACE: "1"
     - name: Upload test results to Codecov
       if: ${{ !cancelled() }}
-      uses: codecov/codecov-action@v5
+      uses: codecov/codecov-action@v6
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         report_type: test_results
@@ -378,14 +378,13 @@ jobs:
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: "feat_os_unix,test_risky_names", use-cross: use-cross, skip-publish: true }
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: "feat_os_unix,uudoc"   , use-cross: no, workspace-tests: true }
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-musl   , features: feat_os_unix_musl , use-cross: use-cross }
-          # utmpx, chroot stdbuf is broken on NetBSD at least for...
-          - { os: ubuntu-latest  , target: x86_64-unknown-netbsd       , features: "feat_Tier1" , use-cross: use-cross , skip-tests: true , check-only: true }
+          - { os: ubuntu-latest  , target: x86_64-unknown-netbsd, features: "feat_os_unix", use-cross: use-cross , skip-tests: true , check-only: true }
           - { os: ubuntu-latest  , target: x86_64-unknown-redox        , features: feat_os_unix_redox     , use-cross: redoxer , skip-tests: true , check-only: true }
           - { os: ubuntu-latest  , target: wasm32-wasip1, default-features: false, features: feat_wasm, skip-tests: true }
-          - { os: macos-latest   , target: aarch64-apple-darwin        , features: feat_os_macos, workspace-tests: true } # M1 CPU
+          - { os: macos-latest   , target: aarch64-apple-darwin        , features: feat_os_unix, workspace-tests: true } # M1 CPU
           # PR #7964: chcon should not break build without the feature. cargo check is enough to detect it.
           - { os: macos-latest   , target: aarch64-apple-darwin        , workspace-tests: true, check-only: true } # M1 CPU
-          - { os: macos-latest   , target: x86_64-apple-darwin         , features: feat_os_macos, workspace-tests: true }
+          - { os: macos-latest   , target: x86_64-apple-darwin         , features: feat_os_unix, workspace-tests: true }
           - { os: windows-latest , target: i686-pc-windows-msvc        , features: feat_os_windows }
           - { os: windows-latest , target: x86_64-pc-windows-gnu       , features: feat_os_windows }
           - { os: windows-latest , target: x86_64-pc-windows-msvc      , features: feat_os_windows }
@@ -505,9 +504,16 @@ jobs:
             ;;
         esac
     - uses: taiki-e/install-action@v2
-      if: steps.vars.outputs.CARGO_CMD == 'cross'
+      # `cross` v0.2.5 lacks `libexecinfo` on NetBSD. However, this has been added in main.
+      # See https://github.com/cross-rs/cross/blob/main/docker/netbsd.sh
+      # We are pulling cross from a specific commit hash rather than HEAD to avoid any potential breakage that may be introduced.
+      # Once `cross` v0.3 is out, these conditionals can be removed.
+      if: steps.vars.outputs.CARGO_CMD == 'cross' && matrix.job.target != 'x86_64-unknown-netbsd'
       with:
         tool: cross@0.2.5
+    - name: Install cross from git (NetBSD)
+      if: steps.vars.outputs.CARGO_CMD == 'cross' && matrix.job.target == 'x86_64-unknown-netbsd'
+      run: cargo install cross --git https://github.com/cross-rs/cross --rev f86fd03bb70b4c6802847c18087e21391498b0b4
     - name: Create all needed build/work directories
       shell: bash
       run: |
@@ -604,7 +610,7 @@ jobs:
       if: matrix.job.skip-publish != true && matrix.job.check-only == true
       run: |
         # expr breaks redox
-        sed -i.b '/"expr",/d' Cargo.toml
+        if [[ "${{ matrix.job.target }}" == *"redox"* ]]; then sed -i.b '/"expr",/d' Cargo.toml; fi
         ${{ steps.vars.outputs.CARGO_CMD }} ${{ steps.vars.outputs.CARGO_CMD_OPTIONS }} check \
         --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} ${{ steps.vars.outputs.CARGO_DEFAULT_FEATURES_OPTION }}
     - name: Test
@@ -625,7 +631,7 @@ jobs:
         ${{ steps.vars.outputs.CARGO_CMD }} ${{ steps.vars.outputs.CARGO_CMD_OPTIONS }} build --release --config=profile.release.strip=true \
         --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} ${{ steps.vars.outputs.CARGO_DEFAULT_FEATURES_OPTION }}
     # We don't want to have many duplicated long jobs at here
-    # So we build individual binaries for few platforms until we deduplicate many release build for Linux 
+    # So we build individual binaries for few platforms until we deduplicate many release build for Linux
     - name: Build individual binaries
       if: matrix.job.skip-tests != true && matrix.job.target == 'x86_64-pc-windows-msvc'
       shell: bash
@@ -799,7 +805,7 @@ jobs:
         # RUSTUP_TOOLCHAIN: ${{ steps.vars.outputs.TOOLCHAIN }}
 
     - name: Upload coverage results (to Codecov.io)
-      uses: codecov/codecov-action@v5
+      uses: codecov/codecov-action@v6
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         files: ${{ steps.run_test_cov.outputs.report }}
@@ -809,7 +815,7 @@ jobs:
         fail_ci_if_error: false
     - name: Upload test results to Codecov
       if: ${{ !cancelled() }}
-      uses: codecov/codecov-action@v5
+      uses: codecov/codecov-action@v6
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         report_type: test_results
@@ -860,7 +866,7 @@ jobs:
       fail-fast: false
       matrix:
         job:
-          - { os: macos-latest   , features: feat_os_macos }
+          - { os: macos-latest   , features: feat_os_unix }
           - { os: windows-latest , features: feat_os_windows }
 
     steps:

.github/workflows/FixPR.yml

@@ -1,6 +1,6 @@
 name: FixPR
 
-# spell-checker:ignore Swatinem dtolnay dedupe
+# spell-checker:ignore dedupe
 
 # Trigger automated fixes for PRs being merged (with associated commits)
 
@@ -69,7 +69,7 @@ jobs:
         ## * using the 'stable' toolchain is necessary to avoid "unexpected '--filter-platform'" errors
         cargo +stable tree --locked --no-dedupe -e=no-dev --prefix=none --features ${{ matrix.job.features }} | grep -vE "$PWD" | sort --unique
     - name: Commit any changes (to '${{ env.BRANCH_TARGET }}')
-      uses: EndBug/add-and-commit@v9
+      uses: EndBug/add-and-commit@v10
       with:
         new_branch: ${{ env.BRANCH_TARGET }}
         default_author: github_actions

.github/workflows/GnuTests.yml

@@ -1,10 +1,10 @@
 name: GnuTests
 
-# spell-checker:ignore (abbrev/names) CodeCov gnulib GnuTests Swatinem
+# spell-checker:ignore (abbrev/names) CodeCov gnulib GnuTests
 # spell-checker:ignore (jargon) submodules devel
-# spell-checker:ignore (libs/utils) chksum dpkg getenforce getlimits gperf lcov libexpect limactl pyinotify setenforce shopt valgrind libattr libcap taiki-e zstd cpio
+# spell-checker:ignore (libs/utils) chksum dpkg getenforce gperf lcov libexpect limactl pyinotify setenforce shopt valgrind libattr libcap taiki-e zstd cpio
 # spell-checker:ignore (options) Ccodegen Coverflow Cpanic Zpanic
-# spell-checker:ignore (people) Dawid Dziurla * dawidd dtolnay
+# spell-checker:ignore (people) Dawid Dziurla * dawidd
 # spell-checker:ignore (vars) FILESET SUBDIRS XPASS
 # spell-checker:ignore userns nodocs
 
@@ -354,7 +354,7 @@ jobs:
         path: 'uutils'
         persist-credentials: false
     - name: Retrieve reference artifacts
-      uses: dawidd6/action-download-artifact@v19
+      uses: dawidd6/action-download-artifact@v20
       # ref: <https://github.com/dawidd6/action-download-artifact>
       continue-on-error: true ## don't break the build for missing reference artifacts (may be expired or just not generated yet)
       with:

.github/workflows/android.yml

@@ -1,6 +1,6 @@
 name: Android
 
-# spell-checker:ignore (people) reactivecircus Swatinem dtolnay juliangruber
+# spell-checker:ignore (people) reactivecircus juliangruber
 # spell-checker:ignore (shell/tools) TERMUX nextest udevadm pkill
 # spell-checker:ignore (misc) swiftshader playstore DATALOSS noaudio
 

.github/workflows/benchmarks.yml

@@ -1,6 +1,6 @@
 name: Benchmarks
 
-# spell-checker:ignore (people) dtolnay Swatinem taiki-e
+# spell-checker:ignore (people) taiki-e
 # spell-checker:ignore (misc) codspeed sccache
 
 on:
@@ -30,6 +30,7 @@ jobs:
           uu_base64,
           uu_cksum,
           uu_cp,
+          uu_cat,
           uu_cut,
           uu_dd,
           uu_df,
@@ -47,6 +48,7 @@ jobs:
           uu_shuf,
           uu_sort,
           uu_split,
+          uu_timeout,
           uu_tsort,
           uu_unexpand,
           uu_uniq,

.github/workflows/code-quality.yml

@@ -1,6 +1,6 @@
 name: Code Quality
 
-# spell-checker:ignore (people) dtolnay juliangruber pell reactivecircus Swatinem taiki-e taplo
+# spell-checker:ignore (people) juliangruber pell reactivecircus taiki-e taplo
 # spell-checker:ignore (misc) TERMUX noaudio pkill swiftshader esac sccache pcoreutils shopt subshell dequote libsystemd
 
 on:
@@ -72,8 +72,9 @@ jobs:
       matrix:
         job:
           - { os: ubuntu-latest  , features: all             , workspace: true }
-          - { os: macos-latest   , features: feat_os_macos }
+          - { os: macos-latest   , features: feat_os_unix }
           - { os: windows-latest , features: feat_os_windows }
+          - { os: ubuntu-latest  , features: feat_wasm , target: wasm32-wasip1 }
     steps:
     - uses: actions/checkout@v6
       with:
@@ -82,6 +83,7 @@ jobs:
       with:
         toolchain: stable
         components: clippy
+        targets: ${{ matrix.job.target || '' }}
     - uses: Swatinem/rust-cache@v2
     - name: Run sccache-cache
       id: sccache-setup
@@ -105,6 +107,7 @@ jobs:
         esac;
         outputs FAIL_ON_FAULT FAULT_TYPE
     - name: Install/setup prerequisites
+      if: ${{ ! matrix.job.target }}
       shell: bash
       run: |
         ## Install/setup prerequisites
@@ -116,39 +119,28 @@ jobs:
           ;;
         esac
     - name: "`cargo clippy` lint testing"
-      uses: nick-fields/retry@v3
+      uses: nick-fields/retry@v4
       with:
         max_attempts: 3
         retry_on: error
         timeout_minutes: 90
         shell: bash
         command: |
           ## `cargo clippy` lint testing
-          unset fault
-          fault_type="${{ steps.vars.outputs.FAULT_TYPE }}"
-          fault_prefix=$(echo "$fault_type" | tr '[:lower:]' '[:upper:]')
-          # * convert any warnings to GHA UI annotations; ref: <https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-a-warning-message>
-          if [[ "${{ matrix.job.features }}" == "all" ]]; then
-            extra="--all-features"
-          else
-            extra="--features ${{ matrix.job.features }}"
+          ARGS="--features ${{ matrix.job.features }}"
+          ARGS="${ARGS} --fault-type ${{ steps.vars.outputs.FAULT_TYPE }}"
+          if [[ "${{ matrix.job.workspace }}" =~ ^(1|t|true|y|yes)$ ]]; then
+            ARGS="${ARGS} --workspace"
           fi
-          case '${{ matrix.job.workspace }}' in
-          1|t|true|y|yes)
-            extra="${extra} --workspace"
-            ;;
-          esac
-          # * determine sub-crate utility list (similar to FreeBSD workflow)
-          if [[ "${{ matrix.job.features }}" == "all" ]]; then
-            UTILITY_LIST="$(./util/show-utils.sh --all-features)"
-          else
-            UTILITY_LIST="$(./util/show-utils.sh --features ${{ matrix.job.features }})"
+          if [[ -n "${{ matrix.job.target }}" ]]; then
+            ARGS="${ARGS} --target ${{ matrix.job.target }}"
           fi
-          CARGO_UTILITY_LIST_OPTIONS="$(for u in ${UTILITY_LIST}; do echo -n "-puu_${u} "; done;)"
-          S=$(cargo clippy --all-targets $extra --tests --benches -pcoreutils ${CARGO_UTILITY_LIST_OPTIONS} -- -D warnings 2>&1) && printf "%s\n" "$S" || { printf "%s\n" "$S" ; printf "%s" "$S" | sed -E -n -e '/^error:/{' -e "N; s/^error:[[:space:]]+(.*)\\n[[:space:]]+-->[[:space:]]+(.*):([0-9]+):([0-9]+).*$/::${fault_type} file=\2,line=\3,col=\4::${fault_prefix}: \`cargo clippy\`: \1 (file:'\2', line:\3)/p;" -e '}' ; fault=true ; }
-          if [ -n "${{ steps.vars.outputs.FAIL_ON_FAULT }}" ] && [ -n "$fault" ]; then exit 1 ; fi
+          if [[ -n "${{ steps.vars.outputs.FAIL_ON_FAULT }}" ]]; then
+            ARGS="${ARGS} --fail-on-fault"
+          fi
+          python3 util/run-clippy.py ${ARGS}
     - name: "cargo clippy on fuzz dir"
-      if: runner.os != 'Windows'
+      if: runner.os != 'Windows' && !matrix.job.target
       shell: bash
       run: |
         cd fuzz

.github/workflows/documentation.yml

@@ -1,4 +1,4 @@
-# spell-checker:ignore dtolnay libsystemd libattr libcap gsub
+# spell-checker:ignore libsystemd libattr libcap gsub
 
 name: Check uudoc Documentation Generation
 

.github/workflows/freebsd.yml

@@ -1,6 +1,6 @@
 name: FreeBSD
 
-# spell-checker:ignore sshfs usesh vmactions taiki Swatinem esac fdescfs fdesc nextest copyback logind
+# spell-checker:ignore sshfs usesh vmactions taiki esac fdescfs fdesc nextest copyback logind
 
 env:
   # * style job configuration
@@ -41,7 +41,7 @@ jobs:
         sync: rsync
         copyback: false
         # We need jq and GNU coreutils to run show-utils.sh and bash to use inline shell string replacement
-        prepare: pkg install -y curl sudo jq coreutils bash
+        prepare: pkg install -y curl sudo jq coreutils bash python3
         run: |
           ## Prepare, build, and test
           # implementation modelled after ref: <https://github.com/rust-lang/rustup/pull/2783>
@@ -73,7 +73,6 @@ jobs:
           FAULT_PREFIX=\$(echo "\${FAULT_TYPE}" | tr '[:lower:]' '[:upper:]')
           # * determine sub-crate utility list
           UTILITY_LIST="\$(./util/show-utils.sh --features ${{ matrix.job.features }})"
-          CARGO_UTILITY_LIST_OPTIONS="\$(for u in \${UTILITY_LIST}; do echo -n "-puu_\${u} "; done;)"
           ## Info
           # environment
           echo "## environment"
@@ -101,8 +100,9 @@ jobs:
           ## cargo clippy lint testing
           if [ -z "\${FAULT}" ]; then
             echo "## cargo clippy lint testing"
-            # * convert any warnings to GHA UI annotations; ref: <https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-a-warning-message>
-            S=\$(cargo clippy --all-targets \${CARGO_UTILITY_LIST_OPTIONS} -- -D warnings 2>&1) && printf "%s\n" "\$S" || { printf "%s\n" "\$S" ; printf "%s" "\$S" | sed -E -n -e '/^error:/{' -e "N; s/^error:[[:space:]]+(.*)\\n[[:space:]]+-->[[:space:]]+(.*):([0-9]+):([0-9]+).*\$/::\${FAULT_TYPE} file=\2,line=\3,col=\4::\${FAULT_PREFIX}: \\\`cargo clippy\\\`: \1 (file:'\2', line:\3)/p;" -e '}' ; FAULT=true ; }
+            CLIPPY_ARGS="--features ${{ matrix.job.features }} --fault-type \${FAULT_TYPE}"
+            if [ -n "\${FAIL_ON_FAULT}" ]; then CLIPPY_ARGS="\${CLIPPY_ARGS} --fail-on-fault"; fi
+            python3 util/run-clippy.py \${CLIPPY_ARGS} || FAULT=true
           fi
           # Clean to avoid to rsync back the files
           cargo clean

.github/workflows/fuzzing.yml

@@ -1,6 +1,6 @@
 name: Fuzzing
 
-# spell-checker:ignore (people) dtolnay Swatinem taiki-e
+# spell-checker:ignore (people) taiki-e
 # spell-checker:ignore (misc) fuzzer
 
 env:

.github/workflows/ignore-intermittent.txt

@@ -1,6 +1,7 @@
 tests/cut/bounded-memory
 tests/date/date-locale-hour
 tests/date/resolution
+tests/expand/bounded-memory
 tests/pr/bounded-memory
 tests/tail/inotify-dir-recreate
 tests/tail/overlay-headers
@@ -13,3 +14,4 @@ tests/misc/stdbuf
 tests/misc/usage_vs_getopt
 tests/misc/tee
 tests/tail/follow-name
+tests/rm/isatty