Use the in-tree `compiler-builtins` for the sysroot #141993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

bors merged 5 commits into rust-lang:master from tgross35:use-in-tree-builtins

Jun 9, 2025

Contributor

tgross35 commented Jun 4, 2025 •

edited

Loading

Many of std's dependency have a dependency on the crates.io compiler-builtins when used with the feature rustc-std-workspace-core. Use a Cargo patch to select the in-tree version instead.

compiler-builtins is also added as a dependency of rustc-std-workspace-core so these crates can remove their crates.io dependency in the future.

Zulip discussion: #t-compiler > Using in-tree compiler-builtins

Once this merges, the following PRs will need to make it to a release for the relevant crates:

Bump unicode-width to 0.2.0 getopts#119 (can merge at any time) released in v0.2.23
Remove optional dependency on compiler-builtins hashbrown#625 (can merge at any time) released in v0.15.4
Remove compiler-builtins from rustc-dep-of-std dependencies stdarch#1825
Remove compiler-builtins from rustc-dep-of-std dependencies rustc-demangle#80
Remove compiler-builtins from rustc-dep-of-std dependencies cfg-if#84
Remove compiler-builtins from rustc-dep-of-std dependencies unicode-rs/unicode-width#77

The above should cover all tier 1 targets with no std features enabled. The remaining cover the rest:

try-job: x86_64-gnu
try-job: test-various

rustbot added A-compiler-builtins T-libs labels

This comment has been minimized.

Sign in to view

tgross35 added the rla-silenced label

tgross35 mentioned this pull request

Remove compiler-builtins from rustc-dep-of-std dependencies rust-lang/stdarch#1824

Closed

rustbot added A-tidy T-bootstrap labels

bjorn3 reviewed

View reviewed changes

compiler/rustc_metadata/src/creader.rs Outdated Show resolved Hide resolved

bjorn3 reviewed

View reviewed changes

library/compiler-builtins/compiler-builtins/Cargo.toml Outdated Show resolved Hide resolved

This comment was marked as outdated.

Sign in to view

This comment was marked as outdated.

Sign in to view

rust-bors bot added a commit that referenced this pull request


          Auto merge of #141993 - tgross35:use-in-tree-builtins, r=<try>

e9c598d

WIP: Use the in-tree compiler-builtins for the sysroot

