Skip to content

Commit

Permalink
Add libz-sys to rustc-workspace-hack.
Browse files Browse the repository at this point in the history
alexcrichton/curl-rust#351 changed
curl-rust to no longer enable the default features of libz-sys.
Because rustfmt includes rustc-workspace-hack with the
rustc-workspace-hack/all-static feature (sometimes), it ends up building
libz-sys without the default features. This causes a duplicate
with other packages (like rls) which enable the default
features.
  • Loading branch information
ehuss committed Dec 23, 2020
1 parent 468af39 commit 0bfc45a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3435,6 +3435,7 @@ dependencies = [
"byteorder",
"crossbeam-utils 0.7.2",
"libc",
"libz-sys",
"proc-macro2",
"quote",
"serde",
Expand Down
2 changes: 2 additions & 0 deletions src/tools/rustc-workspace-hack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ byteorder = { version = "1", features = ['default', 'std'] }
curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true }
crossbeam-utils = { version = "0.7.2", features = ["nightly"] }
libc = { version = "0.2.79", features = ["align"] }
# Ensure default features of libz-sys, which are disabled in some scenarios.
libz-sys = { version = "1.1.2" }
proc-macro2 = { version = "1", features = ["default"] }
quote = { version = "1", features = ["default"] }
serde = { version = "1.0.82", features = ['derive'] }
Expand Down

0 comments on commit 0bfc45a

Please sign in to comment.