Bump boostrap compiler to new beta

[BoxyUwU]

Currently failing due to something about the const stability checks and panic!. I'm not sure why though since I wasn't able to see any PRs merged in the past few days that would result in a cfg(bootstrap) that shouldn't be removed. cc @RalfJung #131349

[rustbot]

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]

library/core/src/unicode/unicode_data.rs is generated by
src/tools/unicode-table-generator via ./x run src/tools/unicode-table-generator. If you want to modify unicode_data.rs,
please modify the tool then regenerate the library source file with the tool
instead of editing the library source file manually.

Some changes occurred to the intrinsics. Make sure the CTFE / Miri interpreter
gets adapted for the changes, if necessary.

cc @rust-lang/miri, @rust-lang/wg-const-eval

[RalfJung]

There are some cfg_attr(bootstrap, ...) that you did not remove, like here:

rust/library/core/src/fmt/mod.rs

Line 337 in 6852fd4

bootstrap,

Probably it's related to them being broken across multiple lines. rustfmt enforces that... but it might be tricky yo update your scripts to support that.

[BoxyUwU]

Ah.... yep that would do it. There was some cfg(not(bootstrap), split across multiple lines that i did notice but didn't see those. Thanks

[rustbot]

Some changes occurred to the intrinsics. Make sure the CTFE / Miri interpreter
gets adapted for the changes, if necessary.

cc @rust-lang/miri, @rust-lang/wg-const-eval

library/core/src/unicode/unicode_data.rs is generated by
src/tools/unicode-table-generator via ./x run src/tools/unicode-table-generator. If you want to modify unicode_data.rs,
please modify the tool then regenerate the library source file with the tool
instead of editing the library source file manually.

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

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

[jieyouxu]

Thanks

[jieyouxu]

AFAICT this looks good.
@bors r+ rollup=never p=1 (bootstrap compiler bump)

[bors]

📌 Commit 583e26c has been approved by jieyouxu

It is now in the queue for this repository.

[jieyouxu]

@bors p=10 (potentially conflict-prone)

[bors]

⌛ Testing commit 583e26c with merge 64ab128...

[bors]

💔 Test failed - checks-actions

[BoxyUwU]

not spurious :^)

[RalfJung]

Seems like it's a cargo test that failed?
Cc @rust-lang/cargo

[weihanglo]

The nightly CARGO_RUSTC_CURRENT_DIR environment variable has been removed. Cargo needs to adjust this hack maybe. Let me check.

[epage]

We removed that 3 weeks ago (rust-lang/cargo#14799), why is it just now causing problems?

[RalfJung]

Because this PR updates the cargo used for Rust bootstraping to the just-released beta.

[weihanglo]

@BoxyUwU this patch should fix the test failures.

However since it changes bootstrap, I would recommend looping some bootstrap team folks to have a look.

diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
index dd967bca867..1c24ccc3216 100644
--- a/src/bootstrap/src/core/build_steps/test.rs
+++ b/src/bootstrap/src/core/build_steps/test.rs
@@ -263,12 +263,16 @@ pub struct Cargo {
     host: TargetSelection,
 }
 
+impl Cargo {
+    const CRATE_PATH: &str = "src/tools/cargo";
+}
+
 impl Step for Cargo {
     type Output = ();
     const ONLY_HOSTS: bool = true;
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        run.path("src/tools/cargo")
+        run.path(Self::CRATE_PATH)
     }
 
     fn make_run(run: RunConfig<'_>) {
@@ -286,7 +290,7 @@ fn run(self, builder: &Builder<'_>) {
             Mode::ToolRustc,
             self.host,
             Kind::Test,
-            "src/tools/cargo",
+            Self::CRATE_PATH,
             SourceType::Submodule,
             &[],
         );
@@ -301,6 +305,9 @@ fn run(self, builder: &Builder<'_>) {
         // those features won't be able to land.
         cargo.env("CARGO_TEST_DISABLE_NIGHTLY", "1");
         cargo.env("PATH", path_for_cargo(builder, compiler));
+        // Cargo's test suite requires configurations from its own `.cargo/config.toml`.
+        // Change to the directory so Cargo can read from it.
+        cargo.current_dir(builder.src.join(Self::CRATE_PATH));
 
         #[cfg(feature = "build-metrics")]
         builder.metrics.begin_test_suite(

[Mark-Simulacrum]

Cargo patch looks fine to me.

[BoxyUwU]

@bors r=jieyouxu,Mark-Simulacrum

[bors]

📌 Commit 5fa483c has been approved by jieyouxu,Mark-Simulacrum

It is now in the queue for this repository.

[bors]

⌛ Testing commit 5fa483c with merge 1fc691e...

[bors]

☀️ Test successful - checks-actions
Approved by: jieyouxu,Mark-Simulacrum
Pushing 1fc691e to master...

[rust-timer]

Finished benchmarking commit (1fc691e): comparison URL.

Overall result: ✅ improvements - 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
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.4%	[-0.4%, -0.4%]	1
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (secondary 2.3%)

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)	2.3%	[2.3%, 2.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Cycles

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

Binary size

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

Bootstrap: 773.513s -> 773.861s (0.04%)
Artifact size: 332.31 MiB -> 332.29 MiB (-0.01%)