diff options
| author | Eric Huss <eric@huss.org> | 2020-12-23 12:18:15 -0800 |
|---|---|---|
| committer | Eric Huss <eric@huss.org> | 2020-12-23 12:18:15 -0800 |
| commit | 0bfc45aa859b94cedeffcbd949f9aaad9f3ac8d8 (patch) | |
| tree | c4096fb4bc1429428f41b901e7e9494dcf21eec6 | |
| parent | 468af39ef2f689ed151018fc76c571c2c9804893 (diff) | |
| download | rust-0bfc45aa859b94cedeffcbd949f9aaad9f3ac8d8.tar.gz rust-0bfc45aa859b94cedeffcbd949f9aaad9f3ac8d8.zip | |
Add libz-sys to rustc-workspace-hack.
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.
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | src/tools/rustc-workspace-hack/Cargo.toml | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Cargo.lock b/Cargo.lock index 8fbfa8d6428..3603dbe1d0c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3435,6 +3435,7 @@ dependencies = [ "byteorder", "crossbeam-utils 0.7.2", "libc", + "libz-sys", "proc-macro2", "quote", "serde", diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index 11b175f9e80..1cde0e25ced 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -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'] } |