diff options
| author | bors <bors@rust-lang.org> | 2025-01-28 20:15:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-28 20:15:51 +0000 |
| commit | bf1b174e7d0922fc549071b751ab96fc9ee9f6fe (patch) | |
| tree | e98cf327b1b995ead0c48fdb52669a22a5af86d6 /compiler/rustc_data_structures | |
| parent | 77a455303bf08da8eef6236b2b4422a77cd25c42 (diff) | |
| parent | 9715fea5d52a521a62c7165fbd85ed6559db2b52 (diff) | |
| download | rust-bf1b174e7d0922fc549071b751ab96fc9ee9f6fe.tar.gz rust-bf1b174e7d0922fc549071b751ab96fc9ee9f6fe.zip | |
Auto merge of #136203 - matthiaskrgr:rollup-1k0f44l, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #135869 (Make docs for AtomicUsize::from_mut platform-independent) - #135892 (-Znext-solver: "normalize" signature before checking it mentions self in `deduce_closure_signature`) - #136055 (Implement MIR const trait stability checks) - #136066 (Pass spans to `perform_locally_in_new_solver`) - #136071 ([Clippy] Add vec_reserve & vecdeque_reserve diagnostic items) - #136124 (Arbitrary self types v2: explain test.) - #136149 (Flip the `rustc-rayon`/`indexmap` dependency order) - #136173 (Update comments and sort target_arch in c_char_definition) - #136178 (Update username in build helper example) 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, 2 insertions, 2 deletions
diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml index 889a8299c18..8e5af33d8b6 100644 --- a/compiler/rustc_data_structures/Cargo.toml +++ b/compiler/rustc_data_structures/Cargo.toml @@ -10,11 +10,11 @@ bitflags = "2.4.1" either = "1.0" elsa = "=1.7.1" ena = "0.14.3" -indexmap = { version = "2.4.0", features = ["rustc-rayon"] } +indexmap = "2.4.0" jobserver_crate = { version = "0.1.28", package = "jobserver" } measureme = "11" rustc-hash = "2.0.0" -rustc-rayon = "0.5.0" +rustc-rayon = { version = "0.5.1", features = ["indexmap"] } rustc-stable-hash = { version = "0.1.0", features = ["nightly"] } rustc_arena = { path = "../rustc_arena" } rustc_graphviz = { path = "../rustc_graphviz" } |