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

JonathanBrouwer · 2026-02-03T21:23:55Z

JonathanBrouwer · 2026-02-04T07:45:11Z

lqd · 2026-02-04T09:35:01Z

I think we can eventually fine tune the name of the inline_fluent macro.

I'll still roll the PR up despite the other tiny perf regressions: they should only happen for the benchmarks that are emitting noticeable amounts of diagnostics, i.e. it's fine.

@bors r+ rollup

rust-bors · 2026-02-04T09:35:05Z

📌 Commit 024c9b7 has been approved by lqd

It is now in the queue for this repository.

JonathanBrouwer · 2026-02-04T09:37:44Z

Added bikeshedding inline_fluent to the Unresolved questions of the tracking issue :)

…=lqd Convert to inline diagnostics in `rustc_resolve` For rust-lang#151366

…uwer Rollup of 11 pull requests Successful merges: - #150605 (skip codegen for intrinsics with big fallback bodies if backend does not need them) - #150992 (link modifier `export-symbols`: export all global symbols from selected uptream c static libraries) - #151534 (target: fix destabilising target-spec-json) - #152088 (rustbook/README.md: add missing `)`) - #151526 (Fix autodiff codegen tests) - #151810 (citool: report debuginfo test statistics) - #152065 (Convert to inline diagnostics in `rustc_ty_utils`) - #152068 (Convert to inline diagnostics in `rustc_resolve`) - #152070 (Convert to inline diagnostics in `rustc_pattern_analysis`) - #152072 (Convert to inline diagnostics in `rustc_monomorphize`) - #152083 (Fix set_times_nofollow for directory on windows) Failed merges: - #152069 (Convert to inline diagnostics in `rustc_privacy`)

…=lqd Convert to inline diagnostics in `rustc_resolve` For rust-lang#151366

…uwer Rollup of 12 pull requests Successful merges: - #150992 (link modifier `export-symbols`: export all global symbols from selected uptream c static libraries) - #151534 (target: fix destabilising target-spec-json) - #152088 (rustbook/README.md: add missing `)`) - #151526 (Fix autodiff codegen tests) - #151810 (citool: report debuginfo test statistics) - #151952 (Revert doc attribute parsing errors to future warnings) - #152065 (Convert to inline diagnostics in `rustc_ty_utils`) - #152066 (Convert to inline diagnostics in `rustc_session`) - #152069 (Convert to inline diagnostics in `rustc_privacy`) - #152072 (Convert to inline diagnostics in `rustc_monomorphize`) - #152083 (Fix set_times_nofollow for directory on windows) - #152102 (Convert to inline diagnostics in all codegen backends) Failed merges: - #152068 (Convert to inline diagnostics in `rustc_resolve`) - #152070 (Convert to inline diagnostics in `rustc_pattern_analysis`)

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

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-04T17:33:09Z

@bors r=lqd

rust-bors · 2026-02-04T17:33:12Z

📌 Commit e005754 has been approved by lqd

It is now in the queue for this repository.

…=lqd Convert to inline diagnostics in `rustc_resolve` For rust-lang#151366

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

…=lqd Convert to inline diagnostics in `rustc_resolve` For rust-lang#151366

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

…=lqd Convert to inline diagnostics in `rustc_resolve` For rust-lang#151366

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

Rollup merge of #152068 - JonathanBrouwer:convert_resolve, r=lqd Convert to inline diagnostics in `rustc_resolve` For #151366

JonathanBrouwer · 2026-02-05T14:48:09Z

@rust-timer build 3f9c2e2

rust-timer · 2026-02-05T15:29:15Z

