Skip to content

Commit 0bfc45a

Browse files
committed
Add libz-sys to rustc-workspace-hack.
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.
1 parent 468af39 commit 0bfc45a

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -3435,6 +3435,7 @@ dependencies = [
34353435
"byteorder",
34363436
"crossbeam-utils 0.7.2",
34373437
"libc",
3438+
"libz-sys",
34383439
"proc-macro2",
34393440
"quote",
34403441
"serde",

src/tools/rustc-workspace-hack/Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ byteorder = { version = "1", features = ['default', 'std'] }
6565
curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true }
6666
crossbeam-utils = { version = "0.7.2", features = ["nightly"] }
6767
libc = { version = "0.2.79", features = ["align"] }
68+
# Ensure default features of libz-sys, which are disabled in some scenarios.
69+
libz-sys = { version = "1.1.2" }
6870
proc-macro2 = { version = "1", features = ["default"] }
6971
quote = { version = "1", features = ["default"] }
7072
serde = { version = "1.0.82", features = ['derive'] }

0 commit comments

Comments
 (0)