Convert to inline diagnostics in `rustc_borrowck` by JonathanBrouwer · Pull Request #152107 · rust-lang/rust

JonathanBrouwer · 2026-02-04T15:01:22Z

For #151366
r? @jdonszelmann

compiler/rustc_borrowck/src/diagnostics/mod.rs

lqd · 2026-02-04T18:05:53Z

I'll also take this one, r? me

compiler/rustc_borrowck/src/diagnostics/mod.rs

compiler/rustc_borrowck/src/diagnostics/region_errors.rs

lqd · 2026-02-05T09:21:15Z

compiler/rustc_borrowck/src/session_diagnostics.rs

note to self: rename this module, IIRC SessionDiagnostic is the old name of derived Diagnostic and doesn't make sense anymore

Also added this to the tracking issue :)

it was mostly for me to remember to do it at some point, but sure, anyone could do it

lqd · 2026-02-05T09:26:07Z

compiler/rustc_borrowck/src/session_diagnostics.rs

@@ -203,77 +216,97 @@ pub(crate) enum CaptureVarKind {

 #[derive(Subdiagnostic)]
 pub(crate) enum CaptureVarCause {


note: clean up opportunities here due to combinatorial explosion of borrow/move use/use of place in closure/coroutine etc

lqd · 2026-02-05T09:30:49Z

r=me with the first two comments resolved, the other 2 are just notes about pre-existing annoyances I'd like to fix in the future

JonathanBrouwer · 2026-02-05T10:15:36Z

@bors r=lqd rollup

rust-bors · 2026-02-05T10:15:39Z

📌 Commit 5263438 has been approved by lqd

It is now in the queue for this repository.

JonathanBrouwer · 2026-02-05T11:19:56Z

Spurious @GuillaumeGomez

…uwer Rollup of 9 pull requests Successful merges: - #150831 (c-variadic: make `va_arg` match on `Arch` exhaustive) - #152113 (Fix GitHub CI summary in CodeBuild) - #152153 (Incorporate query description functions into `QueryVTable`) - #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`) - #152119 (Convert to inline diagnostics in `rustc_middle`) - #152121 (Convert to inline diagnostics in `rustc_builtin_macros`) - #152133 (library/std: Rename `ON_BROKEN_PIPE_FLAG_USED` to `ON_BROKEN_PIPE_USED`) Failed merges: - #152107 (Convert to inline diagnostics in `rustc_borrowck`) - #152117 (Convert to inline diagnostics in `rustc_trait_selection`) - #152126 (Convert to inline diagnostics in `rustc_mir_build`) - #152131 (Port rustc_no_implicit_bounds attribute to parser.)

rustbot · 2026-02-05T15:57:50Z

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:57:56Z

@bors r=lqd

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

📌 Commit dd61998 has been approved by lqd

It is now in the queue for this repository.

@jdonszelmann

…r=lqd Convert to inline diagnostics in `rustc_borrowck` For rust-lang#151366 r? @jdonszelmann

@jdonszelmann

…r=lqd Convert to inline diagnostics in `rustc_borrowck` For rust-lang#151366 r? @jdonszelmann

…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

…r=lqd Convert to inline diagnostics in `rustc_borrowck` 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)

rustbot assigned jdonszelmann Feb 4, 2026

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

JonathanBrouwer mentioned this pull request Feb 4, 2026

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

Open

5 tasks

lqd reviewed Feb 4, 2026

View reviewed changes

compiler/rustc_borrowck/src/diagnostics/mod.rs Outdated Show resolved Hide resolved

JonathanBrouwer force-pushed the convert_borrowck branch from c74649d to 3852fd9 Compare February 4, 2026 16:29

rustbot assigned lqd and unassigned jdonszelmann Feb 4, 2026

lqd reviewed Feb 5, 2026

View reviewed changes

compiler/rustc_borrowck/src/diagnostics/mod.rs Outdated Show resolved Hide resolved

lqd reviewed Feb 5, 2026

View reviewed changes

compiler/rustc_borrowck/src/diagnostics/region_errors.rs Outdated Show resolved Hide resolved

lqd reviewed Feb 5, 2026

View reviewed changes

JonathanBrouwer force-pushed the convert_borrowck branch from 3852fd9 to 5263438 Compare February 5, 2026 10:14

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 5, 2026

JonathanBrouwer mentioned this pull request Feb 5, 2026

Rollup of 9 pull requests #152163

Merged

This comment has been minimized.

Sign in to view

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

Convert to inline diagnostics in rustc_borrowck

dd61998

JonathanBrouwer force-pushed the convert_borrowck branch from 5263438 to dd61998 Compare February 5, 2026 15:57

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 a commit to JonathanBrouwer/rust that referenced this pull request Feb 5, 2026

Rollup merge of rust-lang#152107 - JonathanBrouwer:convert_borrowck, …

3f51338

…r=lqd Convert to inline diagnostics in `rustc_borrowck` For rust-lang#151366 r? @jdonszelmann

JonathanBrouwer mentioned this pull request Feb 5, 2026

Rollup of 4 pull requests #152178

Closed

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Feb 5, 2026

Rollup merge of rust-lang#152107 - JonathanBrouwer:convert_borrowck, …

220c5df

…r=lqd Convert to inline diagnostics in `rustc_borrowck` For rust-lang#151366 r? @jdonszelmann

JonathanBrouwer mentioned this pull request Feb 5, 2026

Rollup of 9 pull requests #152181

Closed

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Feb 5, 2026

Rollup merge of rust-lang#152107 - JonathanBrouwer:convert_borrowck, …

ea215bc

…r=lqd Convert to inline diagnostics in `rustc_borrowck` For rust-lang#151366 r? @jdonszelmann

JonathanBrouwer mentioned this pull request Feb 5, 2026

Rollup of 11 pull requests #152185

Closed

		@@ -203,77 +216,97 @@ pub(crate) enum CaptureVarKind {

		#[derive(Subdiagnostic)]
		pub(crate) enum CaptureVarCause {

Uh oh!

Conversation

JonathanBrouwer commented Feb 4, 2026

Uh oh!

Uh oh!

lqd commented Feb 4, 2026

Uh oh!

Uh oh!

Uh oh!

lqd Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

JonathanBrouwer Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

lqd Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

lqd Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

lqd commented Feb 5, 2026

Uh oh!

JonathanBrouwer commented Feb 5, 2026

Uh oh!

rust-bors bot commented Feb 5, 2026

Uh oh!

This comment has been minimized.

JonathanBrouwer commented Feb 5, 2026

Uh oh!

This comment has been minimized.

rustbot commented Feb 5, 2026

Uh oh!

JonathanBrouwer commented Feb 5, 2026

Uh oh!

rust-bors bot commented Feb 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants