redesign stage 0 std follow-ups #141914

onur-ozkan · 2025-06-02T13:43:22Z

Various follow-ups pointed out on Zulip during post-merge discussions of redesign stage 0 std #119899.

r? @jieyouxu

Fixes #141902.
Fixes #141905.

cc @jyn514

jieyouxu

Looks good to me modulo changelog entry and a nit.

Consistent with what we discussed in #t-infra/bootstrap > Stage 0 std redesign support thread @ 💬.

src/bootstrap/defaults/bootstrap.compiler.toml

rustbot · 2025-06-02T14:03:51Z

This PR modifies src/bootstrap/defaults.

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

src/bootstrap/src/core/build_steps/check.rs

onur-ozkan · 2025-06-02T14:06:49Z

Currently blocked by #141904

@rustbot blocked.

onur-ozkan · 2025-06-02T14:10:29Z

src/ci/docker/host-x86_64/mingw-check-2/Dockerfile

@@ -27,6 +27,7 @@ COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh

 ENV SCRIPT \
+        python3 ../x.py check --stage 0 && \


I am not entirely sure about this yet. If it makes the pipeline too long, we can consider moving it to some other PR pipeline.

It still seems to be roughly the same duration as mingw-check-1 (only about 3.5 minutes longer).

Yeah this seems fine.

~~Not needed anymore.~~ It's still needed actually. I will keep it.

jieyouxu · 2025-06-02T14:41:58Z

For a second opinion of hard-error on check library at explicit stage 0.
r? bootstrap

bjorn3 · 2025-06-02T14:59:24Z

If I want to check the standard library, how would I do so with this PR?

onur-ozkan · 2025-06-02T15:10:44Z

If I want to check the standard library, how would I do so with this PR?

x check library on non-compiler profile and x check --stage 1 library on compiler profile.

onur-ozkan · 2025-06-03T05:22:47Z

@rustbot ready

onur-ozkan · 2025-06-03T07:42:57Z

We probably want some quicker action on this.

r? Kobzol

Kobzol

Left some comments, but if we switch the default stage of check back to 0, it won't be relevant anymore, I guess :)

Kobzol · 2025-06-03T07:47:40Z

src/ci/docker/host-x86_64/mingw-check-2/Dockerfile

@@ -27,6 +27,7 @@ COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh

 ENV SCRIPT \
+        python3 ../x.py check --stage 0 && \


Yeah this seems fine.

src/bootstrap/src/core/build_steps/check.rs

rustbot · 2025-06-03T07:57:41Z

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

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

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan · 2025-06-03T08:11:07Z

Left some comments, but if we switch the default stage of check back to 0, it won't be relevant anymore, I guess :)

I thought the same, but then I realized that we run check --stage 1 on PR CI. So it still makes sense to run the default x check on mingw-check-2. It's also nice that we cover both stage 0 and stage 1 in PR CI and they are not increasing the pipeline unexpectedly.

onur-ozkan · 2025-06-03T08:12:25Z

src/bootstrap/src/core/build_steps/check.rs

+            if is_explicitly_called {
+                eprintln!("WARNING: stage 0 std is precompiled and does nothing during `x check`.");
+            }


Should we give this warning unconditionally, or keep it as it is?

I would only keep it when the library was explicitly requested, so this seems fine.

onur-ozkan · 2025-06-03T08:20:30Z

If I want to check the standard library, how would I do so with this PR?

x check library on non-compiler profile and x check --stage 1 library on compiler profile.

This is changed. To check library, you should either do x check library --stage 1 on non-library profile, or x check library on the library profile.

cc @bjorn3

Kobzol · 2025-06-03T08:40:00Z

Looks good. You can r=me once CI is green.

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan · 2025-06-03T08:57:48Z

If I want to check the standard library, how would I do so with this PR?

x check library on non-compiler profile and x check --stage 1 library on compiler profile.

This is changed. To check library, you should either do x check library --stage 1 on non-library profile, or x check library on the library profile.

cc @bjorn3

Updated again (sorry). Now you just need to run x check library regardless of the profile. check::Std is now smart enough to pick the best default even when the stage isn't explicitly set.

onur-ozkan · 2025-06-03T09:15:24Z

Looks good. You can r=me once CI is green.

This was pushed after you approved the PR. Are you okay with that commit as well?

Signed-off-by: onur-ozkan <work@onurozkan.dev>

Kobzol · 2025-06-03T10:16:07Z

Yeah, I'm fine with that.

onur-ozkan · 2025-06-03T11:16:57Z

@bors r+ r=Kobzol

bors · 2025-06-03T11:17:00Z

📌 Commit 59d993b has been approved by onur-ozkan

It is now in the queue for this repository.

bors · 2025-06-03T11:17:02Z

📌 Commit 59d993b has been approved by Kobzol

It is now in the queue for this repository.

onur-ozkan · 2025-06-03T11:19:39Z

I think I have never seen bors duplicating the merge message before. 🤔

jieyouxu · 2025-06-03T11:21:48Z

I think I have never seen bors duplicating the merge message before. 🤔

You wrote r+ and r= :D

onur-ozkan · 2025-06-03T11:32:10Z

lol, seems like I didn't sleep enough

Rollup of 8 pull requests Successful merges: - #141724 (fix(#141141): When expanding `PartialEq`, check equality of scalar types first.) - #141833 (`tests/ui`: A New Order [2/N]) - #141861 (Switch `x86_64-msvc-{1,2}` back to Windows Server 2025 images) - #141914 (redesign stage 0 std follow-ups) - #141918 (Deconstruct values in the THIR visitor) - #141923 (Update books) - #141931 (Deconstruct values in the THIR visitor) - #141956 (Remove two trait methods from cg_ssa) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #141914 - onur-ozkan:follow-ups, r=Kobzol redesign stage 0 std follow-ups Various follow-ups pointed out on Zulip during post-merge discussions of [redesign stage 0 std #119899](#119899). r? `@jieyouxu` Fixes #141902. Fixes #141905. cc `@jyn514`

rustbot assigned jieyouxu Jun 2, 2025

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Jun 2, 2025

jieyouxu approved these changes Jun 2, 2025

View reviewed changes

src/bootstrap/defaults/bootstrap.compiler.toml Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

onur-ozkan force-pushed the follow-ups branch 2 times, most recently from 6692543 to 118eb4c Compare June 2, 2025 14:03

onur-ozkan marked this pull request as ready for review June 2, 2025 14:03

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 2, 2025

onur-ozkan commented Jun 2, 2025

View reviewed changes

src/bootstrap/src/core/build_steps/check.rs Outdated Show resolved Hide resolved

rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 2, 2025

onur-ozkan commented Jun 2, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

rustbot assigned Mark-Simulacrum and unassigned jieyouxu Jun 2, 2025

onur-ozkan force-pushed the follow-ups branch from 118eb4c to d5e8eca Compare June 3, 2025 04:15

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jun 3, 2025

rustbot assigned Kobzol and unassigned Mark-Simulacrum Jun 3, 2025

Kobzol reviewed Jun 3, 2025

View reviewed changes

onur-ozkan added 2 commits June 3, 2025 11:00

make x check to use stage0 by default

4e71f24

Signed-off-by: onur-ozkan <work@onurozkan.dev>

make library profile to use stage 1 on x check

8a65d9f

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the follow-ups branch from 1880ffb to 0fbe285 Compare June 3, 2025 08:04

onur-ozkan commented Jun 3, 2025

View reviewed changes

onur-ozkan added 2 commits June 3, 2025 08:51

handle stage0 on Std::check

ecc7dde

Signed-off-by: onur-ozkan <work@onurozkan.dev>

run x check on mingw-check-2

9505178

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the follow-ups branch from 0fbe285 to de86ce1 Compare June 3, 2025 08:56

use better default stage for check::Std when stage isn't explicit

59d993b

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the follow-ups branch from de86ce1 to 59d993b Compare June 3, 2025 09:59

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 3, 2025

matthiaskrgr mentioned this pull request Jun 3, 2025

Rollup of 8 pull requests #141961

Merged

bors merged commit 72f60fb into rust-lang:master Jun 3, 2025
10 checks passed

rustbot added this to the 1.89.0 milestone Jun 3, 2025

onur-ozkan deleted the follow-ups branch June 4, 2025 02:59

redesign stage 0 std follow-ups #141914

redesign stage 0 std follow-ups #141914

Uh oh!

Conversation

onur-ozkan commented Jun 2, 2025 • edited by jieyouxu Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This comment has been minimized.

rustbot commented Jun 2, 2025

Uh oh!

Uh oh!

onur-ozkan commented Jun 2, 2025

Uh oh!

onur-ozkan Jun 2, 2025

Choose a reason for hiding this comment

Uh oh!

onur-ozkan Jun 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Kobzol Jun 3, 2025

Choose a reason for hiding this comment

Uh oh!

onur-ozkan Jun 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

jieyouxu commented Jun 2, 2025

Uh oh!

bjorn3 commented Jun 2, 2025

Uh oh!

onur-ozkan commented Jun 2, 2025

Uh oh!

onur-ozkan commented Jun 3, 2025

Uh oh!

onur-ozkan commented Jun 3, 2025

Uh oh!

Kobzol left a comment

Choose a reason for hiding this comment

Uh oh!

Kobzol Jun 3, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rustbot commented Jun 3, 2025

Uh oh!

onur-ozkan commented Jun 3, 2025

Uh oh!

onur-ozkan Jun 3, 2025

Choose a reason for hiding this comment

Uh oh!

Kobzol Jun 3, 2025

Choose a reason for hiding this comment

Uh oh!

onur-ozkan commented Jun 3, 2025

Uh oh!

Kobzol commented Jun 3, 2025

Uh oh!

onur-ozkan commented Jun 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

onur-ozkan commented Jun 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Kobzol commented Jun 3, 2025

Uh oh!

onur-ozkan commented Jun 3, 2025

Uh oh!

bors commented Jun 3, 2025

Uh oh!

bors commented Jun 3, 2025

Uh oh!

onur-ozkan commented Jun 3, 2025

Uh oh!

jieyouxu commented Jun 3, 2025

onur-ozkan commented Jun 2, 2025 •

edited by jieyouxu

Loading

onur-ozkan Jun 3, 2025 •

edited

Loading

onur-ozkan Jun 3, 2025 •

edited

Loading

onur-ozkan commented Jun 3, 2025 •

edited

Loading

onur-ozkan commented Jun 3, 2025 •

edited

Loading