Fix a few diagnostics#152328
Merged
rust-bors[bot] merged 3 commits intorust-lang:mainfrom Feb 8, 2026
Merged
Conversation
rustbot
added
S-waiting-on-review
JonathanBrouwer
commented
Feb 8, 2026
| #[help( | ||
| "if you meant to call a macro, remove the `pub` and add a trailing `!` after the identifier" | ||
| )] | ||
| HelpMacro, |
Contributor
Author
There was a problem hiding this comment.
For this one I can't find a way to trigger this help message (though I didn't try very hard)
At least I added an assertion for the message above :)
lqd
reviewed
Feb 8, 2026
| #[derive(Subdiagnostic)] | ||
| #[multipart_suggestion( | ||
| "you can wrap the call in an `unsafe` block if you can guarantee that the environment access only happens in single-threaded code", | ||
| "you can wrap the call in an `unsafe` block if you can guarantee {$guarantee}", |
Member
There was a problem hiding this comment.
hmm, is this correct? guarantee is in the parent diagnostic. If it is, it seems quite error-prone e.g. with respect to refactoring (or complicates checking the syntax at compile time I guess).
Contributor
Author
There was a problem hiding this comment.
This is correct, subdiagnostics can use variables from their parent diagnostic, and this message (and quite a few others) do!
This was already the case, I also don't like it, and want to fix it
Contributor
Author
There was a problem hiding this comment.
This is also why subdiagnostics are currently exempted from the compile-time "do variables exist" check, again, was also already the case before my refactoring
Member
There was a problem hiding this comment.
great to hear, it'll help reduce this magic flexibility for the better, surely.
3 tasks
Contributor
|
Looks good to me, @bors r=jdonszelmann,lqd |
Contributor
rust-bors
bot
added
S-waiting-on-bors
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Feb 8, 2026
…zelmann,lqd Fix a few diagnostics When working on the inline diagnostics conversion (rust-lang#151366), I noticed that my script sometimes took the wrong message. Because it didn't happen very often, I just fixed it manually when a uitest fails. However I got paranoid that the script changed messages that were not covered by uitests, so I checked for all messages in the previous `messages.ftl` files, whether they occured at least once in the codebase. I found 3 messages that indeed were wrongly replaced by my script, fixed them, and added uitests to make sure this doesn't happen again :) r? @jdonszelmann (Anyone else, also feel free to review, just assigning to Jana because she's been reviewing the other PRs)
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 8, 2026
…uwer Rollup of 7 pull requests Successful merges: - #151455 (Fix `SourceFile::normalized_byte_pos`) - #152250 (Remove support for slugs in diagnostic messages) - #152322 (Replace some `feature(core_intrinsics)` with stable hints) - #152328 (Fix a few diagnostics) - #151640 (Cleanup offload datatransfer) - #152212 (Port some attributes to the attr parser) - #152309 (Fix bound var resolution for trait aliases)
Contributor
Author
rust-bors
bot
added
S-waiting-on-author
Contributor
Contributor
Author
|
Right, |
JonathanBrouwer
force-pushed
the
fix_diags
branch
from
7c37cd6 to
d14c26f
Compare
Contributor
Author
|
@bors try jobs=test-various |
This comment has been minimized.
This comment has been minimized.
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 8, 2026
Fix a few diagnostics try-job: test-various
Contributor
Contributor
Author
|
@bors r+ |
Contributor
rust-bors
bot
added
S-waiting-on-bors
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 8, 2026
…uwer Rollup of 9 pull requests Successful merges: - #151455 (Fix `SourceFile::normalized_byte_pos`) - #152250 (Remove support for slugs in diagnostic messages) - #152322 (Replace some `feature(core_intrinsics)` with stable hints) - #152328 (Fix a few diagnostics) - #151640 (Cleanup offload datatransfer) - #152212 (Port some attributes to the attr parser) - #152309 (Fix bound var resolution for trait aliases) - #152339 (diagnostics: fix ICE in closure signature mismatch) - #152341 (`cfg_select!`: allow optional comma after `{ /* ... */ }`)
Contributor
Author
|
Oops, this is supposed to be |
Contributor
Member
|
I'm more surprised by the fact that old bors used to report when a commit that was already approved was reapproved. (It's not worth recreating the rollup to pick up the new reviewers, but thanks for thinking of our internet points 🙃) |
rust-timer
added a commit
that referenced
this pull request
Feb 8, 2026
Rollup merge of #152328 - JonathanBrouwer:fix_diags, r=JonathanBrouwer Fix a few diagnostics When working on the inline diagnostics conversion (#151366), I noticed that my script sometimes took the wrong message. Because it didn't happen very often, I just fixed it manually when a uitest fails. However I got paranoid that the script changed messages that were not covered by uitests, so I checked for all messages in the previous `messages.ftl` files, whether they occured at least once in the codebase. I found 3 messages that indeed were wrongly replaced by my script, fixed them, and added uitests to make sure this doesn't happen again :) r? @jdonszelmann (Anyone else, also feel free to review, just assigning to Jana because she's been reviewing the other PRs)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When working on the inline diagnostics conversion (#151366), I noticed that my script sometimes took the wrong message.
Because it didn't happen very often, I just fixed it manually when a uitest fails.
However I got paranoid that the script changed messages that were not covered by uitests, so I checked for all messages in the previous
messages.ftlfiles, whether they occured at least once in the codebase. I found 3 messages that indeed were wrongly replaced by my script, fixed them, and added uitests to make sure this doesn't happen again :)r? @jdonszelmann (Anyone else, also feel free to review, just assigning to Jana because she's been reviewing the other PRs)