Convert to inline diagnostics in `rustc_trait_selection` #152117

JonathanBrouwer · 2026-02-04T16:18:22Z

For #151366
r? @jdonszelmann

rustbot · 2026-02-04T16:18:26Z

rustc_errors::translation was changed

cc @davidtwco, @TaKO8Ki

rustc_error_messages was changed

cc @davidtwco, @TaKO8Ki

GuillaumeGomez · 2026-02-04T20:22:46Z

Looks good to me, thanks!

@bors r+ rollup

rust-bors · 2026-02-04T20:22:50Z

📌 Commit 8c6c912 has been approved by GuillaumeGomez

It is now in the queue for this repository.

Rollup of 15 pull requests Successful merges: - #151431 (Add new unstable attribute: `#[export_visibility = ...]`.) - #146900 (Add avr_target_feature) - #152033 (Rename trait `DepNodeParams` to `DepNodeKey`) - #152142 (Convert to inline diagnostics in `rustc_hir_typeck`) - #152020 (Remove dummy loads on offload codegen) - #152023 (Some `rustc_query_system` cleanups) - #152068 (Convert to inline diagnostics in `rustc_resolve`) - #152081 (Port depgraph testing attributes to parser) - #152090 (Port reexport_test_harness_main to attr parser) - #152105 (Convert to inline diagnostics in `rustc_ast_lowering`) - #152108 (Convert to inline diagnostics in `rustc_expand`) - #152114 (Convert to inline diagnostics in `rustc_mir_transform`) - #152115 (Convert to inline diagnostics in `rustc_metadata`) - #152116 (Remove rustdoc GUI flaky test) - #152128 (Adopt matches-logical-or-141497.rs to LLVM HEAD) Failed merges: - #152070 (Convert to inline diagnostics in `rustc_pattern_analysis`) - #152106 (Convert to inline diagnostics in `rustc_ast_passes`) - #152109 (Convert to inline diagnostics in `rustc_errors`) - #152117 (Convert to inline diagnostics in `rustc_trait_selection`) - #152118 (Convert to inline diagnostics in `rustc_codegen_ssa`) - #152119 (Convert to inline diagnostics in `rustc_middle`) - #152126 (Convert to inline diagnostics in `rustc_mir_build`) - #152131 (Port rustc_no_implicit_bounds attribute to parser.)

Rollup of 19 pull requests Successful merges: - #146900 (Add avr_target_feature) - #150379 (Return `ExitCode` from `rustc_driver::main` instead of calling `process::exit`) - #152033 (Rename trait `DepNodeParams` to `DepNodeKey`) - #152142 (Convert to inline diagnostics in `rustc_hir_typeck`) - #152145 (Disable flaky test `oneshot::recv_timeout_before_send`) - #152020 (Remove dummy loads on offload codegen) - #152023 (Some `rustc_query_system` cleanups) - #152068 (Convert to inline diagnostics in `rustc_resolve`) - #152081 (Port depgraph testing attributes to parser) - #152090 (Port reexport_test_harness_main to attr parser) - #152105 (Convert to inline diagnostics in `rustc_ast_lowering`) - #152108 (Convert to inline diagnostics in `rustc_expand`) - #152110 (Fix incorrect RSS on systems with non-4K page size) - #152111 (bootstrap: exclude hexagon-unknown-qurt from llvm-libunwind default) - #152114 (Convert to inline diagnostics in `rustc_mir_transform`) - #152115 (Convert to inline diagnostics in `rustc_metadata`) - #152116 (Remove rustdoc GUI flaky test) - #152118 (Convert to inline diagnostics in `rustc_codegen_ssa`) - #152128 (Adopt matches-logical-or-141497.rs to LLVM HEAD) Failed merges: - #152070 (Convert to inline diagnostics in `rustc_pattern_analysis`) - #152106 (Convert to inline diagnostics in `rustc_ast_passes`) - #152109 (Convert to inline diagnostics in `rustc_errors`) - #152117 (Convert to inline diagnostics in `rustc_trait_selection`) - #152119 (Convert to inline diagnostics in `rustc_middle`) - #152126 (Convert to inline diagnostics in `rustc_mir_build`) - #152131 (Port rustc_no_implicit_bounds attribute to parser.)

