diff options
| author | bors <bors@rust-lang.org> | 2025-08-28 03:06:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-08-28 03:06:52 +0000 |
| commit | 43a216604a7fc98deb0744513341fc0d09e461d4 (patch) | |
| tree | f6fbed08eb5467fb33e308adb74e4d2843023fdd /compiler/rustc_data_structures | |
| parent | d36f964125163c2e698de5559efefb8217b8b7f0 (diff) | |
| parent | 27d6005f7ae41c8da96dc77102e064b0d0a0fde1 (diff) | |
| download | rust-43a216604a7fc98deb0744513341fc0d09e461d4.tar.gz rust-43a216604a7fc98deb0744513341fc0d09e461d4.zip | |
Auto merge of #145949 - jhpratt:rollup-smzd7tr, r=jhpratt
Rollup of 5 pull requests Successful merges: - rust-lang/rust#145382 (Add assembly test for `-Zreg-struct-return` option) - rust-lang/rust#145746 (Fix STD build failing for target_os = "espidf") - rust-lang/rust#145826 (Use AcceptContext in AttribueParser::check_target) - rust-lang/rust#145894 (Ensure the coordinator thread terminates before its channels drop) - rust-lang/rust#145946 (Remove unnecessary `[dependencies.unicode-properties]` entries.) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_data_structures')
| -rw-r--r-- | compiler/rustc_data_structures/Cargo.toml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml index aa964806a87..0ac9e02508a 100644 --- a/compiler/rustc_data_structures/Cargo.toml +++ b/compiler/rustc_data_structures/Cargo.toml @@ -13,6 +13,7 @@ ena = "0.14.3" indexmap = "2.4.0" jobserver_crate = { version = "0.1.28", package = "jobserver" } measureme = "12.0.1" +parking_lot = "0.12" rustc-hash = "2.0.0" rustc-stable-hash = { version = "0.1.0", features = ["nightly"] } rustc_arena = { path = "../rustc_arena" } @@ -34,9 +35,6 @@ version = "0.15.2" default-features = false features = ["nightly"] # for may_dangle -[dependencies.parking_lot] -version = "0.12" - [target.'cfg(windows)'.dependencies.windows] version = "0.61.0" features = [ |