Skip to content

[Beta-1.89] Fix potential deadlock in CacheState::lock #15699

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 23, 2025

Conversation

epage
Copy link
Contributor

@epage epage commented Jun 23, 2025

Beta backports

In order to make CI pass, the following PRs are also cherry-picked:


Problem has been around since 1.75 but significant enough for us to aim for 6 weeks of testing instead of 12.

@rustbot
Copy link
Collaborator

rustbot commented Jun 23, 2025

r? @ehuss

rustbot has assigned @ehuss.
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 the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 23, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 23, 2025

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.89.0. Please double check that you specified the right target!

Copy link
Contributor

@ehuss ehuss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@ehuss ehuss enabled auto-merge June 23, 2025 20:32
@ehuss ehuss merged commit c24e106 into rust-lang:rust-1.89.0 Jun 23, 2025
24 checks passed
@epage epage deleted the deadlock branch June 23, 2025 20:53
bors added a commit to rust-lang/rust that referenced this pull request Jun 25, 2025
[beta] update cargo and reference

## cargo

1 commits in 84709f085062cbf3c51fa507527c1b2334015178..c24e1064277fe51ab72011e2612e556ac56addf7
2025-06-22 23:58:39 +0000 to 2025-06-23 13:53:07 -0700
- [Beta-1.89] Fix potential deadlock in `CacheState::lock` (rust-lang/cargo#15699)

### reference

3 commits in 50fc1628f36563958399123829c73755fa7a8421..9571d4d38cc580bd9fe926f97fccd98f215564a9
2025-06-19 02:02:39 +0000 to 2025-06-24 22:32:56 +0000
- Add new temporary lifetime extension rule (rust-lang/reference#1813)
- Fix smart punctuation inside grammar terminals (rust-lang/reference#1869)
- Fix placement of codegen link definitions (rust-lang/reference#1868)
@rustbot rustbot added this to the 1.89.0 milestone Jun 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants