Skip to content

bootstrap: Clean up try_run #113643

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 3 commits into from
Jul 16, 2023
Merged

bootstrap: Clean up try_run #113643

merged 3 commits into from
Jul 16, 2023

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Jul 13, 2023

r? @ozkanonur since you reviewed @GuillaumeGomez's PR

i recommend reviewing commit-by-commit

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jul 13, 2023
onur-ozkan
onur-ozkan approved these changes Jul 13, 2023
View reviewed changes
Copy link
Member

@onur-ozkan onur-ozkan left a comment

Choose a reason for hiding this comment

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

This PR alone reduces a lot of confusion. Thanks a lot! :)

Only 1 suggestion which is non-blocker. Feel free to queue this up with r=me if you don't agree on the suggestion.

@jyn514
Copy link
Member Author

jyn514 commented Jul 14, 2023

@bors r=ozkanonur

@bors
Copy link
Collaborator

bors commented Jul 14, 2023

📌 Commit e99d99a7eec7431d4c1984cd93a0ad32283fa2ab has been approved by ozkanonur

It is now in the queue for this repository.

@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 Jul 14, 2023
@bors
Copy link
Collaborator

bors commented Jul 15, 2023

⌛ Testing commit e99d99a7eec7431d4c1984cd93a0ad32283fa2ab with merge f295a360b0630b5c1d5735d6904e24390dafd3db...

@bors
Copy link
Collaborator

bors commented Jul 15, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 15, 2023
@rust-log-analyzer

This comment has been minimized.

# to view
@jyn514
Copy link
Member Author

jyn514 commented Jul 15, 2023

@bors retry #113713

@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 Jul 15, 2023
@bors
Copy link
Collaborator

bors commented Jul 15, 2023

☔ The latest upstream changes (presumably #113514) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 15, 2023
jyn514 added 3 commits July 15, 2023 12:27
@jyn514
Deduplicate Builder::try_run and mark Config::try_run as deprecated
63d7992 
This does three things:
1. Remove `forward!(Build, fn try_run())`. Having `try_run` behave differently as a free function than an associated function is confusing, and `Builder::try_run` is a very desirable name.
2. Move `test::try_run` and `run::try_run` to `Builder::try_run`. These functions are different than `Config::try_run` - they delay the failure and print it out at the end of the build.
3. Mark `Config::try_run` as deprecated to encourage people to use `Builder::try_run` instead.
@jyn514
Rename Builder::try_run to run_delaying_failure
78f51a4
@jyn514
Replace builder::try_run_quiet with run_quiet_delaying_failure
c0c6a24 
It was only used when a `builder` is available, and I want to encourage using the version that supports `--no-fail-fast`.
@jyn514
Copy link
Member Author

jyn514 commented Jul 15, 2023

@bors r=ozkanonur

@bors
Copy link
Collaborator

bors commented Jul 15, 2023

📌 Commit c0c6a24 has been approved by ozkanonur

It is now in the queue for this repository.

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 15, 2023
@jyn514 jyn514 mentioned this pull request Jul 15, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 16, 2023
@bors
Auto merge of rust-lang#113738 - jyn514:rollup-mjcya4c, r=jyn514
2c718d1 
Rollup of 3 pull requests

Successful merges:

 - rust-lang#113643 (bootstrap: Clean up try_run)
 - rust-lang#113731 (Remove unused `bootstrap::util::CiEnv` enum)
 - rust-lang#113737 (update mailmap for myself)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 90c74e2 into rust-lang:master Jul 16, 2023
@bors
Copy link
Collaborator

bors commented Jul 16, 2023

⌛ Testing commit c0c6a24 with merge 2c718d1...

@rustbot rustbot added this to the 1.73.0 milestone Jul 16, 2023
@jyn514 jyn514 deleted the try-run branch July 16, 2023 12:14
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@onur-ozkan onur-ozkan onur-ozkan approved these changes

Assignees

@onur-ozkan onur-ozkan

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.73.0
Development

Successfully merging this pull request may close these issues.
5 participants
@jyn514 @bors @rust-log-analyzer @onur-ozkan @rustbot