Skip to content

Commit ada1024

Browse files
committed
Auto merge of rust-lang#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`
2 parents 50ca3ac + 170a10b commit ada1024

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

Diff for: compiler/rustc_data_structures/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ tempfile = "3.2"
3232

3333
[dependencies.parking_lot]
3434
version = "0.11"
35-
features = ["nightly"]
3635

3736
[target.'cfg(windows)'.dependencies]
3837
winapi = { version = "0.3", features = ["fileapi", "psapi"] }

0 commit comments

Comments
 (0)