…uwer Rollup of 18 pull requests Successful merges: - #150379 (Return `ExitCode` from `rustc_driver::main` instead of calling `process::exit`) - #152033 (Rename trait `DepNodeParams` to `DepNodeKey`) - #152142 (Convert to inline diagnostics in `rustc_hir_typeck`) - #152145 (Disable flaky test `oneshot::recv_timeout_before_send`) - #152020 (Remove dummy loads on offload codegen) - #152023 (Some `rustc_query_system` cleanups) - #152068 (Convert to inline diagnostics in `rustc_resolve`) - #152081 (Port depgraph testing attributes to parser) - #152090 (Port reexport_test_harness_main to attr parser) - #152105 (Convert to inline diagnostics in `rustc_ast_lowering`) - #152108 (Convert to inline diagnostics in `rustc_expand`) - #152110 (Fix incorrect RSS on systems with non-4K page size) - #152111 (bootstrap: exclude hexagon-unknown-qurt from llvm-libunwind default) - #152114 (Convert to inline diagnostics in `rustc_mir_transform`) - #152115 (Convert to inline diagnostics in `rustc_metadata`) - #152116 (Remove rustdoc GUI flaky test) - #152118 (Convert to inline diagnostics in `rustc_codegen_ssa`) - #152128 (Adopt matches-logical-or-141497.rs to LLVM HEAD) Failed merges: - #152070 (Convert to inline diagnostics in `rustc_pattern_analysis`) - #152106 (Convert to inline diagnostics in `rustc_ast_passes`) - #152109 (Convert to inline diagnostics in `rustc_errors`) - #152117 (Convert to inline diagnostics in `rustc_trait_selection`) - #152119 (Convert to inline diagnostics in `rustc_middle`) - #152126 (Convert to inline diagnostics in `rustc_mir_build`) - #152131 (Port rustc_no_implicit_bounds attribute to parser.)

rust-bors · 2026-02-05T11:03:42Z

⚠️ A new commit 3e7ac74b3158ee5b64def67ea1124a8af7201443 was pushed to the branch, the PR will need to be re-approved.

JonathanBrouwer · 2026-02-05T11:03:48Z

@bors r=GuillaumeGomez

rust-bors · 2026-02-05T11:03:51Z

📌 Commit 3e7ac74 has been approved by GuillaumeGomez

It is now in the queue for this repository.

rustbot · 2026-02-05T15:59:27Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

JonathanBrouwer · 2026-02-05T15:59:31Z

@bors r=GuillaumeGomez

rust-bors · 2026-02-05T15:59:34Z

📌 Commit 55d1ba1 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@jdonszelmann

…ction2, r=GuillaumeGomez Convert to inline diagnostics in `rustc_trait_selection` For rust-lang#151366 r? @jdonszelmann

@jdonszelmann

…ction2, r=GuillaumeGomez Convert to inline diagnostics in `rustc_trait_selection` For rust-lang#151366 r? @jdonszelmann

rust-log-analyzer · 2026-02-05T17:14:02Z

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

REPOSITORY                                   TAG       IMAGE ID       CREATED       SIZE
ghcr.io/dependabot/dependabot-updater-core   latest    bcec0b4e062b   10 days ago   783MB
=> Removing docker images...
Deleted Images:
untagged: ghcr.io/dependabot/dependabot-updater-core:latest
untagged: ghcr.io/dependabot/dependabot-updater-core@sha256:b662be51f7b8ef7e2c8464428f14e49cb79c36aa9afb7ecb9221dfe0f507050c
deleted: sha256:bcec0b4e062b5ffe11cc1c2729558c0cd96621c0271ab5e97ff3a56e0c25045a
deleted: sha256:64e147d5e54d9be8b8aa322e511cda02296eda4b8b8d063c6a314833aca50e29
deleted: sha256:5cba409bb463f4e7fa1a19f695450170422582c1bc7c0e934d893b4e5f558bc6
deleted: sha256:cddc6ebd344b0111eaab170ead1dfda24acdfe865ed8a12599a34d338fa8e28b
deleted: sha256:2412c3f334d79134573cd45e657fb6cc0abd75bef3881458b0d498d936545c8d
---
tests/ui/drain_collect.fixed ... ok
tests/ui/drop_non_drop.rs ... ok
tests/ui/duplicate_underscore_argument.rs ... ok
tests/ui/duplicated_attributes.rs ... ok
tests/ui/duration_suboptimal_units_days_weeks.rs ... ok
tests/ui/duration_suboptimal_units.rs ... ok
tests/ui/duration_subsec.rs ... ok
tests/ui/double_parens.fixed ... ok
tests/ui/duration_suboptimal_units_days_weeks.fixed ... ok
tests/ui/duration_suboptimal_units.fixed ... ok
tests/ui/duration_subsec.fixed ... ok
tests/ui/eager_transmute.rs ... ok
tests/ui/else_if_without_else.rs ... ok
tests/ui/elidable_lifetime_names.rs ... ok
tests/ui/empty_docs.rs ... ok
---
..............................................     (146/146)

======== tests/rustdoc-gui/search-filter.goml ========

