Skip to content

Convert to inline diagnostics in rustc_const_eval - #152186

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:inline-diag-rustc_const_eval
Feb 7, 2026
Merged

Convert to inline diagnostics in rustc_const_eval#152186
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:inline-diag-rustc_const_eval

Conversation

@GuillaumeGomez

@GuillaumeGomezGuillaumeGomez commented Feb 5, 2026•
edited by rustbot
Loading

Copy link
Copy Markdown
Member

@rustbot

rustbot commented Feb 5, 2026

Copy link
Copy Markdown
Collaborator

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri

Some changes occurred to constck

cc @fee1-dead

⚠️#[rustc_intrinsic_const_stable_indirect] controls whether intrinsics can be exposed to stable const
code; adding it needs t-lang approval.

cc @rust-lang/wg-const-eval

Some changes occurred to the CTFE machinery

cc @RalfJung, @oli-obk, @lcnr

@rustbotrustbot 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 5, 2026
RalfJung
RalfJung reviewed Feb 5, 2026
View reviewed changes
Comment threadcompiler/rustc_const_eval/src/errors.rs
RalfJung
RalfJung reviewed Feb 5, 2026
View reviewed changes
Comment threadcompiler/rustc_const_eval/src/interpret/call.rs Outdated
JonathanBrouwer
JonathanBrouwer reviewed Feb 5, 2026
View reviewed changes
Comment threadtests/ui/consts/const-try-feature-gate.stderr
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@JonathanBrouwerJonathanBrouwer mentioned this pull request Feb 5, 2026
Closed
7 tasks
@JonathanBrouwer

JonathanBrouwer commented Feb 6, 2026

Copy link
Copy Markdown
Member

@rustbot author

@rustbotrustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 6, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@GuillaumeGomez
GuillaumeGomezforce-pushed the inline-diag-rustc_const_eval branch from 3225771 to d575741CompareFebruary 6, 2026 21:24
@GuillaumeGomez
GuillaumeGomezforce-pushed the inline-diag-rustc_const_eval branch from 543765c to c41480eCompareFebruary 6, 2026 21:56
@rustbot

rustbot commented Feb 6, 2026

Copy link
Copy Markdown
Collaborator

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.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
GuillaumeGomezforce-pushed the inline-diag-rustc_const_eval branch 2 times, most recently from 02277e3 to c682902CompareFebruary 6, 2026 22:15
@JonathanBrouwer

JonathanBrouwer commented Feb 6, 2026

Copy link
Copy Markdown
Member

@bors r+ rollup

@rust-bors

rust-borsBot commented Feb 6, 2026

Copy link
Copy Markdown
Contributor

