Skip to content

remove libc from default features #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

remove libc from default features #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fffb7d9
remove libc from default features, add alias for miniz-sys (miniz) th…
Craig-Macomber Jan 18, 2022
a148c1e
fix pipeline for new feature name
Craig-Macomber Jan 18, 2022
3cc4146
revert indent changes from autoformat
Craig-Macomber Jan 18, 2022
b59f0fb
fix readme for renamed feature
Craig-Macomber Jan 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ jobs:
- run: rustdoc --test README.md -L target/debug/deps --extern flate2=target/debug/libflate2.rlib --edition=2018
- run: cargo test
- run: cargo test --features zlib
- run: cargo test --features miniz-sys
- run: cargo test --features miniz
- run: cargo test --features zlib --no-default-features
- run: cargo test --features zlib-ng-compat --no-default-features
- run: cargo test --features cloudflare_zlib --no-default-features
if: matrix.build != 'mingw'
- run: cargo test --features miniz-sys --no-default-features
- run: cargo test --features miniz --no-default-features
- run: cargo test --features tokio

rustfmt:
Expand Down
5 changes: 3 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ zlib, gzip, and raw deflate streams.
members = ['systest']

[dependencies]
libc = "0.2.65"
libc = { version = "0.2.65", optional = true }
cfg-if = "1.0.0"
miniz-sys = { path = "miniz-sys", version = "0.1.11", optional = true }
libz-sys = { version = "1.1.0", optional = true, default-features = false }
Expand All @@ -43,9 +43,10 @@ futures = "0.1"

[features]
default = ["rust_backend"]
any_zlib = [] # note: this is not a real user-facing feature
any_zlib = ["libc"] # note: this is not a real user-facing feature
zlib = ["any_zlib", "libz-sys"]
zlib-ng-compat = ["zlib", "libz-sys/zlib-ng"]
cloudflare_zlib = ["any_zlib", "cloudflare-zlib-sys"]
miniz = ["libc", "miniz-sys"]
rust_backend = ["miniz_oxide"]
tokio = ["tokio-io", "futures"]
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ documentation](https://crates.io/crates/cloudflare-zlib-sys). Note that
uses another version of zlib/libz.

For compatibility with previous versions of `flate2`, the C version of `miniz.c`
is still available, using the feature `miniz-sys`.
is still available, using the feature `miniz`.

# License

Expand Down