interpret: go back to regular string interpolation for error messages - #153611

Merged
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom
RalfJung:interp-error-strings
Mar 12, 2026
Merged

interpret: go back to regular string interpolation for error messages#153611
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom
RalfJung:interp-error-strings

Conversation

@RalfJung

@RalfJungRalfJung commented Mar 9, 2026•
edited
Loading

Copy link
Copy Markdown
Member

Using the translatable diagnostic infrastructure adds a whole lot of boilerplate which isn't actually useful for const-eval errors, so let's get rid of it. This effectively reverts #111677. That PR effectively added 1000 lines and this PR only removes around 600 -- the difference is caused by (a) keeping some of the types around for validation, where we can use them to share error strings and to trigger the extra help for pointer byte shenanigans during CTFE, and (b) this not being a full revert of #111677; I am not touching diagnostics outside the interpreter such as all the const-checking code which also got converted to fluent in the same PR.

The last commit does something similar for LayoutError, which also helps deduplicate a bunch of error strings. I can make that into a separate PR if you prefer.

r? @oli-obk
Fixes#113117
Fixes#116764
Fixes#112618

@rustbot

rustbot commented Mar 9, 2026

Copy link
Copy Markdown
Collaborator

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred to the CTFE machinery

cc @oli-obk, @lcnr

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri, @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 Mar 9, 2026
@rustbot

rustbot commented Mar 9, 2026

Copy link
Copy Markdown
Collaborator

oli-obk is not on the review rotation at the moment.
They may take a while to respond.

@RalfJung
RalfJungforce-pushed the interp-error-strings branch from caa7de3 to d42a68bCompareMarch 9, 2026 14:38
@rustbot

This comment has been minimized.

Sign in to view
Bryntet
Bryntet reviewed Mar 9, 2026
View reviewed changes
Comment threadcompiler/rustc_abi/src/lib.rs
Comment on lines -1026 to -1027
AlignFromBytesError::NotPowerOfTwo(align) => write!(f, "`{align}` is not a power of 2"),
AlignFromBytesError::TooLarge(align) => write!(f, "`{align}` is too large"),

@BryntetBryntetMar 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I personally prefer this with the backticks

@RalfJungRalfJungMar 9, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

These are just numbers. We don't usually render them with backticks. And in fact they were not rendered with backticks in const-eval errors before, only in JSON errors. I changed the strings here to avoid changing the const-eval error output.

@RalfJung
RalfJungforce-pushed the interp-error-strings branch from a2139d5 to a060599CompareMarch 9, 2026 15:06
RalfJung
RalfJung commented Mar 9, 2026
View reviewed changes
Comment threadcompiler/rustc_abi/src/lib.rs
TooLarge(u64),
}

impl AlignFromBytesError {

@RalfJungRalfJungMar 9, 2026•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

The AlignFromBytesError type got added #111677. Reverting that PR would mean replacing it by String again, but it actually seems reasonable to have a proper error type here so I decided to keep the type, but simplify and deduplicate the logic for turning it into a user-visible message.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed the interp-error-strings branch from a060599 to 66fbaa6CompareMarch 9, 2026 16:46
@rustbot

rustbot commented Mar 9, 2026

Copy link
Copy Markdown
Collaborator

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

@rustbotrustbot added the A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. label Mar 9, 2026
@GuillaumeGomez

GuillaumeGomez commented Mar 9, 2026

Copy link
Copy Markdown
Member

This is MUCH better, thanks a lot!

@RalfJung
RalfJungforce-pushed the interp-error-strings branch 2 times, most recently from fa2e674 to 5cf0904CompareMarch 9, 2026 17:55
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed the interp-error-strings branch from 5cf0904 to 86315e9CompareMarch 9, 2026 19:23
@rust-bors

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed the interp-error-strings branch from 86315e9 to e50b65cCompareMarch 9, 2026 20:52
@rustbot

This comment has been minimized.

Sign in to view
oli-obk
oli-obk approved these changes Mar 11, 2026
View reviewed changes

@oli-obkoli-obk left a comment •
edited by rustbot
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@bors r+

View changes since this review

@rust-bors

rust-borsBot commented Mar 11, 2026

Copy link
Copy Markdown
Contributor

📌 Commit e50b65c has been approved by oli-obk

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. 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 Mar 11, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rust-borsrust-borsBot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 11, 2026
@RalfJung
RalfJungforce-pushed the interp-error-strings branch from e50b65c to fe1f92aCompareMarch 11, 2026 12:55
@rustbot

rustbot commented Mar 11, 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.

@RalfJung

RalfJung commented Mar 11, 2026

Copy link
Copy Markdown
MemberAuthor

@bors r=oli-obk

@rust-bors

rust-borsBot commented Mar 11, 2026

Copy link
Copy Markdown
Contributor

📌 Commit fe1f92a has been approved by oli-obk

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 Mar 11, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Mar 11, 2026
@JonathanBrouwer
Rollup merge ofrust-lang#153611- RalfJung:interp-error-strings, r=o…
78bf4eb
…li-obk
interpret: go back to regular string interpolation for error messages
Using the translatable diagnostic infrastructure adds a whole lot of boilerplate which isn't actually useful for const-eval errors, so let's get rid of it. This effectively reverts rust-lang#111677. That PR effectively added 1000 lines and this PR only removes around 600 -- the difference is caused by (a) keeping some of the types around for validation, where we can use them to share error strings and to trigger the extra help for pointer byte shenanigans during CTFE, and (b) this not being a full revert of rust-lang#111677; I am not touching diagnostics outside the interpreter such as all the const-checking code which also got converted to fluent in the same PR.
The last commit does something similar for `LayoutError`, which also helps deduplicate a bunch of error strings. I can make that into a separate PR if you prefer.
r? @oli-obkFixesrust-lang#113117Fixesrust-lang#116764Fixesrust-lang#112618
@JonathanBrouwerJonathanBrouwer mentioned this pull request Mar 11, 2026
Closed
rust-borsBot pushed a commit that referenced this pull request Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
0d711f1
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
rust-borsBot pushed a commit that referenced this pull request Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
b5d3e7e
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
rust-borsBot pushed a commit that referenced this pull request Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
937011f
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
@JonathanBrouwerJonathanBrouwer mentioned this pull request Mar 11, 2026
Merged
rust-borsBot pushed a commit that referenced this pull request Mar 11, 2026
@bors
Auto merge of#153741- JonathanBrouwer:rollup-xwr7mEB, r=JonathanBro…
d1ee5e5
…uwer
Rollup of 12 pull requests
Successful merges:
- #152569 (Stop using rustc_layout_scalar_valid_range_* in rustc)
- #153421 (Fix ICE in fn_delegation when child segment resolves to a trait)
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153722 (miri-test-libstd: use --tests and update some comments)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
@rust-bors
rust-borsBot merged commit 77134bd into rust-lang:mainMar 12, 2026
11 checks passed
@rustbotrustbot added this to the 1.96.0 milestone Mar 12, 2026
github-actionsBot pushed a commit to rust-lang/miri that referenced this pull request Mar 12, 2026
@bors
Auto merge of #153741 - JonathanBrouwer:rollup-xwr7mEB, r=JonathanBro…
76126be
…uwer
Rollup of 12 pull requests
Successful merges:
- rust-lang/rust#152569 (Stop using rustc_layout_scalar_valid_range_* in rustc)
- rust-lang/rust#153421 (Fix ICE in fn_delegation when child segment resolves to a trait)
- rust-lang/rust#153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- rust-lang/rust#153581 (Simplify `type_of_opaque`.)
- rust-lang/rust#153611 (interpret: go back to regular string interpolation for error messages)
- rust-lang/rust#153635 (Unify same-span labels in move error diagnostics)
- rust-lang/rust#153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- rust-lang/rust#153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- rust-lang/rust#153722 (miri-test-libstd: use --tests and update some comments)
- rust-lang/rust#153671 (Make Enzyme has dependent on LLVM hash)
- rust-lang/rust#153710 (remove `.ftl` checks from tidy)
- rust-lang/rust#153720 (doc/rustc: clarify how to contact arm-maintainers)
@RalfJung
RalfJung deleted the interp-error-strings branch March 12, 2026 07:55
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk approved these changes
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes
+1 more reviewer
@BryntetBryntetBryntet left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@oli-obkoli-obk

Labels

A-LLVMArea: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.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.96.0

6 participants

@RalfJung@rustbot@rust-log-analyzer@GuillaumeGomez@oli-obk@Bryntet
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
interpret: go back to regular string interpolation for error messages - #153611
Merged
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom 
RalfJung:interp-error-strings
Mar 12, 2026
Merged
interpret: go back to regular string interpolation for error messages#153611
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom 
RalfJung:interp-error-strings
Conversation
@RalfJung
@RalfJungRalfJung
commented
Mar 9, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Using the translatable diagnostic infrastructure adds a whole lot of boilerplate which isn't actually useful for const-eval errors, so let's get rid of it. This effectively reverts #111677. That PR effectively added 1000 lines and this PR only removes around 600 -- the difference is caused by (a) keeping some of the types around for validation, where we can use them to share error strings and to trigger the extra help for pointer byte shenanigans during CTFE, and (b) this not being a full revert of #111677; I am not touching diagnostics outside the interpreter such as all the const-checking code which also got converted to fluent in the same PR.
The last commit does something similar for LayoutError, which also helps deduplicate a bunch of error strings. I can make that into a separate PR if you prefer.
r? @oli-obk
Fixes#113117
Fixes#116764
Fixes#112618
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
Some changes occurred to the CTFE / Miri interpreter
cc @rust-lang/miri
The Miri subtree was changed
cc @rust-lang/miri
Some changes occurred to the CTFE machinery
cc @oli-obk, @lcnr
Some changes occurred to MIR optimizations
cc @rust-lang/wg-mir-opt
Some changes occurred to the CTFE / Miri interpreter
cc @rust-lang/miri, @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
Mar 9, 2026
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
oli-obk is not on the review rotation at the moment.

They may take a while to respond.
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
caa7de3 to
d42a68bCompareMarch 9, 2026 14:38
@rustbot

This comment has been minimized.

Sign in to view
Bryntet
Bryntet
reviewed
Mar 9, 2026
View reviewed changes
Comment threadcompiler/rustc_abi/src/lib.rs

Comment on lines

-1026
 to 
-1027

 AlignFromBytesError::NotPowerOfTwo(align) => write!(f, "`{align}` is not a power of 2"),
 AlignFromBytesError::TooLarge(align) => write!(f, "`{align}` is too large"),
@BryntetBryntetMar 9, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I personally prefer this with the backticks
@RalfJungRalfJungMar 9, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

These are just numbers. We don't usually render them with backticks. And in fact they were not rendered with backticks in const-eval errors before, only in JSON errors. I changed the strings here to avoid changing the const-eval error output.
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
a2139d5 to
a060599CompareMarch 9, 2026 15:06
RalfJung
RalfJung
commented
Mar 9, 2026
View reviewed changes
Comment threadcompiler/rustc_abi/src/lib.rs
 TooLarge(u64),
}

impl AlignFromBytesError {
@RalfJungRalfJungMar 9, 2026•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

The AlignFromBytesError type got added #111677. Reverting that PR would mean replacing it by String again, but it actually seems reasonable to have a proper error type here so I decided to keep the type, but simplify and deduplicate the logic for turning it into a user-visible message.
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
a060599 to
66fbaa6CompareMarch 9, 2026 16:46
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
Some changes occurred in compiler/rustc_codegen_gcc
cc @antoyo, @GuillaumeGomez
@rustbotrustbot
added
the 
A-LLVM
Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.
label
Mar 9, 2026
@GuillaumeGomez
GuillaumeGomez
commented
Mar 9, 2026

Copy link


Copy Markdown

Member
This is MUCH better, thanks a lot!
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
2 times, most recently
from
fa2e674 to
5cf0904CompareMarch 9, 2026 17:55
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
5cf0904 to
86315e9CompareMarch 9, 2026 19:23
@rust-bors

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
86315e9 to
e50b65cCompareMarch 9, 2026 20:52
@rustbot

This comment has been minimized.

Sign in to view
oli-obk
oli-obk
approved these changes
Mar 11, 2026
View reviewed changes
@oli-obkoli-obk
left a comment
•

edited by rustbot

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@bors r+
View changes since this review
@rust-bors
rust-borsBot
commented
Mar 11, 2026

Copy link


Copy Markdown

Contributor
📌 Commit e50b65c has been approved by oli-obk
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.
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
Mar 11, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rust-borsrust-borsBot
removed
the 
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
Mar 11, 2026
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
e50b65c to
fe1f92aCompareMarch 11, 2026 12:55
@rustbot
rustbot
commented
Mar 11, 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.
@RalfJung
RalfJung
commented
Mar 11, 2026

Copy link


Copy Markdown

MemberAuthor
@bors r=oli-obk
@rust-bors
rust-borsBot
commented
Mar 11, 2026

Copy link


Copy Markdown

Contributor
📌 Commit fe1f92a has been approved by oli-obk
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
Mar 11, 2026
JonathanBrouwer added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Mar 11, 2026
@JonathanBrouwer
Rollup merge ofrust-lang#153611- RalfJung:interp-error-strings, r=o…
78bf4eb
…li-obk
interpret: go back to regular string interpolation for error messages
Using the translatable diagnostic infrastructure adds a whole lot of boilerplate which isn't actually useful for const-eval errors, so let's get rid of it. This effectively reverts rust-lang#111677. That PR effectively added 1000 lines and this PR only removes around 600 -- the difference is caused by (a) keeping some of the types around for validation, where we can use them to share error strings and to trigger the extra help for pointer byte shenanigans during CTFE, and (b) this not being a full revert of rust-lang#111677; I am not touching diagnostics outside the interpreter such as all the const-checking code which also got converted to fluent in the same PR.
The last commit does something similar for `LayoutError`, which also helps deduplicate a bunch of error strings. I can make that into a separate PR if you prefer.
r? @oli-obkFixesrust-lang#113117Fixesrust-lang#116764Fixesrust-lang#112618
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Mar 11, 2026
 Closed

rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
0d711f1
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
b5d3e7e
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
937011f
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Mar 11, 2026
 Merged

rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153741- JonathanBrouwer:rollup-xwr7mEB, r=JonathanBro…
d1ee5e5
…uwer
Rollup of 12 pull requests
Successful merges:
- #152569 (Stop using rustc_layout_scalar_valid_range_* in rustc)
- #153421 (Fix ICE in fn_delegation when child segment resolves to a trait)
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153722 (miri-test-libstd: use --tests and update some comments)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
@rust-bors
rust-borsBot
merged commit 77134bd
into
rust-lang:mainMar 12, 2026

11 checks passed

@rustbotrustbot
added this to the 1.96.0 milestone
Mar 12, 2026
github-actionsBot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Mar 12, 2026
@bors
Auto merge of #153741 - JonathanBrouwer:rollup-xwr7mEB, r=JonathanBro…
76126be
…uwer
Rollup of 12 pull requests
Successful merges:
- rust-lang/rust#152569 (Stop using rustc_layout_scalar_valid_range_* in rustc)
- rust-lang/rust#153421 (Fix ICE in fn_delegation when child segment resolves to a trait)
- rust-lang/rust#153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- rust-lang/rust#153581 (Simplify `type_of_opaque`.)
- rust-lang/rust#153611 (interpret: go back to regular string interpolation for error messages)
- rust-lang/rust#153635 (Unify same-span labels in move error diagnostics)
- rust-lang/rust#153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- rust-lang/rust#153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- rust-lang/rust#153722 (miri-test-libstd: use --tests and update some comments)
- rust-lang/rust#153671 (Make Enzyme has dependent on LLVM hash)
- rust-lang/rust#153710 (remove `.ftl` checks from tidy)
- rust-lang/rust#153720 (doc/rustc: clarify how to contact arm-maintainers)
@RalfJung
RalfJung
deleted the

interp-error-strings

branch
March 12, 2026 07:55
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk approved these changes
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

+1 more reviewer

@BryntetBryntetBryntet left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@oli-obkoli-obk

Labels

A-LLVMArea: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.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.96.0

6 participants

@RalfJung@rustbot@rust-log-analyzer@GuillaumeGomez@oli-obk@Bryntet

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
interpret: go back to regular string interpolation for error messages - #153611
Merged
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom 
RalfJung:interp-error-strings
Mar 12, 2026
Merged
interpret: go back to regular string interpolation for error messages#153611
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom 
RalfJung:interp-error-strings
Conversation
@RalfJung
@RalfJungRalfJung
commented
Mar 9, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Using the translatable diagnostic infrastructure adds a whole lot of boilerplate which isn't actually useful for const-eval errors, so let's get rid of it. This effectively reverts #111677. That PR effectively added 1000 lines and this PR only removes around 600 -- the difference is caused by (a) keeping some of the types around for validation, where we can use them to share error strings and to trigger the extra help for pointer byte shenanigans during CTFE, and (b) this not being a full revert of #111677; I am not touching diagnostics outside the interpreter such as all the const-checking code which also got converted to fluent in the same PR.
The last commit does something similar for LayoutError, which also helps deduplicate a bunch of error strings. I can make that into a separate PR if you prefer.
r? @oli-obk
Fixes#113117
Fixes#116764
Fixes#112618
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
Some changes occurred to the CTFE / Miri interpreter
cc @rust-lang/miri
The Miri subtree was changed
cc @rust-lang/miri
Some changes occurred to the CTFE machinery
cc @oli-obk, @lcnr
Some changes occurred to MIR optimizations
cc @rust-lang/wg-mir-opt
Some changes occurred to the CTFE / Miri interpreter
cc @rust-lang/miri, @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
Mar 9, 2026
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
oli-obk is not on the review rotation at the moment.

They may take a while to respond.
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
caa7de3 to
d42a68bCompareMarch 9, 2026 14:38
@rustbot

This comment has been minimized.

Sign in to view
Bryntet
Bryntet
reviewed
Mar 9, 2026
View reviewed changes
Comment threadcompiler/rustc_abi/src/lib.rs

Comment on lines

-1026
 to 
-1027

