Re-add help_on_error for download-ci-llvm #97519
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
|
(rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
jyn514
reviewed
May 29, 2022
There was a problem hiding this comment.
Thanks for tackling this! Can you please squash the commits once you've addressed the review comments? There are instructions at https://rustc-dev-guide.rust-lang.org/git.html#advanced-rebasing.
| @@ -197,8 +197,6 @@ def run(args, verbose=False, exception=False, is_bootstrap=False, help_on_error= | |||
| code = ret.wait() | |||
| if code != 0: | |||
| err = "failed to run: " + ' '.join(args) | |||
| if help_on_error is not None: | |||
| err += "\n" + help_on_error | |||
| if verbose or exception: | |||
There was a problem hiding this comment.
Please also remove this from the function parameters (for run, and for all functions which call it, recursively)
src/bootstrap/native.rs
Outdated
| @@ -179,7 +179,22 @@ fn download_ci_llvm(builder: &Builder<'_>, llvm_sha: &str) { | |||
| let filename = format!("rust-dev-nightly-{}.tar.xz", builder.build.build.triple); | |||
| let tarball = rustc_cache.join(&filename); | |||
| if !tarball.exists() { | |||
| builder.download_component(base, &format!("{}/{}", url, filename), &tarball); | |||
| if !tarball.exists() { | |||
There was a problem hiding this comment.
This check looks duplicated - no need to check it twice.
There was a problem hiding this comment.
oops - that was an accident, thanks for the catch!
jyn514
approved these changes
May 29, 2022
Remove dead code Missing } ./x.py fmt Remove duplicate check Recursively remove all usage of help_on_error
eightfilms
force-pushed
the
readd-help-on-error
branch
from
a01a055
to
c0f18f9
Compare
|
@bors r=jyn514 |
|
📌 Commit c0f18f9 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 30, 2022
Rollup of 6 pull requests Successful merges: - rust-lang#97494 (Use Box::new() instead of box syntax in library tests) - rust-lang#97499 (Remove "sys isn't exported yet" phrase) - rust-lang#97504 (Ensure source file present when calculating max line number) - rust-lang#97519 (Re-add help_on_error for download-ci-llvm) - rust-lang#97531 (Note pattern mismatch coming from `for` loop desugaring) - rust-lang#97545 (Reword safety comments in core/hash/sip.rs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
Closes #97503
help_on_errorfordownload_component()and the downstream functionsbootstrap.pyThanks @jyn514 for the helpful tips!
(first contribution here, please let me know if I missed anything out!)