Merge branch 'main' into stty-fix-hex

Author: sylvestre

.cargo/config.toml

@@ -12,3 +12,7 @@ rustflags = ["-C", "target-feature=+crt-static"]
 [env]
 # See feat_external_libstdbuf in src/uu/stdbuf/Cargo.toml
 LIBSTDBUF_DIR = "/usr/local/libexec/coreutils"
+
+# remove me
+[build]
+rustflags = ["-A", "clippy::collapsible_if"]

.clippy.toml

@@ -1,5 +1,5 @@
-msrv = "1.85.0"
 avoid-breaking-exported-api = false
 check-private-items = true
 cognitive-complexity-threshold = 24
 missing-docs-in-crate-items = true
+allow-mixed-uninlined-format-args = false

.github/workflows/CICD.yml

@@ -5,13 +5,13 @@ name: CICD
 # 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 (shell/tools) binutils choco clippy dmake esac fakeroot fdesc fdescfs gmake grcov halium lcov libclang libfuse libssl limactl mkdir 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
+# 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
 
 env:
   PROJECT_NAME: coreutils
   PROJECT_DESC: "Core universal (cross-platform) utilities"
   PROJECT_AUTH: "uutils"
-  RUST_MIN_SRV: "1.85.0"
+  RUST_MIN_SRV: "1.88.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
 
@@ -322,13 +322,13 @@ jobs:
         disable_search: true
         flags: makefile,${{ matrix.job.os }}
         fail_ci_if_error: false
-    - name: "`make install PROG_PREFIX=uu- PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n`"
+    - name: "`make install PROG_PREFIX=uu- PROFILE=release-small COMPLETIONS=n MANPAGES=n LOCALES=n`"
       shell: bash
       run: |
         set -x
-        DESTDIR=/tmp/ make install PROG_PREFIX=uu- PROFILE=release-fast COMPLETIONS=n MANPAGES=n LOCALES=n
+        DESTDIR=/tmp/ make install PROG_PREFIX=uu- PROFILE=release-small COMPLETIONS=n MANPAGES=n LOCALES=n
         # Check that utils are built with given profile
-        ./target/release-fast/true
+        ./target/release-small/true
         # Check that the progs have prefix
         test -f /tmp/usr/local/bin/uu-tty
         test -f /tmp/usr/local/libexec/uu-coreutils/libstdbuf.*
@@ -501,10 +501,10 @@ jobs:
     - uses: Swatinem/rust-cache@v2
     - name: Run sccache-cache
       uses: mozilla-actions/sccache-action@v0.0.9
-    - name: "`make install PROFILE=release-fast`"
+    - name: "`make install PROFILE=release`"
       shell: bash
       run: |
-        export CARGO_TARGET_DIR=cargo-target RUSTFLAGS="${RUSTFLAGS} -C strip=symbols" PROFILE=release-fast MANPAGES=n COMPLETIONS=n LOCALES=n
+        export CARGO_TARGET_DIR=cargo-target RUSTFLAGS="${RUSTFLAGS} -C strip=symbols" PROFILE=release MANPAGES=n COMPLETIONS=n LOCALES=n
         mkdir -p "${CARGO_TARGET_DIR}" && sudo mount -t tmpfs -o noatime,size=16G tmpfs "${CARGO_TARGET_DIR}"
         make install DESTDIR=target/size-release/
         make install COMPLETIONS=n MULTICALL=y LN="ln -vf" DESTDIR=target/size-multi-release/
@@ -631,7 +631,7 @@ jobs:
           - { 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 }
           - { os: ubuntu-latest  , target: x86_64-unknown-redox        , features: feat_os_unix_redox     , use-cross: redoxer , skip-tests: true }
-          - { os: ubuntu-latest  , target: wasm32-unknown-unknown      , default-features: false, features: uucore/format, skip-tests: true, skip-package: true, skip-publish: true }
+          - { os: ubuntu-latest  , target: wasm32-wasip1, default-features: false, features: "basenc,cksum", skip-tests: true }
           - { os: macos-latest   , target: aarch64-apple-darwin        , features: feat_os_macos, workspace-tests: true } # M1 CPU
           # PR #7964: Mac should still build even if the feature is not enabled. Do not publish this.
           - { os: macos-latest   , target: aarch64-apple-darwin        , workspace-tests: true, skip-publish: true } # M1 CPU
