Convert to inline diagnostics in `rustc_builtin_macros`#152121

JonathanBrouwer · 2026-02-04T17:05:47Z

For #151366
r? @jdonszelmann

rustbot · 2026-02-04T17:05:52Z

jdonszelmann is currently at their maximum review capacity.
They may take a while to respond.

lqd · 2026-02-04T18:00:47Z

jdonszelmann is currently at their maximum review capacity.

r? me

lqd · 2026-02-05T08:54:03Z

compiler/rustc_builtin_macros/src/deriving/coerce_pointee.rs

 #[derive(Diagnostic)]
-#[diag(builtin_macros_coerce_pointee_requires_transparent, code = E0802)]
+#[diag("`CoercePointee` can only be derived on `struct`s with `#[repr(transparent)]`", code = E0802)]
 struct RequireTransparent {
    #[primary_span]
    span: Span,
 }


interesting that these are not in errors.rs...

lqd · 2026-02-05T08:55:08Z

compiler/rustc_builtin_macros/src/errors.rs

 #[derive(Diagnostic)]
-#[diag(builtin_macros_non_generic_pointee)]
+#[diag("the `#[pointee]` attribute may only be used on generic parameters")]
 pub(crate) struct NonGenericPointee {
    #[primary_span]
    pub span: Span,
 }


...which makes this one split from its sibling diagnostic structs from coerce_pointee.rs

lqd · 2026-02-05T08:59:48Z

Reading all these PRs makes me also think about

formatting, with the many newlines and space at the beginning of lines, that are sometimes ignored sometimes not -- maybe in those cases extracting the message to a const str could be helpful
whether to collect all diagnostic structs in an errors module or not
whether it'd be nice to use r#"" strings when the parts of the error message needs escaping

@bors r+ rollup

rust-bors · 2026-02-05T08:59:52Z

📌 Commit ac37233 has been approved by lqd

It is now in the queue for this repository.

JonathanBrouwer · 2026-02-05T10:09:38Z

formatting, with the many newlines and space at the beginning of lines, that are sometimes ignored sometimes not -- maybe in those cases extracting the message to a const str could be helpful

I want to put some compile-time checks on the formatting of these messages, but I'll do that after we finish porting everything

whether to collect all diagnostic structs in an errors module or not

This is something I've been thinking about as well, I kinda want to distribute them among the code but that's something I'd want to MCP in the future

whether it'd be nice to use r#"" strings when the parts of the error message needs escaping

Agreed, this would be better, put it in the tracking issue so I can do it for all messages at the same time

rust-bors · 2026-02-05T11:01:27Z

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

rustbot · 2026-02-05T11:01: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-05T11:01:28Z

@bors r=lqd

rust-bors · 2026-02-05T11:01:31Z

📌 Commit d40e60f has been approved by lqd

It is now in the queue for this repository.

rust-log-analyzer · 2026-02-05T12:06:29Z

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/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: - #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.)

lqd · 2026-02-05T12:16:41Z

cc @GuillaumeGomez

@jdonszelmann

Rollup merge of #152121 - JonathanBrouwer:convert_builtin_macros, r=lqd Convert to inline diagnostics in `rustc_builtin_macros` For #151366 r? @jdonszelmann

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

rustbot assigned lqd and unassigned jdonszelmann Feb 4, 2026

lqd reviewed Feb 5, 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 5, 2026

Convert to inline diagnostics in rustc_builtin_macros

d40e60f

JonathanBrouwer force-pushed the convert_builtin_macros branch from ac37233 to d40e60f Compare February 5, 2026 11:01

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 3c61714 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 #152121

a492a20

Rollup merge of #152121 - JonathanBrouwer:convert_builtin_macros, r=lqd Convert to inline diagnostics in `rustc_builtin_macros` 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

Uh oh!

Conversation

JonathanBrouwer commented Feb 4, 2026

Uh oh!

rustbot commented Feb 4, 2026

Uh oh!

lqd commented Feb 4, 2026

Uh oh!

lqd Feb 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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!

rust-bors bot commented Feb 5, 2026

Uh oh!

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!

lqd commented Feb 5, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

lqd Feb 5, 2026 •

edited

Loading