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

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

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`

Rollup of 29 pull requests Successful merges: - rust-lang#135733 (Implement `&pin const self` and `&pin mut self` sugars) - rust-lang#137107 (Override default `Write` methods for cursor-like types) - rust-lang#137303 (Remove `MaybeForgetReturn` suggestion) - rust-lang#137327 (Undeprecate env::home_dir) - rust-lang#137358 (Match Ergonomics 2024: add context and examples to the unstable book) - rust-lang#137534 ([rustdoc] hide item that is not marked as doc(inline) and whose src is doc(hidden)) - rust-lang#137565 (Try to point of macro expansion from resolver and method errors if it involves macro var) - rust-lang#137612 (Update bootstrap to edition 2024) - rust-lang#137637 (Check dyn flavor before registering upcast goal on wide pointer cast in MIR typeck) - rust-lang#137643 (Add DWARF test case for non-C-like `repr128` enums) - rust-lang#137685 (self-contained linker: conservatively default to `-znostart-stop-gc` on x64 linux) - rust-lang#137744 (Re-add `Clone`-derive on `Thir`) - 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#137802 (miri native-call support: all previously exposed provenance is accessible to the callee) - 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#137827 (Add timestamp to unstable feature usage metrics) - rust-lang#137832 (Fix crash in BufReader::peek()) - rust-lang#137910 (Improve error message for `AsyncFn` trait failure for RPIT) - rust-lang#137920 (interpret/provenance_map: consistently use range_is_empty) - rust-lang#138038 (Update `compiler-builtins` to 0.1.151) - rust-lang#138046 (trim channel value in `get_closest_merge_commit`) - rust-lang#138052 (strip `-Wlinker-messages` wrappers from `rust-lld` rmake test) - rust-lang#138053 (Increase the max. custom try jobs requested to `20`) r? `@ghost` `@rustbot` modify labels: rollup

jieyouxu · 2025-03-05T22:25:04Z

There's probably a cfg(windows)'d unsafe_op_in_unsafe_fn in job.rs.
Failed in #138071 (comment).
@bors r-

Kobzol · 2025-03-06T08:13:45Z

Ok that whole function is pretty much one giant unsafe block, I'm not sure if it makes sense to deal with the individual function calls separately.

@rustbot ready

bors · 2025-03-07T07:11:46Z

☔ The latest upstream changes (presumably #138127) made this pull request unmergeable. Please resolve the merge conflicts.

onur-ozkan · 2025-03-07T07:13:38Z

Ok that whole function is pretty much one giant unsafe block, I'm not sure if it makes sense to deal with the individual function calls separately.

@rustbot ready

It's fine I think. You can r=me.

Kobzol · 2025-03-07T08:14:25Z

I realized that this will conflict with #137665. But this should be more conflict prone, so let's merge this first.

@bors r=onur-ozkan

bors · 2025-03-07T08:14:27Z

📌 Commit 760d9c9 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`

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``

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```

matthiaskrgr · 2025-03-07T18:17:50Z

@bors r-
https://github.com/rust-lang/rust/actions/runs/13725811332/job/38391904614#step:28:22852

Kobzol · 2025-03-08T12:18:33Z

I'm a doofus 🤦‍♂️ I already fixed this before, but probably the change got lost because I rebased and force pushed from a second PC.

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.

Sign in 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.

Sign in 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 the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 5, 2025

jieyouxu mentioned this pull request Mar 5, 2025

Rollup of 29 pull requests #138071

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 5, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 6, 2025

Kobzol force-pushed the bootstrap-2024 branch from 579d6c8 to 760d9c9 Compare March 7, 2025 08:12

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

Kobzol mentioned this pull request Mar 7, 2025

Update sccache to 0.10.0 #137665

Open

jhpratt mentioned this pull request Mar 7, 2025

Rollup of 13 pull requests #138152

Closed

matthiaskrgr mentioned this pull request Mar 7, 2025

Rollup of 8 pull requests #138169

Closed

matthiaskrgr mentioned this pull request Mar 7, 2025

Rollup of 7 pull requests #138171

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 7, 2025

Update bootstrap to edition 2024

b2de19e

Kobzol force-pushed the bootstrap-2024 branch from 760d9c9 to b2de19e Compare March 8, 2025 12:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update bootstrap to edition 2024 #137612

Update bootstrap to edition 2024 #137612

Kobzol commented Feb 25, 2025

onur-ozkan left a comment

onur-ozkan commented Feb 25, 2025

This comment has been minimized.

This comment has been minimized.

antoyo commented Feb 25, 2025

Kobzol commented Feb 25, 2025

Kobzol commented Mar 5, 2025

onur-ozkan commented Mar 5, 2025

bors commented Mar 5, 2025

onur-ozkan commented Mar 5, 2025 •

edited

Loading

klensy commented Mar 5, 2025

jieyouxu commented Mar 5, 2025 •

edited

Loading

Kobzol commented Mar 6, 2025

bors commented Mar 7, 2025

onur-ozkan commented Mar 7, 2025

Kobzol commented Mar 7, 2025

bors commented Mar 7, 2025

matthiaskrgr commented Mar 7, 2025

Kobzol commented Mar 8, 2025

Update bootstrap to edition 2024 #137612

Are you sure you want to change the base?

Update bootstrap to edition 2024 #137612

Conversation

Kobzol commented Feb 25, 2025

onur-ozkan left a comment

Choose a reason for hiding this comment

onur-ozkan commented Feb 25, 2025

This comment has been minimized.

This comment has been minimized.

antoyo commented Feb 25, 2025

Kobzol commented Feb 25, 2025

Kobzol commented Mar 5, 2025

onur-ozkan commented Mar 5, 2025

bors commented Mar 5, 2025

onur-ozkan commented Mar 5, 2025 • edited Loading

klensy commented Mar 5, 2025

jieyouxu commented Mar 5, 2025 • edited Loading

Kobzol commented Mar 6, 2025

bors commented Mar 7, 2025

onur-ozkan commented Mar 7, 2025

Kobzol commented Mar 7, 2025

bors commented Mar 7, 2025

matthiaskrgr commented Mar 7, 2025

Kobzol commented Mar 8, 2025

onur-ozkan commented Mar 5, 2025 •

edited

Loading

jieyouxu commented Mar 5, 2025 •

edited

Loading