Fix broken ./x.py install #80514
Merged
Fix broken ./x.py install #80514
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
rustbot
added
beta-accepted
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ |
|
📌 Commit f946b54 has been approved by |
bors
added
S-waiting-on-bors
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Dec 31, 2020
…mulacrum Fix broken ./x.py install During my tarball refactorings in rust-lang#79788 I changed the directory layout used by the tarball generation code, and that broke the other parts of rustbuild which hardcoded the paths of those directories. Namely, `./x.py install` relied on the uncompressed copy of the tarball left behind by `fabricate`/`rust-installer`, causing rust-lang#80494. While the easy fix for rust-lang#80494 would've been to just update the hardcoded paths to match the new structure, that fix would leave us in the same situation if we were to change the directory layout again in the future. Instead I refactored the code to return a `GeneratedTarball` struct as the output of all the dist steps, and I put all the paths the rest of rustbuild needs to care about in its fields. That way, future changes to `src/bootstrap/tarball.rs` will not break other stuff. This PR is best reviewed commit-by-commit. r? `@Mark-Simulacrum` `@rustbot` modify labels: beta-nominated beta-accepted T-release
|
☔ The latest upstream changes (presumably #80435) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
Files in the temporary directory are used by ./x.py install.
The struct will allow to store more context on the generated tarballs.
pietroalbini
force-pushed
the
fix-install
branch
from
f946b54
to
8e0ab0f
Compare
|
Rebased! @bors r=Mark-Simulacrum |
|
📌 Commit 8e0ab0f has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 1, 2021
Rollup of 8 pull requests Successful merges: - rust-lang#80323 (Update and improve `rustc_codegen_{llvm,ssa}` docs) - rust-lang#80368 (rustdoc: Render visibilities succinctly) - rust-lang#80514 (Fix broken ./x.py install) - rust-lang#80519 (Take type defaults into account in suggestions to reorder generic parameters) - rust-lang#80526 (Update LLVM) - rust-lang#80532 (remove unnecessary trailing semicolon from bootstrap) - rust-lang#80548 (FIx ICE on wf check for foreign fns) - rust-lang#80551 (support pattern as const parents in type_of) Failed merges: - rust-lang#80547 (In which we start to parse const generics defaults) r? `@ghost` `@rustbot` modify labels: rollup
6 tasks
Mark-Simulacrum
removed
the
beta-nominated
Merged
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 20, 2021
…ulacrum [beta] backports This backports: * Update RLS and Rustfmt rust-lang#81027 * bump rustfmt to v1.4.32 rust-lang#81093 * Fix handling of malicious Readers in read_to_end rust-lang#80895 * Fix broken ./x.py install rust-lang#80514 * Fix x.py install not working with relative prefix rust-lang#80797 * [security] Update mdbook rust-lang#80688 * rustdoc: Render visibilities succinctly rust-lang#80368 r? `@ghost`
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.
During my tarball refactorings in #79788 I changed the directory layout used by the tarball generation code, and that broke the other parts of rustbuild which hardcoded the paths of those directories. Namely,
./x.py installrelied on the uncompressed copy of the tarball left behind byfabricate/rust-installer, causing #80494.While the easy fix for #80494 would've been to just update the hardcoded paths to match the new structure, that fix would leave us in the same situation if we were to change the directory layout again in the future. Instead I refactored the code to return a
GeneratedTarballstruct as the output of all the dist steps, and I put all the paths the rest of rustbuild needs to care about in its fields. That way, future changes tosrc/bootstrap/tarball.rswill not break other stuff.This PR is best reviewed commit-by-commit.
r? @Mark-Simulacrum
@rustbot modify labels: beta-nominated beta-accepted T-release