 AlignFromBytesError::NotPowerOfTwo(align) => write!(f, "`{align}` is not a power of 2"),
 AlignFromBytesError::TooLarge(align) => write!(f, "`{align}` is too large"),
@BryntetBryntetMar 9, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I personally prefer this with the backticks
@RalfJungRalfJungMar 9, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

These are just numbers. We don't usually render them with backticks. And in fact they were not rendered with backticks in const-eval errors before, only in JSON errors. I changed the strings here to avoid changing the const-eval error output.
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
a2139d5 to
a060599CompareMarch 9, 2026 15:06
RalfJung
RalfJung
commented
Mar 9, 2026
View reviewed changes
Comment threadcompiler/rustc_abi/src/lib.rs
 TooLarge(u64),
}

impl AlignFromBytesError {
@RalfJungRalfJungMar 9, 2026•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

The AlignFromBytesError type got added #111677. Reverting that PR would mean replacing it by String again, but it actually seems reasonable to have a proper error type here so I decided to keep the type, but simplify and deduplicate the logic for turning it into a user-visible message.
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
a060599 to
66fbaa6CompareMarch 9, 2026 16:46
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
Some changes occurred in compiler/rustc_codegen_gcc
cc @antoyo, @GuillaumeGomez
@rustbotrustbot
added
the 
A-LLVM
Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.
label
Mar 9, 2026
@GuillaumeGomez
GuillaumeGomez
commented
Mar 9, 2026

Copy link


Copy Markdown

Member
This is MUCH better, thanks a lot!
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
2 times, most recently
from
fa2e674 to
5cf0904CompareMarch 9, 2026 17:55
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
5cf0904 to
86315e9CompareMarch 9, 2026 19:23
@rust-bors

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
86315e9 to
e50b65cCompareMarch 9, 2026 20:52
@rustbot

This comment has been minimized.

Sign in to view
oli-obk
oli-obk
approved these changes
Mar 11, 2026
View reviewed changes
@oli-obkoli-obk
left a comment
•

edited by rustbot

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@bors r+
View changes since this review
@rust-bors
rust-borsBot
commented
Mar 11, 2026

Copy link


Copy Markdown

Contributor
📌 Commit e50b65c has been approved by oli-obk
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.
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
Mar 11, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rust-borsrust-borsBot
removed
the 
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
Mar 11, 2026
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
e50b65c to
fe1f92aCompareMarch 11, 2026 12:55
@rustbot
rustbot
commented
Mar 11, 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.
@RalfJung
RalfJung
commented
Mar 11, 2026

Copy link


Copy Markdown

MemberAuthor
@bors r=oli-obk
@rust-bors
rust-borsBot
commented
Mar 11, 2026

Copy link


Copy Markdown

Contributor
📌 Commit fe1f92a has been approved by oli-obk
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
Mar 11, 2026
JonathanBrouwer added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Mar 11, 2026
@JonathanBrouwer
Rollup merge ofrust-lang#153611- RalfJung:interp-error-strings, r=o…
78bf4eb
…li-obk
interpret: go back to regular string interpolation for error messages
Using the translatable diagnostic infrastructure adds a whole lot of boilerplate which isn't actually useful for const-eval errors, so let's get rid of it. This effectively reverts rust-lang#111677. That PR effectively added 1000 lines and this PR only removes around 600 -- the difference is caused by (a) keeping some of the types around for validation, where we can use them to share error strings and to trigger the extra help for pointer byte shenanigans during CTFE, and (b) this not being a full revert of rust-lang#111677; I am not touching diagnostics outside the interpreter such as all the const-checking code which also got converted to fluent in the same PR.
The last commit does something similar for `LayoutError`, which also helps deduplicate a bunch of error strings. I can make that into a separate PR if you prefer.
r? @oli-obkFixesrust-lang#113117Fixesrust-lang#116764Fixesrust-lang#112618
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Mar 11, 2026
 Closed

rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
0d711f1
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
b5d3e7e
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
937011f
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Mar 11, 2026
 Merged

rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153741- JonathanBrouwer:rollup-xwr7mEB, r=JonathanBro…
d1ee5e5
…uwer
Rollup of 12 pull requests
Successful merges:
- #152569 (Stop using rustc_layout_scalar_valid_range_* in rustc)
- #153421 (Fix ICE in fn_delegation when child segment resolves to a trait)
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153722 (miri-test-libstd: use --tests and update some comments)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
@rust-bors
rust-borsBot
merged commit 77134bd
into
rust-lang:mainMar 12, 2026

11 checks passed

@rustbotrustbot
added this to the 1.96.0 milestone
Mar 12, 2026
github-actionsBot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Mar 12, 2026
@bors
Auto merge of #153741 - JonathanBrouwer:rollup-xwr7mEB, r=JonathanBro…
76126be
…uwer
Rollup of 12 pull requests
Successful merges:
- rust-lang/rust#152569 (Stop using rustc_layout_scalar_valid_range_* in rustc)
- rust-lang/rust#153421 (Fix ICE in fn_delegation when child segment resolves to a trait)
- rust-lang/rust#153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- rust-lang/rust#153581 (Simplify `type_of_opaque`.)
- rust-lang/rust#153611 (interpret: go back to regular string interpolation for error messages)
- rust-lang/rust#153635 (Unify same-span labels in move error diagnostics)
- rust-lang/rust#153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- rust-lang/rust#153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- rust-lang/rust#153722 (miri-test-libstd: use --tests and update some comments)
- rust-lang/rust#153671 (Make Enzyme has dependent on LLVM hash)
- rust-lang/rust#153710 (remove `.ftl` checks from tidy)
- rust-lang/rust#153720 (doc/rustc: clarify how to contact arm-maintainers)
@RalfJung
RalfJung
deleted the

interp-error-strings

branch
March 12, 2026 07:55
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk approved these changes
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

+1 more reviewer

@BryntetBryntetBryntet left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@oli-obkoli-obk

Labels

A-LLVMArea: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.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.96.0

6 participants

@RalfJung@rustbot@rust-log-analyzer@GuillaumeGomez@oli-obk@Bryntet

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
interpret: go back to regular string interpolation for error messages - #153611
Merged
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom 
RalfJung:interp-error-strings
Mar 12, 2026
Merged
interpret: go back to regular string interpolation for error messages#153611
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom 
RalfJung:interp-error-strings
Conversation
@RalfJung
@RalfJungRalfJung
commented
Mar 9, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Using the translatable diagnostic infrastructure adds a whole lot of boilerplate which isn't actually useful for const-eval errors, so let's get rid of it. This effectively reverts #111677. That PR effectively added 1000 lines and this PR only removes around 600 -- the difference is caused by (a) keeping some of the types around for validation, where we can use them to share error strings and to trigger the extra help for pointer byte shenanigans during CTFE, and (b) this not being a full revert of #111677; I am not touching diagnostics outside the interpreter such as all the const-checking code which also got converted to fluent in the same PR.
The last commit does something similar for LayoutError, which also helps deduplicate a bunch of error strings. I can make that into a separate PR if you prefer.
r? @oli-obk
Fixes#113117
Fixes#116764
Fixes#112618
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
Some changes occurred to the CTFE / Miri interpreter
cc @rust-lang/miri
The Miri subtree was changed
cc @rust-lang/miri
Some changes occurred to the CTFE machinery
cc @oli-obk, @lcnr
Some changes occurred to MIR optimizations
cc @rust-lang/wg-mir-opt
Some changes occurred to the CTFE / Miri interpreter
cc @rust-lang/miri, @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
Mar 9, 2026
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
oli-obk is not on the review rotation at the moment.

They may take a while to respond.
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
caa7de3 to
d42a68bCompareMarch 9, 2026 14:38
@rustbot

This comment has been minimized.

Sign in to view
Bryntet
Bryntet
reviewed
Mar 9, 2026
View reviewed changes
Comment threadcompiler/rustc_abi/src/lib.rs

Comment on lines

-1026
 to 
-1027

