Skip to content

Rollup of 5 pull requests#157894

Merged
rust-bors[bot] merged 14 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-57tXUrt
Jun 14, 2026
Merged

Rollup of 5 pull requests#157894
rust-bors[bot] merged 14 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-57tXUrt

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

cjgillot and others added 14 commits June 10, 2026 11:39
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.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Jun 14, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jun 14, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

@rust-bors

rust-bors Bot commented Jun 14, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 243521a has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 14, 2026
@rust-bors

This comment has been minimized.

@rust-bors rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 14, 2026
@rust-bors

rust-bors Bot commented Jun 14, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 19m 2s
Pushing c7446f2 to main...

@rust-bors rust-bors Bot merged commit c7446f2 into rust-lang:main Jun 14, 2026
14 checks passed
@rustbot rustbot added this to the 1.98.0 milestone Jun 14, 2026
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#157677 Slightly improve diagnostic impl+output for uncovered type … 0b27a0a11a2d507bae447fe969a8c8cc6b616de7 (link)
#157715 Stop using a fn pointer to normalize_fn_sig inside TypeErrC… 9db82384994453c5cba681de68fff5176c9f3252 (link)
#157884 Rename errors.rs file to diagnostics.rs (9/N) 6edf2f1066e67037178d6d8411eafa190522eb3a (link)
#157887 Rename diagnostic::on_unmatch_args to `diagnostic::on_unm… 8f2e4a2a66b4be884eecc9549331e7a3fafd65ea (link)
#157888 Avoid &raw call recovery inside nested delimiters 8f1a6648ffd0b87025ac117a01dbe67944b73c74 (link)

previous master: 1a30ed949b

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@github-actions

Copy link
Copy Markdown
Contributor
What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 1a30ed9 (parent) -> c7446f2 (this PR)

Test differences

Show 81 test diffs

