Merge pull request #146 from contain-rs/workspace-b

Create a common workspace for the three crates and maintain it + fuzzing

Author: pczarn

.github/workflows/rust.yml

@@ -16,12 +16,16 @@ jobs:
     - uses: actions/checkout@v5
     - name: Build
       run: cargo build --verbose
+    - name: Build with serde
+      run: cargo build --features serde --verbose
+    - name: Build with miniserde
+      run: cargo build --features miniserde --verbose
+    - name: Build with borsh
+      run: cargo build --features borsh --verbose
     - name: Run tests
       run: cargo test --verbose
     - name: Run miniserde tests
       run: cargo test --features miniserde --verbose
-    - name: Run nanoserde tests
-      run: cargo test --features nanoserde --verbose
     - name: Run borsh tests
       run: cargo test --features borsh --verbose
 
@@ -54,19 +58,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [1.82.0, 1.83.0]
+        rust: [1.85.0, 1.86.0]
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{matrix.rust}}
       - run: cargo build
+      - run: cargo build --features serde
+      - run: cargo build --features serde --no-default-features
+      - run: cargo build --features miniserde
+      - run: cargo build --features borsh
+      - run: cargo build --features borsh,serde
+      - run: cargo build --features borsh,serde,miniserde
+      - run: cargo build --features borsh,serde,miniserde --no-default-features
       - run: cargo test
       - run: cargo test --features serde
-      - run: cargo test --features nanoserde
-      - run: cargo test --features miniserde
-      - run: cargo test --features borsh
+      - run: cargo test --features borsh,serde,miniserde
+      - run: cargo test --features borsh,serde,miniserde --no-default-features
 
   clippy:
     runs-on: ubuntu-latest
@@ -79,7 +89,6 @@ jobs:
       - run: cargo clippy --workspace --tests --examples
       - run: cargo clippy --workspace --tests --examples --features serde
       - run: cargo clippy --workspace --tests --examples --features miniserde
-      - run: cargo clippy --workspace --tests --examples --features nanoserde
       - run: cargo clippy --workspace --tests --examples --features borsh
 
   docs:

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "rust-analyzer.cargo.features": ["serde", "nanoserde"]
+    "rust-analyzer.check.command": "clippy",
+    "rust-analyzer.cargo.features": ["serde", "borsh", "miniserde"]
 }

Cargo.toml

@@ -1,34 +1,24 @@
-[package]
-name = "bit-vec"
-version = "0.9.1"
-authors = ["Alexis Beingessner <a.beingessner@gmail.com>"]
-license = "Apache-2.0 OR MIT"
-description = "A vector of bits"
-repository = "https://github.com/contain-rs/bit-vec"
-homepage = "https://github.com/contain-rs/bit-vec"
-documentation = "https://docs.rs/bit-vec/"
-keywords = ["data-structures", "bitvec", "bitmask", "bitmap", "bit"]
-readme = "README.md"
-edition = "2021"
-rust-version = "1.82"
+[workspace]
 
-[dependencies]
-borsh = { version = "1.6.0", default-features = false, features = ["derive"], optional = true }
-serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true }
-miniserde = { version = "0.1", optional = true }
-nanoserde = { version = "0.2", optional = true }
+members = [
+    "vec",
+    "set",
+    "matrix",
+]
 
-[dev-dependencies]
-serde_json = "1.0"
-rand = "0.9"
-rand_xorshift = "0.4"
+exclude = [
+    "fuzz",
+]
 
-[features]
-default = ["std"]
-serde_std = ["std", "serde/std"]
-serde_no_std = []
-borsh_std = ["borsh/std"]
-std = ["serde?/std"]
+resolver = "2"
 
-[package.metadata.docs.rs]
-features = ["borsh", "serde", "miniserde", "nanoserde"]
+# add debug info for profiling?
+[profile.release]
+debug = false
+
+[workspace.dependencies]
+
+[workspace.package]
+# shared version of all public crates in the workspace
+version = "0.10.0"
+rust-version = "1.85.0"

README.md

@@ -0,0 +1 @@
+vec/README.md

README.md

@@ -3,6 +3,8 @@ Version 0.10.0 (TO BE RELEASED)
 
 <a id="v0.10.0"></a>
 
+- removed nanoserde support
+
 Version 0.9.1
 ==========================
 

RELEASES.md

@@ -0,0 +1,2 @@
+/out
+

fuzz/.gitignore

@@ -0,0 +1,26 @@
+[package]
+name = "bit-fuzz"
+version = "0.1.0"
+authors = ["Dawid Ciężarkiewicz <dpc@dpc.pw>", "Peter Blackson <pioczarn@gmail.com>"]
+edition = "2021"
+publish = false
+
+[package.metadata]
+cargo-fuzz = true
+
+[features]
+default = ["afl"]
+afl_fuzz = ["afl"]
+honggfuzz_fuzz = ["honggfuzz"]
+
+[dependencies]
+honggfuzz = { version = "0.5", optional = true }
+afl = { version = "0.17", optional = true }
+bit-vec = { path = "../vec/" }
+bit-set = { path = "../set/" }
+bit-matrix = { path = "../matrix/" }
+# smallvec = "1.15"
+
+[[bin]]
+name = "bit_ops"
+path = "fuzz_targets/bit_ops.rs"

fuzz/Cargo.toml

@@ -0,0 +1 @@
+../LICENSE-APACHE

fuzz/LICENSE-APACHE

@@ -0,0 +1 @@
+../LICENSE-MIT