Skip to content

Commit 53bc38b

Browse files
authored
Rollup merge of rust-lang#133584 - ehuss:more-2024-unstable-options, r=compiler-errors
Update more 2024 tests to remove -Zunstable-options This removes `-Zunsable-options` from more tests that I missed in rust-lang#133349.
2 parents fbad22e + 6005d1c commit 53bc38b

File tree

77 files changed

+136
-177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+136
-177
lines changed

tests/rustdoc-ui/doctest/doctest-output-include-fail.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//@ edition:2024
2-
//@ compile-flags:--test --test-args=--test-threads=1 -Z unstable-options
2+
//@ compile-flags:--test --test-args=--test-threads=1
33
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
44
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
55
//@ failure-status: 101

tests/rustdoc-ui/doctest/doctest-output.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//@[edition2015]compile-flags:--test --test-args=--test-threads=1
55
//@[edition2024]edition:2015
66
//@[edition2024]aux-build:extern_macros.rs
7-
//@[edition2024]compile-flags:--test --test-args=--test-threads=1 -Z unstable-options
7+
//@[edition2024]compile-flags:--test --test-args=--test-threads=1
88
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
99
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
1010
//@ check-pass

tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//@[edition2015]compile-flags:--test --test-args=--test-threads=1
77
//@[edition2024]edition:2024
88
//@[edition2024]check-pass
9-
//@[edition2024]compile-flags:--test --test-args=--test-threads=1 -Z unstable-options
9+
//@[edition2024]compile-flags:--test --test-args=--test-threads=1
1010
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
1111
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
1212

tests/ui/coroutine/async-gen-deduce-yield.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ compile-flags: --edition 2024 -Zunstable-options
1+
//@ compile-flags: --edition 2024
22
//@ check-pass
33

44
#![feature(async_iterator, gen_blocks)]

tests/ui/coroutine/async-gen-yield-ty-is-unit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ compile-flags: --edition 2024 -Zunstable-options
1+
//@ compile-flags: --edition 2024
22
//@ check-pass
33

44
#![feature(async_iterator, gen_blocks, noop_waker)]

tests/ui/drop/drop_order.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//@ compile-flags: -Z validate-mir
33
//@ revisions: edition2021 edition2024
44
//@ [edition2021] edition: 2021
5-
//@ [edition2024] compile-flags: -Z unstable-options
65
//@ [edition2024] edition: 2024
76

87
#![feature(let_chains)]

tests/ui/drop/lint-if-let-rescope-gated.edition2021.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: `if let` assigns a shorter lifetime since Edition 2024
2-
--> $DIR/lint-if-let-rescope-gated.rs:27:8
2+
--> $DIR/lint-if-let-rescope-gated.rs:26:8
33
|
44
LL | if let Some(_value) = Droppy.get() {
55
| ^^^^^^^^^^^^^^^^^^^------^^^^^^
@@ -9,12 +9,12 @@ LL | if let Some(_value) = Droppy.get() {
99
= warning: this changes meaning in Rust 2024
1010
= note: for more information, see issue #124085 <https://github.com/rust-lang/rust/issues/124085>
1111
help: the value is now dropped here in Edition 2024
12-
--> $DIR/lint-if-let-rescope-gated.rs:31:5
12+
--> $DIR/lint-if-let-rescope-gated.rs:30:5
1313
|
1414
LL | } else {
1515
| ^
1616
note: the lint level is defined here
17-
--> $DIR/lint-if-let-rescope-gated.rs:11:9
17+
--> $DIR/lint-if-let-rescope-gated.rs:10:9
1818
|
1919
LL | #![deny(if_let_rescope)]
2020
| ^^^^^^^^^^^^^^

tests/ui/drop/lint-if-let-rescope-gated.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
//@ revisions: edition2021 edition2024
66
//@ [edition2021] edition: 2021
77
//@ [edition2024] edition: 2024
8-
//@ [edition2024] compile-flags: -Zunstable-options
98
//@ [edition2024] check-pass
109

1110
#![deny(if_let_rescope)]

tests/ui/drop/tail-expr-drop-order-negative.edition2024.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0716]: temporary value dropped while borrowed
2-
--> $DIR/tail-expr-drop-order-negative.rs:9:15
2+
--> $DIR/tail-expr-drop-order-negative.rs:8:15
33
|
44
LL | x.replace(std::cell::RefCell::new(123).borrow()).is_some()
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - temporary value is freed at the end of this statement

tests/ui/drop/tail-expr-drop-order-negative.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//@ revisions: edition2021 edition2024
2-
//@ [edition2024] compile-flags: -Zunstable-options
32
//@ [edition2024] edition: 2024
43
//@ [edition2021] check-pass
54

0 commit comments

Comments
 (0)