📌 Commit c682902 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 6, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Feb 6, 2026
@JonathanBrouwer
Rollup merge ofrust-lang#152186- GuillaumeGomez:inline-diag-rustc_c…
da7089a
…onst_eval, r=JonathanBrouwer
Convert to inline diagnostics in `rustc_const_eval`
Part of rust-lang#151366.
r? @JonathanBrouwer
@JonathanBrouwerJonathanBrouwer mentioned this pull request Feb 6, 2026
Closed
JonathanBrouwer
JonathanBrouwer reviewed Feb 6, 2026
View reviewed changes
Comment threadcompiler/rustc_const_eval/src/const_eval/machine.rs
fluent::const_eval_invalid_align_details,
inline_fluent!(
"invalid align passed to `{$name}`: {$align} is {$err_kind ->
[not_power_of_two] not a power of 2

@JonathanBrouwerJonathanBrouwerFeb 6, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are ugly but I will fix this in a separate PR for all crates simultaneously :)

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Feb 6, 2026
@JonathanBrouwer
Rollup merge ofrust-lang#152186- GuillaumeGomez:inline-diag-rustc_c…
75cbc98
…onst_eval, r=JonathanBrouwer
Convert to inline diagnostics in `rustc_const_eval`
Part of rust-lang#151366.
r? @JonathanBrouwer
@JonathanBrouwerJonathanBrouwer mentioned this pull request Feb 6, 2026
Closed
rust-borsBot pushed a commit that referenced this pull request Feb 6, 2026
@bors
Auto merge of#152260- JonathanBrouwer:rollup-ZTLa9e6, r=JonathanBro…
0d8969e
…uwer
Rollup of 5 pull requests
Successful merges:
- #149960 (add `unreachable_cfg_select_predicates` lint)
- #152126 (Convert to inline diagnostics in `rustc_mir_build`)
- #152186 (Convert to inline diagnostics in `rustc_const_eval`)
- #152234 (Dont strip const blocks in array lengths)
- #152243 (Use relative paths for std links in rustc-docs)
@JonathanBrouwerJonathanBrouwer mentioned this pull request Feb 7, 2026
Merged
rust-borsBot pushed a commit that referenced this pull request Feb 7, 2026
@bors
Auto merge of#152264- JonathanBrouwer:rollup-pBsxN9G, r=JonathanBro…
ce9b15c
…uwer
Rollup of 4 pull requests
Successful merges:
- #152126 (Convert to inline diagnostics in `rustc_mir_build`)
- #152186 (Convert to inline diagnostics in `rustc_const_eval`)
- #152234 (Dont strip const blocks in array lengths)
- #152243 (Use relative paths for std links in rustc-docs)
rust-borsBot pushed a commit that referenced this pull request Feb 7, 2026
@bors
Auto merge of#152264- JonathanBrouwer:rollup-pBsxN9G, r=JonathanBro…
c58d9f9
…uwer
Rollup of 4 pull requests
Successful merges:
- #152126 (Convert to inline diagnostics in `rustc_mir_build`)
- #152186 (Convert to inline diagnostics in `rustc_const_eval`)
- #152234 (Dont strip const blocks in array lengths)
- #152243 (Use relative paths for std links in rustc-docs)
@rust-bors
rust-borsBot merged commit a66d0f8 into rust-lang:mainFeb 7, 2026
11 checks passed
@rustbotrustbot added this to the 1.95.0 milestone Feb 7, 2026
rust-timer added a commit that referenced this pull request Feb 7, 2026
@rust-timer
Unrolled build for#152186
3f41e19
Rollup merge of #152186 - GuillaumeGomez:inline-diag-rustc_const_eval, r=JonathanBrouwer
Convert to inline diagnostics in `rustc_const_eval`
Part of #151366.
r? @JonathanBrouwer
@JonathanBrouwer

JonathanBrouwer commented Feb 7, 2026

Copy link
Copy Markdown
Member

@rust-timer build 3f41e19

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer

rust-timer commented Feb 7, 2026

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (3f41e19): comparison URL.

Overall result: ❌✅ regressions and 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.

meanrangecount
Regressions ❌
(primary)		--0
Regressions ❌
(secondary)		0.2%[0.2%, 0.2%]1
Improvements ✅
(primary)		--0
Improvements ✅
(secondary)		-0.8%[-1.8%, -0.4%]7
All ❌✅ (primary)--0

Max RSS (memory usage)

Results (primary -5.3%)

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

meanrangecount
Regressions ❌
(primary)		--0
Regressions ❌
(secondary)		--0
Improvements ✅
(primary)		-5.3%[-5.3%, -5.3%]1
Improvements ✅
(secondary)		--0
All ❌✅ (primary)-5.3%[-5.3%, -5.3%]1

Cycles

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

Binary size

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

Bootstrap: 474.536s -> 474.919s (0.08%)
Artifact size: 397.98 MiB -> 398.01 MiB (0.01%)

@GuillaumeGomez
GuillaumeGomez deleted the inline-diag-rustc_const_eval branch February 7, 2026 16:01
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJungRalfJungRalfJung left review comments
@JonathanBrouwerJonathanBrouwerJonathanBrouwer left review comments

Assignees

@JonathanBrouwerJonathanBrouwer

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.95.0

Development

Successfully merging this pull request may close these issues.

6 participants

@GuillaumeGomez@rustbot@rust-log-analyzer@JonathanBrouwer@rust-timer@RalfJung