 AlignFromBytesError::NotPowerOfTwo(align) => write!(f, "`{align}` is not a power of 2"),
 AlignFromBytesError::TooLarge(align) => write!(f, "`{align}` is too large"),
@BryntetBryntetMar 9, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I personally prefer this with the backticks
@RalfJungRalfJungMar 9, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

These are just numbers. We don't usually render them with backticks. And in fact they were not rendered with backticks in const-eval errors before, only in JSON errors. I changed the strings here to avoid changing the const-eval error output.
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
a2139d5 to
a060599CompareMarch 9, 2026 15:06
RalfJung
RalfJung
commented
Mar 9, 2026
View reviewed changes
Comment threadcompiler/rustc_abi/src/lib.rs
 TooLarge(u64),
}

impl AlignFromBytesError {
@RalfJungRalfJungMar 9, 2026•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

The AlignFromBytesError type got added #111677. Reverting that PR would mean replacing it by String again, but it actually seems reasonable to have a proper error type here so I decided to keep the type, but simplify and deduplicate the logic for turning it into a user-visible message.
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
a060599 to
66fbaa6CompareMarch 9, 2026 16:46
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
Some changes occurred in compiler/rustc_codegen_gcc
cc @antoyo, @GuillaumeGomez
@rustbotrustbot
added
the 
A-LLVM
Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.
label
Mar 9, 2026
@GuillaumeGomez
GuillaumeGomez
commented
Mar 9, 2026

Copy link


Copy Markdown

Member
This is MUCH better, thanks a lot!
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
2 times, most recently
from
fa2e674 to
5cf0904CompareMarch 9, 2026 17:55
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
5cf0904 to
86315e9CompareMarch 9, 2026 19:23
@rust-bors

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
86315e9 to
e50b65cCompareMarch 9, 2026 20:52
@rustbot

This comment has been minimized.

Sign in to view
oli-obk
oli-obk
approved these changes
Mar 11, 2026
View reviewed changes
@oli-obkoli-obk
left a comment
•

edited by rustbot

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@bors r+
View changes since this review
@rust-bors
rust-borsBot
commented
Mar 11, 2026

Copy link


Copy Markdown

Contributor
📌 Commit e50b65c has been approved by oli-obk
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.
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
Mar 11, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rust-borsrust-borsBot
removed
the 
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
Mar 11, 2026
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
e50b65c to
fe1f92aCompareMarch 11, 2026 12:55
@rustbot
rustbot
commented
Mar 11, 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.
@RalfJung
RalfJung
commented
Mar 11, 2026

Copy link


Copy Markdown

MemberAuthor
@bors r=oli-obk
@rust-bors
rust-borsBot
commented
Mar 11, 2026

Copy link


Copy Markdown

Contributor
📌 Commit fe1f92a has been approved by oli-obk
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
Mar 11, 2026
JonathanBrouwer added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Mar 11, 2026
@JonathanBrouwer
Rollup merge ofrust-lang#153611- RalfJung:interp-error-strings, r=o…
78bf4eb
…li-obk
interpret: go back to regular string interpolation for error messages
Using the translatable diagnostic infrastructure adds a whole lot of boilerplate which isn't actually useful for const-eval errors, so let's get rid of it. This effectively reverts rust-lang#111677. That PR effectively added 1000 lines and this PR only removes around 600 -- the difference is caused by (a) keeping some of the types around for validation, where we can use them to share error strings and to trigger the extra help for pointer byte shenanigans during CTFE, and (b) this not being a full revert of rust-lang#111677; I am not touching diagnostics outside the interpreter such as all the const-checking code which also got converted to fluent in the same PR.
The last commit does something similar for `LayoutError`, which also helps deduplicate a bunch of error strings. I can make that into a separate PR if you prefer.
r? @oli-obkFixesrust-lang#113117Fixesrust-lang#116764Fixesrust-lang#112618
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Mar 11, 2026
 Closed

rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
0d711f1
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
b5d3e7e
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
937011f
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Mar 11, 2026
 Merged

rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153741- JonathanBrouwer:rollup-xwr7mEB, r=JonathanBro…
d1ee5e5
…uwer
Rollup of 12 pull requests
Successful merges:
- #152569 (Stop using rustc_layout_scalar_valid_range_* in rustc)
- #153421 (Fix ICE in fn_delegation when child segment resolves to a trait)
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153722 (miri-test-libstd: use --tests and update some comments)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
@rust-bors
rust-borsBot
merged commit 77134bd
into
rust-lang:mainMar 12, 2026

11 checks passed

@rustbotrustbot
added this to the 1.96.0 milestone
Mar 12, 2026
github-actionsBot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Mar 12, 2026
@bors
Auto merge of #153741 - JonathanBrouwer:rollup-xwr7mEB, r=JonathanBro…
76126be
…uwer
Rollup of 12 pull requests
Successful merges:
- rust-lang/rust#152569 (Stop using rustc_layout_scalar_valid_range_* in rustc)
- rust-lang/rust#153421 (Fix ICE in fn_delegation when child segment resolves to a trait)
- rust-lang/rust#153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- rust-lang/rust#153581 (Simplify `type_of_opaque`.)
- rust-lang/rust#153611 (interpret: go back to regular string interpolation for error messages)
- rust-lang/rust#153635 (Unify same-span labels in move error diagnostics)
- rust-lang/rust#153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- rust-lang/rust#153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- rust-lang/rust#153722 (miri-test-libstd: use --tests and update some comments)
- rust-lang/rust#153671 (Make Enzyme has dependent on LLVM hash)
- rust-lang/rust#153710 (remove `.ftl` checks from tidy)
- rust-lang/rust#153720 (doc/rustc: clarify how to contact arm-maintainers)
@RalfJung
RalfJung
deleted the

interp-error-strings

branch
March 12, 2026 07:55
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk approved these changes
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

+1 more reviewer

@BryntetBryntetBryntet left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@oli-obkoli-obk

Labels

A-LLVMArea: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.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.96.0

6 participants

@RalfJung@rustbot@rust-log-analyzer@GuillaumeGomez@oli-obk@Bryntet

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
interpret: go back to regular string interpolation for error messages - #153611
Merged
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom 
RalfJung:interp-error-strings
Mar 12, 2026
Merged
interpret: go back to regular string interpolation for error messages#153611
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom 
RalfJung:interp-error-strings
Conversation
@RalfJung
@RalfJungRalfJung
commented
Mar 9, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Using the translatable diagnostic infrastructure adds a whole lot of boilerplate which isn't actually useful for const-eval errors, so let's get rid of it. This effectively reverts #111677. That PR effectively added 1000 lines and this PR only removes around 600 -- the difference is caused by (a) keeping some of the types around for validation, where we can use them to share error strings and to trigger the extra help for pointer byte shenanigans during CTFE, and (b) this not being a full revert of #111677; I am not touching diagnostics outside the interpreter such as all the const-checking code which also got converted to fluent in the same PR.
The last commit does something similar for LayoutError, which also helps deduplicate a bunch of error strings. I can make that into a separate PR if you prefer.
r? @oli-obk
Fixes#113117
Fixes#116764
Fixes#112618
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
Some changes occurred to the CTFE / Miri interpreter
cc @rust-lang/miri
The Miri subtree was changed
cc @rust-lang/miri
Some changes occurred to the CTFE machinery
cc @oli-obk, @lcnr
Some changes occurred to MIR optimizations
cc @rust-lang/wg-mir-opt
Some changes occurred to the CTFE / Miri interpreter
cc @rust-lang/miri, @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
Mar 9, 2026
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
oli-obk is not on the review rotation at the moment.

They may take a while to respond.
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
caa7de3 to
d42a68bCompareMarch 9, 2026 14:38
@rustbot

This comment has been minimized.

Sign in to view
Bryntet
Bryntet
reviewed
Mar 9, 2026
View reviewed changes
Comment threadcompiler/rustc_abi/src/lib.rs

Comment on lines

-1026
 to 
-1027

