Skip to content

Commit 48ba89a

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#133584
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 0c4f3a4 + 6005d1c commit 48ba89a

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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

-1
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

+3-3
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

-1
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

+1-1
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

-1
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

‎tests/ui/editions/never-type-fallback-breaking.e2021.fixed

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//
33
//@[e2021] edition: 2021
44
//@[e2024] edition: 2024
5-
//@[e2024] compile-flags: -Zunstable-options
65
//
76
//@[e2021] run-pass
87
//@[e2021] run-rustfix

‎tests/ui/editions/never-type-fallback-breaking.e2021.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: this function depends on never type fallback being `()`
2-
--> $DIR/never-type-fallback-breaking.rs:17:1
2+
--> $DIR/never-type-fallback-breaking.rs:16:1
33
|
44
LL | fn m() {
55
| ^^^^^^
@@ -8,7 +8,7 @@ LL | fn m() {
88
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
99
= help: specify the types explicitly
1010
note: in edition 2024, the requirement `!: Default` will fail
11-
--> $DIR/never-type-fallback-breaking.rs:21:17
11+
--> $DIR/never-type-fallback-breaking.rs:20:17
1212
|
1313
LL | true => Default::default(),
1414
| ^^^^^^^^^^^^^^^^^^
@@ -19,7 +19,7 @@ LL | let x: () = match true {
1919
| ++++
2020

2121
warning: this function depends on never type fallback being `()`
22-
--> $DIR/never-type-fallback-breaking.rs:29:1
22+
--> $DIR/never-type-fallback-breaking.rs:28:1
2323
|
2424
LL | fn q() -> Option<()> {
2525
| ^^^^^^^^^^^^^^^^^^^^
@@ -28,7 +28,7 @@ LL | fn q() -> Option<()> {
2828
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
2929
= help: specify the types explicitly
3030
note: in edition 2024, the requirement `!: Default` will fail
31-
--> $DIR/never-type-fallback-breaking.rs:36:5
31+
--> $DIR/never-type-fallback-breaking.rs:35:5
3232
|
3333
LL | deserialize()?;
3434
| ^^^^^^^^^^^^^
@@ -38,7 +38,7 @@ LL | deserialize::<()>()?;
3838
| ++++++
3939

4040
warning: this function depends on never type fallback being `()`
41-
--> $DIR/never-type-fallback-breaking.rs:46:1
41+
--> $DIR/never-type-fallback-breaking.rs:45:1
4242
|
4343
LL | fn meow() -> Result<(), ()> {
4444
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -47,7 +47,7 @@ LL | fn meow() -> Result<(), ()> {
4747
= note: for more information, see issue #123748 <https://github.com/rust-lang/rust/issues/123748>
4848
= help: specify the types explicitly
4949
note: in edition 2024, the requirement `(): From<!>` will fail
50-
--> $DIR/never-type-fallback-breaking.rs:49:5
50+
--> $DIR/never-type-fallback-breaking.rs:48:5
5151
|
5252
LL | help(1)?;
5353
| ^^^^^^^

‎tests/ui/editions/never-type-fallback-breaking.e2024.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: the trait bound `!: Default` is not satisfied
2-
--> $DIR/never-type-fallback-breaking.rs:21:17
2+
--> $DIR/never-type-fallback-breaking.rs:20:17
33
|
44
LL | true => Default::default(),
55
| ^^^^^^^^^^^^^^^^^^ the trait `Default` is not implemented for `!`
@@ -8,21 +8,21 @@ LL | true => Default::default(),
88
= help: did you intend to use the type `()` here instead?
99

1010
error[E0277]: the trait bound `!: Default` is not satisfied
11-
--> $DIR/never-type-fallback-breaking.rs:36:5
11+
--> $DIR/never-type-fallback-breaking.rs:35:5
1212
|
1313
LL | deserialize()?;
1414
| ^^^^^^^^^^^^^ the trait `Default` is not implemented for `!`
1515
|
1616
= note: this error might have been caused by changes to Rust's type-inference algorithm (see issue #48950 <https://github.com/rust-lang/rust/issues/48950> for more information)
1717
= help: did you intend to use the type `()` here instead?
1818
note: required by a bound in `deserialize`
19-
--> $DIR/never-type-fallback-breaking.rs:32:23
19+
--> $DIR/never-type-fallback-breaking.rs:31:23
2020
|
2121
LL | fn deserialize<T: Default>() -> Option<T> {
2222
| ^^^^^^^ required by this bound in `deserialize`
2323

2424
error[E0277]: the trait bound `(): From<!>` is not satisfied
25-
--> $DIR/never-type-fallback-breaking.rs:49:5
25+
--> $DIR/never-type-fallback-breaking.rs:48:5
2626
|
2727
LL | help(1)?;
2828
| ^^^^^^^ the trait `From<!>` is not implemented for `()`
@@ -39,7 +39,7 @@ LL | help(1)?;
3939
and 4 others
4040
= note: required for `!` to implement `Into<()>`
4141
note: required by a bound in `help`
42-
--> $DIR/never-type-fallback-breaking.rs:43:20
42+
--> $DIR/never-type-fallback-breaking.rs:42:20
4343
|
4444
LL | fn help<'a: 'a, T: Into<()>, U>(_: U) -> Result<T, ()> {
4545
| ^^^^^^^^ required by this bound in `help`

‎tests/ui/editions/never-type-fallback-breaking.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//
33
//@[e2021] edition: 2021
44
//@[e2024] edition: 2024
5-
//@[e2024] compile-flags: -Zunstable-options
65
//
76
//@[e2021] run-pass
87
//@[e2021] run-rustfix

‎tests/ui/editions/never-type-fallback.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//
33
//@[e2021] edition: 2021
44
//@[e2024] edition: 2024
5-
//@[e2024] compile-flags: -Zunstable-options
65
//
76
//@ run-pass
87
//@ check-run-results

‎tests/ui/hello.rs

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
//@[e2021] edition:2021
66
//@[e2024] edition:2024
77

8-
//@[e2024] compile-flags: -Zunstable-options
9-
108
fn main() {
119
println!("hello");
1210
}

‎tests/ui/impl-trait/variance.e2024.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
error: ['a: *, 'a: o]
2-
--> $DIR/variance.rs:14:36
2+
--> $DIR/variance.rs:13:36
33
|
44
LL | fn not_captured_early<'a: 'a>() -> impl Sized {}
55
| ^^^^^^^^^^
66

77
error: ['a: *, 'a: o]
8-
--> $DIR/variance.rs:19:32
8+
--> $DIR/variance.rs:18:32
99
|
1010
LL | fn captured_early<'a: 'a>() -> impl Sized + Captures<'a> {}
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^
1212

1313
error: ['a: o]
14-
--> $DIR/variance.rs:21:40
14+
--> $DIR/variance.rs:20:40
1515
|
1616
LL | fn not_captured_late<'a>(_: &'a ()) -> impl Sized {}
1717
| ^^^^^^^^^^
1818

1919
error: ['a: o]
20-
--> $DIR/variance.rs:26:36
20+
--> $DIR/variance.rs:25:36
2121
|
2222
LL | fn captured_late<'a>(_: &'a ()) -> impl Sized + Captures<'a> {}
2323
| ^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/impl-trait/variance.new.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
error: ['a: *, 'a: o]
2-
--> $DIR/variance.rs:14:36
2+
--> $DIR/variance.rs:13:36
33
|
44
LL | fn not_captured_early<'a: 'a>() -> impl Sized {}
55
| ^^^^^^^^^^
66

77
error: ['a: *, 'a: o]
8-
--> $DIR/variance.rs:19:32
8+
--> $DIR/variance.rs:18:32
99
|
1010
LL | fn captured_early<'a: 'a>() -> impl Sized + Captures<'a> {}
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^
1212

1313
error: ['a: o]
14-
--> $DIR/variance.rs:21:40
14+
--> $DIR/variance.rs:20:40
1515
|
1616
LL | fn not_captured_late<'a>(_: &'a ()) -> impl Sized {}
1717
| ^^^^^^^^^^
1818

1919
error: ['a: o]
20-
--> $DIR/variance.rs:26:36
20+
--> $DIR/variance.rs:25:36
2121
|
2222
LL | fn captured_late<'a>(_: &'a ()) -> impl Sized + Captures<'a> {}
2323
| ^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/impl-trait/variance.old.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
error: ['a: *]
2-
--> $DIR/variance.rs:14:36
2+
--> $DIR/variance.rs:13:36
33
|
44
LL | fn not_captured_early<'a: 'a>() -> impl Sized {}
55
| ^^^^^^^^^^
66

77
error: ['a: *, 'a: o]
8-
--> $DIR/variance.rs:19:32
8+
--> $DIR/variance.rs:18:32
99
|
1010
LL | fn captured_early<'a: 'a>() -> impl Sized + Captures<'a> {}
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^
1212

1313
error: []
14-
--> $DIR/variance.rs:21:40
14+
--> $DIR/variance.rs:20:40
1515
|
1616
LL | fn not_captured_late<'a>(_: &'a ()) -> impl Sized {}
1717
| ^^^^^^^^^^
1818

1919
error: ['a: o]
20-
--> $DIR/variance.rs:26:36
20+
--> $DIR/variance.rs:25:36
2121
|
2222
LL | fn captured_late<'a>(_: &'a ()) -> impl Sized + Captures<'a> {}
2323
| ^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/impl-trait/variance.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//@ revisions: old new e2024
22
//@[e2024] edition: 2024
3-
//@[e2024] compile-flags: -Z unstable-options
43

54
#![cfg_attr(new, feature(lifetime_capture_rules_2024))]
65

‎tests/ui/lifetimes/raw/gen-lt.e2024.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: lifetimes cannot use keyword names
2-
--> $DIR/gen-lt.rs:11:11
2+
--> $DIR/gen-lt.rs:10:11
33
|
44
LL | fn gen_lt<'gen>() {}
55
| ^^^^

‎tests/ui/lifetimes/raw/gen-lt.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
//@[e2021] edition:2021
44
//@[e2024] edition:2024
5-
//@[e2024] compile-flags: -Zunstable-options
65

76
//@[e2021] check-pass
87

‎tests/ui/lifetimes/refcell-in-tail-expr.edition2021.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0597]: `cell` does not live long enough
2-
--> $DIR/refcell-in-tail-expr.rs:10:27
2+
--> $DIR/refcell-in-tail-expr.rs:9:27
33
|
44
LL | let cell = std::cell::RefCell::new(0u8);
55
| ---- binding `cell` declared here

‎tests/ui/lifetimes/refcell-in-tail-expr.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
//@ revisions: edition2021 edition2024
22
//@ [edition2021] edition: 2021
33
//@ [edition2024] edition: 2024
4-
//@ [edition2024] compile-flags: -Zunstable-options
54
//@ [edition2024] check-pass
65

76
fn main() {

‎tests/ui/lifetimes/shorter-tail-expr-lifetime.edition2021.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0597]: `c` does not live long enough
2-
--> $DIR/shorter-tail-expr-lifetime.rs:8:5
2+
--> $DIR/shorter-tail-expr-lifetime.rs:7:5
33
|
44
LL | let c = std::cell::RefCell::new("..");
55
| - binding `c` declared here

‎tests/ui/lifetimes/shorter-tail-expr-lifetime.rs

-1
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
//@ [edition2024] run-pass
54

‎tests/ui/lifetimes/tail-expr-lock-poisoning.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//@ revisions: edition2021 edition2024
22
//@ ignore-wasm no panic or subprocess support
3-
//@ [edition2024] compile-flags: -Zunstable-options
43
//@ [edition2024] edition: 2024
54
//@ run-pass
65
//@ needs-unwind

‎tests/ui/lifetimes/temporary-lifetime-extension.rs

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
//@ revisions: edition2021 edition2024
1616
//@ [edition2021] edition: 2021
1717
//@ [edition2024] edition: 2024
18-
//@ [edition2024] compile-flags: -Z unstable-options
1918

2019
fn temp() -> (String, i32) {
2120
(String::from("Hello"), 1)

0 commit comments

Comments
 (0)