Skip to content

Rollup of 3 pull requests#157893

Closed
JonathanBrouwer wants to merge 8 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-aNxuyJw
Closed

Rollup of 3 pull requests#157893
JonathanBrouwer wants to merge 8 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-aNxuyJw

Conversation

@JonathanBrouwer

@JonathanBrouwer JonathanBrouwer commented Jun 14, 2026

Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

cjgillot and others added 8 commits June 10, 2026 11:39
@cjgillot
Implement normalize_fn_sig inside rustc_trait_selection.
561b2d8
@GuillaumeGomez
Rename rustc_trait_selection/src/errors.rs into `rustc_trait_select…
93d56ce 
…ion/src/diagnostics.rs`
@GuillaumeGomez
Rename rustc_mir_transform/src/errors.rs into `rustc_mir_transform/…
bbd0e83 
…src/diagnostics.rs`
@fmease
Deduplicate diagnostic impl of an orphanck error+lint
5c850e6 
Moreover, don't add the error code to the lint warning(!).
While helpful, it's quite unconventional.
@fmease
Slightly tweak the diagnostic for uncovered type parameters
2fda233 
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".
@JonathanBrouwer
Rollup merge of rust-lang#157677 - fmease:orphanck-improv-diag, r=jac…
aa2f08d 
…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.
@JonathanBrouwer
Rollup merge of rust-lang#157715 - cjgillot:type-err-ctxt-normalize, …
d17a52c 
…r=TaKO8Ki

Stop using a fn pointer to normalize_fn_sig inside TypeErrCtxt

Part of rust-lang#127492
@JonathanBrouwer
Rollup merge of rust-lang#157884 - GuillaumeGomez:rename-err-to-diag,…
68445bd 
… r=JonathanBrouwer

Rename `errors.rs` file to `diagnostics.rs` (9/N)

Follow-up of rust-lang#157485.

r? @JonathanBrouwer
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Jun 14, 2026
@rustbot rustbot added 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. labels Jun 14, 2026
@JonathanBrouwer

JonathanBrouwer commented Jun 14, 2026

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 68445bd 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 rust-bors Bot mentioned this pull request Jun 14, 2026
Open
@rust-bors

This comment has been minimized.

Sign in to view
rust-bors Bot pushed a commit that referenced this pull request Jun 14, 2026
@bors
Auto merge of #157893 - JonathanBrouwer:rollup-aNxuyJw, r=JonathanBro…
3b8e209 
…uwer

Rollup of 3 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))
@rust-log-analyzer

rust-log-analyzer commented Jun 14, 2026

Copy link
Copy Markdown
Collaborator

The job aarch64-apple failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
[RUSTC-TIMING] regex_syntax test:false 5.951
   Compiling regex-automata v0.4.13
error: linking with `cc` failed: exit status: 1
  |
  = note:  "cc" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/bootstrap-tools/release/build/parking_lot_core-a6ea3df8c34d76ac/rustctE0m0c/symbols.o" "<2 object files omitted>" "<sysroot>/lib/rustlib/aarch64-apple-darwin/lib/{libstd-*,libpanic_unwind-*,libobject-*,libmemchr-*,libaddr2line-*,libgimli-*,libcfg_if-*,librustc_demangle-*,libstd_detect-*,libhashbrown-*,librustc_std_workspace_alloc-*,libminiz_oxide-*,libadler2-*,libunwind-*,liblibc-*,librustc_std_workspace_core-*,liballoc-*,libcore-*,libcompiler_builtins-*}.rlib" "-lSystem" "-lc" "-lm" "-arch" "arm64" "-mmacosx-version-min=11.0.0" "-o" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/bootstrap-tools/release/build/parking_lot_core-a6ea3df8c34d76ac/build_script_build-a6ea3df8c34d76ac" "-Wl,-dead_strip" "-nodefaultlibs"
  = note: some arguments are omitted. use `--verbose` to show all linker arguments
  = note: clang: error: unable to execute command: Segmentation fault: 11
          clang: error: linker command failed due to signal (use -v to see invocation)
          Apple clang version 17.0.0 (clang-1700.6.3.2)
          Target: arm64-apple-darwin24.6.0
          Thread model: posix
          InstalledDir: /Applications/Xcode_26.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
          clang: note: diagnostic msg: 
          ********************
          
          PLEASE ATTACH THE FOLLOWING FILES TO THE BUG REPORT:
          Linker snapshot containing input(s) and associated run script(s) are located at:
          clang: note: diagnostic msg: /var/folders/bh/cdl3cft92_dbvg852_fp7y7w0000gn/T/linker-crash-d62ce6
          clang: note: diagnostic msg: 
          
          ********************
          

[RUSTC-TIMING] build_script_build test:false 1.447

@rust-bors rust-bors Bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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 for 3b8e209 failed: CI. Failed job:

@rust-bors

rust-bors Bot commented Jun 14, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved due to being closed.

@rust-bors rust-bors Bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 14, 2026
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@JonathanBrouwer @rust-log-analyzer @rustbot @cjgillot @GuillaumeGomez @fmease