diff options
| author | bors <bors@rust-lang.org> | 2021-04-29 02:53:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-29 02:53:52 +0000 |
| commit | ada102456de38e462b4f00473dd923f15dc3f296 (patch) | |
| tree | b76c12782e67a7439736a25131c2f132f6a45f9f | |
| parent | 50ca3ac24f08cc6c8bbef9ac27245f83f30bc749 (diff) | |
| parent | 170a10b2dd085afc92a52a58bde8a6e7a5eb3b85 (diff) | |
| download | rust-ada102456de38e462b4f00473dd923f15dc3f296.tar.gz rust-ada102456de38e462b4f00473dd923f15dc3f296.zip | |
Auto merge of #84614 - RalfJung:daily, r=Mark-Simulacrum
don't enable parking_lot nightly features Having the compiler itself depend on external libraries that use nightly features can lead to "fun" bootstrap situations. Within the rustc repo we use `cfg(bootstrap)` to resolve those, but that is not a reasonable option for external dependencies. So I propose we stop enabling the "nightly" feature of `parking_lot` here. In my experiments, this then indeed leads to the feature not being enabled (i.e., nothing else enables it), and everything still builds. However, this means parking_lot's `RwLock` will no longer have hardware lock elision for readers -- I hope that is okay to lose in exchange for less bootstrap brain twisting. ;) Cc `@Amanieu`
| -rw-r--r-- | compiler/rustc_data_structures/Cargo.toml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml index 507425d64e3..aa95ecbdaf9 100644 --- a/compiler/rustc_data_structures/Cargo.toml +++ b/compiler/rustc_data_structures/Cargo.toml @@ -32,7 +32,6 @@ tempfile = "3.2" [dependencies.parking_lot] version = "0.11" -features = ["nightly"] [target.'cfg(windows)'.dependencies] winapi = { version = "0.3", features = ["fileapi", "psapi"] } |