Finished benchmarking commit (3f9c2e2): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.7%	[-1.6%, -0.3%]	29
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary 4.3%, secondary -1.2%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	4.3%	[4.3%, 4.3%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.2%	[-1.2%, -1.2%]	1
All ❌✅ (primary)	4.3%	[4.3%, 4.3%]	1

Cycles

Results (primary 3.0%, secondary 3.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	3.0%	[2.3%, 3.6%]	4
Regressions ❌ (secondary)	3.1%	[3.1%, 3.1%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	3.0%	[2.3%, 3.6%]	4

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 474.797s -> 474.603s (-0.04%)
Artifact size: 397.94 MiB -> 397.92 MiB (-0.01%)

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

JonathanBrouwer mentioned this pull request Feb 3, 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_resolve branch from 1478b28 to 024c9b7 Compare February 4, 2026 07:44

rustbot assigned lqd Feb 4, 2026

JonathanBrouwer marked this pull request as ready for review February 4, 2026 07:45

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 4, 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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 4, 2026

JonathanBrouwer mentioned this pull request Feb 4, 2026

Rollup of 9 pull requests #152093

Closed

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

Rollup merge of rust-lang#152068 - JonathanBrouwer:convert_resolve, r…

ccf8839

…=lqd Convert to inline diagnostics in `rustc_resolve` For rust-lang#151366

JonathanBrouwer mentioned this pull request Feb 4, 2026

Rollup of 11 pull requests #152099

Closed

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

Rollup merge of rust-lang#152068 - JonathanBrouwer:convert_resolve, r…

13d79ed

…=lqd Convert to inline diagnostics in `rustc_resolve` For rust-lang#151366

This was referenced Feb 4, 2026

Rollup of 10 pull requests #152100

Closed

Rollup of 10 pull requests #152101

Closed

Rollup of 12 pull requests #152104

Merged

rust-bors bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Feb 4, 2026

This comment has been minimized.

Sign in to view

rust-bors bot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 4, 2026

Convert to inline diagnostics in rustc_resolve

e005754

JonathanBrouwer force-pushed the convert_resolve branch from 024c9b7 to e005754 Compare February 4, 2026 17:33

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

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

Rollup merge of rust-lang#152068 - JonathanBrouwer:convert_resolve, r…

1b29338

…=lqd Convert to inline diagnostics in `rustc_resolve` For rust-lang#151366

JonathanBrouwer mentioned this pull request Feb 4, 2026

Rollup of 6 pull requests #152127

Closed

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

Rollup merge of rust-lang#152068 - JonathanBrouwer:convert_resolve, r…

dd0fd9a

…=lqd Convert to inline diagnostics in `rustc_resolve` For rust-lang#151366

JonathanBrouwer mentioned this pull request Feb 4, 2026

Rollup of 7 pull requests #152130

Closed

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

Rollup merge of rust-lang#152068 - JonathanBrouwer:convert_resolve, r…

41fd190

…=lqd Convert to inline diagnostics in `rustc_resolve` For rust-lang#151366

JonathanBrouwer mentioned this pull request Feb 4, 2026

Rollup of 8 pull requests #152135

Closed

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

Rollup merge of rust-lang#152068 - JonathanBrouwer:convert_resolve, r…

86ff314

…=lqd Convert to inline diagnostics in `rustc_resolve` For rust-lang#151366

Zalathar mentioned this pull request Feb 5, 2026

Rollup of 15 pull requests #152144

Closed

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

Rollup merge of rust-lang#152068 - JonathanBrouwer:convert_resolve, r…

f344539

…=lqd Convert to inline diagnostics in `rustc_resolve` For rust-lang#151366

Zalathar mentioned this pull request Feb 5, 2026

Rollup of 18 pull requests #152147

Closed

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

Rollup merge of rust-lang#152068 - JonathanBrouwer:convert_resolve, r…

9a6e969

…=lqd Convert to inline diagnostics in `rustc_resolve` For rust-lang#151366

Zalathar mentioned this pull request Feb 5, 2026

Rollup of 19 pull requests #152149

Closed

JonathanBrouwer mentioned this pull request Feb 5, 2026

Rollup of 18 pull requests #152156

Merged

rust-bors bot merged commit 50c768e into rust-lang:main Feb 5, 2026
11 checks passed

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

Unrolled build for #152068

3f9c2e2

Rollup merge of #152068 - JonathanBrouwer:convert_resolve, r=lqd Convert to inline diagnostics in `rustc_resolve` For #151366

This comment has been minimized.

Sign in to view

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Convert to inline diagnostics in `rustc_resolve`#152068

Convert to inline diagnostics in `rustc_resolve`#152068
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
JonathanBrouwer:convert_resolve

JonathanBrouwer commented Feb 3, 2026

Uh oh!

This comment has been minimized.

JonathanBrouwer commented Feb 4, 2026

Uh oh!

lqd commented Feb 4, 2026

Uh oh!

rust-bors bot commented Feb 4, 2026

Uh oh!

JonathanBrouwer commented Feb 4, 2026

Uh oh!

This comment has been minimized.

rustbot commented Feb 4, 2026

Uh oh!

JonathanBrouwer commented Feb 4, 2026

Uh oh!

rust-bors bot commented Feb 4, 2026

Uh oh!

Uh oh!

JonathanBrouwer commented Feb 5, 2026

Uh oh!

This comment has been minimized.

rust-timer commented Feb 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

JonathanBrouwer commented Feb 3, 2026

Uh oh!

This comment has been minimized.

JonathanBrouwer commented Feb 4, 2026

Uh oh!

lqd commented Feb 4, 2026

Uh oh!

rust-bors bot commented Feb 4, 2026

Uh oh!

JonathanBrouwer commented Feb 4, 2026

Uh oh!

This comment has been minimized.

rustbot commented Feb 4, 2026

Uh oh!

JonathanBrouwer commented Feb 4, 2026

Uh oh!

rust-bors bot commented Feb 4, 2026

Uh oh!

Uh oh!

JonathanBrouwer commented Feb 5, 2026

Uh oh!

This comment has been minimized.

rust-timer commented Feb 5, 2026

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants