Auto merge of #3902 - RalfJung:rustup, r=RalfJung

bors · bors · commit e2c950a0f45f · 2024-09-22T06:31:10.000Z
Rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-c0838c8ebec23fb87855bb6de3a287981cb1df98
+6ce376774c0bc46ac8be247bca93ff5a1287a8fc
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1,4 +1,4 @@
-version = "Two"
+style_edition = "2024"
 use_small_heuristics = "Max"
 match_arm_blocks = false
 match_arm_leading_pipes = "Preserve"
diff --git a/tests/fail/type-too-large.stderr b/tests/fail/type-too-large.stderr
@@ -1,8 +1,8 @@
-error: post-monomorphization error: values of the type `[u8; 2305843011361177600]` are too big for the current architecture
+error: post-monomorphization error: values of the type `[u8; 2305843011361177600]` are too big for the target architecture
   --> tests/fail/type-too-large.rs:LL:CC
    |
 LL |     _fat = [0; (1u64 << 61) as usize + (1u64 << 31) as usize];
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ values of the type `[u8; 2305843011361177600]` are too big for the current architecture
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ values of the type `[u8; 2305843011361177600]` are too big for the target architecture
    |
    = note: BACKTRACE:
    = note: inside `main` at tests/fail/type-too-large.rs:LL:CC

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = "Two"`
	`1`	`+style_edition = "2024"`
`2`	`2`	`use_small_heuristics = "Max"`
`3`	`3`	`match_arm_blocks = false`
`4`	`4`	`match_arm_leading_pipes = "Preserve"`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		-error: post-monomorphization error: values of the type `[u8; 2305843011361177600]` are too big for the current architecture
	`1`	+error: post-monomorphization error: values of the type `[u8; 2305843011361177600]` are too big for the target architecture
`2`	`2`	`--> tests/fail/type-too-large.rs:LL:CC`
`3`	`3`	`\|`
`4`	`4`	`LL \| _fat = [0; (1u64 << 61) as usize + (1u64 << 31) as usize];`
`5`		- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ values of the type `[u8; 2305843011361177600]` are too big for the current architecture
	`5`	+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ values of the type `[u8; 2305843011361177600]` are too big for the target architecture
`6`	`6`	`\|`
`7`	`7`	`= note: BACKTRACE:`
`8`	`8`	= note: inside `main` at tests/fail/type-too-large.rs:LL:CC