@@ -672,7 +672,11 @@ jobs:
         STAGING='_staging'
         outputs STAGING
         # determine EXE suffix
-        EXE_suffix="" ; case '${{ matrix.job.target }}' in *-pc-windows-*) EXE_suffix=".exe" ;; esac;
+        unset EXE_suffix
+        case '${{ matrix.job.target }}' in
+         *-pc-windows-*) EXE_suffix=".exe" ;;
+         *wasm-*) EXE_suffix=".wasm" ;;
+        esac;
         outputs EXE_suffix
         # parse commit reference info
         echo GITHUB_REF=${GITHUB_REF}
@@ -868,7 +872,7 @@ jobs:
       run: |
         ## Package artifact(s)
         # binaries
-        cp 'target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}' '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/'
+        cp 'target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}'* '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/'
         cp 'target/${{ matrix.job.target }}/release/uudoc${{ steps.vars.outputs.EXE_suffix }}' '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/' || :
         # README and LICENSE
         # * spell-checker:ignore EADME ICENSE

.github/workflows/GnuComment.yml

@@ -59,4 +59,4 @@ jobs:
                 issue_number: issue_number,
                 body: 'GNU testsuite comparison:\n```\n' + content + '```'
               });
-            } 
+            }

.github/workflows/audit.yml

@@ -0,0 +1,15 @@
+name: Security audit
+
+# spell-checker:ignore (misc) rustsec
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+jobs:
+  audit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: rustsec/audit-check@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/documentation.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Get current version from Cargo.toml
         id: version
         run: |
-          VERSION=$(awk '/\[workspace\.package\]/{flag=1; next} flag && /version = /{gsub(/.*= "/, ""); gsub(/".*/, ""); print; exit}' Cargo.toml)
+          VERSION=$(awk '/\[workspace\.package\]/{flag=1; next} flag && /^version = /{gsub(/.*= "/, ""); gsub(/".*/, ""); print; exit}' Cargo.toml)
           echo "version=$VERSION" >> $GITHUB_OUTPUT
           echo "Detected version: $VERSION"
 

.github/workflows/freebsd.yml

@@ -35,7 +35,7 @@ jobs:
       with:
         persist-credentials: false
     - name: Prepare, build and test
-      uses: vmactions/freebsd-vm@v1.2.9
+      uses: vmactions/freebsd-vm@v1.3.9
       with:
         usesh: true
         sync: rsync
@@ -127,7 +127,7 @@ jobs:
     - name: Avoid no space left on device (Ubuntu runner)
       run: sudo rm -rf /usr/share/dotnet /usr/local/lib/android &
     - name: Prepare, build and test
-      uses: vmactions/freebsd-vm@v1.2.9
+      uses: vmactions/freebsd-vm@v1.3.9
       with:
         usesh: true
         sync: rsync

.github/workflows/fuzzing.yml

@@ -1,6 +1,7 @@
 name: Fuzzing
 
-# spell-checker:ignore fuzzer dtolnay Swatinem
+# spell-checker:ignore (people) dtolnay Swatinem taiki-e
+# spell-checker:ignore (misc) fuzzer
 
 on:
   pull_request:
@@ -19,16 +20,13 @@ concurrency:
 jobs:
   uufuzz-examples:
     name: Build and test uufuzz examples
+    env:
+      CARGO_INCREMENTAL: 0
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v6
       with:
         persist-credentials: false
-    - uses: dtolnay/rust-toolchain@stable
-    - uses: Swatinem/rust-cache@v2
-      with:
-        shared-key: "uufuzz-cache-key"
-        cache-directories: "fuzz/target"
     - name: Build uufuzz library
       run: |
         cd fuzz/uufuzz
