Revert "Copy stage0 binaries into stage0-sysroot" #101942
Merged
Conversation
This file contains 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 reverts commit 32f8eb2.
rustbot
added
the
T-bootstrap
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ cc @chenyukang, I'd like to fix the underlying bug but there's some urgency since it broke perf. |
bors
added
S-waiting-on-bors
|
@bors p=1 since we want to avoid a broken benchmark for long, I think. |
I think this is the right approach, yeah. Even for distro binaries, I don't see why you wouldn't be able to use them with in-tree std as long as they're able to compile it. |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 17, 2022
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#101093 (Initial version of 1.64 release notes) - rust-lang#101713 (change AccessLevels representation) - rust-lang#101821 (Bump Unicode to version 15.0.0, regenerate tables) - rust-lang#101826 (Enforce "joined()" and "joined_with_noop()" test) - rust-lang#101835 (Allow using vendoring when running bootstrap from outside the source root) - rust-lang#101942 (Revert "Copy stage0 binaries into stage0-sysroot") - rust-lang#101943 (rustdoc: remove unused CSS `.non-exhaustive { margin-bottom }`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
|
@Mark-Simulacrum the initial fix (which was reverted here) has made it into rust-1.65.0 beta branch, so can you please backport the fix to the beta branch as well? |
|
@rustbot label +beta-nominated +T-release |
rustbot
added
beta-nominated
Mark-Simulacrum
added
the
beta-accepted
Merged
cuviper
removed
the
beta-nominated
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 10, 2022
[beta] backports * Avoid duplicating StorageLive in let-else rust-lang#101894 * Re-add HRTB implied static bug note rust-lang#101924 * Revert "Copy stage0 binaries into stage0-sysroot" rust-lang#101942 * implied_bounds: deal with inference vars rust-lang#102016 * fix ConstProp handling of written_only_inside_own_block_locals rust-lang#102045 * Fix wrongly refactored Lift impl rust-lang#102088 * Fix a typo “pararmeter” in error message rust-lang#102119 * Deny associated type bindings within associated type bindings rust-lang#102338 * Continue migration of CSS themes rust-lang#101934 * Fix search result colors rust-lang#102369 * Fix unwind drop glue for if-then scopes rust-lang#102394 * Revert "Use getentropy when possible on all Apple platforms" rust-lang#102693 * Fix associated type bindings with anon const in GAT position rust-lang#102336 * Revert perf-regression 101620 rust-lang#102064 * `EscapeAscii` is not an `ExactSizeIterator` rust-lang#99880
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
This reverts PR #101711.
The PR broke the rustc/bootstrap benchmark on rustc-perf, I believe due to the assumption that the stage0 directory exists. Fixing that by just skipping this logic might be reasonable, but I think there's a larger discussion to be had around the right behavior when we don't have a single bin/ directory (when rustc= and cargo= are specified in config.toml). I think it's potentially reasonable to put those binaries (cargo, rustc, rustfmt?) into the bin directory, but for now just want to get us back to a healthy state.
r? @jyn514 (but would appreciate review from others as this is just a direct revert).