Skip to content

Commit b0c162f

Browse files
committed
Migrate alloc to Rust 2024
1 parent b1f3dd5 commit b0c162f

File tree

4 files changed

+4
-22
lines changed

4 files changed

+4
-22
lines changed

compiler/rustc_codegen_cranelift/patches/0029-stdlib-Disable-f16-and-f128-in-compiler-builtins.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ index 7165c3e48af..968552ad435 100644
1212
--- a/library/alloc/Cargo.toml
1313
+++ b/library/alloc/Cargo.toml
1414
@@ -11,7 +11,7 @@ test = { path = "../test" }
15-
edition = "2021"
15+
edition = "2024"
1616

1717
[dependencies]
1818
core = { path = "../core", public = true }

library/alloc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repository = "https://github.com/rust-lang/rust.git"
88
description = "The Rust core allocation and collections library"
99
autotests = false
1010
autobenches = false
11-
edition = "2021"
11+
edition = "2024"
1212

1313
[dependencies]
1414
core = { path = "../core", public = true }

tests/ui/macros/std-2024-macros.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Tests a small handful of macros in the standard library how they handle the
22
// new behavior introduced in 2024.
33

4+
//@ check-pass
5+
46
fn main() {
57
assert_eq!(0, const { 0 });
68
assert_eq!(const { 0 }, const { 0 });
79
assert_eq!(const { 0 }, 0);
810

911
let _: Vec<Vec<String>> = vec![const { vec![] }];
10-
//~^ ERROR: no rules expected keyword `const`
1112
let _: Vec<Vec<String>> = vec![const { vec![] }; 10];
12-
//~^ ERROR: no rules expected keyword `const`
1313
}

tests/ui/macros/std-2024-macros.stderr

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)