Skip to content

Fix --skip-std-check-if-no-download-rustc #143707

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 11, 2025

Conversation

Kobzol
Copy link
Member

@Kobzol Kobzol commented Jul 9, 2025

Since #143048, we now explicitly set the build compiler for check::Std, which caused it to be built before we checked --skip-std-check-if-no-download-rustc. So I moved the check earlier to make_run, which resolves it.

I also added a regression test for this. Sadly we can't really test for the positive case easily (when download-ci-rustc is enabled), but we can test the negative cases, where it is disabled.

Fixes: #143705

r? @RalfJung

@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 9, 2025
@RalfJung
Copy link
Member

RalfJung commented Jul 9, 2025

Thanks a lot for the quick fix. :)
However, sorry, I can't review this code, I don't understand any of it.^^

r? bootstrap

@rustbot rustbot assigned albertlarsan68 and unassigned RalfJung Jul 9, 2025
@Kobzol
Copy link
Member Author

Kobzol commented Jul 9, 2025

r? @jieyouxu

@rustbot rustbot assigned jieyouxu and unassigned albertlarsan68 Jul 9, 2025
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks, r=me after nit

@jieyouxu
Copy link
Member

@rustbot author

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 10, 2025
Since rust-lang#143048, we now explicitly set the build compiler for `check::Std`, which caused it to be built before we checked `--skip-std-check-if-no-download-rustc`. So I moved the check earlier to `make_run`, which resolves it.

I also added a regression test for this. Sadly we can't really test for the positive case easily (when download-ci-rustc is enabled), but we can test the negative cases, where it is disabled.
@Kobzol Kobzol force-pushed the bootstrap-std-check branch from f65c6c7 to 3e675f4 Compare July 10, 2025 06:20
@Kobzol
Copy link
Member Author

Kobzol commented Jul 10, 2025

@bors r=jieyouxu

@bors
Copy link
Collaborator

bors commented Jul 10, 2025

📌 Commit 3e675f4 has been approved by jieyouxu

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 10, 2025
tgross35 added a commit to tgross35/rust that referenced this pull request Jul 10, 2025
…ouxu

Fix `--skip-std-check-if-no-download-rustc`

Since rust-lang#143048, we now explicitly set the build compiler for `check::Std`, which caused it to be built before we checked `--skip-std-check-if-no-download-rustc`. So I moved the check earlier to `make_run`, which resolves it.

I also added a regression test for this. Sadly we can't really test for the positive case easily (when download-ci-rustc is enabled), but we can test the negative cases, where it is disabled.

Fixes: rust-lang#143705

r? `@RalfJung`
tgross35 added a commit to tgross35/rust that referenced this pull request Jul 10, 2025
…ouxu

Fix `--skip-std-check-if-no-download-rustc`

Since rust-lang#143048, we now explicitly set the build compiler for `check::Std`, which caused it to be built before we checked `--skip-std-check-if-no-download-rustc`. So I moved the check earlier to `make_run`, which resolves it.

I also added a regression test for this. Sadly we can't really test for the positive case easily (when download-ci-rustc is enabled), but we can test the negative cases, where it is disabled.

Fixes: rust-lang#143705

r? ``@RalfJung``
bors added a commit that referenced this pull request Jul 10, 2025
Rollup of 8 pull requests

Successful merges:

 - #140136 (Add an aarch64-msvc build running on ARM64 Windows)
 - #143642 (stdarch subtree update)
 - #143679 (Preserve the .debug_gdb_scripts section)
 - #143707 (Fix `--skip-std-check-if-no-download-rustc`)
 - #143722 (Make some "safe" llvm ops actually sound)
 - #143728 (Resolve refactor: extraction of `finalize_module_binding` and `single_import_can_define_name`)
 - #143742 (Rework borrowing suggestions to use `Expr` instead of just `Span`)
 - #143744 (Properly track the depth when expanding free alias types)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Jul 11, 2025
Rollup of 7 pull requests

Successful merges:

 - #140136 (Add an aarch64-msvc build running on ARM64 Windows)
 - #143642 (stdarch subtree update)
 - #143707 (Fix `--skip-std-check-if-no-download-rustc`)
 - #143722 (Make some "safe" llvm ops actually sound)
 - #143728 (Resolve refactor: extraction of `finalize_module_binding` and `single_import_can_define_name`)
 - #143742 (Rework borrowing suggestions to use `Expr` instead of just `Span`)
 - #143744 (Properly track the depth when expanding free alias types)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d1a5767 into rust-lang:master Jul 11, 2025
11 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 11, 2025
rust-timer added a commit that referenced this pull request Jul 11, 2025
Rollup merge of #143707 - Kobzol:bootstrap-std-check, r=jieyouxu

Fix `--skip-std-check-if-no-download-rustc`

Since #143048, we now explicitly set the build compiler for `check::Std`, which caused it to be built before we checked `--skip-std-check-if-no-download-rustc`. So I moved the check earlier to `make_run`, which resolves it.

I also added a regression test for this. Sadly we can't really test for the positive case easily (when download-ci-rustc is enabled), but we can test the negative cases, where it is disabled.

Fixes: #143705

r? ```@RalfJung```
@Kobzol Kobzol deleted the bootstrap-std-check branch July 11, 2025 05:06
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. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

./x check library --stage 1 --skip-std-check-if-no-download-rustc builds rustc
6 participants