expr: replace onig with fancy-regex

.github/workflows/CICD.yml

@@ -554,15 +554,6 @@ jobs:
             sudo apt-get -y update
             sudo apt-get -y install fuse3 libfuse-dev
           ;;
-          wasm32-wasi*)
-            # expr depends on oniguruma, a C library, so cross-compiling needs a WASI sysroot
-            WASI_SDK=wasi-sdk-25.0-x86_64-linux
-            curl -sSfL "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/${WASI_SDK}.tar.gz" | tar -xz -C "$HOME"
-            for abi in wasip1 wasip2; do
-              echo "CC_wasm32_${abi}=$HOME/${WASI_SDK}/bin/clang" >> $GITHUB_ENV
-              echo "AR_wasm32_${abi}=$HOME/${WASI_SDK}/bin/llvm-ar" >> $GITHUB_ENV
-            done
-          ;;
         esac
         case '${{ matrix.job.os }}' in
           macos-latest) brew install coreutils ;; # needed for testing

.github/workflows/code-quality.yml

@@ -119,18 +119,6 @@ jobs:
             sudo apt-get -y install libselinux1-dev libsystemd-dev
           ;;
         esac
-    - name: Install/setup WASI prerequisites
-      if: startsWith(matrix.job.target, 'wasm32-wasi')
-      shell: bash
-      run: |
-        ## Install/setup WASI prerequisites
-        # expr depends on oniguruma, a C library, so cross-compiling needs a WASI sysroot
-        WASI_SDK=wasi-sdk-25.0-x86_64-linux
-        curl -sSfL "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/${WASI_SDK}.tar.gz" | tar -xz -C "$HOME"
-        for abi in wasip1 wasip2; do
-          echo "CC_wasm32_${abi}=$HOME/${WASI_SDK}/bin/clang" >> $GITHUB_ENV
-          echo "AR_wasm32_${abi}=$HOME/${WASI_SDK}/bin/llvm-ar" >> $GITHUB_ENV
-        done
     - name: "`cargo clippy` lint testing"
       uses: nick-fields/retry@v4
       with:

.github/workflows/wasi.yml

@@ -36,15 +36,6 @@ jobs:
     - uses: Swatinem/rust-cache@v2
       with:
         key: "${{ matrix.job.target }}"
-    - name: Install WASI sysroot
-      run: |
-        # expr depends on oniguruma, a C library, so cross-compiling needs a WASI sysroot
-        WASI_SDK=wasi-sdk-25.0-x86_64-linux
-        curl -sSfL "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/${WASI_SDK}.tar.gz" | tar -xz -C "$HOME"
-        for abi in wasip1 wasip2; do
-          echo "CC_wasm32_${abi}=$HOME/${WASI_SDK}/bin/clang" >> $GITHUB_ENV
-          echo "AR_wasm32_${abi}=$HOME/${WASI_SDK}/bin/llvm-ar" >> $GITHUB_ENV
-        done
     - name: Install wasmtime
       run: |
         curl https://wasmtime.dev/install.sh -sSf | bash

Cargo.toml

@@ -33,9 +33,8 @@ expensive_tests = []
 # Enable with: `cargo build --release --features openssl`
 #
 # By default OpenSSL is built from source and statically linked (via the
-# `vendored` feature of the `openssl` crate), mirroring how `expr` links
-# oniguruma. To link against the system libcrypto/libssl dynamically instead,
-# set `OPENSSL_NO_VENDOR=1` at build time.
+# `vendored` feature of the `openssl` crate). To link against the system
+# libcrypto/libssl dynamically instead, set `OPENSSL_NO_VENDOR=1` at build time.
 #
 # The `?/openssl` entries propagate the choice into each standalone checksum
 # crate only when that crate is itself enabled, so disabling this feature
@@ -464,7 +463,10 @@ notify = { version = "8.2.0", features = ["macos_kqueue"] }
 num-bigint = "0.4.4"
 num-prime = "0.5.0"
 num-traits = "0.2.19"
-onig = { version = "~6.5.1", default-features = false }
+fancy-regex = { version = "0.19.0", default-features = false, features = [
+  "std",
+  "unicode",
+] }
 os_display = "0.1.3"
 parse_datetime = "0.16.0"
 phf = "0.14.0"

README.md

@@ -142,9 +142,8 @@ the pure-Rust digest crates, enable the `openssl` feature:
 cargo build --release --features openssl
 ```
 By default OpenSSL is built from source and statically linked into the
-binary (mirroring how `expr` links `oniguruma`), so no runtime dependency
-on system libcrypto/libssl is added. To link dynamically against the system
-libcrypto instead, set `OPENSSL_NO_VENDOR=1` at build time.
+binary, so no runtime dependency on system libcrypto/libssl is added. To link
+dynamically against the system libcrypto instead, set `OPENSSL_NO_VENDOR=1` at build time.
 
 The speedup is largest on CPUs without SHA-NI hardware acceleration. The
 feature is a no-op on Windows (the pure-Rust implementations are always used

src/uu/expr/Cargo.toml

@@ -19,7 +19,7 @@ doctest = false
 clap = { workspace = true }
 num-bigint = { workspace = true }
 num-traits = { workspace = true }
-onig = { workspace = true }
+fancy-regex = { workspace = true, default-features = false }
 uucore = { workspace = true, features = ["i18n-collator"] }
 thiserror = { workspace = true }
 fluent = { workspace = true }