@@ -59,15 +57,16 @@ jobs:
       with:
         persist-credentials: false
     - name: Install `cargo-fuzz`
-      run: |
-        echo "RUSTC_BOOTSTRAP=1" >> "${GITHUB_ENV}" # Use -Z
-        cargo install cargo-fuzz --locked
-    - uses: Swatinem/rust-cache@v2
+      uses: taiki-e/install-action@v2
       with:
-        shared-key: "cargo-fuzz-cache-key"
-        cache-directories: "fuzz/target"
+        tool: cargo-fuzz
+    - name: Emulate a nightly toolchain
+      run: |
+        echo "RUSTC_BOOTSTRAP=1" >> "${GITHUB_ENV}"
     - name: Run `cargo-fuzz build`
-      run: cargo fuzz build
+      # Force the correct target
+      # https://github.com/rust-fuzz/cargo-fuzz/issues/398
+      run: cargo fuzz build --target $(rustc --print host-tuple)
 
   fuzz-run:
     needs: fuzz-build
@@ -76,6 +75,7 @@ jobs:
     timeout-minutes: 5
     env:
       RUN_FOR: 60
+      CARGO_INCREMENTAL: 0
     strategy:
       matrix:
         test-target:
@@ -104,27 +104,22 @@ jobs:
       with:
         persist-credentials: false
     - name: Install `cargo-fuzz`
-      run: |
-        echo "RUSTC_BOOTSTRAP=1" >> "${GITHUB_ENV}" # Use nightly
-        cargo install cargo-fuzz --locked
-    - uses: Swatinem/rust-cache@v2
+      uses: taiki-e/install-action@v2
       with:
-        shared-key: "cargo-fuzz-cache-key"
-        cache-directories: "fuzz/target"
-    - name: Restore Cached Corpus
-      uses: actions/cache/restore@v5
-      with:
-        key: corpus-cache-${{ matrix.test-target.name }}
-        path: |
-          fuzz/corpus/${{ matrix.test-target.name }}
+        tool: cargo-fuzz
+    - name: Emulate a nightly toolchain
+      run: |
+        echo "RUSTC_BOOTSTRAP=1" >> "${GITHUB_ENV}"
     - name: Run ${{ matrix.test-target.name }} for XX seconds
       id: run_fuzzer
       shell: bash
       continue-on-error: ${{ !matrix.test-target.should_pass }}
       run: |
         mkdir -p fuzz/stats
         STATS_FILE="fuzz/stats/${{ matrix.test-target.name }}.txt"
-        cargo fuzz run ${{ matrix.test-target.name }} -- -max_total_time=${{ env.RUN_FOR }} -timeout=${{ env.RUN_FOR }} -detect_leaks=0 -print_final_stats=1 2>&1 | tee "$STATS_FILE"
+        # Force the correct target
+        # https://github.com/rust-fuzz/cargo-fuzz/issues/398
+        cargo fuzz run --target $(rustc --print host-tuple) ${{ matrix.test-target.name }} -- -max_total_time=${{ env.RUN_FOR }} -timeout=${{ env.RUN_FOR }} -detect_leaks=0 -print_final_stats=1 2>&1 | tee "$STATS_FILE"
 
         # Extract key stats from the output
         if grep -q "stat::number_of_executed_units" "$STATS_FILE"; then
@@ -193,12 +188,6 @@ jobs:
         fi
 
         echo "" >> $GITHUB_STEP_SUMMARY
-    - name: Save Corpus Cache
-      uses: actions/cache/save@v5
-      with:
-        key: corpus-cache-${{ matrix.test-target.name }}
-        path: |
-          fuzz/corpus/${{ matrix.test-target.name }}
     - name: Upload Stats
       uses: actions/upload-artifact@v6
       with:

.gitignore

@@ -21,3 +21,5 @@ lib*.a
 
 ### direnv ###
 /.direnv/
+
+*.code-workspace

.markdownlint.yaml

@@ -3,4 +3,3 @@ MD013: false
 # Disable 'Fenced code blocks should have a language specified'
 # Doesn't provide much in src/ to enforce it
 MD040: false
-