Skip to content

Commit

Permalink
Workspace with brotli and brotli-ffi crates
Browse files Browse the repository at this point in the history
* make both packages into a single workspace
* make `brotli-ffi` use latest `brotli` version
* commented out `brotli-ffi` `simd` feature because it is no longer available
  • Loading branch information
nyurik committed Feb 21, 2024
1 parent 9d2a732 commit 372cd26
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
14 changes: 9 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[workspace]
members = [".", "c"]
default-members = [".", "c"]

[package]
name = "brotli"
version = "3.4.0"
Expand Down Expand Up @@ -27,11 +31,11 @@ incremental = false

[dependencies]
"alloc-no-stdlib" = { version = "2.0" }
"alloc-stdlib" = { version = "~0.2", optional = true }
"brotli-decompressor" = { version = "~2.5", default-features = false }
"sha2" = { version = "~0.10", optional = true }
"alloc-stdlib" = { version = "0.2", optional = true }
"brotli-decompressor" = { version = "2.5", default-features = false }
"sha2" = { version = "0.10", optional = true }
# Uncomment once this packed_simd
# "packed_simd_2" = {version="0.3", optional=true}
# "packed_simd_2" = { version = "0.3", optional = true }

[features]
default = ["std", "ffi-api"]
Expand All @@ -44,4 +48,4 @@ seccomp = ["brotli-decompressor/seccomp"]
std = ["alloc-stdlib", "brotli-decompressor/std"]
validation = ["sha2"]
vector_scratch_space = []
# simd = ["packed_simd_2/into_bits"]
# simd = ["packed_simd_2", "packed_simd_2?/into_bits"]
8 changes: 3 additions & 5 deletions c/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,16 @@ autobins = false
path = "src/lib.rs"
crate-type = ["cdylib", "staticlib", "rlib"]

[profile.release]
lto = true

[dependencies]
"brotli" = { version = "~3.3", default-features = false, features = ["ffi-api"] }
"brotli" = { version = "3.4", default-features = false, features = ["ffi-api"], path = ".." }

[features]
default = ["std"]
benchmark = ["brotli/benchmark"]
disable-timer = ["brotli/disable-timer"]
seccomp = ["brotli/seccomp"]
simd = ["brotli/simd"]
# Uncomment once brotli package supports simd feature again
# simd = ["brotli/simd"]
std = ["brotli/std"]
validation = ["brotli/validation"]
vector_scratch_space = ["brotli/vector_scratch_space"]

0 comments on commit 372cd26

Please sign in to comment.