 AlignFromBytesError::NotPowerOfTwo(align) => write!(f, "`{align}` is not a power of 2"),
 AlignFromBytesError::TooLarge(align) => write!(f, "`{align}` is too large"),
@BryntetBryntetMar 9, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I personally prefer this with the backticks
@RalfJungRalfJungMar 9, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

These are just numbers. We don't usually render them with backticks. And in fact they were not rendered with backticks in const-eval errors before, only in JSON errors. I changed the strings here to avoid changing the const-eval error output.
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
a2139d5 to
a060599CompareMarch 9, 2026 15:06
RalfJung
RalfJung
commented
Mar 9, 2026
View reviewed changes
Comment threadcompiler/rustc_abi/src/lib.rs
 TooLarge(u64),
}

impl AlignFromBytesError {
@RalfJungRalfJungMar 9, 2026•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

The AlignFromBytesError type got added #111677. Reverting that PR would mean replacing it by String again, but it actually seems reasonable to have a proper error type here so I decided to keep the type, but simplify and deduplicate the logic for turning it into a user-visible message.
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
a060599 to
66fbaa6CompareMarch 9, 2026 16:46
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
Some changes occurred in compiler/rustc_codegen_gcc
cc @antoyo, @GuillaumeGomez
@rustbotrustbot
added
the 
A-LLVM
Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.
label
Mar 9, 2026
@GuillaumeGomez
GuillaumeGomez
commented
Mar 9, 2026

Copy link


Copy Markdown

Member
This is MUCH better, thanks a lot!
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
2 times, most recently
from
fa2e674 to
5cf0904CompareMarch 9, 2026 17:55
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
5cf0904 to
86315e9CompareMarch 9, 2026 19:23
@rust-bors

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
86315e9 to
e50b65cCompareMarch 9, 2026 20:52
@rustbot

This comment has been minimized.

Sign in to view
oli-obk
oli-obk
approved these changes
Mar 11, 2026
View reviewed changes
@oli-obkoli-obk
left a comment
•

edited by rustbot

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@bors r+
View changes since this review
@rust-bors
rust-borsBot
commented
Mar 11, 2026

Copy link


Copy Markdown

Contributor
📌 Commit e50b65c has been approved by oli-obk
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.
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
Mar 11, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rust-borsrust-borsBot
removed
the 
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
Mar 11, 2026
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
e50b65c to
fe1f92aCompareMarch 11, 2026 12:55
@rustbot
rustbot
commented
Mar 11, 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.
@RalfJung
RalfJung
commented
Mar 11, 2026

Copy link


Copy Markdown

MemberAuthor
@bors r=oli-obk
@rust-bors
rust-borsBot
commented
Mar 11, 2026

Copy link


Copy Markdown

Contributor
📌 Commit fe1f92a has been approved by oli-obk
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
Mar 11, 2026
JonathanBrouwer added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Mar 11, 2026
@JonathanBrouwer
Rollup merge ofrust-lang#153611- RalfJung:interp-error-strings, r=o…
78bf4eb
…li-obk
interpret: go back to regular string interpolation for error messages
Using the translatable diagnostic infrastructure adds a whole lot of boilerplate which isn't actually useful for const-eval errors, so let's get rid of it. This effectively reverts rust-lang#111677. That PR effectively added 1000 lines and this PR only removes around 600 -- the difference is caused by (a) keeping some of the types around for validation, where we can use them to share error strings and to trigger the extra help for pointer byte shenanigans during CTFE, and (b) this not being a full revert of rust-lang#111677; I am not touching diagnostics outside the interpreter such as all the const-checking code which also got converted to fluent in the same PR.
The last commit does something similar for `LayoutError`, which also helps deduplicate a bunch of error strings. I can make that into a separate PR if you prefer.
r? @oli-obkFixesrust-lang#113117Fixesrust-lang#116764Fixesrust-lang#112618
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Mar 11, 2026
 Closed

rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
0d711f1
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
b5d3e7e
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
937011f
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Mar 11, 2026
 Merged

rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153741- JonathanBrouwer:rollup-xwr7mEB, r=JonathanBro…
d1ee5e5
…uwer
Rollup of 12 pull requests
Successful merges:
- #152569 (Stop using rustc_layout_scalar_valid_range_* in rustc)
- #153421 (Fix ICE in fn_delegation when child segment resolves to a trait)
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153722 (miri-test-libstd: use --tests and update some comments)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
@rust-bors
rust-borsBot
merged commit 77134bd
into
rust-lang:mainMar 12, 2026

11 checks passed

@rustbotrustbot
added this to the 1.96.0 milestone
Mar 12, 2026
github-actionsBot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Mar 12, 2026
@bors
Auto merge of #153741 - JonathanBrouwer:rollup-xwr7mEB, r=JonathanBro…
76126be
…uwer
Rollup of 12 pull requests
Successful merges:
- rust-lang/rust#152569 (Stop using rustc_layout_scalar_valid_range_* in rustc)
- rust-lang/rust#153421 (Fix ICE in fn_delegation when child segment resolves to a trait)
- rust-lang/rust#153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- rust-lang/rust#153581 (Simplify `type_of_opaque`.)
- rust-lang/rust#153611 (interpret: go back to regular string interpolation for error messages)
- rust-lang/rust#153635 (Unify same-span labels in move error diagnostics)
- rust-lang/rust#153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- rust-lang/rust#153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- rust-lang/rust#153722 (miri-test-libstd: use --tests and update some comments)
- rust-lang/rust#153671 (Make Enzyme has dependent on LLVM hash)
- rust-lang/rust#153710 (remove `.ftl` checks from tidy)
- rust-lang/rust#153720 (doc/rustc: clarify how to contact arm-maintainers)
@RalfJung
RalfJung
deleted the

interp-error-strings

branch
March 12, 2026 07:55
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk approved these changes
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

+1 more reviewer

@BryntetBryntetBryntet left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@oli-obkoli-obk

Labels

A-LLVMArea: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.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.96.0

6 participants

@RalfJung@rustbot@rust-log-analyzer@GuillaumeGomez@oli-obk@Bryntet

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
interpret: go back to regular string interpolation for error messages - #153611
Merged
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom 
RalfJung:interp-error-strings
Mar 12, 2026
Merged
interpret: go back to regular string interpolation for error messages#153611
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom 
RalfJung:interp-error-strings
Conversation
@RalfJung
@RalfJungRalfJung
commented
Mar 9, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Using the translatable diagnostic infrastructure adds a whole lot of boilerplate which isn't actually useful for const-eval errors, so let's get rid of it. This effectively reverts #111677. That PR effectively added 1000 lines and this PR only removes around 600 -- the difference is caused by (a) keeping some of the types around for validation, where we can use them to share error strings and to trigger the extra help for pointer byte shenanigans during CTFE, and (b) this not being a full revert of #111677; I am not touching diagnostics outside the interpreter such as all the const-checking code which also got converted to fluent in the same PR.
The last commit does something similar for LayoutError, which also helps deduplicate a bunch of error strings. I can make that into a separate PR if you prefer.
r? @oli-obk
Fixes#113117
Fixes#116764
Fixes#112618
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
Some changes occurred to the CTFE / Miri interpreter
cc @rust-lang/miri
The Miri subtree was changed
cc @rust-lang/miri
Some changes occurred to the CTFE machinery
cc @oli-obk, @lcnr
Some changes occurred to MIR optimizations
cc @rust-lang/wg-mir-opt
Some changes occurred to the CTFE / Miri interpreter
cc @rust-lang/miri, @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
Mar 9, 2026
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
oli-obk is not on the review rotation at the moment.

They may take a while to respond.
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
caa7de3 to
d42a68bCompareMarch 9, 2026 14:38
@rustbot

This comment has been minimized.

Sign in to view
Bryntet
Bryntet
reviewed
Mar 9, 2026
View reviewed changes
Comment threadcompiler/rustc_abi/src/lib.rs

Comment on lines

-1026
 to 
-1027

