Simplify rustc_public context handling by celinval · Pull Request #147923 · rust-lang/rust

celinval · 2025-10-20T20:50:04Z

We no longer need two thread-local variables to store the context. We used to have two because the conversion logic used to live in a separate crate from the rest of the business logic.

I'm also merging the Container struct and the CompilerInterface trait as a single struct. This removes the unnecessary indirection and code duplication. Using a trait would also block us from adding any generic method to the compiler interface.

r? @oli-obk

cc: @makai410

rustbot · 2025-10-20T20:50:07Z

This PR changes rustc_public

cc @oli-obk, @celinval, @ouz-a

rustbot · 2025-10-20T20:50:09Z

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

makai410

The overall solution LGTM.

View changes since this review

compiler/rustc_public/src/compiler_interface.rs

bors · 2025-10-21T09:11:12Z

☔ The latest upstream changes (presumably #147928) made this pull request unmergeable. Please resolve the merge conflicts.

celinval · 2025-10-27T20:38:12Z

r? @compiler-errors

Are you able to take this one? It looks like @oli-obk is off.

rustbot · 2025-10-27T20:38:16Z

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

celinval · 2025-10-27T20:38:51Z

r? stable-mir

rustbot · 2025-10-27T20:38:54Z

Failed to set assignee to stable-mir: invalid assignee

Note: Only org members with at least the repository "read" role, users with write permissions, or people who have commented on the PR may be assigned.

compiler-errors · 2025-10-27T20:39:29Z

Not working on Rust for a while unfortunately.

celinval · 2025-10-27T20:40:00Z

r? project-stable-mir

scottmcm · 2025-10-29T06:12:45Z

Since this is stable MIR and shouldn't impact other stuff I can attempt to review this, albeit without knowing much about the specific details of what it's doing.

Looks like there's a conflict right now, though?

oli-obk · 2025-10-29T06:56:20Z

I can review, I just can't be on the rotation rn

oli-obk

Oh, this is super straight forward. Nice cleanup!

View changes since this review

oli-obk · 2025-10-29T06:59:43Z

r=me after rebase

We no longer need two thread-local variables to store the context. We used to have two because the conversion logic used to live in a separate crate from the rest of the business logic. I'm also removing the Container struct and replacing the CompilerInterface trait with a struct. This removes the unnecessary indirection and code duplication. Using a trait would also block us from adding any generic method to the compiler interface.

rustbot · 2025-10-29T23:39:02Z

This PR was rebased onto a different master 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.

celinval · 2025-10-29T23:40:01Z

@bors r=@oli-obk rollup

bors · 2025-10-29T23:40:04Z

📌 Commit e0b8dd3 has been approved by oli-obk

It is now in the queue for this repository.

Simplify rustc_public context handling We no longer need two thread-local variables to store the context. We used to have two because the conversion logic used to live in a separate crate from the rest of the business logic. I'm also merging the Container struct and the CompilerInterface trait as a single struct. This removes the unnecessary indirection and code duplication. Using a trait would also block us from adding any generic method to the compiler interface. r? `@oli-obk` cc: `@makai410`

Rollup of 9 pull requests Successful merges: - #138217 (Turn `Cow::is_borrowed,is_owned` into associated functions.) - #147858 (Micro-optimization attempt in coroutine layout computation) - #147923 (Simplify rustc_public context handling) - #147935 (Add LLVM realtime sanitizer) - #148115 (rustdoc: Rename unstable option `--nocapture` to `--no-capture` in accordance with `libtest`) - #148137 (Couple of changes for Redox OS) - #148176 ([rustdoc] Include attribute and derive macros when filtering on "macros") - #148193 (Remove `QPath::LangItem`) - #148253 (Handle default features and -Ctarget-features in the dummy backend) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 8 pull requests Successful merges: - #138217 (Turn `Cow::is_borrowed,is_owned` into associated functions.) - #147858 (Micro-optimization attempt in coroutine layout computation) - #147923 (Simplify rustc_public context handling) - #148115 (rustdoc: Rename unstable option `--nocapture` to `--no-capture` in accordance with `libtest`) - #148137 (Couple of changes for Redox OS) - #148176 ([rustdoc] Include attribute and derive macros when filtering on "macros") - #148253 (Handle default features and -Ctarget-features in the dummy backend) - #148272 (Align VEX V5 boot routine to 4 bytes) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #147923 - celinval:rpub-remove-trait, r=oli-obk Simplify rustc_public context handling We no longer need two thread-local variables to store the context. We used to have two because the conversion logic used to live in a separate crate from the rest of the business logic. I'm also merging the Container struct and the CompilerInterface trait as a single struct. This removes the unnecessary indirection and code duplication. Using a trait would also block us from adding any generic method to the compiler interface. r? ``@oli-obk`` cc: ``@makai410``

Rollup of 8 pull requests Successful merges: - rust-lang/rust#138217 (Turn `Cow::is_borrowed,is_owned` into associated functions.) - rust-lang/rust#147858 (Micro-optimization attempt in coroutine layout computation) - rust-lang/rust#147923 (Simplify rustc_public context handling) - rust-lang/rust#148115 (rustdoc: Rename unstable option `--nocapture` to `--no-capture` in accordance with `libtest`) - rust-lang/rust#148137 (Couple of changes for Redox OS) - rust-lang/rust#148176 ([rustdoc] Include attribute and derive macros when filtering on "macros") - rust-lang/rust#148253 (Handle default features and -Ctarget-features in the dummy backend) - rust-lang/rust#148272 (Align VEX V5 boot routine to 4 bytes) r? `@ghost` `@rustbot` modify labels: rollup

Simplify rustc_public context handling We no longer need two thread-local variables to store the context. We used to have two because the conversion logic used to live in a separate crate from the rest of the business logic. I'm also merging the Container struct and the CompilerInterface trait as a single struct. This removes the unnecessary indirection and code duplication. Using a trait would also block us from adding any generic method to the compiler interface. r? ``@oli-obk`` cc: ``@makai410``

Rollup of 8 pull requests Successful merges: - rust-lang#138217 (Turn `Cow::is_borrowed,is_owned` into associated functions.) - rust-lang#147858 (Micro-optimization attempt in coroutine layout computation) - rust-lang#147923 (Simplify rustc_public context handling) - rust-lang#148115 (rustdoc: Rename unstable option `--nocapture` to `--no-capture` in accordance with `libtest`) - rust-lang#148137 (Couple of changes for Redox OS) - rust-lang#148176 ([rustdoc] Include attribute and derive macros when filtering on "macros") - rust-lang#148253 (Handle default features and -Ctarget-features in the dummy backend) - rust-lang#148272 (Align VEX V5 boot routine to 4 bytes) r? `@ghost` `@rustbot` modify labels: rollup

Simplify rustc_public context handling We no longer need two thread-local variables to store the context. We used to have two because the conversion logic used to live in a separate crate from the rest of the business logic. I'm also merging the Container struct and the CompilerInterface trait as a single struct. This removes the unnecessary indirection and code duplication. Using a trait would also block us from adding any generic method to the compiler interface. r? ``@oli-obk`` cc: ``@makai410``

Rollup of 8 pull requests Successful merges: - rust-lang#138217 (Turn `Cow::is_borrowed,is_owned` into associated functions.) - rust-lang#147858 (Micro-optimization attempt in coroutine layout computation) - rust-lang#147923 (Simplify rustc_public context handling) - rust-lang#148115 (rustdoc: Rename unstable option `--nocapture` to `--no-capture` in accordance with `libtest`) - rust-lang#148137 (Couple of changes for Redox OS) - rust-lang#148176 ([rustdoc] Include attribute and derive macros when filtering on "macros") - rust-lang#148253 (Handle default features and -Ctarget-features in the dummy backend) - rust-lang#148272 (Align VEX V5 boot routine to 4 bytes) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 8 pull requests Successful merges: - rust-lang/rust#138217 (Turn `Cow::is_borrowed,is_owned` into associated functions.) - rust-lang/rust#147858 (Micro-optimization attempt in coroutine layout computation) - rust-lang/rust#147923 (Simplify rustc_public context handling) - rust-lang/rust#148115 (rustdoc: Rename unstable option `--nocapture` to `--no-capture` in accordance with `libtest`) - rust-lang/rust#148137 (Couple of changes for Redox OS) - rust-lang/rust#148176 ([rustdoc] Include attribute and derive macros when filtering on "macros") - rust-lang/rust#148253 (Handle default features and -Ctarget-features in the dummy backend) - rust-lang/rust#148272 (Align VEX V5 boot routine to 4 bytes) r? `@ghost` `@rustbot` modify labels: rollup

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 Oct 20, 2025

rustbot assigned oli-obk Oct 20, 2025

makai410 reviewed Oct 21, 2025

View reviewed changes

compiler/rustc_public/src/compiler_interface.rs Show resolved Hide resolved

celinval force-pushed the rpub-remove-trait branch from 6ef263f to 604d30b Compare October 21, 2025 22:28

celinval closed this Oct 27, 2025

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 27, 2025

celinval reopened this Oct 27, 2025

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 27, 2025

rustbot assigned compiler-errors and unassigned oli-obk Oct 27, 2025

rustbot assigned scottmcm and unassigned compiler-errors Oct 27, 2025

oli-obk assigned oli-obk and unassigned scottmcm Oct 29, 2025

oli-obk approved these changes Oct 29, 2025

View reviewed changes

celinval force-pushed the rpub-remove-trait branch from 604d30b to e0b8dd3 Compare October 29, 2025 23:38

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 29, 2025

Zalathar mentioned this pull request Oct 30, 2025

Rollup of 9 pull requests #148276

Closed

jhpratt mentioned this pull request Oct 30, 2025

Rollup of 8 pull requests #148280

Merged

bors merged commit 2e4e4ab into rust-lang:master Oct 30, 2025
11 checks passed

rustbot added this to the 1.93.0 milestone Oct 30, 2025

github-actions bot mentioned this pull request Nov 4, 2025

Toolchain upgrade to nightly-2026-02-09 flux-rs/flux#1345

Open

Uh oh!

Conversation

celinval commented Oct 20, 2025

Uh oh!

rustbot commented Oct 20, 2025

Uh oh!

rustbot commented Oct 20, 2025

Uh oh!

makai410 left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

bors commented Oct 21, 2025

Uh oh!

celinval commented Oct 27, 2025

Uh oh!

rustbot commented Oct 27, 2025

Uh oh!

celinval commented Oct 27, 2025

Uh oh!

rustbot commented Oct 27, 2025

Uh oh!

compiler-errors commented Oct 27, 2025

Uh oh!

celinval commented Oct 27, 2025

Uh oh!

scottmcm commented Oct 29, 2025

Uh oh!

oli-obk commented Oct 29, 2025

Uh oh!

oli-obk left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

oli-obk commented Oct 29, 2025

Uh oh!

rustbot commented Oct 29, 2025

Uh oh!

celinval commented Oct 29, 2025

Uh oh!

bors commented Oct 29, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

makai410 left a comment •

edited by rustbot

Loading

oli-obk left a comment •

edited by rustbot

Loading