Skip to content

Commit 7ee926a

Browse files
authored
Rollup merge of #90554 - ehuss:unstable-options-cleanup, r=joshtriplett
Clean up some `-Z unstable-options` in tests. Several of these tests were for features that have been stabilized, or otherwise don't need `-Z unstable-options`.
2 parents 6964ec2 + 754455e commit 7ee926a

22 files changed

+27
-38
lines changed

src/test/ui/hello2021.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// run-pass
22
// edition:2021
3-
// compile-flags: -Zunstable-options
43

54
fn main() {
65
println!("hello, 2021");

src/test/ui/iterators/into-iter-on-arrays-2021.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// check-pass
22
// edition:2021
3-
// compile-flags: -Zunstable-options
43

54
use std::array::IntoIter;
65
use std::ops::Deref;

src/test/ui/lint/force-warn/allowed-cli-deny-by-default-lint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --force-warn $LINT causes $LINT (which is deny-by-default) to warn
22
// despite $LINT being allowed on command line
3-
// compile-flags: -A const_err --force-warn const_err -Zunstable-options
3+
// compile-flags: -A const_err --force-warn const_err
44
// check-pass
55

66
const C: i32 = 1 / 0;

src/test/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --force-warn $LINT_GROUP causes $LINT (which is warn-by-default) to warn
22
// despite $LINT being allowed on command line
3-
// compile-flags: -A bare-trait-objects --force-warn rust-2018-idioms -Zunstable-options
3+
// compile-flags: -A bare-trait-objects --force-warn rust-2018-idioms
44
// check-pass
55

66
pub trait SomeTrait {}

src/test/ui/lint/force-warn/warn-by-default-lint-two-modules.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --force-warn $LINT causes $LINT (which is warn-by-default) to warn
22
// despite being allowed in one submodule (but not the other)
3-
// compile-flags: --force-warn dead_code -Zunstable-options
3+
// compile-flags: --force-warn dead_code
44
// check-pass
55

66
mod one {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// --force-warn warnings is an error
2-
// compile-flags: --force-warn warnings -Zunstable-options
2+
// compile-flags: --force-warn warnings
33
// error-pattern: `warnings` lint group is not supported
44

55
fn main() {}

src/test/ui/lint/force-warn/warnings-lint-group.stderr

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ error[E0602]: `warnings` lint group is not supported with ´--force-warn´
22

33
error[E0602]: `warnings` lint group is not supported with ´--force-warn´
44

5-
error[E0602]: `warnings` lint group is not supported with ´--force-warn´
6-
7-
error: aborting due to 3 previous errors
5+
error: aborting due to 2 previous errors
86

97
For more information about this error, try `rustc --explain E0602`.

src/test/ui/lint/unused_parens_json_suggestion.fixed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// compile-flags: --error-format json -Zunstable-options
1+
// compile-flags: --error-format json
22
// run-rustfix
33

44
// The output for humans should just highlight the whole span without showing

src/test/ui/lint/unused_parens_json_suggestion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// compile-flags: --error-format json -Zunstable-options
1+
// compile-flags: --error-format json
22
// run-rustfix
33

44
// The output for humans should just highlight the whole span without showing

src/test/ui/lint/unused_parens_json_suggestion.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{"message":"unnecessary parentheses around assigned value","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_json_suggestion.rs","byte_start":596,"byte_end":597,"line_start":16,"line_end":16,"column_start":14,"column_end":15,"is_primary":true,"text":[{"text":" let _a = (1 / (2 + 3));
1+
{"message":"unnecessary parentheses around assigned value","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_json_suggestion.rs","byte_start":577,"byte_end":578,"line_start":16,"line_end":16,"column_start":14,"column_end":15,"is_primary":true,"text":[{"text":" let _a = (1 / (2 + 3));
22
--> $DIR/unused_parens_json_suggestion.rs:16:14
33
|
44
LL | let _a = (1 / (2 + 3));

0 commit comments

Comments
 (0)