Merge branch 'main' into timeout-bench-only-clean

Author: sylvestre

.github/workflows/CICD.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/FixPR.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@v16
+      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/GnuTests.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
 
@@ -111,7 +111,7 @@ jobs:
           ~/.android/avd/*/*.lock
     - name: Create and cache emulator image
       if: steps.avd-cache.outputs.cache-hit != 'true'
-      uses: reactivecircus/android-emulator-runner@v2.35.0
+      uses: reactivecircus/android-emulator-runner@v2.37.0
       with:
         api-level: ${{ matrix.api-level }}
         target: ${{ matrix.target }}
@@ -156,7 +156,7 @@ jobs:
         free -mh
         df -Th
     - name: Build and Test
-      uses: reactivecircus/android-emulator-runner@v2.35.0
+      uses: reactivecircus/android-emulator-runner@v2.37.0
       with:
         api-level: ${{ matrix.api-level }}
         target: ${{ matrix.target }}

.github/workflows/android.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,
@@ -54,7 +55,9 @@ jobs:
           uu_wc,
           uu_factor,
           uu_date,
-          uu_csplit
+          uu_csplit,
+          uu_true,
+          uu_false
         ]
     steps:
       - uses: actions/checkout@v6

.github/workflows/benchmarks.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:
@@ -10,6 +10,7 @@ on:
       - '*'
 
 env:
+  CARGO_INCREMENTAL: "0"
   # * style job configuration
   STYLE_FAIL_ON_FAULT: true ## (bool) fail the build if a style job contains a fault (error or warning); may be overridden on a per-job basis
 
@@ -66,15 +67,14 @@ jobs:
   style_lint:
     name: Style/lint
     runs-on: ${{ matrix.job.os }}
-    env:
-      CARGO_INCREMENTAL: 0
     strategy:
       fail-fast: false
       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:
@@ -83,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
@@ -106,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
@@ -117,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/code-quality.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/documentation.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/freebsd.yml

@@ -1,8 +1,11 @@
 name: Fuzzing
 
-# spell-checker:ignore (people) dtolnay Swatinem taiki-e
+# spell-checker:ignore (people) taiki-e
 # spell-checker:ignore (misc) fuzzer
 
+env:
+  CARGO_INCREMENTAL: "0"
+
 on:
   pull_request:
   push:
@@ -20,8 +23,6 @@ concurrency:
 jobs:
   uufuzz-examples:
     name: Build and test uufuzz examples
-    env:
-      CARGO_INCREMENTAL: 0
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v6
@@ -75,7 +76,6 @@ jobs:
     timeout-minutes: 5
     env:
       RUN_FOR: 60
-      CARGO_INCREMENTAL: 0
     strategy:
       matrix:
         test-target:

.github/workflows/fuzzing.yml

@@ -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