From 32e17b5921ea3fbe90cb4b0e3760b03e3f22a143 Mon Sep 17 00:00:00 2001 From: Eduard-Mihai Burtescu Date: Thu, 16 Aug 2018 10:36:11 +0300 Subject: [PATCH] tests: prefer edition: directives to compile-flags:--edition. --- src/test/run-pass/macro-at-most-once-rep.rs | 2 +- .../rust-2018/suggestions-not-always-applicable.fixed | 2 +- .../ui-fulldeps/rust-2018/suggestions-not-always-applicable.rs | 2 +- src/test/ui-fulldeps/unnecessary-extern-crate.rs | 2 +- src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs | 2 +- src/test/ui/borrowck/borrowck-migrate-to-nll.rs | 2 +- .../issue-52967-edition-2018-needs-two-phase-borrows.rs | 2 +- src/test/ui/editions/edition-extern-crate-allowed.rs | 2 +- src/test/ui/in-band-lifetimes/elided-lifetimes.fixed | 2 +- src/test/ui/in-band-lifetimes/elided-lifetimes.rs | 2 +- .../macros/macro-at-most-once-rep-2015-ques-rep-feature-flag.rs | 2 +- src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.rs | 2 +- src/test/ui/macros/macro-at-most-once-rep-2015-ques-sep.rs | 2 +- src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.rs | 2 +- src/test/ui/macros/macro-at-most-once-rep-2018.rs | 2 +- src/test/ui/removing-extern-crate.fixed | 2 +- src/test/ui/removing-extern-crate.rs | 2 +- src/test/ui/rust-2018/async-ident-allowed.rs | 2 +- src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.fixed | 2 +- src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.rs | 2 +- src/test/ui/rust-2018/issue-52202-use-suggestions.rs | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/test/run-pass/macro-at-most-once-rep.rs b/src/test/run-pass/macro-at-most-once-rep.rs index dcf2222ba6de..61c3e781c086 100644 --- a/src/test/run-pass/macro-at-most-once-rep.rs +++ b/src/test/run-pass/macro-at-most-once-rep.rs @@ -18,7 +18,7 @@ // // This test focuses on non-error cases and making sure the correct number of repetitions happen. -// compile-flags: --edition=2018 +// edition:2018 #![feature(macro_at_most_once_rep)] diff --git a/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.fixed b/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.fixed index e5b47c70863e..b64ebed03058 100644 --- a/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.fixed +++ b/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.fixed @@ -9,7 +9,7 @@ // except according to those terms. // aux-build:suggestions-not-always-applicable.rs -// compile-flags: --edition 2015 +// edition:2015 // run-rustfix // rustfix-only-machine-applicable // compile-pass diff --git a/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.rs b/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.rs index e5b47c70863e..b64ebed03058 100644 --- a/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.rs +++ b/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.rs @@ -9,7 +9,7 @@ // except according to those terms. // aux-build:suggestions-not-always-applicable.rs -// compile-flags: --edition 2015 +// edition:2015 // run-rustfix // rustfix-only-machine-applicable // compile-pass diff --git a/src/test/ui-fulldeps/unnecessary-extern-crate.rs b/src/test/ui-fulldeps/unnecessary-extern-crate.rs index 0811c79b0a4b..ea3e0587958b 100644 --- a/src/test/ui-fulldeps/unnecessary-extern-crate.rs +++ b/src/test/ui-fulldeps/unnecessary-extern-crate.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// compile-flags: --edition 2018 +// edition:2018 #![deny(unused_extern_crates)] #![feature(alloc, test, libc)] diff --git a/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs b/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs index 72043938f535..104c0886311d 100644 --- a/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs +++ b/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs @@ -20,7 +20,7 @@ // revisions: zflag edition // [zflag]compile-flags: -Z borrowck=migrate -// [edition]compile-flags: --edition 2018 +// [edition]edition:2018 #![feature(nll)] diff --git a/src/test/ui/borrowck/borrowck-migrate-to-nll.rs b/src/test/ui/borrowck/borrowck-migrate-to-nll.rs index e7f2bfbfedba..bb6b29072e25 100644 --- a/src/test/ui/borrowck/borrowck-migrate-to-nll.rs +++ b/src/test/ui/borrowck/borrowck-migrate-to-nll.rs @@ -23,7 +23,7 @@ // revisions: zflag edition //[zflag]compile-flags: -Z borrowck=migrate -//[edition]compile-flags: --edition 2018 +//[edition]edition:2018 //[zflag] run-pass //[edition] run-pass diff --git a/src/test/ui/borrowck/issue-52967-edition-2018-needs-two-phase-borrows.rs b/src/test/ui/borrowck/issue-52967-edition-2018-needs-two-phase-borrows.rs index c39fff2644df..3b53fb9fc428 100644 --- a/src/test/ui/borrowck/issue-52967-edition-2018-needs-two-phase-borrows.rs +++ b/src/test/ui/borrowck/issue-52967-edition-2018-needs-two-phase-borrows.rs @@ -14,7 +14,7 @@ // revisions: ast zflags edition //[zflags]compile-flags: -Z borrowck=migrate -Z two-phase-borrows -//[edition]compile-flags: --edition 2018 +//[edition]edition:2018 // run-pass diff --git a/src/test/ui/editions/edition-extern-crate-allowed.rs b/src/test/ui/editions/edition-extern-crate-allowed.rs index 7368564e250d..75761a0b5b97 100644 --- a/src/test/ui/editions/edition-extern-crate-allowed.rs +++ b/src/test/ui/editions/edition-extern-crate-allowed.rs @@ -9,7 +9,7 @@ // except according to those terms. // aux-build:edition-extern-crate-allowed.rs -// compile-flags: --edition 2015 +// edition:2015 // compile-pass #![warn(rust_2018_idioms)] diff --git a/src/test/ui/in-band-lifetimes/elided-lifetimes.fixed b/src/test/ui/in-band-lifetimes/elided-lifetimes.fixed index c9381e6350f2..153e50037468 100644 --- a/src/test/ui/in-band-lifetimes/elided-lifetimes.fixed +++ b/src/test/ui/in-band-lifetimes/elided-lifetimes.fixed @@ -9,7 +9,7 @@ // except according to those terms. // run-rustfix -// compile-flags: --edition 2018 +// edition:2018 #![allow(unused)] #![deny(elided_lifetimes_in_paths)] diff --git a/src/test/ui/in-band-lifetimes/elided-lifetimes.rs b/src/test/ui/in-band-lifetimes/elided-lifetimes.rs index 8151dd01a98d..41aa7e1a7b7b 100644 --- a/src/test/ui/in-band-lifetimes/elided-lifetimes.rs +++ b/src/test/ui/in-band-lifetimes/elided-lifetimes.rs @@ -9,7 +9,7 @@ // except according to those terms. // run-rustfix -// compile-flags: --edition 2018 +// edition:2018 #![allow(unused)] #![deny(elided_lifetimes_in_paths)] diff --git a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep-feature-flag.rs b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep-feature-flag.rs index fd7925ea3eee..63a4ef16a258 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep-feature-flag.rs +++ b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep-feature-flag.rs @@ -12,7 +12,7 @@ // with the feature flag. // gate-test-macro_at_most_once_rep -// compile-flags: --edition=2015 +// edition:2015 #![feature(macro_at_most_once_rep)] diff --git a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.rs b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.rs index 90bc19739b87..64848d050cb1 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.rs +++ b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.rs @@ -10,7 +10,7 @@ // Test behavior of `?` macro _kleene op_ under the 2015 edition. Namely, it doesn't exist. -// compile-flags: --edition=2015 +// edition:2015 macro_rules! bar { ($(a)?) => {} //~ERROR expected `*` or `+` diff --git a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-sep.rs b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-sep.rs index 2e06b4bd5c24..a7857991079f 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2015-ques-sep.rs +++ b/src/test/ui/macros/macro-at-most-once-rep-2015-ques-sep.rs @@ -11,7 +11,7 @@ // Test behavior of `?` macro _separator_ under the 2015 edition. Namely, `?` can be used as a // separator, but you get a migration warning for the edition. -// compile-flags: --edition=2015 +// edition:2015 // compile-pass #![warn(rust_2018_compatibility)] diff --git a/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.rs b/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.rs index f3107d4f1e4f..ffabf9bcdf68 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.rs +++ b/src/test/ui/macros/macro-at-most-once-rep-2018-feature-gate.rs @@ -11,7 +11,7 @@ // Feature gate test for macro_at_most_once_rep under 2018 edition. // gate-test-macro_at_most_once_rep -// compile-flags: --edition=2018 +// edition:2018 macro_rules! foo { ($(a)?) => {} diff --git a/src/test/ui/macros/macro-at-most-once-rep-2018.rs b/src/test/ui/macros/macro-at-most-once-rep-2018.rs index 958a7e0cdf44..5dabe8d95280 100644 --- a/src/test/ui/macros/macro-at-most-once-rep-2018.rs +++ b/src/test/ui/macros/macro-at-most-once-rep-2018.rs @@ -10,7 +10,7 @@ // Tests that `?` is a Kleene op and not a macro separator in the 2018 edition. -// compile-flags: --edition=2018 +// edition:2018 #![feature(macro_at_most_once_rep)] diff --git a/src/test/ui/removing-extern-crate.fixed b/src/test/ui/removing-extern-crate.fixed index 83b35cec8095..90427b061b65 100644 --- a/src/test/ui/removing-extern-crate.fixed +++ b/src/test/ui/removing-extern-crate.fixed @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// compile-flags: --edition 2018 +// edition:2018 // aux-build:removing-extern-crate.rs // run-rustfix // compile-pass diff --git a/src/test/ui/removing-extern-crate.rs b/src/test/ui/removing-extern-crate.rs index 29479086460e..3905d285becb 100644 --- a/src/test/ui/removing-extern-crate.rs +++ b/src/test/ui/removing-extern-crate.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// compile-flags: --edition 2018 +// edition:2018 // aux-build:removing-extern-crate.rs // run-rustfix // compile-pass diff --git a/src/test/ui/rust-2018/async-ident-allowed.rs b/src/test/ui/rust-2018/async-ident-allowed.rs index fd4eae1f9b54..3bc468483bda 100644 --- a/src/test/ui/rust-2018/async-ident-allowed.rs +++ b/src/test/ui/rust-2018/async-ident-allowed.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// compile-flags: --edition 2015 +// edition:2015 #![deny(rust_2018_compatibility)] diff --git a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.fixed b/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.fixed index c7c73e90988e..fc81ab08f624 100644 --- a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.fixed +++ b/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.fixed @@ -10,7 +10,7 @@ // aux-build:edition-lint-paths.rs // run-rustfix -// compile-flags:--edition 2018 +// edition:2018 // The "normal case". Ideally we would remove the `extern crate` here, // but we don't. diff --git a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.rs b/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.rs index ee37a3d766af..72751f2080cc 100644 --- a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.rs +++ b/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.rs @@ -10,7 +10,7 @@ // aux-build:edition-lint-paths.rs // run-rustfix -// compile-flags:--edition 2018 +// edition:2018 // The "normal case". Ideally we would remove the `extern crate` here, // but we don't. diff --git a/src/test/ui/rust-2018/issue-52202-use-suggestions.rs b/src/test/ui/rust-2018/issue-52202-use-suggestions.rs index 5acd19c2471e..deb80411bbf6 100644 --- a/src/test/ui/rust-2018/issue-52202-use-suggestions.rs +++ b/src/test/ui/rust-2018/issue-52202-use-suggestions.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// compile-flags: --edition 2018 +// edition:2018 // The local `use` suggestion should start with `crate::` (but the // standard-library suggestions should not, obviously).