Skip to content

Flip the rustc-rayon/indexmap dependency order #136149

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Jan 28, 2025

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Jan 27, 2025

rustc-rayon v0.5.1 added indexmap implementations that will allow indexmap to drop its own "internal-only" implementations.

(This is separate from indexmap's implementation for normal rayon.)

[`rustc-rayon v0.5.1`](rust-lang/rustc-rayon#14)
added `indexmap` implementations that will allow `indexmap` to drop its
own "internal-only" implementations.

(This is separate from `indexmap`'s implementation for normal `rayon`.)
@rustbot
Copy link
Collaborator

rustbot commented Jan 27, 2025

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 27, 2025
@rustbot

This comment was marked as resolved.

@compiler-errors
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 27, 2025

📌 Commit 314238f has been approved by compiler-errors

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 27, 2025
cuviper added a commit to cuviper/indexmap that referenced this pull request Jan 27, 2025
While this looks like a breaking change, it was always documented in
`Cargo.toml` as internal-only for use in the compiler:

> Internal feature, only used when building as part of rustc,
> not part of the stable interface of this crate.

That's flipped around in [rustc-rayon#14] and [rust#136149].

[rustc-rayon#14]: rust-lang/rustc-rayon#14
[rust#136149]: rust-lang/rust#136149
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 28, 2025
…mpiler-errors

Flip the `rustc-rayon`/`indexmap` dependency order

[`rustc-rayon v0.5.1`](rust-lang/rustc-rayon#14) added `indexmap` implementations that will allow `indexmap` to drop its own "internal-only" implementations.

(This is separate from `indexmap`'s implementation for normal `rayon`.)
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 28, 2025
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#135869 (Make docs for AtomicUsize::from_mut platform-independent)
 - rust-lang#135892 (-Znext-solver: "normalize" signature before checking it mentions self in `deduce_closure_signature`)
 - rust-lang#136055 (Implement MIR const trait stability checks)
 - rust-lang#136066 (Pass spans to `perform_locally_in_new_solver`)
 - rust-lang#136071 ([Clippy] Add vec_reserve & vecdeque_reserve diagnostic items)
 - rust-lang#136124 (Arbitrary self types v2: explain test.)
 - rust-lang#136149 (Flip the `rustc-rayon`/`indexmap` dependency order)
 - rust-lang#136173 (Update comments and sort target_arch in c_char_definition)
 - rust-lang#136178 (Update username in build helper example)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 995eb5c into rust-lang:master Jan 28, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 28, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 28, 2025
Rollup merge of rust-lang#136149 - cuviper:rustc-rayon-indexmap, r=compiler-errors

Flip the `rustc-rayon`/`indexmap` dependency order

[`rustc-rayon v0.5.1`](rust-lang/rustc-rayon#14) added `indexmap` implementations that will allow `indexmap` to drop its own "internal-only" implementations.

(This is separate from `indexmap`'s implementation for normal `rayon`.)
@cuviper cuviper deleted the rustc-rayon-indexmap branch February 27, 2025 19:35
github-actions bot pushed a commit to tautschnig/verify-rust-std that referenced this pull request Mar 11, 2025
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#135869 (Make docs for AtomicUsize::from_mut platform-independent)
 - rust-lang#135892 (-Znext-solver: "normalize" signature before checking it mentions self in `deduce_closure_signature`)
 - rust-lang#136055 (Implement MIR const trait stability checks)
 - rust-lang#136066 (Pass spans to `perform_locally_in_new_solver`)
 - rust-lang#136071 ([Clippy] Add vec_reserve & vecdeque_reserve diagnostic items)
 - rust-lang#136124 (Arbitrary self types v2: explain test.)
 - rust-lang#136149 (Flip the `rustc-rayon`/`indexmap` dependency order)
 - rust-lang#136173 (Update comments and sort target_arch in c_char_definition)
 - rust-lang#136178 (Update username in build helper example)

r? `@ghost`
`@rustbot` modify labels: rollup
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants