Skip to content

Remove check run bootstrap#142499

Merged
bors merged 4 commits intorust-lang:masterfrom
Shourya742:2025-06-14-remove-check-run-bootstrap
Jun 16, 2025
Merged

Remove check run bootstrap#142499
bors merged 4 commits intorust-lang:masterfrom
Shourya742:2025-06-14-remove-check-run-bootstrap

Conversation

@Shourya742
Copy link
Contributor

@Shourya742 Shourya742 commented Jun 14, 2025

This PR migrates all usage of check_run to new execution context api's.

r? @Kobzol

@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 Jun 14, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 14, 2025

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Shourya742 Shourya742 force-pushed the 2025-06-14-remove-check-run-bootstrap branch from a750def to c9eeeb4 Compare June 14, 2025 13:02
Kobzol
Kobzol reviewed Jun 14, 2025
View reviewed changes
Copy link
Member

@Kobzol Kobzol left a comment

Choose a reason for hiding this comment

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

Nice ❤️ Maybe we don't need run_always() everywhere, but I'd rather reproduce the old behavior faithfully, we can always optimize dry run later.

src/bootstrap/src/core/config/config.rs
};
if !self.check_run(&mut update(true)) {
self.check_run(&mut update(false));
if !update(true).allow_failure().run(self) {
Copy link
Member

@Kobzol Kobzol Jun 14, 2025

Choose a reason for hiding this comment

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

run_always

src/bootstrap/src/core/config/config.rs
"HEAD",
]));
let has_local_modifications =
!submodule_git().allow_failure().args(["diff-index", "--quiet", "HEAD"]).run(self);
Copy link
Member

@Kobzol Kobzol Jun 14, 2025

Choose a reason for hiding this comment

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

same

src/bootstrap/src/core/config/config.rs
!submodule_git().allow_failure().args(["diff-index", "--quiet", "HEAD"]).run(self);
if has_local_modifications {
self.check_run(submodule_git().args(["stash", "push"]));
submodule_git().allow_failure().args(["stash", "push"]).run(self);
Copy link
Member

@Kobzol Kobzol Jun 14, 2025

Choose a reason for hiding this comment

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

same

src/bootstrap/src/core/config/config.rs

self.check_run(submodule_git().args(["reset", "-q", "--hard"]));
self.check_run(submodule_git().args(["clean", "-qdfx"]));
submodule_git().allow_failure().args(["reset", "-q", "--hard"]).run(self);
Copy link
Member

@Kobzol Kobzol Jun 14, 2025

Choose a reason for hiding this comment

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

same

src/bootstrap/src/core/config/config.rs
submodule_git().allow_failure().args(["clean", "-qdfx"]).run(self);

if has_local_modifications {
self.check_run(submodule_git().args(["stash", "pop"]));
Copy link
Member

@Kobzol Kobzol Jun 14, 2025

Choose a reason for hiding this comment

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

same

src/bootstrap/src/core/download.rs
}
curl.arg(url);
if !self.check_run(&mut curl) {
if !curl.run(self) {
Copy link
Member

@Kobzol Kobzol Jun 14, 2025

Choose a reason for hiding this comment

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

same

@Shourya742
Copy link
Contributor Author

Shourya742 commented Jun 15, 2025

@Kobzol , if we look at the implementation of the check_run method, we can see that it skips method execution when a dry run is set and run_always is not specified. By explicitly setting run_always for the commands in this PR, won’t it cause these commands to run even in dry run mode?

@Kobzol
Copy link
Member

Kobzol commented Jun 15, 2025

Sorry, I only saw the check_run function, and missed that there is also a method with the same name that does actually check dry_run. You're absolutely right!

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 15, 2025

📌 Commit c9eeeb4 has been approved by Kobzol

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 Jun 15, 2025
@fmease fmease mentioned this pull request Jun 15, 2025
Merged
bors added a commit that referenced this pull request Jun 16, 2025
@bors
Auto merge of #142550 - fmease:rollup-fteyzcv, r=fmease
e314b97 
Rollup of 10 pull requests

Successful merges:

 - #133952 (Remove wasm legacy abi)
 - #134661 (Reduce precedence of expressions that have an outer attr)
 - #141769 (Move metadata object generation for dylibs to the linker code )
 - #141937 (Report never type lints in dependencies)
 - #142347 (Async drop - fix for StorageLive/StorageDead codegen for pinned future)
 - #142389 (Apply ABI attributes on return types in `rustc_codegen_cranelift`)
 - #142470 (Add some missing mailmap entries)
 - #142481 (Add `f16` inline asm support for LoongArch)
 - #142499 (Remove check run bootstrap)
 - #142543 (Suggest adding semicolon in user code rather than macro impl details)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b83fb80 into rust-lang:master Jun 16, 2025
10 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 16, 2025
rust-timer added a commit that referenced this pull request Jun 16, 2025
@rust-timer
Unrolled build for #142499
5b85d74 
Rollup merge of #142499 - Shourya742:2025-06-14-remove-check-run-bootstrap, r=Kobzol

Remove check run bootstrap

This PR migrates all usage of check_run to new execution context api's.

r? `@Kobzol`
christian-schilling pushed a commit to christian-schilling/rustc_codegen_cranelift that referenced this pull request Jan 27, 2026
@bors
Auto merge of #142550 - fmease:rollup-fteyzcv, r=fmease
007b2c0 
Rollup of 10 pull requests

Successful merges:

 - rust-lang/rust#133952 (Remove wasm legacy abi)
 - rust-lang/rust#134661 (Reduce precedence of expressions that have an outer attr)
 - rust-lang/rust#141769 (Move metadata object generation for dylibs to the linker code )
 - rust-lang/rust#141937 (Report never type lints in dependencies)
 - rust-lang/rust#142347 (Async drop - fix for StorageLive/StorageDead codegen for pinned future)
 - rust-lang/rust#142389 (Apply ABI attributes on return types in `rustc_codegen_cranelift`)
 - rust-lang/rust#142470 (Add some missing mailmap entries)
 - rust-lang/rust#142481 (Add `f16` inline asm support for LoongArch)
 - rust-lang/rust#142499 (Remove check run bootstrap)
 - rust-lang/rust#142543 (Suggest adding semicolon in user code rather than macro impl details)

r? `@ghost`
`@rustbot` modify labels: rollup
christian-schilling pushed a commit to christian-schilling/rustc_codegen_cranelift that referenced this pull request Jan 27, 2026
@bors
Auto merge of #142550 - fmease:rollup-fteyzcv, r=fmease
74c252c 
Rollup of 10 pull requests

Successful merges:

 - rust-lang/rust#133952 (Remove wasm legacy abi)
 - rust-lang/rust#134661 (Reduce precedence of expressions that have an outer attr)
 - rust-lang/rust#141769 (Move metadata object generation for dylibs to the linker code )
 - rust-lang/rust#141937 (Report never type lints in dependencies)
 - rust-lang/rust#142347 (Async drop - fix for StorageLive/StorageDead codegen for pinned future)
 - rust-lang/rust#142389 (Apply ABI attributes on return types in `rustc_codegen_cranelift`)
 - rust-lang/rust#142470 (Add some missing mailmap entries)
 - rust-lang/rust#142481 (Add `f16` inline asm support for LoongArch)
 - rust-lang/rust#142499 (Remove check run bootstrap)
 - rust-lang/rust#142543 (Suggest adding semicolon in user code rather than macro impl details)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Kobzol Kobzol Kobzol left review comments

Assignees

@Kobzol Kobzol

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.89.0

Development

Successfully merging this pull request may close these issues.

5 participants

@Shourya742 @rustbot @rust-log-analyzer @Kobzol @bors