Use the in-tree compiler-builtins for the sysroot
#141993
Open
+29
−24
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
bjorn3
reviewed
Jun 4, 2025
bjorn3
reviewed
Jun 4, 2025
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
rust-bors bot
added a commit
that referenced
this pull request
Jun 4, 2025
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
94592d3 to
3c91330
Compare
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
e3edcc4 to
145c702
Compare
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
rust-bors bot
added a commit
that referenced
this pull request
Jun 4, 2025
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.
This comment was marked as outdated.
145c702 to
a543f01
Compare
This comment was marked as outdated.
This comment was marked as outdated.
|
Sounds like we need a |
|
That was an alternative - but then updates to the patch section are definitely needed :) By instead making it a dependency of @bors2 try |
rust-bors bot
added a commit
that referenced
this pull request
Jun 5, 2025
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: dist-x86_64-linux try-job: x86_64-gnu try-job: x86_64-gnu-aux try-job: test-various
|
@rust-lang/cargo @rust-lang/rust-analyzer does anyone have a rough idea of what changes, if any, would be needed with this PR to keep from breaking |
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.
9e8f95d to
6d859bf
Compare
tgross35
added a commit
to tgross35/rust-stdarch
that referenced
this pull request
Jun 5, 2025
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
Jun 5, 2025
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
This was referenced Jun 5, 2025
tgross35
added a commit
to tgross35/cfg-if
that referenced
this pull request
Jun 5, 2025
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/unicode-width
that referenced
this pull request
Jun 5, 2025
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/dlmalloc-rs
that referenced
this pull request
Jun 5, 2025
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-build-sysroot
that referenced
this pull request
Jun 5, 2025
In order to help support changes to the standard library's Cargo workspace ([1], apply a patch for `crates-io.compiler-builtins` if the workspace `Cargo.toml` also has one. [1]: rust-lang/rust#141993
tgross35
added a commit
to tgross35/rustc-build-sysroot
that referenced
this pull request
Jun 5, 2025
In order to help support changes to the standard library's Cargo workspace ([1], apply a patch for `crates-io.compiler-builtins` if the workspace `Cargo.toml` also has one. [1]: rust-lang/rust#141993
|
These commits modify the If this was unintentional then you should revert the changes before this PR is merged. |
tgross35
added a commit
to tgross35/rustc-build-sysroot
that referenced
this pull request
Jun 5, 2025
In order to help support changes to the standard library's Cargo workspace ([1], apply a patch for `crates-io.compiler-builtins` if the workspace `Cargo.toml` also has one. [1]: rust-lang/rust#141993
|
Test with RalfJung/rustc-build-sysroot#27 @bors2 try |
rust-bors bot
added a commit
that referenced
this pull request
Jun 5, 2025
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. The remaining cover the rest: - `dlmalloc` (wasm, xous, sgx) alexcrichton/dlmalloc-rs#50 - `gimli` (xous) - `r-efi`, `r-efi-alloc` (efi) - `fortanix-sgx-abi` (sgx) - `hermit-abi` (hermit) - `wasi` (wasi) try-job: dist-x86_64-linux try-job: x86_64-gnu try-job: x86_64-gnu-aux try-job: test-various
@ehuss was able to verify this didn't seem to break Cargo things: https://rust-lang.zulipchat.com/#narrow/channel/246057-t-cargo/topic/Testing.20with.20a.20specific.20rust-lang.2Frust.20PR/with/522678293 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Many of
std's dependency have a dependency on the crates.iocompiler-builtinswhen used with the featurerustc-std-workspace-core. Use a Cargo patch to select the in-tree version instead.compiler-builtinsis also added as a dependency ofrustc-std-workspace-coreso 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:
compiler-builtinsfromrustc-dep-of-stddependencies stdarch#1825compiler-builtinsfromrustc-dep-of-stddependencies rustc-demangle#80compiler-builtinsfromrustc-dep-of-stddependencies cfg-if#84compiler-builtinsfromrustc-dep-of-stddependencies unicode-rs/unicode-width#77The above should cover all tier 1 targets. The remaining cover the rest:
dlmalloc(wasm, xous, sgx) Removecompiler-builtinsfromrustc-dep-of-stddependencies alexcrichton/dlmalloc-rs#50gimli(xous)r-efi,r-efi-alloc(efi)fortanix-sgx-abi(sgx)hermit-abi(hermit)wasi(wasi)try-job: dist-x86_64-linux
try-job: x86_64-gnu
try-job: x86_64-gnu-aux
try-job: test-various