Make fuzz dir a part of the workspace

With the changes from rust-fuzz/cargo-fuzz#357
merged, `fuzz` dir now can be a part of the workspace.

.github/workflows/test.yml

@@ -94,33 +94,29 @@ jobs:
           # Cache only on main build
           save-if: ${{ github.ref == 'refs/heads/main' }}
           cache-directories: |
-            i18n-helpers/fuzz/target
-            i18n-helpers/fuzz/corpus
+            fuzz/target
+            fuzz/corpus
 
       - name: Install cargo-fuzz
         run: cargo install cargo-fuzz
 
       - name: Run group_events fuzzer and minimize corpus
-        working-directory: i18n-helpers
         run: |
           cargo fuzz run group_events -- -only_ascii=1 -max_total_time=30
           cargo fuzz cmin group_events
 
       - name: Run normalize fuzzer and minimize corpus
-        working-directory: i18n-helpers
         run: |
           cargo fuzz run normalize -- -only_ascii=1 -max_total_time=30
           cargo fuzz cmin normalize
 
       - name: Run gettext fuzzer and minimize corpus
-        working-directory: i18n-helpers
         run: |
           cargo fuzz run gettext -- -only_ascii=1 -max_total_time=30
           cargo fuzz cmin gettext
 
       - name: Run xgettext fuzzer and minimize corpus
         run: |
-          cd i18n-helpers
           cargo fuzz run xgettext -- -only_ascii=1 -max_total_time=30
           cargo fuzz cmin xgettext
 
@@ -136,10 +132,6 @@ jobs:
       - name: Clippy
         run: cargo clippy --all-targets
 
-      - name: Clippy on fuzzers
-        working-directory: ./i18n-helpers/fuzz
-        run: cargo clippy --all-targets
-
   format:
     name: Format
     runs-on: ubuntu-latest

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["i18n-helpers", "mdbook-tera-backend"]
+members = ["i18n-helpers", "mdbook-tera-backend", "fuzz"]
 default-members = ["i18n-helpers", "mdbook-tera-backend"]
 resolver = "2"
 
@@ -11,5 +11,7 @@ print_stderr = "warn"
 [workspace.dependencies]
 anyhow = "1.0.79"
 mdbook = { version = "0.4.36", default-features = false }
+polib = "0.2.0"
+pretty_assertions = "1.3.0"
 serde_json = "1.0.111"
 tempfile = "3.9.0"

i18n-helpers/fuzz/Cargo.toml → fuzz/Cargo.toml

@@ -7,46 +7,41 @@ publish = false
 [package.metadata]
 cargo-fuzz = true
 
-[lints.clippy]
-dbg_macro = "warn"
-print_stdout = "warn"
-print_stderr = "warn"
+[lints]
+workspace = true
 
 [dependencies]
 arbitrary = { version = "1.3.1", features = ["derive"] }
 libfuzzer-sys = "0.4.0"
-mdbook = { version = "0.4.25", default-features = false }
-mdbook-i18n-helpers = { path = ".." }
-polib = "0.2.0"
-pretty_assertions = "1.3.0"
-
-# Prevent this from interfering with workspaces
-[workspace]
-members = ["."]
-
-[profile.release]
-debug = 1
+mdbook.workspace = true
+mdbook-i18n-helpers = { path = "../i18n-helpers" }
+polib.workspace = true
+pretty_assertions.workspace = true
 
 [[bin]]
 name = "group_events"
 path = "fuzz_targets/group_events.rs"
 test = false
 doc = false
+bench = false
 
 [[bin]]
 name = "normalize"
 path = "fuzz_targets/normalize.rs"
 test = false
 doc = false
+bench = false
 
 [[bin]]
 name = "gettext"
 path = "fuzz_targets/gettext.rs"
 test = false
 doc = false
+bench = false
 
 [[bin]]
 name = "xgettext"
 path = "fuzz_targets/xgettext.rs"
 test = false
 doc = false
+bench = false

i18n-helpers/Cargo.toml

@@ -16,8 +16,8 @@ workspace = true
 anyhow.workspace = true
 chrono = { version = "0.4.33", default-features = false, features = ["alloc"] }
 mdbook.workspace = true
-polib = "0.2.0"
-pulldown-cmark = { version = "0.9.6", default-features = false }
+polib.workspace = true
+pulldown-cmark = { version = "0.9.2", default-features = false }
 pulldown-cmark-to-cmark = "11.2.0"
 regex = "1.10.3"
 semver = "1.0.21"
@@ -26,5 +26,5 @@ syntect = "5.1.0"
 textwrap = { version = "0.16.0", default-features = false }
 
 [dev-dependencies]
-pretty_assertions = "1.3.0"
+pretty_assertions.workspace = true
 tempfile.workspace = true