Skip to content

redesign stage 0 std follow-ups part2 #142002

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Jun 4, 2025
Merged

redesign stage 0 std follow-ups part2 #142002

merged 3 commits into from
Jun 4, 2025

Conversation

onur-ozkan
Copy link
Contributor

@onur-ozkan onur-ozkan commented Jun 4, 2025 •
edited by jieyouxu
Loading

Fixes three bugs:

  1. x check fails when run on rustdoc without download-rustc enabled. (1st commit)
  2. x check fails when run on the compiler with download-rustc enabled. (2nd commit)
  3. x test library fails with download-rustc enabled. (3rd commit)

Fixes #142018 (case 1)
Fixes #141983 (case 3)

onur-ozkan added 2 commits June 4, 2025 06:57
@onur-ozkan
run check::Std as the final step
bded701 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
make it possible to request stage 0 std with Builder::ensure
e66948c 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@rustbot
Copy link
Collaborator

rustbot commented Jun 4, 2025

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 4, 2025
@onur-ozkan
remove outdated RUSTC_SYSROOT handling for ci-rustc
7af12a1 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@rustbot rustbot added the A-testsuite Area: The testsuite used to check the correctness of rustc label Jun 4, 2025
@jieyouxu
Copy link
Member

jieyouxu commented Jun 4, 2025

Testing locally

jieyouxu
jieyouxu approved these changes Jun 4, 2025
View reviewed changes
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

Testing

nnethercote's minimal bootstrap.toml

[rust]
download-rustc = false
  • ./x check: OK
  • ./x check rustdoc: OK
[rust]
download-rustc = true
  • ./x check: OK
  • ./x check rustdoc: OK

./x check on compiler

No bootstrap.toml:

  • ./x check compiler: OK
  • ./x check rustc: OK
[rust]
download-rustc = true
  • ./x check: OK, already checked earlier
  • ./x check compiler: OK
  • ./x check rustc: OK

./x test library

profile = "library" # <- with `download-rustc = "if-unchanged"` default
  • ./x test library/: OK

@jieyouxu
Copy link
Member

jieyouxu commented Jun 4, 2025

@bors r+ rollup p=10 (contributor workflow)

@bors
Copy link
Collaborator

bors commented Jun 4, 2025

📌 Commit 7af12a1 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 4, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 4, 2025
@matthiaskrgr
Rollup merge of rust-lang#142002 - onur-ozkan:follow-ups2, r=jieyouxu
dce8dd4 
redesign stage 0 std follow-ups part2

Fixes three bugs:

1. `x check` fails when run on rustdoc without `download-rustc` enabled. (1st commit)
2. `x check` fails when run on the compiler with `download-rustc` enabled. (2nd commit)
3. `x test library` fails with `download-rustc` enabled. (3rd commit)

Fixes rust-lang#142018 (case 1)
Fixes rust-lang#141983 (case 3)
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 4, 2025
Closed
bors added a commit that referenced this pull request Jun 4, 2025
@bors
Auto merge of #142020 - matthiaskrgr:rollup-8g1r496, r=matthiaskrgr
f9cb39b 
Rollup of 9 pull requests

Successful merges:

 - #141271 (Streamline some attr parsing APIs)
 - #141570 (Fix incorrect eq_unspanned in TokenStream)
 - #141857 (coretests: move float tests from num to floats module and use a more flexible macro to generate them)
 - #141893 (remove `f16: From<u16>`)
 - #141924 (Lightly tweak docs for BTree{Map,Set}::extract_if)
 - #141939 (exact_div: add tests)
 - #141959 (Add more missing 2015 edition directives)
 - #142002 (redesign stage 0 std follow-ups part2)
 - #142007 (Improve some `Visitor` comments.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Jun 4, 2025

⌛ Testing commit 7af12a1 with merge df8102f...

@bors
Copy link
Collaborator

bors commented Jun 4, 2025

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing df8102f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 4, 2025
@bors bors merged commit df8102f into rust-lang:master Jun 4, 2025
11 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 4, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 4, 2025

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 61413ae (parent) -> df8102f (this PR)

Test differences

No test diffs found

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard df8102fe5f24f28a918660b0cd918d7331c3896e --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. dist-aarch64-linux: 8151.3s -> 5553.3s (-31.9%)
  2. x86_64-apple-2: 4203.2s -> 5063.8s (20.5%)
  3. i686-gnu-2: 6389.9s -> 5362.1s (-16.1%)
  4. x86_64-rust-for-linux: 2466.6s -> 2079.5s (-15.7%)
  5. armhf-gnu: 4465.2s -> 3871.1s (-13.3%)
  6. i686-gnu-nopt-1: 8073.9s -> 7186.5s (-11.0%)
  7. dist-apple-various: 6847.9s -> 7577.8s (10.7%)
  8. i686-gnu-1: 7950.3s -> 7180.8s (-9.7%)
  9. arm-android: 5414.0s -> 4931.6s (-8.9%)
  10. aarch64-gnu-debug: 3890.4s -> 3560.6s (-8.5%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@onur-ozkan onur-ozkan deleted the follow-ups2 branch June 4, 2025 18:36
tgross35 added a commit to tgross35/rust that referenced this pull request Jun 4, 2025
@tgross35
Update the upstream Rust version
eb45e57 
To prepare for merging from rust-lang/rust, set the version file to:

    df8102f Auto merge of rust-lang#142002 - onur-ozkan:follow-ups2, r=jieyouxu
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (df8102f): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 0.3% [0.3%, 0.3%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -4.6%, secondary 1.9%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 1.9% [1.6%, 2.1%] 2
Improvements ✅
(primary)		 -4.6% [-4.6%, -4.6%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -4.6% [-4.6%, -4.6%] 1

Cycles

Results (secondary -2.8%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.8% [-2.8%, -2.8%] 1
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 749.479s -> 749.348s (-0.02%)
Artifact size: 371.89 MiB -> 371.86 MiB (-0.01%)

kiseitai3 pushed a commit to kiseitai3/rust that referenced this pull request Jun 6, 2025
@tgross35
Update the upstream Rust version
4993831 
To prepare for merging from rust-lang/rust, set the version file to:

    df8102f Auto merge of rust-lang#142002 - onur-ozkan:follow-ups2, r=jieyouxu
tautschnig pushed a commit to model-checking/verify-rust-std that referenced this pull request Jun 17, 2025
@tgross35
Update the upstream Rust version
8ce226b 
To prepare for merging from rust-lang/rust, set the version file to:

    df8102f Auto merge of rust-lang#142002 - onur-ozkan:follow-ups2, r=jieyouxu
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. 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.

./x check is broken for rustdoc ./x.py test library fails when using the library profile (after stage0 redesign)
5 participants
@onur-ozkan @rustbot @jieyouxu @bors @rust-timer