 AlignFromBytesError::NotPowerOfTwo(align) => write!(f, "`{align}` is not a power of 2"),
 AlignFromBytesError::TooLarge(align) => write!(f, "`{align}` is too large"),
@BryntetBryntetMar 9, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I personally prefer this with the backticks
@RalfJungRalfJungMar 9, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

These are just numbers. We don't usually render them with backticks. And in fact they were not rendered with backticks in const-eval errors before, only in JSON errors. I changed the strings here to avoid changing the const-eval error output.
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
a2139d5 to
a060599CompareMarch 9, 2026 15:06
RalfJung
RalfJung
commented
Mar 9, 2026
View reviewed changes
Comment threadcompiler/rustc_abi/src/lib.rs
 TooLarge(u64),
}

impl AlignFromBytesError {
@RalfJungRalfJungMar 9, 2026•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

The AlignFromBytesError type got added #111677. Reverting that PR would mean replacing it by String again, but it actually seems reasonable to have a proper error type here so I decided to keep the type, but simplify and deduplicate the logic for turning it into a user-visible message.
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
a060599 to
66fbaa6CompareMarch 9, 2026 16:46
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
Some changes occurred in compiler/rustc_codegen_gcc
cc @antoyo, @GuillaumeGomez
@rustbotrustbot
added
the 
A-LLVM
Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.
label
Mar 9, 2026
@GuillaumeGomez
GuillaumeGomez
commented
Mar 9, 2026

Copy link


Copy Markdown

Member
This is MUCH better, thanks a lot!
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
2 times, most recently
from
fa2e674 to
5cf0904CompareMarch 9, 2026 17:55
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
5cf0904 to
86315e9CompareMarch 9, 2026 19:23
@rust-bors

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
86315e9 to
e50b65cCompareMarch 9, 2026 20:52
@rustbot

This comment has been minimized.

Sign in to view
oli-obk
oli-obk
approved these changes
Mar 11, 2026
View reviewed changes
@oli-obkoli-obk
left a comment
•

edited by rustbot

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@bors r+
View changes since this review
@rust-bors
rust-borsBot
commented
Mar 11, 2026

Copy link


Copy Markdown

Contributor
📌 Commit e50b65c has been approved by oli-obk
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.
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
Mar 11, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rust-borsrust-borsBot
removed
the 
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
Mar 11, 2026
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
e50b65c to
fe1f92aCompareMarch 11, 2026 12:55
@rustbot
rustbot
commented
Mar 11, 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.
@RalfJung
RalfJung
commented
Mar 11, 2026

Copy link


Copy Markdown

MemberAuthor
@bors r=oli-obk
@rust-bors
rust-borsBot
commented
Mar 11, 2026

Copy link


Copy Markdown

Contributor
📌 Commit fe1f92a has been approved by oli-obk
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
Mar 11, 2026
JonathanBrouwer added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Mar 11, 2026
@JonathanBrouwer
Rollup merge ofrust-lang#153611- RalfJung:interp-error-strings, r=o…
78bf4eb
…li-obk
interpret: go back to regular string interpolation for error messages
Using the translatable diagnostic infrastructure adds a whole lot of boilerplate which isn't actually useful for const-eval errors, so let's get rid of it. This effectively reverts rust-lang#111677. That PR effectively added 1000 lines and this PR only removes around 600 -- the difference is caused by (a) keeping some of the types around for validation, where we can use them to share error strings and to trigger the extra help for pointer byte shenanigans during CTFE, and (b) this not being a full revert of rust-lang#111677; I am not touching diagnostics outside the interpreter such as all the const-checking code which also got converted to fluent in the same PR.
The last commit does something similar for `LayoutError`, which also helps deduplicate a bunch of error strings. I can make that into a separate PR if you prefer.
r? @oli-obkFixesrust-lang#113117Fixesrust-lang#116764Fixesrust-lang#112618
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Mar 11, 2026
 Closed

rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
0d711f1
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
b5d3e7e
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
937011f
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Mar 11, 2026
 Merged

rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153741- JonathanBrouwer:rollup-xwr7mEB, r=JonathanBro…
d1ee5e5
…uwer
Rollup of 12 pull requests
Successful merges:
- #152569 (Stop using rustc_layout_scalar_valid_range_* in rustc)
- #153421 (Fix ICE in fn_delegation when child segment resolves to a trait)
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153722 (miri-test-libstd: use --tests and update some comments)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
@rust-bors
rust-borsBot
merged commit 77134bd
into
rust-lang:mainMar 12, 2026

11 checks passed

@rustbotrustbot
added this to the 1.96.0 milestone
Mar 12, 2026
github-actionsBot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Mar 12, 2026
@bors
Auto merge of #153741 - JonathanBrouwer:rollup-xwr7mEB, r=JonathanBro…
76126be
…uwer
Rollup of 12 pull requests
Successful merges:
- rust-lang/rust#152569 (Stop using rustc_layout_scalar_valid_range_* in rustc)
- rust-lang/rust#153421 (Fix ICE in fn_delegation when child segment resolves to a trait)
- rust-lang/rust#153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- rust-lang/rust#153581 (Simplify `type_of_opaque`.)
- rust-lang/rust#153611 (interpret: go back to regular string interpolation for error messages)
- rust-lang/rust#153635 (Unify same-span labels in move error diagnostics)
- rust-lang/rust#153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- rust-lang/rust#153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- rust-lang/rust#153722 (miri-test-libstd: use --tests and update some comments)
- rust-lang/rust#153671 (Make Enzyme has dependent on LLVM hash)
- rust-lang/rust#153710 (remove `.ftl` checks from tidy)
- rust-lang/rust#153720 (doc/rustc: clarify how to contact arm-maintainers)
@RalfJung
RalfJung
deleted the

interp-error-strings

branch
March 12, 2026 07:55
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk approved these changes
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

+1 more reviewer

@BryntetBryntetBryntet left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@oli-obkoli-obk

Labels

A-LLVMArea: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.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.96.0

6 participants

@RalfJung@rustbot@rust-log-analyzer@GuillaumeGomez@oli-obk@Bryntet

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
interpret: go back to regular string interpolation for error messages - #153611
Merged
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom 
RalfJung:interp-error-strings
Mar 12, 2026
Merged
interpret: go back to regular string interpolation for error messages#153611
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom 
RalfJung:interp-error-strings
Conversation
@RalfJung
@RalfJungRalfJung
commented
Mar 9, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Using the translatable diagnostic infrastructure adds a whole lot of boilerplate which isn't actually useful for const-eval errors, so let's get rid of it. This effectively reverts #111677. That PR effectively added 1000 lines and this PR only removes around 600 -- the difference is caused by (a) keeping some of the types around for validation, where we can use them to share error strings and to trigger the extra help for pointer byte shenanigans during CTFE, and (b) this not being a full revert of #111677; I am not touching diagnostics outside the interpreter such as all the const-checking code which also got converted to fluent in the same PR.
The last commit does something similar for LayoutError, which also helps deduplicate a bunch of error strings. I can make that into a separate PR if you prefer.
r? @oli-obk
Fixes#113117
Fixes#116764
Fixes#112618
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
Some changes occurred to the CTFE / Miri interpreter
cc @rust-lang/miri
The Miri subtree was changed
cc @rust-lang/miri
Some changes occurred to the CTFE machinery
cc @oli-obk, @lcnr
Some changes occurred to MIR optimizations
cc @rust-lang/wg-mir-opt
Some changes occurred to the CTFE / Miri interpreter
cc @rust-lang/miri, @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
Mar 9, 2026
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
oli-obk is not on the review rotation at the moment.

They may take a while to respond.
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
caa7de3 to
d42a68bCompareMarch 9, 2026 14:38
@rustbot

This comment has been minimized.

Sign in to view
Bryntet
Bryntet
reviewed
Mar 9, 2026
View reviewed changes
Comment threadcompiler/rustc_abi/src/lib.rs

Comment on lines

-1026
 to 
-1027

