Update bootstrap to edition 2024 #137612

Kobzol · 2025-02-25T12:43:42Z

The stage0 compiler now supports edition 2024, so we can update bootstrap to it. I manually reviewed all the changes from cargo fix --edition and reverted most of them (if let -> matches changes and two unneeded usages of use <>).

r? @onur-ozkan

try-job: dist-x86_64-msvc

onur-ozkan

Looks good, thanks!

onur-ozkan · 2025-02-25T13:17:58Z

Waiting for CI to be green.

src/bootstrap/src/bin/sccache-plus-cl.rs

src/bootstrap/src/utils/job.rs

antoyo · 2025-02-25T21:11:21Z

The GCC failure can probably fixed by updating this file to this commit which contains the fix for the x87 error.

Kobzol · 2025-02-25T21:54:43Z

I probably won't update the GCC version yet, because #136921 is in the queue, and it would conflict with that change.

Update gcc submodule To add support for the x87 feature (see rust-lang#137612 (comment)). r? `@antoyo`

Rollup merge of rust-lang#137660 - Kobzol:gcc-update, r=GuillaumeGomez Update gcc submodule To add support for the x87 feature (see rust-lang#137612 (comment)). r? `@antoyo`

Update gcc submodule To add support for the x87 feature (see rust-lang/rust#137612 (comment)). r? `@antoyo`

Kobzol · 2025-03-05T07:46:42Z

Rebased.

onur-ozkan · 2025-03-05T08:15:16Z

@bors r+

bors · 2025-03-05T08:15:19Z

📌 Commit b1731a1 has been approved by onur-ozkan

It is now in the queue for this repository.

onur-ozkan · 2025-03-05T08:15:38Z

Waiting for CI to be green.

~~I forgot that, sorry.~~

Oh, you were waiting for #137612 (comment)

Update bootstrap to edition 2024 The stage0 compiler now supports edition 2024, so we can update bootstrap to it. I manually reviewed all the changes from `cargo fix --edition` and reverted most of them (`if let` -> `matches` changes and two unneeded usages of `use <>`). r? `@onur-ozkan`

…kingjubilee Rollup of 25 pull requests Successful merges: - rust-lang#134063 (dec2flt: Clean up float parsing modules) - rust-lang#136581 (Retire the legacy `Makefile`-based `run-make` test infra) - rust-lang#136662 (Count char width at most once in `Formatter::pad`) - rust-lang#136798 (Added documentation for flushing per rust-lang#74348) - rust-lang#137240 (Slightly reformat `std::fs::remove_dir_all` error docs) - rust-lang#137303 (Remove `MaybeForgetReturn` suggestion) - rust-lang#137327 (Undeprecate env::home_dir) - rust-lang#137463 ([illumos] attempt to use posix_spawn to spawn processes) - rust-lang#137477 (uefi: Add Service Binding Protocol abstraction) - rust-lang#137565 (Try to point of macro expansion from resolver and method errors if it involves macro var) - rust-lang#137569 (Stabilize `string_extend_from_within`) - rust-lang#137612 (Update bootstrap to edition 2024) - rust-lang#137633 (Only use implied bounds hack if bevy, and use deeply normalize in implied bounds hack) - rust-lang#137643 (Add DWARF test case for non-C-like `repr128` enums) - rust-lang#137679 (Various coretests improvements) - rust-lang#137723 (Make `rust.description` more general-purpose and pass `CFG_VER_DESCRIPTION`) - rust-lang#137758 (fix usage of ty decl macro fragments in attributes) - rust-lang#137764 (Ensure that negative auto impls are always applicable) - rust-lang#137772 (Fix char count in `Display` for `ByteStr`) - rust-lang#137798 (ci: use ubuntu 24 on arm large runner) - rust-lang#137805 (adjust Layout debug printing to match the internal field name) - rust-lang#137808 (Do not require that unsafe fields lack drop glue) - rust-lang#137820 (Clarify why InhabitedPredicate::instantiate_opt exists) - rust-lang#137825 (Provide more context on resolve error caused from incorrect RTN) - rust-lang#138028 (compiler: add `ExternAbi::is_rustic_abi`) r? `@ghost` `@rustbot` modify labels: rollup

klensy · 2025-03-05T10:25:12Z

Failed build, rollup #138044 will fail too.

2025-03-05T08:38:30.8289112Z �[0m�[1m�[38;5;9merror[E0133]�[0m�[0m�[1m: call to unsafe function `remove_var` is unsafe and requires unsafe block�[0m
2025-03-05T08:38:30.8289911Z �[0m   �[0m�[0m�[1m�[38;5;12m--> �[0m�[0msrc/bootstrap/src/utils/cc_detect/tests.rs:210:5�[0m
2025-03-05T08:38:30.8290587Z �[0m    �[0m�[0m�[1m�[38;5;12m|�[0m
2025-03-05T08:38:30.8294165Z �[0m�[1m�[38;5;12m210�[0m�[0m �[0m�[0m�[1m�[38;5;12m|�[0m�[0m �[0m�[0m    env::remove_var("WASI_SDK_PATH");�[0m
2025-03-05T08:38:30.8294898Z �[0m    �[0m�[0m�[1m�[38;5;12m|�[0m�[0m     �[0m�[0m�[1m�[38;5;9m^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^�[0m�[0m �[0m�[0m�[1m�[38;5;9mcall to unsafe function�[0m
2025-03-05T08:38:30.8295661Z �[0m    �[0m�[0m�[1m�[38;5;12m|�[0m
2025-03-05T08:38:30.8296334Z �[0m    �[0m�[0m�[1m�[38;5;12m= �[0m�[0m�[1mnote�[0m�[0m: consult the function's documentation for information on how to avoid undefined behavior�[0m

Kobzol · 2025-03-11T08:07:44Z

@bors try

Update bootstrap to edition 2024 The stage0 compiler now supports edition 2024, so we can update bootstrap to it. I manually reviewed all the changes from `cargo fix --edition` and reverted most of them (`if let` -> `matches` changes and two unneeded usages of `use <>`). r? `@onur-ozkan` try-job: `*msvc*`

bors · 2025-03-11T08:09:00Z

⌛ Trying commit ed5877e with merge b0e263f...

rust-log-analyzer · 2025-03-11T08:10:12Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

   Compiling ureq v3.0.8
   Compiling citool v0.1.0 (/home/runner/work/rust/rust/src/ci/citool)
    Finished `dev` profile [unoptimized] target(s) in 6.84s
     Running `target/debug/citool calculate-job-matrix`
Run type: TryJob { custom_jobs: Some(["`*msvc*`"]) }
Error: Failed to calculate job matrix

Caused by:
    Custom job(s) ``*msvc*`` not found in auto jobs
##[error]Process completed with exit code 1.
Post job cleanup.

Kobzol · 2025-03-11T08:11:47Z

@bors try

Kobzol · 2025-03-11T08:11:51Z

@bors rollup=never

Update bootstrap to edition 2024 The stage0 compiler now supports edition 2024, so we can update bootstrap to it. I manually reviewed all the changes from `cargo fix --edition` and reverted most of them (`if let` -> `matches` changes and two unneeded usages of `use <>`). r? `@onur-ozkan` try-job: dist-x86_64-msvc

bors · 2025-03-11T08:12:58Z

⌛ Trying commit ed5877e with merge 8de4b34...

bors · 2025-03-11T10:01:38Z

☀️ Try build successful - checks-actions
Build commit: 8de4b34 (8de4b340ec1fc40f724bbd7d2b2702c37272acbf)

Kobzol · 2025-03-11T10:06:27Z

@bors r=onur-ozkan

Let's hope I didn't accidentally revert a fix for the third time in a row... It's at least rollup=never now.

bors · 2025-03-11T10:06:30Z

📌 Commit ed5877e has been approved by onur-ozkan

It is now in the queue for this repository.

Update bootstrap to edition 2024 The stage0 compiler now supports edition 2024, so we can update bootstrap to it. I manually reviewed all the changes from `cargo fix --edition` and reverted most of them (`if let` -> `matches` changes and two unneeded usages of `use <>`). r? `@onur-ozkan` try-job: dist-x86_64-msvc

bors · 2025-03-12T00:22:01Z

⌛ Testing commit ed5877e with merge 004e43c...

rust-log-analyzer · 2025-03-12T00:28:39Z

The job x86_64-gnu-distcheck failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

bors · 2025-03-12T00:29:08Z

💔 Test failed - checks-actions

onur-ozkan · 2025-03-12T08:17:04Z

The failure doesn't seem relevant to this PR.

@bors retry

bors · 2025-03-12T11:05:45Z

⌛ Testing commit ed5877e with merge 0998d40...

bors · 2025-03-12T14:10:13Z

☀️ Test successful - checks-actions
Approved by: onur-ozkan
Pushing 0998d40 to master...

github-actions · 2025-03-12T14:12:49Z

Post-merge analysis result

Test differences

No test diffs found

rust-timer · 2025-03-12T15:26:05Z

Finished benchmarking commit (0998d40): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary 5.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)	5.9%	[5.9%, 5.9%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	5.9%	[5.9%, 5.9%]	1

Cycles

Results (secondary 0.4%)

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)	4.4%	[3.6%, 5.1%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.7%	[-3.1%, -2.0%]	5
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 779.955s -> 779.667s (-0.04%)
Artifact size: 365.24 MiB -> 365.24 MiB (0.00%)

rustbot assigned onur-ozkan Feb 25, 2025

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 Feb 25, 2025

onur-ozkan approved these changes Feb 25, 2025

View reviewed changes

This comment has been minimized.

# to view

bjorn3 reviewed Feb 25, 2025

View reviewed changes

src/bootstrap/src/bin/sccache-plus-cl.rs Outdated Show resolved Hide resolved

bjorn3 reviewed Feb 25, 2025

View reviewed changes

src/bootstrap/src/utils/job.rs Show resolved Hide resolved

Kobzol force-pushed the bootstrap-2024 branch from 082ee0c to 65b917c Compare February 25, 2025 16:32

This comment has been minimized.

# to view

Kobzol mentioned this pull request Feb 26, 2025

Update gcc submodule #137660

Merged

onur-ozkan 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 Feb 26, 2025

fmease added a commit to fmease/rust that referenced this pull request Feb 26, 2025

Rollup merge of rust-lang#137660 - Kobzol:gcc-update, r=GuillaumeGomez

ee2b7d6

Update gcc submodule To add support for the x87 feature (see rust-lang#137612 (comment)). r? `@antoyo`

fmease added a commit to fmease/rust that referenced this pull request Feb 26, 2025

Rollup merge of rust-lang#137660 - Kobzol:gcc-update, r=GuillaumeGomez

bd9e38d

Update gcc submodule To add support for the x87 feature (see rust-lang#137612 (comment)). r? `@antoyo`

github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Feb 27, 2025

Rollup merge of #137660 - Kobzol:gcc-update, r=GuillaumeGomez

4a50ef7

Update gcc submodule To add support for the x87 feature (see rust-lang/rust#137612 (comment)). r? `@antoyo`

Kobzol force-pushed the bootstrap-2024 branch from 65b917c to b1731a1 Compare March 5, 2025 07:45

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 Mar 5, 2025

workingjubilee mentioned this pull request Mar 5, 2025

Rollup of 25 pull requests #138044

Closed

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 Mar 11, 2025

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 Mar 12, 2025

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 Mar 12, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 12, 2025

bors merged commit 0998d40 into rust-lang:master Mar 12, 2025
7 checks passed

rustbot added this to the 1.87.0 milestone Mar 12, 2025

Kobzol deleted the bootstrap-2024 branch March 12, 2025 14:38

Update bootstrap to edition 2024 #137612

Update bootstrap to edition 2024 #137612

Uh oh!

Conversation

Kobzol commented Feb 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

onur-ozkan left a comment

Choose a reason for hiding this comment

Uh oh!

onur-ozkan commented Feb 25, 2025

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

This comment has been minimized.

antoyo commented Feb 25, 2025

Uh oh!

Kobzol commented Feb 25, 2025

Uh oh!

Kobzol commented Mar 5, 2025

Uh oh!

onur-ozkan commented Mar 5, 2025

Uh oh!

bors commented Mar 5, 2025

Uh oh!

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

Uh oh!

Uh oh!

klensy commented Mar 5, 2025

Uh oh!

Kobzol commented Mar 11, 2025

Uh oh!

bors commented Mar 11, 2025

Uh oh!

rust-log-analyzer commented Mar 11, 2025

Uh oh!

Kobzol commented Mar 11, 2025

Uh oh!

Kobzol commented Mar 11, 2025

Uh oh!

bors commented Mar 11, 2025

Uh oh!

bors commented Mar 11, 2025

Uh oh!

Kobzol commented Mar 11, 2025

Uh oh!

bors commented Mar 11, 2025

Uh oh!

bors commented Mar 12, 2025

Uh oh!

rust-log-analyzer commented Mar 12, 2025

Uh oh!

bors commented Mar 12, 2025

Uh oh!

onur-ozkan commented Mar 12, 2025

Uh oh!

bors commented Mar 12, 2025

Uh oh!

bors commented Mar 12, 2025

Uh oh!

Uh oh!

github-actions bot commented Mar 12, 2025

Test differences

Uh oh!

rust-timer commented Mar 12, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

Kobzol commented Feb 25, 2025 •

edited

Loading

onur-ozkan commented Mar 5, 2025 •

edited

Loading