Skip to content

Conversation

@spiral-ladder
Copy link

@spiral-ladder spiral-ladder commented May 29, 2022

Closes #97503

  • Re-added help_on_error for download_component() and the downstream functions
  • Removed dead code in bootstrap.py

Thanks @jyn514 for the helpful tips!

(first contribution here, please let me know if I missed anything out!)

@rust-highfive
Copy link
Contributor

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 29, 2022
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also remove this from the function parameters (for run, and for all functions which call it, recursively)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check looks duplicated - no need to check it twice.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops - that was an accident, thanks for the catch!

Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great once you squash the commits, thanks!

Remove dead code

Missing }

./x.py fmt

Remove duplicate check

Recursively remove all usage of help_on_error
@spiral-ladder spiral-ladder force-pushed the readd-help-on-error branch from a01a055 to c0f18f9 Compare May 29, 2022 15:17
@Dylan-DPC
Copy link
Member

@bors r=jyn514

@bors
Copy link
Collaborator

bors commented May 30, 2022

📌 Commit c0f18f9 has been approved by jyn514

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 30, 2022
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
@bors bors merged commit 9bb3832 into rust-lang:master May 30, 2022
@rustbot rustbot added this to the 1.63.0 milestone May 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add back help_on_error for download-ci-llvm

7 participants