Require all paths passed to ShouldRun::paths to exist on disk
#95906
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
|
(rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
jyn514
force-pushed
the
enforce-valid-paths
branch
4 times, most recently
from
99985f9 to
507b798
Compare
|
@rustbot label -S-waiting-on-review +S-waiting-on-author |
rustbot
added
S-waiting-on-author
jyn514
force-pushed
the
enforce-valid-paths
branch
from
507b798 to
0990851
Compare
|
@rustbot ready |
rustbot
added
S-waiting-on-review
| @@ -234,7 +234,7 @@ install!((self, builder, _config), | |||
| }).expect("missing analysis"); | |||
| install_sh(builder, "analysis", self.compiler.stage, Some(self.target), &tarball); | |||
| }; | |||
| Rustc, "src/librustc", true, only_hosts: true, { | |||
| Rustc, path = "compiler/rustc", true, only_hosts: true, { | |||
There was a problem hiding this comment.
x.py install is a bit of a mess I guess between paths and aliases. My tendency is to move towards the dist tarball names for simplicity (and maybe just universally support any of them; I suspect it might not be that hard with the relatively uniform tarball generation work @pietroalbini did a while back).
Can be a future PR.
There was a problem hiding this comment.
Yeah, my impression is that x.py install isn't a super well trodden path in general - not sure who's using it. I can look into cleaning it up sometime in the next few weeks, I've been meaning to write up instructions for how to port a new architecture anyway and I suspect this will come up as part of the work. Leaving it be for now.
|
@bors delegate+ r=me with changes made |
|
✌️ @jyn514 can now approve this pull request |
This has two benefits: 1. There is a clearer mental model of how bootstrap works. Steps correspond to paths on disk unless it's strictly impossible for them to do so (e.g. dist components). 2. Bootstrap has better checks for internal consistency. This caught several issues: - `src/sanitizers` doesn't exist; I changed it to just be a `sanitizers` alias. - `src/tools/lld` doesn't exist; I removed it, since `lld` alone already works. - `src/llvm` doesn't exist; removed it since `llvm` and `src/llvm-project` both work. - `src/lldb_batchmode.py` doesn't exist, it was moved to `src/etc`. - `install` was still using `src/librustc` instead of `compiler/rustc`. - None of the tools in `dist` / `install` allowed using `src/tools/X` to build them. This might be intentional - I can change them to aliases if you like.
jyn514
force-pushed
the
enforce-valid-paths
branch
from
0990851 to
0db70ca
Compare
|
@bors r=Mark-Simulacrum |
|
📌 Commit 0db70ca has been approved by |
bors
added
S-waiting-on-bors
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Apr 17, 2022
…Simulacrum Require all paths passed to `ShouldRun::paths` to exist on disk This has two benefits: 1. There is a clearer mental model of how bootstrap works. Steps correspond to paths on disk unless it's strictly impossible for them to do so (e.g. dist components). 2. Bootstrap has better checks for internal consistency. This caught several issues: - `src/sanitizers` doesn't exist; I changed it to just be a `sanitizers` alias. - `src/tools/lld` doesn't exist; I removed it, since `lld` alone already works. - `src/llvm` doesn't exist; removed it since `llvm` and `src/llvm-project` both work. - `src/lldb_batchmode.py` doesn't exist, it was moved to `src/etc`. - `install` was still using `src/librustc` instead of `compiler/rustc`. - None of the tools in `dist` / `install` allowed using `src/tools/X` to build them. This might be intentional - I can change them to aliases if you like. Builds on rust-lang#95901 and should not be merged before.
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Apr 18, 2022
…Simulacrum Require all paths passed to `ShouldRun::paths` to exist on disk This has two benefits: 1. There is a clearer mental model of how bootstrap works. Steps correspond to paths on disk unless it's strictly impossible for them to do so (e.g. dist components). 2. Bootstrap has better checks for internal consistency. This caught several issues: - `src/sanitizers` doesn't exist; I changed it to just be a `sanitizers` alias. - `src/tools/lld` doesn't exist; I removed it, since `lld` alone already works. - `src/llvm` doesn't exist; removed it since `llvm` and `src/llvm-project` both work. - `src/lldb_batchmode.py` doesn't exist, it was moved to `src/etc`. - `install` was still using `src/librustc` instead of `compiler/rustc`. - None of the tools in `dist` / `install` allowed using `src/tools/X` to build them. This might be intentional - I can change them to aliases if you like. Builds on rust-lang#95901 and should not be merged before.
|
☀️ Test successful - checks-actions |
|
Finished benchmarking commit (0516711): comparison url. Summary:
If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.
@rustbot label: -perf-regression Footnotes |
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.
This has two benefits:
src/sanitizersdoesn't exist; I changed it to just be asanitizersalias.src/tools/llddoesn't exist; I removed it, sincelldalone already works.src/llvmdoesn't exist; removed it sincellvmandsrc/llvm-projectboth work.src/lldb_batchmode.pydoesn't exist, it was moved tosrc/etc.installwas still usingsrc/librustcinstead ofcompiler/rustc.dist/installallowed usingsrc/tools/Xto build them. This might be intentional - I can change them to aliases if you like.Builds on #95901 and should not be merged before.