[ERROR] line 48: Error: The CSS selector "#search-tabs .count.loading" still exists: for command `wait-for-false: "#search-tabs .count.loading"`
    at <file:///checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc-gui/doc/test_docs/index.html?search=test>

======== tests/rustdoc-gui/search-result-display.goml ========

[WARNING] line 39: Delta is 0 for "x", maybe try to use `compare-elements-position` instead?

…uwer Rollup of 9 pull requests Successful merges: - #151278 (Provide more context on trait bounds being unmet due to imperfect derive) - #151955 (escape symbol names in global asm) - #149329 (Mark match arms in try and for as being from desugarings.) - #151474 (Minor structural improvements) - #151744 (fix refining_impl_trait suggestion with return_type_notation) - #152107 (Convert to inline diagnostics in `rustc_borrowck`) - #152117 (Convert to inline diagnostics in `rustc_trait_selection`) - #152136 (Consolidate type const checks on `tcx.is_type_const`) - #152170 (Port `rustc_effective_visibility` to the new attribute parser)

@jdonszelmann

…ction2, r=GuillaumeGomez Convert to inline diagnostics in `rustc_trait_selection` For rust-lang#151366 r? @jdonszelmann

…uwer Rollup of 11 pull requests Successful merges: - #152174 (stdarch subtree update) - #151278 (Provide more context on trait bounds being unmet due to imperfect derive) - #151955 (escape symbol names in global asm) - #149329 (Mark match arms in try and for as being from desugarings.) - #151474 (Minor structural improvements) - #151744 (fix refining_impl_trait suggestion with return_type_notation) - #152107 (Convert to inline diagnostics in `rustc_borrowck`) - #152117 (Convert to inline diagnostics in `rustc_trait_selection`) - #152136 (Consolidate type const checks on `tcx.is_type_const`) - #152170 (Port `rustc_effective_visibility` to the new attribute parser) - #152184 (Port rustc_abi to the attribute parser)

…uwer Rollup of 18 pull requests Successful merges: - rust-lang/rust#150379 (Return `ExitCode` from `rustc_driver::main` instead of calling `process::exit`) - rust-lang/rust#152033 (Rename trait `DepNodeParams` to `DepNodeKey`) - rust-lang/rust#152142 (Convert to inline diagnostics in `rustc_hir_typeck`) - rust-lang/rust#152145 (Disable flaky test `oneshot::recv_timeout_before_send`) - rust-lang/rust#152020 (Remove dummy loads on offload codegen) - rust-lang/rust#152023 (Some `rustc_query_system` cleanups) - rust-lang/rust#152068 (Convert to inline diagnostics in `rustc_resolve`) - rust-lang/rust#152081 (Port depgraph testing attributes to parser) - rust-lang/rust#152090 (Port reexport_test_harness_main to attr parser) - rust-lang/rust#152105 (Convert to inline diagnostics in `rustc_ast_lowering`) - rust-lang/rust#152108 (Convert to inline diagnostics in `rustc_expand`) - rust-lang/rust#152110 (Fix incorrect RSS on systems with non-4K page size) - rust-lang/rust#152111 (bootstrap: exclude hexagon-unknown-qurt from llvm-libunwind default) - rust-lang/rust#152114 (Convert to inline diagnostics in `rustc_mir_transform`) - rust-lang/rust#152115 (Convert to inline diagnostics in `rustc_metadata`) - rust-lang/rust#152116 (Remove rustdoc GUI flaky test) - rust-lang/rust#152118 (Convert to inline diagnostics in `rustc_codegen_ssa`) - rust-lang/rust#152128 (Adopt matches-logical-or-141497.rs to LLVM HEAD) Failed merges: - rust-lang/rust#152070 (Convert to inline diagnostics in `rustc_pattern_analysis`) - rust-lang/rust#152106 (Convert to inline diagnostics in `rustc_ast_passes`) - rust-lang/rust#152109 (Convert to inline diagnostics in `rustc_errors`) - rust-lang/rust#152117 (Convert to inline diagnostics in `rustc_trait_selection`) - rust-lang/rust#152119 (Convert to inline diagnostics in `rustc_middle`) - rust-lang/rust#152126 (Convert to inline diagnostics in `rustc_mir_build`) - rust-lang/rust#152131 (Port rustc_no_implicit_bounds attribute to parser.)

@jdonszelmann

…ction2, r=GuillaumeGomez Convert to inline diagnostics in `rustc_trait_selection` For rust-lang#151366 r? @jdonszelmann

@jdonszelmann

…ction2, r=GuillaumeGomez Convert to inline diagnostics in `rustc_trait_selection` For rust-lang#151366 r? @jdonszelmann

