mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #90554 - ehuss:unstable-options-cleanup, r=joshtriplett

Browse Source 
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`.
This commit is contained in:
Yuki Okushi 2021-11-05 10:32:45 +09:00 committed by GitHub
commit 7ee926a852
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 27 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/test/ui/hello2021.rs
View File

@ -1,6 +1,5 @@
// run-pass // run-pass
// edition:2021 // edition:2021
// compile-flags: -Zunstable-options
fn main() { fn main() {
println!("hello, 2021"); println!("hello, 2021");

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

@ -1,6 +1,5 @@
// check-pass // check-pass
// edition:2021 // edition:2021
// compile-flags: -Zunstable-options
use std::array::IntoIter; use std::array::IntoIter;
use std::ops::Deref; use std::ops::Deref;

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

@ -1,6 +1,6 @@
// --force-warn $LINT causes $LINT (which is deny-by-default) to warn // --force-warn $LINT causes $LINT (which is deny-by-default) to warn
// despite $LINT being allowed on command line // despite $LINT being allowed on command line
// compile-flags: -A const_err --force-warn const_err -Zunstable-options // compile-flags: -A const_err --force-warn const_err
// check-pass // check-pass
const C: i32 = 1 / 0; const C: i32 = 1 / 0;

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

@ -1,6 +1,6 @@
// --force-warn $LINT_GROUP causes $LINT (which is warn-by-default) to warn // --force-warn $LINT_GROUP causes $LINT (which is warn-by-default) to warn
// despite $LINT being allowed on command line // despite $LINT being allowed on command line
// compile-flags: -A bare-trait-objects --force-warn rust-2018-idioms -Zunstable-options // compile-flags: -A bare-trait-objects --force-warn rust-2018-idioms
// check-pass // check-pass
pub trait SomeTrait {} pub trait SomeTrait {}

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

@ -1,6 +1,6 @@
// --force-warn $LINT causes $LINT (which is warn-by-default) to warn // --force-warn $LINT causes $LINT (which is warn-by-default) to warn
// despite being allowed in one submodule (but not the other) // despite being allowed in one submodule (but not the other)
// compile-flags: --force-warn dead_code -Zunstable-options // compile-flags: --force-warn dead_code
// check-pass // check-pass
mod one { mod one {

2
src/test/ui/lint/force-warn/warnings-lint-group.rs
View File

@ -1,5 +1,5 @@
// --force-warn warnings is an error // --force-warn warnings is an error
// compile-flags: --force-warn warnings -Zunstable-options // compile-flags: --force-warn warnings
// error-pattern: `warnings` lint group is not supported // error-pattern: `warnings` lint group is not supported
fn main() {} fn main() {}

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

@ -2,8 +2,6 @@ error[E0602]: `warnings` lint group is not supported with ´--force-warn´
error[E0602]: `warnings` lint group is not supported with ´--force-warn´ error[E0602]: `warnings` lint group is not supported with ´--force-warn´
error[E0602]: `warnings` lint group is not supported with ´--force-warn´ error: aborting due to 2 previous errors
error: aborting due to 3 previous errors
For more information about this error, try `rustc --explain E0602`. For more information about this error, try `rustc --explain E0602`.

2
src/test/ui/lint/unused_parens_json_suggestion.fixed
View File

@ -1,4 +1,4 @@
// compile-flags: --error-format json -Zunstable-options // compile-flags: --error-format json
// run-rustfix // run-rustfix
// The output for humans should just highlight the whole span without showing // The output for humans should just highlight the whole span without showing

2
src/test/ui/lint/unused_parens_json_suggestion.rs
View File

@ -1,4 +1,4 @@
// compile-flags: --error-format json -Zunstable-options // compile-flags: --error-format json
// run-rustfix // run-rustfix
// The output for humans should just highlight the whole span without showing // The output for humans should just highlight the whole span without showing

2
src/test/ui/lint/unused_parens_json_suggestion.stderr
View File

@ -1,4 +1,4 @@
{"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)); {"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));
--> $DIR/unused_parens_json_suggestion.rs:16:14 --> $DIR/unused_parens_json_suggestion.rs:16:14
| |
LL | let _a = (1 / (2 + 3)); LL | let _a = (1 / (2 + 3));

2
src/test/ui/lint/unused_parens_remove_json_suggestion.fixed
View File

@ -1,4 +1,4 @@
// compile-flags: --error-format json -Zunstable-options // compile-flags: --error-format json
// run-rustfix // run-rustfix
// The output for humans should just highlight the whole span without showing // The output for humans should just highlight the whole span without showing

2
src/test/ui/lint/unused_parens_remove_json_suggestion.rs
View File

@ -1,4 +1,4 @@
// compile-flags: --error-format json -Zunstable-options // compile-flags: --error-format json
// run-rustfix // run-rustfix
// The output for humans should just highlight the whole span without showing // The output for humans should just highlight the whole span without showing

18
src/test/ui/lint/unused_parens_remove_json_suggestion.stderr
View File

@ -1,4 +1,4 @@
{"message":"unnecessary parentheses around `if` condition","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":500,"byte_end":501,"line_start":17,"line_end":17,"column_start":8,"column_end":9,"is_primary":true,"text":[{"text":" if (_b) { {"message":"unnecessary parentheses around `if` condition","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":481,"byte_end":482,"line_start":17,"line_end":17,"column_start":8,"column_end":9,"is_primary":true,"text":[{"text":" if (_b) {
--> $DIR/unused_parens_remove_json_suggestion.rs:17:8 --> $DIR/unused_parens_remove_json_suggestion.rs:17:8
| |
LL | if (_b) { LL | if (_b) {
@ -16,7 +16,7 @@ LL + if _b {
| |
"} "}
{"message":"unnecessary parentheses around `if` condition","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":631,"byte_end":632,"line_start":28,"line_end":28,"column_start":7,"column_end":8,"is_primary":true,"text":[{"text":" if(c) { {"message":"unnecessary parentheses around `if` condition","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":612,"byte_end":613,"line_start":28,"line_end":28,"column_start":7,"column_end":8,"is_primary":true,"text":[{"text":" if(c) {
--> $DIR/unused_parens_remove_json_suggestion.rs:28:7 --> $DIR/unused_parens_remove_json_suggestion.rs:28:7
| |
LL | if(c) { LL | if(c) {
@ -29,7 +29,7 @@ LL + if c {
| |
"} "}
{"message":"unnecessary parentheses around `if` condition","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":711,"byte_end":712,"line_start":32,"line_end":32,"column_start":8,"column_end":9,"is_primary":true,"text":[{"text":" if (c){ {"message":"unnecessary parentheses around `if` condition","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":692,"byte_end":693,"line_start":32,"line_end":32,"column_start":8,"column_end":9,"is_primary":true,"text":[{"text":" if (c){
--> $DIR/unused_parens_remove_json_suggestion.rs:32:8 --> $DIR/unused_parens_remove_json_suggestion.rs:32:8
| |
LL | if (c){ LL | if (c){
@ -42,7 +42,7 @@ LL + if c {
| |
"} "}
{"message":"unnecessary parentheses around `while` condition","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":793,"byte_end":794,"line_start":36,"line_end":36,"column_start":11,"column_end":12,"is_primary":true,"text":[{"text":" while (false && true){","highlight_start":11,"highlight_end":12}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null},{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":807,"byte_end":808,"line_start":36,"line_end":36,"column_start":25,"column_end":26,"is_primary":true,"text":[{"text":" while (false && true){","highlight_start":25,"highlight_end":26}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"remove these parentheses","code":null,"level":"help","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":793,"byte_end":794,"line_start":36,"line_end":36,"column_start":11,"column_end":12,"is_primary":true,"text":[{"text":" while (false && true){","highlight_start":11,"highlight_end":12}],"label":null,"suggested_replacement":"","suggestion_applicability":"MachineApplicable","expansion":null},{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":807,"byte_end":808,"line_start":36,"line_end":36,"column_start":25,"column_end":26,"is_primary":true,"text":[{"text":" while (false && true){","highlight_start":25,"highlight_end":26}],"label":null,"suggested_replacement":" ","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"error: unnecessary parentheses around `while` condition {"message":"unnecessary parentheses around `while` condition","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":774,"byte_end":775,"line_start":36,"line_end":36,"column_start":11,"column_end":12,"is_primary":true,"text":[{"text":" while (false && true){","highlight_start":11,"highlight_end":12}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null},{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":788,"byte_end":789,"line_start":36,"line_end":36,"column_start":25,"column_end":26,"is_primary":true,"text":[{"text":" while (false && true){","highlight_start":25,"highlight_end":26}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"remove these parentheses","code":null,"level":"help","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":774,"byte_end":775,"line_start":36,"line_end":36,"column_start":11,"column_end":12,"is_primary":true,"text":[{"text":" while (false && true){","highlight_start":11,"highlight_end":12}],"label":null,"suggested_replacement":"","suggestion_applicability":"MachineApplicable","expansion":null},{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":788,"byte_end":789,"line_start":36,"line_end":36,"column_start":25,"column_end":26,"is_primary":true,"text":[{"text":" while (false && true){","highlight_start":25,"highlight_end":26}],"label":null,"suggested_replacement":" ","suggestion_applicability":"MachineApplicable","expansion":null}],"children":[],"rendered":null}],"rendered":"error: unnecessary parentheses around `while` condition
--> $DIR/unused_parens_remove_json_suggestion.rs:36:11 --> $DIR/unused_parens_remove_json_suggestion.rs:36:11
| |
LL | while (false && true){ LL | while (false && true){
@ -55,7 +55,7 @@ LL + while false && true {
| |
"} "}
{"message":"unnecessary parentheses around `if` condition","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":821,"byte_end":822,"line_start":37,"line_end":37,"column_start":12,"column_end":13,"is_primary":true,"text":[{"text":" if (c) { {"message":"unnecessary parentheses around `if` condition","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":802,"byte_end":803,"line_start":37,"line_end":37,"column_start":12,"column_end":13,"is_primary":true,"text":[{"text":" if (c) {
--> $DIR/unused_parens_remove_json_suggestion.rs:37:12 --> $DIR/unused_parens_remove_json_suggestion.rs:37:12
| |
LL | if (c) { LL | if (c) {
@ -68,7 +68,7 @@ LL + if c {
| |
"} "}
{"message":"unnecessary parentheses around `while` condition","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":918,"byte_end":919,"line_start":43,"line_end":43,"column_start":10,"column_end":11,"is_primary":true,"text":[{"text":" while(true && false) { {"message":"unnecessary parentheses around `while` condition","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":899,"byte_end":900,"line_start":43,"line_end":43,"column_start":10,"column_end":11,"is_primary":true,"text":[{"text":" while(true && false) {
--> $DIR/unused_parens_remove_json_suggestion.rs:43:10 --> $DIR/unused_parens_remove_json_suggestion.rs:43:10
| |
LL | while(true && false) { LL | while(true && false) {
@ -81,7 +81,7 @@ LL + while true && false {
| |
"} "}
{"message":"unnecessary parentheses around `for` iterator expression","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":987,"byte_end":988,"line_start":44,"line_end":44,"column_start":18,"column_end":19,"is_primary":true,"text":[{"text":" for _ in (0 .. 3){ {"message":"unnecessary parentheses around `for` iterator expression","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":968,"byte_end":969,"line_start":44,"line_end":44,"column_start":18,"column_end":19,"is_primary":true,"text":[{"text":" for _ in (0 .. 3){
--> $DIR/unused_parens_remove_json_suggestion.rs:44:18 --> $DIR/unused_parens_remove_json_suggestion.rs:44:18
| |
LL | for _ in (0 .. 3){ LL | for _ in (0 .. 3){
@ -94,7 +94,7 @@ LL + for _ in 0 .. 3 {
| |
"} "}
{"message":"unnecessary parentheses around `for` iterator expression","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":1088,"byte_end":1089,"line_start":49,"line_end":49,"column_start":14,"column_end":15,"is_primary":true,"text":[{"text":" for _ in (0 .. 3) { {"message":"unnecessary parentheses around `for` iterator expression","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":1069,"byte_end":1070,"line_start":49,"line_end":49,"column_start":14,"column_end":15,"is_primary":true,"text":[{"text":" for _ in (0 .. 3) {
--> $DIR/unused_parens_remove_json_suggestion.rs:49:14 --> $DIR/unused_parens_remove_json_suggestion.rs:49:14
| |
LL | for _ in (0 .. 3) { LL | for _ in (0 .. 3) {
@ -107,7 +107,7 @@ LL + for _ in 0 .. 3 {
| |
"} "}
{"message":"unnecessary parentheses around `while` condition","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":1147,"byte_end":1148,"line_start":50,"line_end":50,"column_start":15,"column_end":16,"is_primary":true,"text":[{"text":" while (true && false) { {"message":"unnecessary parentheses around `while` condition","code":{"code":"unused_parens","explanation":null},"level":"error","spans":[{"file_name":"$DIR/unused_parens_remove_json_suggestion.rs","byte_start":1128,"byte_end":1129,"line_start":50,"line_end":50,"column_start":15,"column_end":16,"is_primary":true,"text":[{"text":" while (true && false) {
--> $DIR/unused_parens_remove_json_suggestion.rs:50:15 --> $DIR/unused_parens_remove_json_suggestion.rs:50:15
| |
LL | while (true && false) { LL | while (true && false) {

1
src/test/ui/matches2021.rs
View File

@ -1,6 +1,5 @@
// run-pass // run-pass
// edition:2021 // edition:2021
// compile-flags: -Zunstable-options
// regression test for https://github.com/rust-lang/rust/pull/85678 // regression test for https://github.com/rust-lang/rust/pull/85678

1
src/test/ui/privacy/pub-priv-dep/pub-priv1.rs
View File

@ -1,5 +1,6 @@
// aux-crate:priv:priv_dep=priv_dep.rs // aux-crate:priv:priv_dep=priv_dep.rs
// aux-build:pub_dep.rs // aux-build:pub_dep.rs
// compile-flags: -Zunstable-options
#![deny(exported_private_dependencies)] #![deny(exported_private_dependencies)]
// This crate is a private dependency // This crate is a private dependency

8
src/test/ui/privacy/pub-priv-dep/pub-priv1.stderr
View File

@ -1,23 +1,23 @@
error: type `OtherType` from private dependency 'priv_dep' in public interface error: type `OtherType` from private dependency 'priv_dep' in public interface
--> $DIR/pub-priv1.rs:20:5 --> $DIR/pub-priv1.rs:21:5
| |
LL | pub field: OtherType, LL | pub field: OtherType,
| ^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^
| |
note: the lint level is defined here note: the lint level is defined here
--> $DIR/pub-priv1.rs:3:9 --> $DIR/pub-priv1.rs:4:9
| |
LL | #![deny(exported_private_dependencies)] LL | #![deny(exported_private_dependencies)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: type `OtherType` from private dependency 'priv_dep' in public interface error: type `OtherType` from private dependency 'priv_dep' in public interface
--> $DIR/pub-priv1.rs:27:5 --> $DIR/pub-priv1.rs:28:5
| |
LL | pub fn pub_fn(param: OtherType) {} LL | pub fn pub_fn(param: OtherType) {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: trait `OtherTrait` from private dependency 'priv_dep' in public interface error: trait `OtherTrait` from private dependency 'priv_dep' in public interface
--> $DIR/pub-priv1.rs:34:5 --> $DIR/pub-priv1.rs:35:5
| |
LL | type Foo: OtherTrait; LL | type Foo: OtherTrait;
| ^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^

1
src/test/ui/rust-2021/prelude2021.rs
View File

@ -1,6 +1,5 @@
// check-pass // check-pass
// edition:2021 // edition:2021
// compile-flags: -Zunstable-options
fn main() { fn main() {
let _: u16 = 123i32.try_into().unwrap(); let _: u16 = 123i32.try_into().unwrap();

2
src/test/ui/rust-2021/reserved-prefixes-migration.fixed
View File

@ -1,6 +1,6 @@
// check-pass // check-pass
// run-rustfix // run-rustfix
// compile-flags: -Z unstable-options --edition 2018 // edition:2018
#![warn(rust_2021_prefixes_incompatible_syntax)] #![warn(rust_2021_prefixes_incompatible_syntax)]

2
src/test/ui/rust-2021/reserved-prefixes-migration.rs
View File

@ -1,6 +1,6 @@
// check-pass // check-pass
// run-rustfix // run-rustfix
// compile-flags: -Z unstable-options --edition 2018 // edition:2018
#![warn(rust_2021_prefixes_incompatible_syntax)] #![warn(rust_2021_prefixes_incompatible_syntax)]

2
src/test/ui/unused-crate-deps/extern-loc-missing-loc.rs
View File

@ -1,7 +1,7 @@
// --extern-location with a raw reference // --extern-location with a raw reference
// aux-crate:bar=bar.rs // aux-crate:bar=bar.rs
// compile-flags:--extern-location bar // compile-flags:--extern-location bar -Zunstable-options
#![warn(unused_crate_dependencies)] #![warn(unused_crate_dependencies)]

3
src/tools/compiletest/src/header.rs
View File

@ -242,9 +242,6 @@ impl TestProps {
if let Some(edition) = config.parse_edition(ln) { if let Some(edition) = config.parse_edition(ln) {
self.compile_flags.push(format!("--edition={}", edition)); self.compile_flags.push(format!("--edition={}", edition));
has_edition = true; has_edition = true;
if edition == "2021" {
self.compile_flags.push("-Zunstable-options".to_string());
}
} }
config.parse_and_update_revisions(ln, &mut self.revisions); config.parse_and_update_revisions(ln, &mut self.revisions);

3
src/tools/compiletest/src/runtest.rs
View File

@ -1607,9 +1607,6 @@ impl<'test> TestCx<'test> {
get_lib_name(&aux_path.trim_end_matches(".rs").replace('-', "_"), is_dylib); get_lib_name(&aux_path.trim_end_matches(".rs").replace('-', "_"), is_dylib);
rustc.arg("--extern").arg(format!("{}={}/{}", aux_name, aux_dir.display(), lib_name)); rustc.arg("--extern").arg(format!("{}={}/{}", aux_name, aux_dir.display(), lib_name));
} }
if !self.props.aux_crates.is_empty() {
rustc.arg("-Zunstable-options");
}
aux_dir aux_dir
} }