Skip to content

Commit 320af6b

Browse files
authored
Rollup merge of #148528 - hkBst:run-make-tests-1, r=jieyouxu
run-make tests: use edition 2024 Bump run-make tests to edition 2024 to prevent test failures when using 2024 idioms in included code, such as I ran into here: #147808.
2 parents fc31898 + fd6466a commit 320af6b

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

tests/run-make/alloc-no-oom-handling/rmake.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use run_make_support::{rustc, source_root};
66

77
fn main() {
88
rustc()
9-
.edition("2021")
9+
.edition("2024")
1010
.arg("-Dwarnings")
1111
.crate_type("rlib")
1212
.input(source_root().join("library/alloc/src/lib.rs"))

tests/run-make/alloc-no-rc/rmake.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use run_make_support::{rustc, source_root};
66

77
fn main() {
88
rustc()
9-
.edition("2021")
9+
.edition("2024")
1010
.arg("-Dwarnings")
1111
.crate_type("rlib")
1212
.input(source_root().join("library/alloc/src/lib.rs"))

tests/run-make/alloc-no-sync/rmake.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use run_make_support::{rustc, source_root};
66

77
fn main() {
88
rustc()
9-
.edition("2021")
9+
.edition("2024")
1010
.arg("-Dwarnings")
1111
.crate_type("rlib")
1212
.input(source_root().join("library/alloc/src/lib.rs"))

tests/run-make/llvm-location-discriminator-limit-dummy-span/rmake.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,21 @@ fn main() {
4949
rustc()
5050
.input("proc.rs")
5151
.crate_type("proc-macro")
52-
.edition("2021")
52+
.edition("2024")
5353
.arg("-Cdebuginfo=line-tables-only")
5454
.run();
5555
rustc()
5656
.extern_("proc", dynamic_lib_name("proc"))
5757
.input("other.rs")
5858
.crate_type("rlib")
59-
.edition("2021")
59+
.edition("2024")
6060
.opt_level("3")
6161
.arg("-Cdebuginfo=line-tables-only")
6262
.run();
6363
rustc()
6464
.extern_("other", rust_lib_name("other"))
6565
.input("main.rs")
66-
.edition("2021")
66+
.edition("2024")
6767
.opt_level("3")
6868
.arg("-Cdebuginfo=line-tables-only")
6969
.arg("-Clto=fat")

tests/run-make/panic-abort-eh_frame/rmake.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fn main() {
1919
.crate_type("lib")
2020
.emit("obj=foo.o")
2121
.panic("abort")
22-
.edition("2021")
22+
.edition("2024")
2323
.arg("-Zvalidate-mir")
2424
.arg("-Cforce-unwind-tables=no")
2525
.run();

tests/run-make/rustdoc-scrape-examples-macros/rmake.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ fn main() {
1919
rustc()
2020
.input("src/proc.rs")
2121
.crate_name(proc_crate_name)
22-
.edition("2021")
22+
.edition("2024")
2323
.crate_type("proc-macro")
2424
.emit("dep-info,link")
2525
.run();
2626
rustc()
2727
.input("src/lib.rs")
2828
.crate_name(crate_name)
29-
.edition("2021")
29+
.edition("2024")
3030
.crate_type("lib")
3131
.emit("dep-info,link")
3232
.run();

0 commit comments

Comments
 (0)