 AlignFromBytesError::NotPowerOfTwo(align) => write!(f, "`{align}` is not a power of 2"),
 AlignFromBytesError::TooLarge(align) => write!(f, "`{align}` is too large"),
@BryntetBryntetMar 9, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I personally prefer this with the backticks
@RalfJungRalfJungMar 9, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

These are just numbers. We don't usually render them with backticks. And in fact they were not rendered with backticks in const-eval errors before, only in JSON errors. I changed the strings here to avoid changing the const-eval error output.
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
a2139d5 to
a060599CompareMarch 9, 2026 15:06
RalfJung
RalfJung
commented
Mar 9, 2026
View reviewed changes
Comment threadcompiler/rustc_abi/src/lib.rs
 TooLarge(u64),
}

impl AlignFromBytesError {
@RalfJungRalfJungMar 9, 2026•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

The AlignFromBytesError type got added #111677. Reverting that PR would mean replacing it by String again, but it actually seems reasonable to have a proper error type here so I decided to keep the type, but simplify and deduplicate the logic for turning it into a user-visible message.
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
a060599 to
66fbaa6CompareMarch 9, 2026 16:46
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
Some changes occurred in compiler/rustc_codegen_gcc
cc @antoyo, @GuillaumeGomez
@rustbotrustbot
added
the 
A-LLVM
Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.
label
Mar 9, 2026
@GuillaumeGomez
GuillaumeGomez
commented
Mar 9, 2026

Copy link


Copy Markdown

Member
This is MUCH better, thanks a lot!
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
2 times, most recently
from
fa2e674 to
5cf0904CompareMarch 9, 2026 17:55
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
5cf0904 to
86315e9CompareMarch 9, 2026 19:23
@rust-bors

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
86315e9 to
e50b65cCompareMarch 9, 2026 20:52
@rustbot

This comment has been minimized.

Sign in to view
oli-obk
oli-obk
approved these changes
Mar 11, 2026
View reviewed changes
@oli-obkoli-obk
left a comment
•

edited by rustbot

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@bors r+
View changes since this review
@rust-bors
rust-borsBot
commented
Mar 11, 2026

Copy link


Copy Markdown

Contributor
📌 Commit e50b65c has been approved by oli-obk
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.
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
Mar 11, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rust-borsrust-borsBot
removed
the 
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
Mar 11, 2026
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
e50b65c to
fe1f92aCompareMarch 11, 2026 12:55
@rustbot
rustbot
commented
Mar 11, 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.
@RalfJung
RalfJung
commented
Mar 11, 2026

Copy link


Copy Markdown

MemberAuthor
@bors r=oli-obk
@rust-bors
rust-borsBot
commented
Mar 11, 2026

Copy link


Copy Markdown

Contributor
📌 Commit fe1f92a has been approved by oli-obk
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
Mar 11, 2026
JonathanBrouwer added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Mar 11, 2026
@JonathanBrouwer
Rollup merge ofrust-lang#153611- RalfJung:interp-error-strings, r=o…
78bf4eb
…li-obk
interpret: go back to regular string interpolation for error messages
Using the translatable diagnostic infrastructure adds a whole lot of boilerplate which isn't actually useful for const-eval errors, so let's get rid of it. This effectively reverts rust-lang#111677. That PR effectively added 1000 lines and this PR only removes around 600 -- the difference is caused by (a) keeping some of the types around for validation, where we can use them to share error strings and to trigger the extra help for pointer byte shenanigans during CTFE, and (b) this not being a full revert of rust-lang#111677; I am not touching diagnostics outside the interpreter such as all the const-checking code which also got converted to fluent in the same PR.
The last commit does something similar for `LayoutError`, which also helps deduplicate a bunch of error strings. I can make that into a separate PR if you prefer.
r? @oli-obkFixesrust-lang#113117Fixesrust-lang#116764Fixesrust-lang#112618
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Mar 11, 2026
 Closed

rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
0d711f1
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
b5d3e7e
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
937011f
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Mar 11, 2026
 Merged

rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153741- JonathanBrouwer:rollup-xwr7mEB, r=JonathanBro…
d1ee5e5
…uwer
Rollup of 12 pull requests
Successful merges:
- #152569 (Stop using rustc_layout_scalar_valid_range_* in rustc)
- #153421 (Fix ICE in fn_delegation when child segment resolves to a trait)
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153722 (miri-test-libstd: use --tests and update some comments)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
@rust-bors
rust-borsBot
merged commit 77134bd
into
rust-lang:mainMar 12, 2026

11 checks passed

@rustbotrustbot
added this to the 1.96.0 milestone
Mar 12, 2026
github-actionsBot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Mar 12, 2026
@bors
Auto merge of #153741 - JonathanBrouwer:rollup-xwr7mEB, r=JonathanBro…
76126be
…uwer
Rollup of 12 pull requests
Successful merges:
- rust-lang/rust#152569 (Stop using rustc_layout_scalar_valid_range_* in rustc)
- rust-lang/rust#153421 (Fix ICE in fn_delegation when child segment resolves to a trait)
- rust-lang/rust#153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- rust-lang/rust#153581 (Simplify `type_of_opaque`.)
- rust-lang/rust#153611 (interpret: go back to regular string interpolation for error messages)
- rust-lang/rust#153635 (Unify same-span labels in move error diagnostics)
- rust-lang/rust#153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- rust-lang/rust#153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- rust-lang/rust#153722 (miri-test-libstd: use --tests and update some comments)
- rust-lang/rust#153671 (Make Enzyme has dependent on LLVM hash)
- rust-lang/rust#153710 (remove `.ftl` checks from tidy)
- rust-lang/rust#153720 (doc/rustc: clarify how to contact arm-maintainers)
@RalfJung
RalfJung
deleted the

interp-error-strings

branch
March 12, 2026 07:55
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk approved these changes
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

+1 more reviewer

@BryntetBryntetBryntet left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@oli-obkoli-obk

Labels

A-LLVMArea: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.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.96.0

6 participants

@RalfJung@rustbot@rust-log-analyzer@GuillaumeGomez@oli-obk@Bryntet

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
interpret: go back to regular string interpolation for error messages - #153611
Merged
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom 
RalfJung:interp-error-strings
Mar 12, 2026
Merged
interpret: go back to regular string interpolation for error messages#153611
rust-bors[bot] merged 3 commits into
rust-lang:mainfrom 
RalfJung:interp-error-strings
Conversation
@RalfJung
@RalfJungRalfJung
commented
Mar 9, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Using the translatable diagnostic infrastructure adds a whole lot of boilerplate which isn't actually useful for const-eval errors, so let's get rid of it. This effectively reverts #111677. That PR effectively added 1000 lines and this PR only removes around 600 -- the difference is caused by (a) keeping some of the types around for validation, where we can use them to share error strings and to trigger the extra help for pointer byte shenanigans during CTFE, and (b) this not being a full revert of #111677; I am not touching diagnostics outside the interpreter such as all the const-checking code which also got converted to fluent in the same PR.
The last commit does something similar for LayoutError, which also helps deduplicate a bunch of error strings. I can make that into a separate PR if you prefer.
r? @oli-obk
Fixes#113117
Fixes#116764
Fixes#112618
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
Some changes occurred to the CTFE / Miri interpreter
cc @rust-lang/miri
The Miri subtree was changed
cc @rust-lang/miri
Some changes occurred to the CTFE machinery
cc @oli-obk, @lcnr
Some changes occurred to MIR optimizations
cc @rust-lang/wg-mir-opt
Some changes occurred to the CTFE / Miri interpreter
cc @rust-lang/miri, @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
Mar 9, 2026
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
oli-obk is not on the review rotation at the moment.

They may take a while to respond.
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
caa7de3 to
d42a68bCompareMarch 9, 2026 14:38
@rustbot

This comment has been minimized.

Sign in to view
Bryntet
Bryntet
reviewed
Mar 9, 2026
View reviewed changes
Comment threadcompiler/rustc_abi/src/lib.rs

Comment on lines

-1026
 to 
-1027