Stage 1

  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/error_is_shown_in_downstream_crates.rs: pass -> [missing] (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/message_and_label.rs: pass -> [missing] (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/notes_on_extra_args.rs: pass -> [missing] (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/on_unmatch_args.rs: pass -> [missing] (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/other_match_macro_error.rs: pass -> [missing] (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/report_warning_on_invalid_formats.rs: pass -> [missing] (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/report_warning_on_invalid_meta_item_syntax.rs: pass -> [missing] (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/report_warning_on_missing_options.rs: pass -> [missing] (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/report_warning_on_non_macro.rs: pass -> [missing] (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/report_warning_on_unknown_options.rs: pass -> [missing] (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/error_is_shown_in_downstream_crates.rs: [missing] -> pass (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/message_and_label.rs: [missing] -> pass (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/notes_on_extra_args.rs: [missing] -> pass (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/on_unmatched_args.rs: [missing] -> pass (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/other_match_macro_error.rs: [missing] -> pass (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/report_warning_on_invalid_formats.rs: [missing] -> pass (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/report_warning_on_invalid_meta_item_syntax.rs: [missing] -> pass (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/report_warning_on_missing_options.rs: [missing] -> pass (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/report_warning_on_non_macro.rs: [missing] -> pass (J0)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/report_warning_on_unknown_options.rs: [missing] -> pass (J0)
  • [ui] tests/ui/feature-gates/feature-gate-diagnostic-on-unmatch-args.rs: pass -> [missing] (J0)
  • [ui] tests/ui/feature-gates/feature-gate-diagnostic-on-unmatched-args.rs: [missing] -> pass (J0)
  • [ui] tests/ui/parser/recover/raw-no-const-mut-nested-call-arg.rs: [missing] -> pass (J0)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatch_args/error_is_shown_in_downstream_crates.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatch_args/message_and_label.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatch_args/notes_on_extra_args.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatch_args/on_unmatch_args.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatch_args/other_match_macro_error.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatch_args/report_warning_on_invalid_formats.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatch_args/report_warning_on_invalid_meta_item_syntax.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatch_args/report_warning_on_missing_options.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatch_args/report_warning_on_non_macro.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatch_args/report_warning_on_unknown_options.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatched_args/error_is_shown_in_downstream_crates.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatched_args/message_and_label.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatched_args/notes_on_extra_args.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatched_args/on_unmatched_args.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatched_args/other_match_macro_error.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatched_args/report_warning_on_invalid_formats.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatched_args/report_warning_on_invalid_meta_item_syntax.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatched_args/report_warning_on_missing_options.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatched_args/report_warning_on_non_macro.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/diagnostic_namespace/on_unmatched_args/report_warning_on_unknown_options.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/feature-gates/feature-gate-diagnostic-on-unmatch-args.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/feature-gates/feature-gate-diagnostic-on-unmatched-args.rs: [missing] -> pass (J1)
  • [ui (polonius)] tests/ui/parser/recover/raw-no-const-mut-nested-call-arg.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/error_is_shown_in_downstream_crates.rs: pass -> [missing] (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/message_and_label.rs: pass -> [missing] (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/notes_on_extra_args.rs: pass -> [missing] (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/on_unmatch_args.rs: pass -> [missing] (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/other_match_macro_error.rs: pass -> [missing] (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/report_warning_on_invalid_formats.rs: pass -> [missing] (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/report_warning_on_invalid_meta_item_syntax.rs: pass -> [missing] (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/report_warning_on_missing_options.rs: pass -> [missing] (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/report_warning_on_non_macro.rs: pass -> [missing] (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatch_args/report_warning_on_unknown_options.rs: pass -> [missing] (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/error_is_shown_in_downstream_crates.rs: [missing] -> pass (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/message_and_label.rs: [missing] -> pass (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/notes_on_extra_args.rs: [missing] -> pass (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/on_unmatched_args.rs: [missing] -> pass (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/other_match_macro_error.rs: [missing] -> pass (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/report_warning_on_invalid_formats.rs: [missing] -> pass (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/report_warning_on_invalid_meta_item_syntax.rs: [missing] -> pass (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/report_warning_on_missing_options.rs: [missing] -> pass (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/report_warning_on_non_macro.rs: [missing] -> pass (J2)
  • [ui] tests/ui/diagnostic_namespace/on_unmatched_args/report_warning_on_unknown_options.rs: [missing] -> pass (J2)
  • [ui] tests/ui/feature-gates/feature-gate-diagnostic-on-unmatch-args.rs: pass -> [missing] (J2)
  • [ui] tests/ui/feature-gates/feature-gate-diagnostic-on-unmatched-args.rs: [missing] -> pass (J2)
  • [ui] tests/ui/parser/recover/raw-no-const-mut-nested-call-arg.rs: [missing] -> pass (J2)

Additionally, 12 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard c7446f2d7fc27aeea22d33cbe2417bdccac9ec5d --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. x86_64-gnu-gcc-core-tests: 6m 30s -> 15m 47s (+142.8%)
  2. x86_64-gnu-pre-stabilization: 28m -> 37m 49s (+35.1%)
  3. optional-x86_64-gnu-parallel-frontend: 2h 14m -> 2h 48m (+24.5%)
  4. x86_64-gnu-tools: 56m 46s -> 1h 9m (+22.7%)
  5. dist-x86_64-mingw: 2h 7m -> 2h 36m (+22.6%)
  6. dist-x86_64-illumos: 1h 27m -> 1h 47m (+22.4%)
  7. dist-armv7-linux: 1h 14m -> 1h 29m (+21.2%)
  8. x86_64-gnu-debug: 2h 1m -> 1h 38m (-19.4%)
  9. x86_64-gnu-miri: 1h 24m -> 1h 41m (+19.1%)
  10. x86_64-mingw-1: 2h 54m -> 2h 22m (-18.2%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (c7446f2): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.6% [-1.0%, -0.4%] 7
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 1.8%, secondary 4.0%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
3.1% [2.6%, 4.1%] 3
Regressions ❌
(secondary)
4.0% [1.0%, 7.1%] 2
Improvements ✅
(primary)
-2.1% [-2.1%, -2.1%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.8% [-2.1%, 4.1%] 4

Cycles

Results (secondary 20.9%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
25.2% [21.8%, 27.7%] 6
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-4.6% [-4.6%, -4.6%] 1
All ❌✅ (primary) - - 0

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 516.688s -> 519.038s (0.45%)
Artifact size: 401.49 MiB -> 401.44 MiB (-0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants