Convert to inline diagnostics in rustc_query_system#152041
Merged
rust-bors[bot] merged 2 commits intorust-lang:mainfrom Feb 3, 2026
Merged
Convert to inline diagnostics in rustc_query_system#152041rust-bors[bot] merged 2 commits intorust-lang:mainfrom
rustc_query_system#152041rust-bors[bot] merged 2 commits intorust-lang:mainfrom
Conversation
Collaborator
|
cc @davidtwco, @TaKO8Ki |
rustbot
added
A-query-system
3 tasks
jdonszelmann
reviewed
Feb 3, 2026
| } | ||
| Message::Inline(message_span, message) => { | ||
| verify_fluent_message(*message_span, &message, variant); | ||
| if let Some(variant) = variant { |
Contributor
There was a problem hiding this comment.
I don't quite get why this had to change to an option
Contributor
Author
There was a problem hiding this comment.
This is an edgecase I missed in the initial implementation.
Subdiagnostics can use variables from their parent. Because the #[derive(Subdiagnostic)] cannot see the parent diagnostic, we can't always verify the variables in the subdiagnostic
Contributor
|
@rustbot author |
rustbot
added
S-waiting-on-author
Collaborator
|
Reminder, once the PR becomes ready for a review, use |
Contributor
|
@bors r+ rollup |
Contributor
rust-bors
bot
added
S-waiting-on-bors
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Feb 3, 2026
…rt, r=jdonszelmann Convert to inline diagnostics in `rustc_query_system` For rust-lang#151366 (comment) r? @jdonszelmann (or anyone else who feels like it)
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Feb 3, 2026
…rt, r=jdonszelmann Convert to inline diagnostics in `rustc_query_system` For rust-lang#151366 (comment) r? @jdonszelmann (or anyone else who feels like it)
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 3, 2026
…uwer Rollup of 13 pull requests Successful merges: - #152034 (Show largest job duration changes in hours and minutes in the post-merge report) - #152039 (coverage: Add a test case for a previously-unknown span mismatch) - #152045 (Convert to inline diagnostics in `rustc_infer`) - #149263 (Forbid manual `Unpin` impls for structurally pinned types) - #151754 (Check proj's parent is trait or not when checking dyn compatibility) - #151848 (Port `rustc_mir` to attribute parser) - #151874 (error on unsized AnonConsts) - #151944 (Convert to inline diagnostics in `rustc_attr_parsing`) - #152012 (Use `DEVELOPER_DIR` instead of a custom `xcode-select` script) - #152019 (`NativeLib` cleanups) - #152029 (disable socket tests in Miri) - #152041 (Convert to inline diagnostics in `rustc_query_system`) - #152050 (Try to fix `rustdoc-gui/globals.goml` flakyness) Failed merges: - #152046 (Use glob imports for attribute parsers)
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 3, 2026
…uwer Rollup of 12 pull requests Successful merges: - #152034 (Show largest job duration changes in hours and minutes in the post-merge report) - #152039 (coverage: Add a test case for a previously-unknown span mismatch) - #152045 (Convert to inline diagnostics in `rustc_infer`) - #149263 (Forbid manual `Unpin` impls for structurally pinned types) - #151754 (Check proj's parent is trait or not when checking dyn compatibility) - #151848 (Port `rustc_mir` to attribute parser) - #151874 (error on unsized AnonConsts) - #151944 (Convert to inline diagnostics in `rustc_attr_parsing`) - #152019 (`NativeLib` cleanups) - #152029 (disable socket tests in Miri) - #152041 (Convert to inline diagnostics in `rustc_query_system`) - #152050 (Try to fix `rustdoc-gui/globals.goml` flakyness) Failed merges: - #152046 (Use glob imports for attribute parsers)
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 3, 2026
…uwer Rollup of 12 pull requests Successful merges: - #152034 (Show largest job duration changes in hours and minutes in the post-merge report) - #152039 (coverage: Add a test case for a previously-unknown span mismatch) - #152045 (Convert to inline diagnostics in `rustc_infer`) - #149263 (Forbid manual `Unpin` impls for structurally pinned types) - #151754 (Check proj's parent is trait or not when checking dyn compatibility) - #151848 (Port `rustc_mir` to attribute parser) - #151874 (error on unsized AnonConsts) - #151944 (Convert to inline diagnostics in `rustc_attr_parsing`) - #152019 (`NativeLib` cleanups) - #152029 (disable socket tests in Miri) - #152041 (Convert to inline diagnostics in `rustc_query_system`) - #152050 (Try to fix `rustdoc-gui/globals.goml` flakyness) Failed merges: - #152046 (Use glob imports for attribute parsers)
rust-timer
added a commit
that referenced
this pull request
Feb 3, 2026
Rollup merge of #152041 - JonathanBrouwer:query_system_convert, r=jdonszelmann Convert to inline diagnostics in `rustc_query_system` For #151366 (comment) r? @jdonszelmann (or anyone else who feels like it)
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
3 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.
For #151366 (comment)
r? @jdonszelmann (or anyone else who feels like it)