split: rebase to main

.github/workflows/fuzzing.yml

@@ -37,14 +37,16 @@ jobs:
     strategy:
       matrix:
         test-target:
-          - { name: fuzz_test, should_pass: true }
-          # https://github.com/uutils/coreutils/issues/5311
-          - { name: fuzz_date, should_pass: false }
-          - { name: fuzz_expr, should_pass: true }
-          - { name: fuzz_printf, should_pass: false }
-          - { name: fuzz_parse_glob, should_pass: true }
-          - { name: fuzz_parse_size, should_pass: true }
-          - { name: fuzz_parse_time, should_pass: true }
+          [
+            fuzz_date,
+            fuzz_test,
+            fuzz_expr,
+            fuzz_parse_glob,
+            fuzz_parse_size,
+            fuzz_parse_time,
+            # adding more fuzz tests here.
+            # e.g. fuzz_test_a,
+          ]
     steps:
     - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@nightly
@@ -57,17 +59,16 @@ jobs:
     - name: Restore Cached Corpus
       uses: actions/cache/restore@v3
       with:
-        key: corpus-cache-${{ matrix.test-target.name }}
+        key: corpus-cache-${{ matrix.test-target }}
         path: |
-          fuzz/corpus/${{ matrix.test-target.name }}
-    - name: Run ${{ matrix.test-target.name }} for XX seconds
+          fuzz/corpus/${{ matrix.test-target }}
+    - name: Run ${{ matrix.test-target }} for XX seconds
       shell: bash
-      continue-on-error: ${{ !matrix.test-target.name.should_pass }}
       run: |
-        cargo +nightly fuzz run ${{ matrix.test-target.name }} -- -max_total_time=${{ env.RUN_FOR }} -detect_leaks=0
+        cargo +nightly fuzz run ${{ matrix.test-target }} -- -max_total_time=${{ env.RUN_FOR }} -detect_leaks=0
     - name: Save Corpus Cache
       uses: actions/cache/save@v3
       with:
-        key: corpus-cache-${{ matrix.test-target.name }}
+        key: corpus-cache-${{ matrix.test-target }}
         path: |
-          fuzz/corpus/${{ matrix.test-target.name }}
+          fuzz/corpus/${{ matrix.test-target }}

Cargo.toml

@@ -330,7 +330,7 @@ walkdir = "2.4"
 winapi-util = "0.1.6"
 windows-sys = { version = "0.48.0", default-features = false }
 xattr = "1.0.1"
-zip = { version = "0.6.6", default-features = false, features = ["deflate"] }
+zip = { version = "0.6.6", default_features = false, features = ["deflate"] }
 
 hex = "0.4.3"
 md-5 = "0.10.6"

fuzz/Cargo.toml

@@ -16,7 +16,6 @@ uucore = { path = "../src/uucore/" }
 uu_date = { path = "../src/uu/date/" }
 uu_test = { path = "../src/uu/test/" }
 uu_expr = { path = "../src/uu/expr/" }
-uu_printf = { path = "../src/uu/printf/" }
 
 
 # Prevent this from interfering with workspaces
@@ -29,12 +28,6 @@ path = "fuzz_targets/fuzz_date.rs"
 test = false
 doc = false
 
-[[bin]]
-name = "fuzz_printf"
-path = "fuzz_targets/fuzz_printf.rs"
-test = false
-doc = false
-
 [[bin]]
 name = "fuzz_expr"
 path = "fuzz_targets/fuzz_expr.rs"