Convert to inline diagnostics in `rustc_errors` #152109

JonathanBrouwer · 2026-02-04T15:27:44Z

For #151366
r? @jdonszelmann

compiler/rustc_errors/src/diagnostic_impls.rs

lqd · 2026-02-04T16:22:14Z

overall looks good r? me r=me when green

JonathanBrouwer · 2026-02-04T18:22:35Z

@bors r=lqd rollup

rust-bors · 2026-02-04T18:22:38Z

📌 Commit b6e3bbb has been approved by lqd

It is now in the queue for this repository.

…uwer Rollup of 8 pull requests Successful merges: - #152068 (Convert to inline diagnostics in `rustc_resolve`) - #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) - #152118 (Convert to inline diagnostics in `rustc_codegen_ssa`) 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`) - #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 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:15:14Z

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

rustbot · 2026-02-05T11:15:14Z

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-05T11:15:14Z

@bors r=lqd

rust-bors · 2026-02-05T11:15:17Z

📌 Commit e55eb45 has been approved by lqd

It is now in the queue for this repository.

…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-log-analyzer · 2026-02-05T12:37:01Z

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   9 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/drop_non_drop.rs ... ok
tests/ui/drain_collect.fixed ... ok
tests/ui/duplicate_underscore_argument.rs ... ok
tests/ui/duplicated_attributes.rs ... ok
tests/ui/duration_suboptimal_units.rs ... ok
tests/ui/duration_suboptimal_units_days_weeks.rs ... ok
tests/ui/double_parens.fixed ... ok
tests/ui/duration_subsec.rs ... 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?

JonathanBrouwer · 2026-02-05T13:08:31Z

cc @GuillaumeGomez

@jdonszelmann

Rollup merge of #152109 - JonathanBrouwer:convert_errors, r=lqd Convert to inline diagnostics in `rustc_errors` For #151366 r? @jdonszelmann

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

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

3 tasks

lqd reviewed Feb 4, 2026

View reviewed changes

compiler/rustc_errors/src/diagnostic_impls.rs Outdated Show resolved Hide resolved

JonathanBrouwer force-pushed the convert_errors branch from ee950ad to c1fc77b Compare February 4, 2026 16:00

lqd reviewed Feb 4, 2026

View reviewed changes

compiler/rustc_errors/src/diagnostic_impls.rs Show resolved Hide resolved

rustbot assigned lqd and unassigned jdonszelmann Feb 4, 2026

This comment has been minimized.

Sign in to view

JonathanBrouwer force-pushed the convert_errors branch from c1fc77b to b6e3bbb Compare February 4, 2026 17:07

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

This was referenced Feb 4, 2026

Rollup of 7 pull requests #152130

Closed

Rollup of 8 pull requests #152135

Closed

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

Convert to inline diagnostics in rustc_errors

e55eb45

JonathanBrouwer force-pushed the convert_errors branch from b6e3bbb to e55eb45 Compare February 5, 2026 11:15

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

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 9 pull requests #152163

Merged

rust-bors bot merged commit 62de21f into rust-lang:main Feb 5, 2026
7 of 11 checks passed

rustbot added this to the 1.95.0 milestone Feb 5, 2026

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

Unrolled build for #152109

884cffe

Rollup merge of #152109 - JonathanBrouwer:convert_errors, r=lqd Convert to inline diagnostics in `rustc_errors` For #151366 r? @jdonszelmann

github-actions bot mentioned this pull request Feb 10, 2026

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

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Convert to inline diagnostics in `rustc_errors` #152109

Convert to inline diagnostics in `rustc_errors` #152109

Uh oh!

JonathanBrouwer commented Feb 4, 2026 •

edited by rustbot

Loading

Uh oh!

Uh oh!

Uh oh!

lqd commented Feb 4, 2026

Uh oh!

This comment has been minimized.

JonathanBrouwer commented Feb 4, 2026

Uh oh!

rust-bors bot commented Feb 4, 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!

JonathanBrouwer commented Feb 5, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Convert to inline diagnostics in rustc_errors #152109

Convert to inline diagnostics in rustc_errors #152109

Uh oh!

Conversation

JonathanBrouwer commented Feb 4, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lqd commented Feb 4, 2026

Uh oh!

This comment has been minimized.

JonathanBrouwer commented Feb 4, 2026

Uh oh!

rust-bors bot commented Feb 4, 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!

JonathanBrouwer commented Feb 5, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Convert to inline diagnostics in `rustc_errors` #152109

Convert to inline diagnostics in `rustc_errors` #152109

JonathanBrouwer commented Feb 4, 2026 •

edited by rustbot

Loading