…uwer Rollup of 13 pull requests Successful merges: - #152191 (Convert to inline diagnostics in `rustc_hir_analysis`) - #149329 (Mark match arms in try and for as being from desugarings.) - #151474 (Minor structural improvements) - #152107 (Convert to inline diagnostics in `rustc_borrowck`) - #152117 (Convert to inline diagnostics in `rustc_trait_selection`) - #152136 (Consolidate type const checks on `tcx.is_type_const`) - #152140 (Hard code the error code registry for custom drivers) - #152155 (Fix typos in riscv64a23-unknown-linux-gnu.md) - #152170 (Port `rustc_effective_visibility` to the new attribute parser) - #152182 (update compiler stable backport zulip msg) - #152184 (Port rustc_abi to the attribute parser) - #152195 (update openmp/offload builds to LLVM 22, Part 1) - #152202 (chore: clearify tidy's error message) Failed merges: - #151744 (fix refining_impl_trait suggestion with return_type_notation) - #152212 (Port some attributes to the attr parser)

@jdonszelmann

Rollup merge of #152117 - JonathanBrouwer:convert_trait_selection2, r=GuillaumeGomez Convert to inline diagnostics in `rustc_trait_selection` For #151366 r? @jdonszelmann

rustbot assigned jdonszelmann Feb 4, 2026

JonathanBrouwer mentioned this pull request Feb 4, 2026

Tracking issue for MCP 959: Remove the fluent files #151366

Open

5 tasks

This comment has been minimized.

Sign in to view

JonathanBrouwer force-pushed the convert_trait_selection2 branch from f23c166 to 8c6c912 Compare February 4, 2026 17:28

This comment has been minimized.

Sign in to view

GuillaumeGomez approved these changes Feb 4, 2026

View reviewed changes

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 Feb 4, 2026

Zalathar mentioned this pull request Feb 5, 2026

Rollup of 15 pull requests #152144

Closed

This was referenced Feb 5, 2026

Rollup of 18 pull requests #152147

Closed

Rollup of 19 pull requests #152149

Closed

JonathanBrouwer mentioned this pull request Feb 5, 2026

Rollup of 18 pull requests #152156

Merged

JonathanBrouwer force-pushed the convert_trait_selection2 branch from 8c6c912 to 3e7ac74 Compare February 5, 2026 11:03

rust-bors bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 5, 2026

This comment has been minimized.

Sign in to view

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 5, 2026

JonathanBrouwer added 2 commits February 5, 2026 16:58

Register functions in translation

6782a19

Convert to inline diagnostics in rustc_trait_selection

55d1ba1

JonathanBrouwer force-pushed the convert_trait_selection2 branch from 3e7ac74 to 55d1ba1 Compare February 5, 2026 15:59

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 5, 2026

JonathanBrouwer mentioned this pull request Feb 5, 2026

Rollup of 4 pull requests #152178

Closed

JonathanBrouwer mentioned this pull request Feb 5, 2026

Rollup of 9 pull requests #152181

Closed

JonathanBrouwer mentioned this pull request Feb 5, 2026

Rollup of 11 pull requests #152185

Closed

JonathanBrouwer mentioned this pull request Feb 6, 2026

Rollup of 12 pull requests #152207

Closed

This was referenced Feb 6, 2026

Rollup of 12 pull requests #152208

Closed

Rollup of 13 pull requests #152213

Merged

rust-bors bot merged commit 771fa57 into rust-lang:main Feb 6, 2026
8 of 11 checks passed

rustbot added this to the 1.95.0 milestone Feb 6, 2026

rust-timer added a commit that referenced this pull request Feb 6, 2026

Unrolled build for #152117

dd7a4f1

Rollup merge of #152117 - JonathanBrouwer:convert_trait_selection2, r=GuillaumeGomez Convert to inline diagnostics in `rustc_trait_selection` For #151366 r? @jdonszelmann

Uh oh!

Convert to inline diagnostics in rustc_trait_selection #152117

Convert to inline diagnostics in rustc_trait_selection #152117

Uh oh!

Conversation

JonathanBrouwer commented Feb 4, 2026

Uh oh!

rustbot commented Feb 4, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

GuillaumeGomez commented Feb 4, 2026

Uh oh!

rust-bors bot commented Feb 4, 2026

Uh oh!

rust-bors bot commented Feb 5, 2026

Uh oh!

This comment has been minimized.

JonathanBrouwer commented Feb 5, 2026

Uh oh!

rust-bors bot commented Feb 5, 2026

Uh oh!

rustbot commented Feb 5, 2026

Uh oh!

JonathanBrouwer commented Feb 5, 2026

Uh oh!

rust-bors bot commented Feb 5, 2026

Uh oh!

rust-log-analyzer commented Feb 5, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Convert to inline diagnostics in `rustc_trait_selection` #152117

Convert to inline diagnostics in `rustc_trait_selection` #152117