Skip to content

Make Diff<'repo> not be Send - #1342

Merged
weihanglo merged 1 commit into
rust-lang:mainfrom
DanielEScherzer:diff-not-send
Nov 17, 2026
Merged

weihanglo merged 1 commit into
rust-lang:mainfrom
DanielEScherzer:diff-not-send

Conversation

@DanielEScherzer

@DanielEScherzer DanielEScherzer commented Nov 14, 2026 •

Copy link
Copy Markdown
Contributor

Doing so is unsound as Repository instances cannot be safely shared across threads.

Since the error messages are different on different versions of Rust, update the GitHub actions setup to use the correct expected output based on the tested version.

Fixes #1333

@rustbot rustbot added the S-waiting-on-review Status: Waiting on review label Nov 14, 2026
@DanielEScherzer

Copy link
Copy Markdown
Contributor Author

Hmm, error output was improved on beta, rust-lang/rust#161624
...except that that is already in stable, I was just running 1.99.1 locally

@DanielEScherzer

Copy link
Copy Markdown
Contributor Author

...but the lowest supported Rust version still has different error messages

@DanielEScherzer

DanielEScherzer commented Nov 14, 2026 •

Copy link
Copy Markdown
Contributor Author

Nightly was failing, ran cargo bisect until it found rust-lang/rust@526c36b, differences caused by the new solver, reported at rust-lang/rust#160895 (rust-lang/rust#160895 (comment))

Doing so is unsound as `Repository` instances cannot be safely shared across
threads.

Since the error messages are different on different versions of Rust, update the
GitHub actions setup to use the correct expected output based on the tested
version.

Fixes rust-lang#1333
@DanielEScherzer

Copy link
Copy Markdown
Contributor Author

@rustbot label +semver-breaking-change

@rustbot rustbot added the semver-breaking-change A SemVer breaking change that will require a new SemVer-incompatible version number bump. label Nov 14, 2026

@weihanglo weihanglo left a comment •

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@rustbot

rustbot commented Nov 17, 2026

Copy link
Copy Markdown
Collaborator

Error: The feature merge is not enabled in this repository.
To enable it add its section in the triagebot.toml in the root of the repository.

Please file an issue on GitHub at triagebot if there's a problem with this bot, or reach out on #triagebot on Zulip.

@weihanglo
weihanglo added this pull request to the merge queue Nov 17, 2026
Merged via the queue into rust-lang:main with commit ab327f6 Nov 17, 2026
12 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Waiting on review label Nov 17, 2026
@DanielEScherzer
DanielEScherzer deleted the diff-not-send branch November 17, 2026 18:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

semver-breaking-change A SemVer breaking change that will require a new SemVer-incompatible version number bump.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

# Diff<'repo> is Send, which lets safe code use one Repository from two threads

3 participants