 AlignFromBytesError::NotPowerOfTwo(align) => write!(f, "`{align}` is not a power of 2"),
 AlignFromBytesError::TooLarge(align) => write!(f, "`{align}` is too large"),
@BryntetBryntetMar 9, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I personally prefer this with the backticks
@RalfJungRalfJungMar 9, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

These are just numbers. We don't usually render them with backticks. And in fact they were not rendered with backticks in const-eval errors before, only in JSON errors. I changed the strings here to avoid changing the const-eval error output.
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
a2139d5 to
a060599CompareMarch 9, 2026 15:06
RalfJung
RalfJung
commented
Mar 9, 2026
View reviewed changes
Comment threadcompiler/rustc_abi/src/lib.rs
 TooLarge(u64),
}

impl AlignFromBytesError {
@RalfJungRalfJungMar 9, 2026•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

The AlignFromBytesError type got added #111677. Reverting that PR would mean replacing it by String again, but it actually seems reasonable to have a proper error type here so I decided to keep the type, but simplify and deduplicate the logic for turning it into a user-visible message.
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
a060599 to
66fbaa6CompareMarch 9, 2026 16:46
@rustbot
rustbot
commented
Mar 9, 2026

Copy link


Copy Markdown

Collaborator
Some changes occurred in compiler/rustc_codegen_gcc
cc @antoyo, @GuillaumeGomez
@rustbotrustbot
added
the 
A-LLVM
Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.
label
Mar 9, 2026
@GuillaumeGomez
GuillaumeGomez
commented
Mar 9, 2026

Copy link


Copy Markdown

Member
This is MUCH better, thanks a lot!
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
2 times, most recently
from
fa2e674 to
5cf0904CompareMarch 9, 2026 17:55
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
5cf0904 to
86315e9CompareMarch 9, 2026 19:23
@rust-bors

This comment has been minimized.

Sign in to view
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
86315e9 to
e50b65cCompareMarch 9, 2026 20:52
@rustbot

This comment has been minimized.

Sign in to view
oli-obk
oli-obk
approved these changes
Mar 11, 2026
View reviewed changes
@oli-obkoli-obk
left a comment
•

edited by rustbot

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@bors r+
View changes since this review
@rust-bors
rust-borsBot
commented
Mar 11, 2026

Copy link


Copy Markdown

Contributor
📌 Commit e50b65c has been approved by oli-obk
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.
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
Mar 11, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rust-borsrust-borsBot
removed
the 
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
Mar 11, 2026
@RalfJung
RalfJungforce-pushed
the
interp-error-strings
branch
from
e50b65c to
fe1f92aCompareMarch 11, 2026 12:55
@rustbot
rustbot
commented
Mar 11, 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.
@RalfJung
RalfJung
commented
Mar 11, 2026

Copy link


Copy Markdown

MemberAuthor
@bors r=oli-obk
@rust-bors
rust-borsBot
commented
Mar 11, 2026

Copy link


Copy Markdown

Contributor
📌 Commit fe1f92a has been approved by oli-obk
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
Mar 11, 2026
JonathanBrouwer added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Mar 11, 2026
@JonathanBrouwer
Rollup merge ofrust-lang#153611- RalfJung:interp-error-strings, r=o…
78bf4eb
…li-obk
interpret: go back to regular string interpolation for error messages
Using the translatable diagnostic infrastructure adds a whole lot of boilerplate which isn't actually useful for const-eval errors, so let's get rid of it. This effectively reverts rust-lang#111677. That PR effectively added 1000 lines and this PR only removes around 600 -- the difference is caused by (a) keeping some of the types around for validation, where we can use them to share error strings and to trigger the extra help for pointer byte shenanigans during CTFE, and (b) this not being a full revert of rust-lang#111677; I am not touching diagnostics outside the interpreter such as all the const-checking code which also got converted to fluent in the same PR.
The last commit does something similar for `LayoutError`, which also helps deduplicate a bunch of error strings. I can make that into a separate PR if you prefer.
r? @oli-obkFixesrust-lang#113117Fixesrust-lang#116764Fixesrust-lang#112618
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Mar 11, 2026
 Closed

rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
0d711f1
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
b5d3e7e
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153723- JonathanBrouwer:rollup-zP7J3H2, r=JonathanBro…
937011f
…uwer
Rollup of 9 pull requests
Successful merges:
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
@JonathanBrouwerJonathanBrouwer
mentioned this pull request
Mar 11, 2026
 Merged

rust-borsBot
pushed a commit
that referenced
this pull request
Mar 11, 2026
@bors
Auto merge of#153741- JonathanBrouwer:rollup-xwr7mEB, r=JonathanBro…
d1ee5e5
…uwer
Rollup of 12 pull requests
Successful merges:
- #152569 (Stop using rustc_layout_scalar_valid_range_* in rustc)
- #153421 (Fix ICE in fn_delegation when child segment resolves to a trait)
- #153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- #153581 (Simplify `type_of_opaque`.)
- #153611 (interpret: go back to regular string interpolation for error messages)
- #153635 (Unify same-span labels in move error diagnostics)
- #153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- #153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- #153722 (miri-test-libstd: use --tests and update some comments)
- #153671 (Make Enzyme has dependent on LLVM hash)
- #153710 (remove `.ftl` checks from tidy)
- #153720 (doc/rustc: clarify how to contact arm-maintainers)
@rust-bors
rust-borsBot
merged commit 77134bd
into
rust-lang:mainMar 12, 2026

11 checks passed

@rustbotrustbot
added this to the 1.96.0 milestone
Mar 12, 2026
github-actionsBot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Mar 12, 2026
@bors
Auto merge of #153741 - JonathanBrouwer:rollup-xwr7mEB, r=JonathanBro…
76126be
…uwer
Rollup of 12 pull requests
Successful merges:
- rust-lang/rust#152569 (Stop using rustc_layout_scalar_valid_range_* in rustc)
- rust-lang/rust#153421 (Fix ICE in fn_delegation when child segment resolves to a trait)
- rust-lang/rust#153571 (Avoid ICE when an EII declaration conflicts with a constructor)
- rust-lang/rust#153581 (Simplify `type_of_opaque`.)
- rust-lang/rust#153611 (interpret: go back to regular string interpolation for error messages)
- rust-lang/rust#153635 (Unify same-span labels in move error diagnostics)
- rust-lang/rust#153660 (mir-opt: Drop invalid debuginfos after SingleUseConsts.)
- rust-lang/rust#153685 (Introduce `for_each_query_vtable!` to move more code out of query macros)
- rust-lang/rust#153722 (miri-test-libstd: use --tests and update some comments)
- rust-lang/rust#153671 (Make Enzyme has dependent on LLVM hash)
- rust-lang/rust#153710 (remove `.ftl` checks from tidy)
- rust-lang/rust#153720 (doc/rustc: clarify how to contact arm-maintainers)
@RalfJung
RalfJung
deleted the

interp-error-strings

branch
March 12, 2026 07:55
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk approved these changes
@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

+1 more reviewer

@BryntetBryntetBryntet left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@oli-obkoli-obk

Labels

A-LLVMArea: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.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.96.0

6 participants

@RalfJung@rustbot@rust-log-analyzer@GuillaumeGomez@oli-obk@Bryntet