Skip to content

Conversation

Patrick-6
Copy link
Contributor

This PR adds support for Miri to intercept uses of std::sync::Mutex using the rustc diagnostic items added in rust-lang/rust#141690.

@rustbot
Copy link
Collaborator

rustbot commented Oct 2, 2025

Thank you for contributing to Miri!
Please remember to not force-push to the PR branch except when you need to rebase due to a conflict or when the reviewer asks you for it.

@rustbot rustbot added the S-waiting-on-review Status: Waiting for a review to complete label Oct 2, 2025
Copy link
Contributor Author

@Patrick-6 Patrick-6 left a comment

Choose a reason for hiding this comment

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

Copy link
Member

@RalfJung RalfJung left a comment

Choose a reason for hiding this comment

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

@rustbot rustbot added S-waiting-on-author Status: Waiting for the PR author to address review comments and removed S-waiting-on-review Status: Waiting for a review to complete labels Oct 3, 2025
@rustbot
Copy link
Collaborator

rustbot commented Oct 3, 2025

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@Patrick-6
Copy link
Contributor Author

This failure is weird, the mutex_poison.rs test passes on my machine with the expected output, but not in CI?
Maybe something changed in the upstream implementation of one of the functions used in the test, so a rebase could potentially fix this?

@RalfJung
Copy link
Member

RalfJung commented Oct 6, 2025

You probably need to rebase over #4617 yeah.

@rustbot
Copy link
Collaborator

rustbot commented Oct 6, 2025

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@Patrick-6
Copy link
Contributor Author

The rebase fixed the previous CI failure, but there is another one now, possibly spurious? Nothing in this PR should affect Windows, or Linux on Arm specifically.

@RalfJung
Copy link
Member

RalfJung commented Oct 6, 2025

Yeah those are just network timeouts, you can ignore them.

@RalfJung
Copy link
Member

RalfJung commented Oct 7, 2025

This looks great, thanks! Please squash the commits using ./miri squash. Then write @rustbot ready after you force-pushed the squashed PR.

@rustbot author

@Patrick-6
Copy link
Contributor Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Waiting for a review to complete and removed S-waiting-on-author Status: Waiting for the PR author to address review comments labels Oct 7, 2025
@RalfJung RalfJung added this pull request to the merge queue Oct 7, 2025
Merged via the queue into rust-lang:master with commit 4e48c1a Oct 7, 2025
13 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Waiting for a review to complete label Oct 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants