Simplify library dependencies on `compiler-builtins` by tgross35 · Pull Request #144683 · rust-lang/rust

tgross35 · 2025-07-30T14:12:45Z

The three panic-related library crates need to have access to core, and compiler-builtins needs to be in the crate graph. Rather than specifying both dependencies, switch these crates to use rustc-std-workspace-core which already does this.

This means there is now a single place that the compiler-builtins dependency needs to get configured, for everything other than alloc and std.

The second commit removes compiler-builtins from std (more details in the message).

r? @ghost

rustbot · 2025-07-30T14:26:27Z

These commits modify the library/Cargo.lock file. Unintentional changes to library/Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

tgross35 · 2025-07-30T14:26:38Z

Things pass locally, assuming similar luck in CI
r? @bjorn3

bjorn3 · 2025-07-30T18:33:53Z

@bors r+

bors · 2025-07-30T18:33:55Z

📌 Commit d7654b9 has been approved by bjorn3

It is now in the queue for this repository.

…e, r=bjorn3 Simplify library dependencies on `compiler-builtins` The three panic-related library crates need to have access to `core`, and `compiler-builtins` needs to be in the crate graph. Rather than specifying both dependencies, switch these crates to use `rustc-std-workspace-core` which already does this. This means there is now a single place that the `compiler-builtins` dependency needs to get configured, for everything other than `alloc` and `std`. The second commit removes `compiler-builtins` from `std` (more details in the message).

Rollup of 6 pull requests Successful merges: - #135975 (Implement `push_mut`) - #143672 (Fix Box allocator drop elaboration) - #144232 (Implement support for `become` and explicit tail call codegen for the LLVM backend) - #144663 (coverage: Re-land "Enlarge empty spans during MIR instrumentation") - #144683 (Simplify library dependencies on `compiler-builtins`) - #144685 (Only extract lang items once in codegen_fn_attrs) r? `@ghost` `@rustbot` modify labels: rollup

Noratrieb · 2025-07-31T05:35:26Z

@bors r-
failed in rollup because UEFI does funny things with compiler-builtins that I imagine one is not supposed to do: #144709 (comment)

tgross35 · 2025-07-31T19:45:38Z

...okay what?

Added in 61e550a, @Ayush1325 why doesn't that create slices and do == rather than calling into compiler_builtins?

tgross35 · 2025-07-31T20:31:15Z

@bors2 try jobs=dist-various-2

rust-bors · 2025-07-31T20:31:20Z

⌛ Trying commit 4f7f450 with merge 282345f…

To cancel the try build, run the command @bors try cancel.

Simplify library dependencies on `compiler-builtins` try-job: dist-various-2

Noratrieb

on the uefi change

rust-bors · 2025-07-31T21:40:28Z

☀️ Try build successful (CI)
Build commit: 282345f (282345f2d55ac3d928eedb1cbfa2f6fc285f8969, parent: adcb3d3b4cd3b7c4cde642f3ed537037f293738e)

`compiler_builtins` shouldn't be called directly. Change the `PartialEq` implementation for `DevicePathNode` to use slice equality instead, which will call `memcmp`/`bcmp` via the intrinsic.

The three panic-related library crates need to have access to `core`, and `compiler-builtins` needs to be in the crate graph. Rather than specifying both dependencies, switch these crates to use `rustc-std-workspace-core` which already does this. This means there is now a single place that the `compiler-builtins` dependency needs to get configured, for everything other than `alloc` and `std`.

`compiler-builtins` is already in the crate graph via `alloc`, and all features related to `compiler-builtins` goes through `alloc`. There isn't any reason that `std` needs this direct dependency, so remove it.

tgross35 · 2025-07-31T22:47:54Z

Thanks Nora!

@bors r=bjorn3,Noratrieb

bors · 2025-07-31T22:47:57Z

📌 Commit 42bf044 has been approved by bjorn3,Noratrieb

It is now in the queue for this repository.

Rollup of 7 pull requests Successful merges: - #143849 (rustdoc: never link to unnamable items) - #144683 (Simplify library dependencies on `compiler-builtins`) - #144691 (Extend `is_case_difference` to handle digit-letter confusables) - #144700 (rustdoc-json: Move `#[macro_export]` from `Other` to it's own variant) - #144751 (Add correct dynamic_lib_extension for aix) - #144757 (Ping Muscraft when emitter change) - #144759 (triagebot: Label `compiler-builtins` T-libs) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #144683 - tgross35:builtins-via-std-workspace, r=bjorn3,Noratrieb Simplify library dependencies on `compiler-builtins` The three panic-related library crates need to have access to `core`, and `compiler-builtins` needs to be in the crate graph. Rather than specifying both dependencies, switch these crates to use `rustc-std-workspace-core` which already does this. This means there is now a single place that the `compiler-builtins` dependency needs to get configured, for everything other than `alloc` and `std`. The second commit removes `compiler-builtins` from `std` (more details in the message).

…e, r=bjorn3,Noratrieb Simplify library dependencies on `compiler-builtins` The three panic-related library crates need to have access to `core`, and `compiler-builtins` needs to be in the crate graph. Rather than specifying both dependencies, switch these crates to use `rustc-std-workspace-core` which already does this. This means there is now a single place that the `compiler-builtins` dependency needs to get configured, for everything other than `alloc` and `std`. The second commit removes `compiler-builtins` from `std` (more details in the message).

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jul 30, 2025

tgross35 changed the title ~~Use core via rustc-std-workspace-core in library/panic*~~Simplify library dependencies on compiler-builtinsJul 30, 2025

tgross35 marked this pull request as ready for review July 30, 2025 14:26

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 Jul 30, 2025

rustbot assigned bjorn3 Jul 30, 2025

This comment has been minimized.
Sign in to view

tgross35 force-pushed the builtins-via-std-workspace branch from 38dea0f to d7654b9Compare July 30, 2025 14:38

rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Jul 30, 2025

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 Jul 30, 2025

Zalathar mentioned this pull request Jul 31, 2025
Rollup of 6 pull requests #144709
Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 31, 2025

rust-borsBot added a commit that referenced this pull request Jul 31, 2025
Auto merge of#144683- tgross35:builtins-via-std-workspace, r=<try>
282345f
Simplify library dependencies on `compiler-builtins` try-job: dist-various-2

Noratrieb approved these changes Jul 31, 2025
View reviewed changes

tgross35 added 2 commits July 31, 2025 22:47

uefi: Use slice equality rather than memcmp
8d0b92a
`compiler_builtins` shouldn't be called directly. Change the `PartialEq` implementation for `DevicePathNode` to use slice equality instead, which will call `memcmp`/`bcmp` via the intrinsic.

Remove std's dependency on compiler-builtins
42bf044
`compiler-builtins` is already in the crate graph via `alloc`, and all features related to `compiler-builtins` goes through `alloc`. There isn't any reason that `std` needs this direct dependency, so remove it.

tgross35 force-pushed the builtins-via-std-workspace branch from 4f7f450 to 42bf044Compare July 31, 2025 22:47

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 31, 2025

jhpratt mentioned this pull request Aug 1, 2025
Rollup of 7 pull requests #144768
Merged

bors merged commit 3f5f045 into rust-lang:masterAug 1, 2025
10 checks passed

rustbot added this to the 1.90.0 milestone Aug 1, 2025

tgross35 deleted the builtins-via-std-workspace branch August 1, 2025 10:29

Uh oh!

Uh oh!

Conversation

tgross35 commented Jul 30, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jul 30, 2025

Uh oh!

tgross35 commented Jul 30, 2025

Uh oh!

This comment has been minimized.

bjorn3 commented Jul 30, 2025

Uh oh!

bors commented Jul 30, 2025

Uh oh!

Noratrieb commented Jul 31, 2025

Uh oh!

tgross35 commented Jul 31, 2025

Uh oh!

tgross35 commented Jul 31, 2025

Uh oh!

rust-borsBot commented Jul 31, 2025

Uh oh!

Noratrieb left a comment

Choose a reason for hiding this comment

Uh oh!

rust-borsBot commented Jul 31, 2025

Uh oh!

tgross35 commented Jul 31, 2025

Uh oh!

bors commented Jul 31, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

tgross35 commented Jul 30, 2025•
edited
Loading