Zulip discussion: [#t-compiler > Using in-tree compiler-builtins](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/Using.20in-tree.20compiler-builtins/with/522445336)

try-job: x86_64-gnu
try-job: test-various

tgross35 force-pushed the use-in-tree-builtins branch 2 times, most recently from 94592d3 to 3c91330 Compare

June 4, 2025 21:01

This comment was marked as outdated.

Sign in to view

This comment was marked as outdated.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

tgross35 force-pushed the use-in-tree-builtins branch 2 times, most recently from e3edcc4 to 145c702 Compare

June 4, 2025 22:28

This comment was marked as outdated.

Sign in to view

This comment was marked as outdated.

Sign in to view

rust-bors bot added a commit that referenced this pull request


          Auto merge of #141993 - tgross35:use-in-tree-builtins, r=<try>

e84c485

WIP: Use the in-tree compiler-builtins for the sysroot

Many of `std`'s dependency have a dependency on the crates.io `compiler-builtins` when used with the feature `rustc-std-workspace-core`. Use a Cargo patch to select the in-tree version instead.

`compiler-builtins` is also added as a dependency of `rustc-std-workspace-core` so these crates can remove their crates.io dependency in the future.

Zulip discussion: [#t-compiler > Using in-tree compiler-builtins](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/Using.20in-tree.20compiler-builtins/with/522445336)

try-job: x86_64-gnu
try-job: x86_64-gnu-aux
try-job: test-various

This comment was marked as outdated.

Sign in to view

tgross35 force-pushed the use-in-tree-builtins branch from 145c702 to a543f01 Compare

June 4, 2025 22:28

This comment was marked as outdated.

Sign in to view

tgross35 changed the title ~~WIP: Use the in-tree compiler-builtins for the sysroot~~ Use the in-tree compiler-builtins for the sysroot

tgross35 marked this pull request as ready for review

June 4, 2025 22:30

Contributor Author

tgross35 commented Jun 4, 2025

I believe this works now. The first two commits are cherry picks that I will drop once #142036 merges.

rustbot assigned workingjubilee

tgross35 added a commit to tgross35/cfg-if that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies

1cc10c7

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

[1]: rust-lang/rust#141993

tgross35 pushed a commit to tgross35/compiler-builtins that referenced this pull request


          Auto merge of #142253 - tgross35:rollup-img49op, r=tgross35

46b8cd8

Rollup of 5 pull requests

Successful merges:

 - rust-lang/rust#140767 (Stabilize `sha512`, `sm3` and `sm4` for x86)
 - rust-lang/rust#141001 (Make NonZero<char> possible)
 - rust-lang/rust#141993 (Use the in-tree `compiler-builtins` for the sysroot)
 - rust-lang/rust#142208 (Always consider `const _` items as live for dead code analysis)
 - rust-lang/rust#142238 (stabilize nonnull_provenance)

r? `@ghost`
`@rustbot` modify labels: rollup

Manishearth pushed a commit to unicode-rs/unicode-width that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies (#77)

6db0c14

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

[1]: rust-lang/rust#141993

github-merge-queue bot pushed a commit to rust-lang/stdarch that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies

a3df9a1

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

[1]: rust-lang/rust#141993

tgross35 added a commit to tgross35/rustc-demangle that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies

9ab3d0a

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

A new `compiler_builtins` feature is added for compatibility, but it
should eventually be removed.

[1]: rust-lang/rust#141993

Mark-Simulacrum pushed a commit to rust-lang/rustc-demangle that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies

2166dc9

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

A new `compiler_builtins` feature is added for compatibility, but it
should eventually be removed.

[1]: rust-lang/rust#141993

github-actions bot pushed a commit to rust-lang/miri that referenced this pull request


          Auto merge of #142253 - tgross35:rollup-img49op, r=tgross35

Rollup of 5 pull requests

Successful merges:

 - rust-lang/rust#140767 (Stabilize `sha512`, `sm3` and `sm4` for x86)
 - rust-lang/rust#141001 (Make NonZero<char> possible)
 - rust-lang/rust#141993 (Use the in-tree `compiler-builtins` for the sysroot)
 - rust-lang/rust#142208 (Always consider `const _` items as live for dead code analysis)
 - rust-lang/rust#142238 (stabilize nonnull_provenance)

r? `@ghost`
`@rustbot` modify labels: rollup

alexcrichton pushed a commit to bytecodealliance/wasi-rs that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies (#108)

d720c28

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

[1]: rust-lang/rust#141993

alexcrichton pushed a commit to bytecodealliance/wasi-rs that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies (#108)

2756dc7

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

[1]: rust-lang/rust#141993

alexcrichton pushed a commit to bytecodealliance/wasi-rs that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies (#108)

c47e942

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

[1]: rust-lang/rust#141993

philipc pushed a commit to gimli-rs/object that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies (#777)

76c63ac

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

[1]: rust-lang/rust#141993

philipc pushed a commit to gimli-rs/gimli that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies (#769)

767d6c5

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

[1]: rust-lang/rust#141993

philipc pushed a commit to gimli-rs/addr2line that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies (#345)

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

[1]: rust-lang/rust#141993

BurntSushi pushed a commit to BurntSushi/memchr that referenced this pull request


          cargo: remove compiler-builtins from rustc-dep-of-std dependencies

599d9d9

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

[1]: rust-lang/rust#141993

PR #180

tgross35 added a commit to tgross35/rust-sgx that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies

b604278

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

[1]: rust-lang/rust#141993

madhav-madhusoodanan pushed a commit to madhav-madhusoodanan/stdarch that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies

4ed7f2f

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

[1]: rust-lang/rust#141993

Kobzol pushed a commit to Kobzol/rust that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies

f0b2564

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

[1]: rust-lang#141993

dvdhrm pushed a commit to r-efi/r-efi that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies

addacc1

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

[1]: rust-lang/rust#141993

dvdhrm pushed a commit to r-efi/r-efi-alloc that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies

9558d8b

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

[1]: rust-lang/rust#141993

tautschnig pushed a commit to model-checking/verify-rust-std that referenced this pull request


          Rollup merge of rust-lang#141993 - tgross35:use-in-tree-builtins, r=b…

eec8fe2

…jorn3

Use the in-tree `compiler-builtins` for the sysroot

Many of `std`'s dependency have a dependency on the crates.io `compiler-builtins` when used with the feature `rustc-std-workspace-core`. Use a Cargo patch to select the in-tree version instead.

`compiler-builtins` is also added as a dependency of `rustc-std-workspace-core` so these crates can remove their crates.io dependency in the future.

Zulip discussion: [#t-compiler > Using in-tree compiler-builtins](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/Using.20in-tree.20compiler-builtins/with/522445336)

Once this merges, the following PRs will need to make it to a release for the relevant crates:

- rust-lang/getopts#119 (can merge at any time)
- rust-lang/hashbrown#625 (can merge at any time)
- rust-lang/stdarch#1825
- rust-lang/rustc-demangle#80
- rust-lang/cfg-if#84
- unicode-rs/unicode-width#77

The above should cover all tier 1 targets with no `std` features enabled. The remaining cover the rest:

- alexcrichton/dlmalloc-rs#50 (wasm, xous, sgx)
- gimli-rs/gimli#769
- r-efi/r-efi#89 (efi)
- r-efi/r-efi-alloc#9 (efi)
- fortanix/rust-sgx#770 (sgx)
- hermit-os/hermit-rs#718 (hermit)
- bytecodealliance/wasi-rs#108 (wasi)
- gimli-rs/addr2line#345
- oyvindln/adler2#2
- BurntSushi/memchr#180
- Frommi/miniz_oxide#173
- gimli-rs/object#777

try-job: x86_64-gnu
try-job: test-various

This was referenced Jun 18, 2025

Drop the compiler_builtins dependency and feature sunfishcode/linux-raw-sys#157

Open

Drop the compiler_builtins dependency and feature bytecodealliance/rustix#1475

Closed

Drop the compiler_builtins dependency and feature rust-random/getrandom#693

Closed

Drop the compiler_builtins dependency and feature bitflags/bitflags#447

Closed

Taowyoo pushed a commit to tgross35/rust-sgx that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies

eb4f847

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

[1]: rust-lang/rust#141993

tgross35 mentioned this pull request

Sync from rust 2025/06/28 rust-lang/rustc_codegen_gcc#723

Merged

cyrgani mentioned this pull request

presence of compiler_builtins in the std doc crate sidebar on beta #143215

Closed

GuillaumeGomez pushed a commit to GuillaumeGomez/rust that referenced this pull request


          Rollup merge of rust-lang#141993 - tgross35:use-in-tree-builtins, r=b…

98e21c8

…jorn3

Use the in-tree `compiler-builtins` for the sysroot

Many of `std`'s dependency have a dependency on the crates.io `compiler-builtins` when used with the feature `rustc-std-workspace-core`. Use a Cargo patch to select the in-tree version instead.

`compiler-builtins` is also added as a dependency of `rustc-std-workspace-core` so these crates can remove their crates.io dependency in the future.

Zulip discussion: [#t-compiler > Using in-tree compiler-builtins](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/Using.20in-tree.20compiler-builtins/with/522445336)

Once this merges, the following PRs will need to make it to a release for the relevant crates:

- rust-lang/getopts#119 (can merge at any time)
- rust-lang/hashbrown#625 (can merge at any time)
- rust-lang/stdarch#1825
- rust-lang/rustc-demangle#80
- rust-lang/cfg-if#84
- unicode-rs/unicode-width#77

The above should cover all tier 1 targets with no `std` features enabled. The remaining cover the rest:

- alexcrichton/dlmalloc-rs#50 (wasm, xous, sgx)
- gimli-rs/gimli#769
- r-efi/r-efi#89 (efi)
- r-efi/r-efi-alloc#9 (efi)
- fortanix/rust-sgx#770 (sgx)
- hermit-os/hermit-rs#718 (hermit)
- bytecodealliance/wasi-rs#108 (wasi)
- gimli-rs/addr2line#345
- oyvindln/adler2#2
- BurntSushi/memchr#180
- Frommi/miniz_oxide#173
- gimli-rs/object#777

try-job: x86_64-gnu
try-job: test-various

tautschnig pushed a commit to model-checking/verify-rust-std that referenced this pull request


          Remove compiler-builtins from rustc-dep-of-std dependencies

d46d270

Since [1], this will come automatically from `rustc-std-workspace-core`
and the crates.io dependency should no longer be specified.

[1]: rust-lang#141993

dtolnay mentioned this pull request

Update to Rust 1.89.0 dtolnay/buck2-rustc-bootstrap#21

Merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-compiler-builtins A-run-make A-tidy rla-silenced S-waiting-on-bors T-bootstrap T-libs