nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add libz-sys to rustc-workspace-hack.

Browse Source 
https://github.com/alexcrichton/curl-rust/pull/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.
This commit is contained in:
Eric Huss 2020-12-23 12:18:15 -08:00
parent 468af39ef2
commit 0bfc45aa85
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock
View File

@ -3435,6 +3435,7 @@ dependencies = [
"byteorder", "byteorder",
"crossbeam-utils 0.7.2", "crossbeam-utils 0.7.2",
"libc", "libc",
"libz-sys",
"proc-macro2", "proc-macro2",
"quote", "quote",
"serde", "serde",

2
src/tools/rustc-workspace-hack/Cargo.toml
View File

@ -65,6 +65,8 @@ byteorder = { version = "1", features = ['default', 'std'] }
curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true } curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true }
crossbeam-utils = { version = "0.7.2", features = ["nightly"] } crossbeam-utils = { version = "0.7.2", features = ["nightly"] }
libc = { version = "0.2.79", features = ["align"] } 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"] } proc-macro2 = { version = "1", features = ["default"] }
quote = { version = "1", features = ["default"] } quote = { version = "1", features = ["default"] }
serde = { version = "1.0.82", features = ['derive'] } serde = { version = "1.0.82", features = ['derive'] }