diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-03-23 07:32:15 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-03-23 10:16:42 -0700 |
| commit | 3ebe12eb3ed09e49ce136d098485e1b4538fbf03 (patch) | |
| tree | 7150b2646cc7a19f85ce9e55e1f0eb76183416a5 /src/test | |
| parent | 82bb41bdab6d6d5611573883bea5779ed43ca184 (diff) | |
| parent | 11f14060a4da7776c5f56e7dc53cc9545e4ab25f (diff) | |
Merge branch '49001_epoch' of https://github.com/klnusbaum/rust into rollup
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/compile-fail/edition-raw-pointer-method-2015.rs (renamed from src/test/compile-fail/epoch-raw-pointer-method-2015.rs) | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/edition-raw-pointer-method-2018.rs (renamed from src/test/compile-fail/epoch-raw-pointer-method-2018.rs) | 4 | ||||
| -rw-r--r-- | src/test/run-pass/dyn-trait.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/epoch-gate-feature.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/inference-variable-behind-raw-pointer.stderr | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/test/compile-fail/epoch-raw-pointer-method-2015.rs b/src/test/compile-fail/edition-raw-pointer-method-2015.rs index 6aa83a38b7e..fdc9b4f704c 100644 --- a/src/test/compile-fail/epoch-raw-pointer-method-2015.rs +++ b/src/test/compile-fail/edition-raw-pointer-method-2015.rs @@ -9,9 +9,9 @@ // except according to those terms. // ignore-tidy-linelength -// compile-flags: -Zepoch=2015 -Zunstable-options +// compile-flags: -Zedition=2015 -Zunstable-options -// tests that epochs work with the tyvar warning-turned-error +// tests that editions work with the tyvar warning-turned-error #[deny(warnings)] fn main() { diff --git a/src/test/compile-fail/epoch-raw-pointer-method-2018.rs b/src/test/compile-fail/edition-raw-pointer-method-2018.rs index c4815de2306..58b34591029 100644 --- a/src/test/compile-fail/epoch-raw-pointer-method-2018.rs +++ b/src/test/compile-fail/edition-raw-pointer-method-2018.rs @@ -9,9 +9,9 @@ // except according to those terms. // ignore-tidy-linelength -// compile-flags: -Zepoch=2018 -Zunstable-options +// compile-flags: -Zedition=2018 -Zunstable-options -// tests that epochs work with the tyvar warning-turned-error +// tests that editions work with the tyvar warning-turned-error #[deny(warnings)] fn main() { diff --git a/src/test/run-pass/dyn-trait.rs b/src/test/run-pass/dyn-trait.rs index fdec6a26ac9..399823ec92d 100644 --- a/src/test/run-pass/dyn-trait.rs +++ b/src/test/run-pass/dyn-trait.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-pretty `dyn ::foo` parses differently in the current epoch +// ignore-pretty `dyn ::foo` parses differently in the current edition #![feature(dyn_trait)] diff --git a/src/test/run-pass/epoch-gate-feature.rs b/src/test/run-pass/epoch-gate-feature.rs index 37d092c06e0..f3d8f216e11 100644 --- a/src/test/run-pass/epoch-gate-feature.rs +++ b/src/test/run-pass/epoch-gate-feature.rs @@ -11,7 +11,7 @@ // Checks if the correct registers are being used to pass arguments // when the sysv64 ABI is specified. -// compile-flags: -Zepoch=2018 +// compile-flags: -Zedition=2018 pub trait Foo {} diff --git a/src/test/ui/inference-variable-behind-raw-pointer.stderr b/src/test/ui/inference-variable-behind-raw-pointer.stderr index eb40151615d..fe6dc0b0748 100644 --- a/src/test/ui/inference-variable-behind-raw-pointer.stderr +++ b/src/test/ui/inference-variable-behind-raw-pointer.stderr @@ -5,6 +5,6 @@ LL | if data.is_null() {} | ^^^^^^^ | = note: #[warn(tyvar_behind_raw_pointer)] on by default - = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 epoch! + = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition! = note: for more information, see issue #46906 <https://github.com/rust-lang/rust/issues/46906> |