Rollup of 5 pull requests#157894
Open
JonathanBrouwer wants to merge 14 commits into
Open
Conversation
…ion/src/diagnostics.rs`
…src/diagnostics.rs`
Moreover, don't add the error code to the lint warning(!). While helpful, it's quite unconventional.
The diagnostic is generally very noisy.
This commit tries to make it slightly less cluttered and more legible by
1. stopping to reuse the lengthy primary message as the primary label.
This duplication didn't increase the information content and only
turned the diagnostic into a letter and symbol soup.
Instead, we now pick a succinct label ("uncovered type parameter")
that immediately(!) signals to the users in red what is wrong with
the highlighted type parameter.
2. breaking some information-dense notes into multiple lines.
Finally, this rephrases the slightly awkward and confusing
"type parameter […] must be used as a type parameter for […] type" to
"type parameter […] must be used as an argument to […] type".
…kh726 Slightly improve diagnostic impl+output for uncovered type parameters Split out of PR rust-lang#135910. No behavioral changes. See individual commit messages for details.
…r=TaKO8Ki Stop using a fn pointer to normalize_fn_sig inside TypeErrCtxt Part of rust-lang#127492
… r=JonathanBrouwer Rename `errors.rs` file to `diagnostics.rs` (9/N) Follow-up of rust-lang#157485. r? @JonathanBrouwer
…mejrs Rename `diagnostic::on_unmatch_args` to `diagnostic::on_unmatched_args` This renders the name of the attribute and the feature grammatical. rust-lang#154794 (comment). r? mejrs
…g-recover, r=folkertdev Avoid `&raw` call recovery inside nested delimiters Fixes rust-lang#157853 The `&raw <expr>` recovery is only valid for malformed raw refs directly in the call argument list. When it handled the nested array case, it tried to skip tokens until the call's ), reached the nested ], and could ICE in parse_token_tree. This PR scopes the call-argument recovery to the call's delimiter depth and makes the recovery loop stop before any closing delimiter or EOF.
rustbot
added
A-attributes
Contributor
Author
|
@bors r+ rollup=never p=5 |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
Contributor
|
⌛ Testing commit 243521a with merge c7446f2... Workflow: https://github.com/rust-lang/rust/actions/runs/27505898519 |
rust-bors Bot
pushed a commit
that referenced
this pull request
Jun 14, 2026
…uwer Rollup of 5 pull requests Successful merges: - #157677 (Slightly improve diagnostic impl+output for uncovered type parameters) - #157715 (Stop using a fn pointer to normalize_fn_sig inside TypeErrCtxt) - #157884 (Rename `errors.rs` file to `diagnostics.rs` (9/N)) - #157887 (Rename `diagnostic::on_unmatch_args` to `diagnostic::on_unmatched_args`) - #157888 (Avoid `&raw` call recovery inside nested delimiters)
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
6 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.
Successful merges:
errors.rsfile todiagnostics.rs(9/N) #157884 (Renameerrors.rsfile todiagnostics.rs(9/N))diagnostic::on_unmatch_argstodiagnostic::on_unmatched_args#157887 (Renamediagnostic::on_unmatch_argstodiagnostic::on_unmatched_args)&rawcall recovery inside nested delimiters #157888 (Avoid&rawcall recovery inside nested delimiters)r? @ghost
Create a similar rollup