Convert to inline diagnostics in `rustc_borrowck` #152107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

rust-bors merged 1 commit into rust-lang:main from JonathanBrouwer:convert_borrowck

Feb 6, 2026

Contributor

JonathanBrouwer commented Feb 4, 2026

For #151366
r? @jdonszelmann

rustbot assigned jdonszelmann

rustbot added S-waiting-on-review T-compiler labels

JonathanBrouwer mentioned this pull request

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

Open

3 tasks

lqd reviewed

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

Member

lqd commented Feb 4, 2026

I'll also take this one, r? me

rustbot assigned lqd and unassigned jdonszelmann

lqd reviewed

View reviewed changes

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

lqd reviewed

View reviewed changes

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

lqd reviewed

View reviewed changes

compiler/rustc_borrowck/src/session_diagnostics.rs

Member

lqd Feb 5, 2026

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

Contributor Author

JonathanBrouwer Feb 5, 2026

Also added this to the tracking issue :)

Member

lqd Feb 5, 2026

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

lqd reviewed

View reviewed changes

compiler/rustc_borrowck/src/session_diagnostics.rs

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

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

Member

lqd Feb 5, 2026

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

Member

lqd commented Feb 5, 2026

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 force-pushed the convert_borrowck branch from 3852fd9 to 5263438 Compare

February 5, 2026 10:14

Contributor Author

JonathanBrouwer commented Feb 5, 2026

@bors r=lqd rollup

Contributor

rust-bors bot commented Feb 5, 2026

📌 Commit 5263438 has been approved by lqd

It is now in the queue for this repository.

rust-bors bot added S-waiting-on-bors and removed S-waiting-on-review labels

JonathanBrouwer mentioned this pull request

Rollup of 9 pull requests #152163

Merged

This comment has been minimized.

Sign in to view

Contributor Author

JonathanBrouwer commented Feb 5, 2026

Spurious @GuillaumeGomez

rust-bors bot pushed a commit that referenced this pull request


          Auto merge of #152163 - JonathanBrouwer:rollup-Ypg7w4H, r=JonathanBro…

66daca1

…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.)

rust-bors bot added S-waiting-on-author and removed S-waiting-on-bors labels

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

Collaborator

rustbot commented Feb 5, 2026

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.

Contributor Author

JonathanBrouwer commented Feb 5, 2026

@bors r=lqd

Contributor

rust-bors bot commented Feb 5, 2026

📌 Commit dd61998 has been approved by lqd

It is now in the queue for this repository.

rust-bors bot added S-waiting-on-bors and removed S-waiting-on-author labels

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          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

Rollup of 4 pull requests #152178

Closed

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          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

Rollup of 9 pull requests #152181

Closed

rust-bors bot pushed a commit that referenced this pull request


          Auto merge of #152181 - JonathanBrouwer:rollup-A2QIb81, r=JonathanBro…

ba2ea18

…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)

rust-bors bot pushed a commit that referenced this pull request


          Auto merge of #152181 - JonathanBrouwer:rollup-A2QIb81, r=JonathanBro…

221de4c

…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)

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


          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

Rollup of 11 pull requests #152185

Closed

rust-bors bot pushed a commit that referenced this pull request


          Auto merge of #152185 - JonathanBrouwer:rollup-JuaHm6e, r=JonathanBro…

a81e5df

…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)

rust-bors bot pushed a commit that referenced this pull request


          Auto merge of #152185 - JonathanBrouwer:rollup-JuaHm6e, r=JonathanBro…

ce8d2f4

…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)

rust-bors bot pushed a commit that referenced this pull request


          Auto merge of #152185 - JonathanBrouwer:rollup-JuaHm6e, r=JonathanBro…

41dca5b

…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)

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


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

70a8160

…r=lqd

Convert to inline diagnostics in `rustc_borrowck`

For rust-lang#151366
r? @jdonszelmann

JonathanBrouwer mentioned this pull request

Rollup of 12 pull requests #152207

Closed

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request


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

8e67013

…r=lqd

Convert to inline diagnostics in `rustc_borrowck`

For rust-lang#151366
r? @jdonszelmann

This was referenced Feb 6, 2026

Rollup of 12 pull requests #152208

Closed

Rollup of 13 pull requests #152213

Merged

rust-bors bot pushed a commit that referenced this pull request


          Auto merge of #152213 - JonathanBrouwer:rollup-trjCgZZ, r=JonathanBro…

035b01b

…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)

rust-bors bot merged commit 65a1d97 into rust-lang:main

11 checks passed

rust-timer added a commit that referenced this pull request


          Unrolled build for #152107

2701a3d

Rollup merge of #152107 - JonathanBrouwer:convert_borrowck, r=lqd

Convert to inline diagnostics in `rustc_borrowck`

For #151366
r? @jdonszelmann

github-actions bot mentioned this pull request

Toolchain upgrade to nightly-2026-02-07 flux-rs/flux#1345

Open

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

Labels

S-waiting-on-bors T-compiler