Skip to content

interpreter error reporting: remove arguments that are always the same#153613

Merged
rust-bors[bot] merged 2 commits intorust-lang:mainfrom
RalfJung:interpret-report
Mar 28, 2026
Merged

interpreter error reporting: remove arguments that are always the same#153613
rust-bors[bot] merged 2 commits intorust-lang:mainfrom
RalfJung:interpret-report

Conversation

@RalfJung
Copy link
Copy Markdown
Member

@RalfJung RalfJung commented Mar 9, 2026

This report function is called twice and both callers use the same span and get_span_and_frames... so let's just fix those arguments inside the function, no need to be more generic than this.

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Mar 9, 2026

Some changes occurred to the CTFE machinery

cc @oli-obk, @lcnr

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 9, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Mar 9, 2026

r? @jdonszelmann

rustbot has assigned @jdonszelmann.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: compiler
  • compiler expanded to 69 candidates
  • Random selection from 15 candidates

)
crate::const_eval::report(ecx, error, move |diag, span, frames| {
// FIXME(oli-obk): figure out how to use structured diagnostics again.
diag.code(E0080);
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.

the error code is also shared by both invocations - might be nice to put in report

@jdonszelmann
Copy link
Copy Markdown
Contributor

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 11, 2026
@RalfJung
Copy link
Copy Markdown
Member Author

Makes sense! I then found some more opportunities for cleanups. :)
@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 11, 2026
@rust-bors

This comment has been minimized.

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Mar 12, 2026

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
Copy link
Copy Markdown
Member Author

@jdonszelmann friendly reminder that this is waiting for your review :)

Copy link
Copy Markdown
Contributor

@oli-obk oli-obk left a comment

Choose a reason for hiding this comment

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

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 28, 2026

📌 Commit 46e3c4d has been approved by oli-obk

It is now in the queue for this repository.

@rust-bors rust-bors bot added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 28, 2026
@rust-bors rust-bors bot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 28, 2026
rust-bors bot pushed a commit that referenced this pull request Mar 28, 2026
Rollup of 11 pull requests

Successful merges:

 - #152880 (Tweak incorrect assoc item note)
 - #153526 (Fix LegacyKeyValueFormat report from docker build: i686)
 - #153613 (interpreter error reporting: remove arguments that are always the same)
 - #154029 (Replace `truncate(0)` with `clear()`)
 - #154125 (Inline and remove `DepGraphData::try_mark_parent_green`.)
 - #154185 (Prevent no_threads RwLock's write() impl from setting mode to -1 when it is locked for reading)
 - #154394 (Normalize rustc path prefix when testing `-Z track-diagnostics`)
 - #154450 (Use the normal arg-parsing machinery for `-Zassert-incr-state`)
 - #154475 (Emit a pre-expansion feature gate warning for `box`'ed struct field patterns)
 - #154500 (EnumSizeOpt: use Allocation::write_scalar instead of manual endianess logic)
 - #154502 (interpret: ensure that untupled arguments are actually tuples)
@rust-bors rust-bors bot merged commit f50103e into rust-lang:main Mar 28, 2026
11 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 28, 2026
rust-timer added a commit that referenced this pull request Mar 28, 2026
Rollup merge of #153613 - RalfJung:interpret-report, r=oli-obk

interpreter error reporting: remove arguments that are always the same

This `report` function is called twice and both callers use the same `span` and `get_span_and_frames`... so let's just fix those arguments inside the function, no need to be more generic than this.
@RalfJung RalfJung deleted the interpret-report branch March 28, 2026 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants