Fix 2018 edition tests

20 files changed, 11 insertions, 42 deletions

diff --git a/src/libcore/tests/lib.rs b/src/libcore/tests/lib.rs
index b77e9e49773..fc92a5a2225 100644
--- a/src/libcore/tests/lib.rs
+++ b/src/libcore/tests/lib.rs
@@ -13,7 +13,6 @@
 #![feature(core_private_bignum)]
 #![feature(core_private_diy_float)]
 #![feature(dec2flt)]
-#![feature(decode_utf8)]
 #![feature(euclidean_division)]
 #![feature(exact_size_is_empty)]
 #![feature(fixed_size_array)]
diff --git a/src/libsyntax/diagnostic_list.rs b/src/libsyntax/diagnostic_list.rs
index bfbe9ef1fee..91265623270 100644
--- a/src/libsyntax/diagnostic_list.rs
+++ b/src/libsyntax/diagnostic_list.rs
@@ -381,7 +381,7 @@ the current edition.
 Erroneous code example:
 
 ```compile_fail,E0705
-#![allow(rust_2018_preview)]
+#![feature(rust_2018_preview)]
 #![feature(raw_identifiers)] // error: the feature `raw_identifiers` is
                              // included in the Rust 2018 edition
 ```
diff --git a/src/test/compile-fail/rfc-2126-extern-absolute-paths/non-existent-1.rs b/src/test/compile-fail/rfc-2126-extern-absolute-paths/non-existent-1.rs
index e04bb27f435..826bf675bd6 100644
--- a/src/test/compile-fail/rfc-2126-extern-absolute-paths/non-existent-1.rs
+++ b/src/test/compile-fail/rfc-2126-extern-absolute-paths/non-existent-1.rs
@@ -10,8 +10,6 @@
 
 // edition:2018
 
-#![feature(extern_absolute_paths)]
-
 use xcrate::S; //~ ERROR can't find crate for `xcrate`
 
 fn main() {}
diff --git a/src/test/compile-fail/rfc-2126-extern-absolute-paths/non-existent-2.rs b/src/test/compile-fail/rfc-2126-extern-absolute-paths/non-existent-2.rs
index bebf0236bb4..053bf92f4d1 100644
--- a/src/test/compile-fail/rfc-2126-extern-absolute-paths/non-existent-2.rs
+++ b/src/test/compile-fail/rfc-2126-extern-absolute-paths/non-existent-2.rs
@@ -10,8 +10,6 @@
 
 // edition:2018
 
-#![feature(extern_absolute_paths)]
-
 fn main() {
     let s = ::xcrate::S; //~ ERROR can't find crate for `xcrate`
 }
diff --git a/src/test/compile-fail/rfc-2126-extern-absolute-paths/non-existent-3.rs b/src/test/compile-fail/rfc-2126-extern-absolute-paths/non-existent-3.rs
index 5906a0719c8..1b9e5a75e83 100644
--- a/src/test/compile-fail/rfc-2126-extern-absolute-paths/non-existent-3.rs
+++ b/src/test/compile-fail/rfc-2126-extern-absolute-paths/non-existent-3.rs
@@ -10,8 +10,6 @@
 
 // edition:2018
 
-#![feature(extern_absolute_paths)]
-
 use ycrate; //~ ERROR can't find crate for `ycrate`
 
 fn main() {}
diff --git a/src/test/compile-fail/rfc-2126-extern-absolute-paths/single-segment.rs b/src/test/compile-fail/rfc-2126-extern-absolute-paths/single-segment.rs
index 7111176dbd9..e9de0f01b30 100644
--- a/src/test/compile-fail/rfc-2126-extern-absolute-paths/single-segment.rs
+++ b/src/test/compile-fail/rfc-2126-extern-absolute-paths/single-segment.rs
@@ -11,9 +11,6 @@
 // aux-build:xcrate.rs
 // edition:2018
 
-#![feature(crate_in_paths)]
-#![feature(extern_absolute_paths)]
-
 use crate; //~ ERROR unresolved import `crate`
            //~^ NOTE crate root imports need to be explicitly named: `use crate as name;`
 use *; //~ ERROR unresolved import `*`
diff --git a/src/test/run-make-fulldeps/save-analysis-rfc2126/extern_absolute_paths.rs b/src/test/run-make-fulldeps/save-analysis-rfc2126/extern_absolute_paths.rs
index b1fe535766d..7e5343df841 100644
--- a/src/test/run-make-fulldeps/save-analysis-rfc2126/extern_absolute_paths.rs
+++ b/src/test/run-make-fulldeps/save-analysis-rfc2126/extern_absolute_paths.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(extern_absolute_paths)]
-
 use krate2::hello;
 
 fn main() {
diff --git a/src/test/run-pass/auxiliary/edition-kw-macro-2018.rs b/src/test/run-pass/auxiliary/edition-kw-macro-2018.rs
index 415988586a0..36562fd0049 100644
--- a/src/test/run-pass/auxiliary/edition-kw-macro-2018.rs
+++ b/src/test/run-pass/auxiliary/edition-kw-macro-2018.rs
@@ -10,8 +10,6 @@
 
 // edition:2018
 
-#![feature(raw_identifiers)]
-
 #[macro_export]
 macro_rules! produces_async {
     () => (pub fn async() {})
diff --git a/src/test/run-pass/edition-keywords-2018-2015.rs b/src/test/run-pass/edition-keywords-2018-2015.rs
index 4c22667d0bf..7d5de00cdb8 100644
--- a/src/test/run-pass/edition-keywords-2018-2015.rs
+++ b/src/test/run-pass/edition-keywords-2018-2015.rs
@@ -11,8 +11,6 @@
 // edition:2018
 // aux-build:edition-kw-macro-2015.rs
 
-#![feature(raw_identifiers)]
-
 #[macro_use]
 extern crate edition_kw_macro_2015;
 
diff --git a/src/test/run-pass/edition-keywords-2018-2018.rs b/src/test/run-pass/edition-keywords-2018-2018.rs
index 2a98b904da5..6462fc4da60 100644
--- a/src/test/run-pass/edition-keywords-2018-2018.rs
+++ b/src/test/run-pass/edition-keywords-2018-2018.rs
@@ -11,8 +11,6 @@
 // edition:2018
 // aux-build:edition-kw-macro-2018.rs
 
-#![feature(raw_identifiers)]
-
 #[macro_use]
 extern crate edition_kw_macro_2018;
 
diff --git a/src/test/run-pass/rfc-2126-extern-absolute-paths/basic.rs b/src/test/run-pass/rfc-2126-extern-absolute-paths/basic.rs
index dfa583415f7..93384b81e4a 100644
--- a/src/test/run-pass/rfc-2126-extern-absolute-paths/basic.rs
+++ b/src/test/run-pass/rfc-2126-extern-absolute-paths/basic.rs
@@ -11,8 +11,6 @@
 // aux-build:xcrate.rs
 // edition:2018
 
-#![feature(extern_absolute_paths)]
-
 use xcrate::Z;
 
 fn f() {
diff --git a/src/test/run-pass/rfc-2126-extern-absolute-paths/test.rs b/src/test/run-pass/rfc-2126-extern-absolute-paths/test.rs
index 6317dc17652..cace83d6274 100644
--- a/src/test/run-pass/rfc-2126-extern-absolute-paths/test.rs
+++ b/src/test/run-pass/rfc-2126-extern-absolute-paths/test.rs
@@ -15,8 +15,5 @@
 // edition:2018
 // compile-flags: --test
 
-#![feature(extern_absolute_paths)]
-
 #[test]
-fn test() {
-}
+fn test() {}
diff --git a/src/test/ui/auxiliary/edition-kw-macro-2018.rs b/src/test/ui/auxiliary/edition-kw-macro-2018.rs
index d42014766ec..85ef15858fe 100644
--- a/src/test/ui/auxiliary/edition-kw-macro-2018.rs
+++ b/src/test/ui/auxiliary/edition-kw-macro-2018.rs
@@ -10,7 +10,6 @@
 
 // edition:2018
 
-#![feature(raw_identifiers)]
 #![allow(async_idents)]
 
 #[macro_export]
diff --git a/src/test/ui/edition-keywords-2018-2015-expansion.rs b/src/test/ui/edition-keywords-2018-2015-expansion.rs
index be22d8b9b01..911dcd855aa 100644
--- a/src/test/ui/edition-keywords-2018-2015-expansion.rs
+++ b/src/test/ui/edition-keywords-2018-2015-expansion.rs
@@ -12,7 +12,6 @@
 // aux-build:edition-kw-macro-2015.rs
 // compile-pass
 
-#![feature(raw_identifiers)]
 #![allow(async_idents)]
 
 #[macro_use]
diff --git a/src/test/ui/edition-keywords-2018-2015-parsing.rs b/src/test/ui/edition-keywords-2018-2015-parsing.rs
index 713da57f7e2..02b061f8cbc 100644
--- a/src/test/ui/edition-keywords-2018-2015-parsing.rs
+++ b/src/test/ui/edition-keywords-2018-2015-parsing.rs
@@ -11,8 +11,6 @@
 // edition:2018
 // aux-build:edition-kw-macro-2015.rs
 
-#![feature(raw_identifiers)]
-
 #[macro_use]
 extern crate edition_kw_macro_2015;
 
diff --git a/src/test/ui/edition-keywords-2018-2015-parsing.stderr b/src/test/ui/edition-keywords-2018-2015-parsing.stderr
index ceab5ea730e..02e7d5b7cd0 100644
--- a/src/test/ui/edition-keywords-2018-2015-parsing.stderr
+++ b/src/test/ui/edition-keywords-2018-2015-parsing.stderr
@@ -1,23 +1,23 @@
 error: expected identifier, found reserved keyword `async`
-  --> $DIR/edition-keywords-2018-2015-parsing.rs:20:13
+  --> $DIR/edition-keywords-2018-2015-parsing.rs:18:13
    |
 LL |     let mut async = 1; //~ ERROR expected identifier, found reserved keyword `async`
    |             ^^^^^ expected identifier, found reserved keyword
 
 error: expected identifier, found reserved keyword `async`
-  --> $DIR/edition-keywords-2018-2015-parsing.rs:30:13
+  --> $DIR/edition-keywords-2018-2015-parsing.rs:28:13
    |
 LL |     module::async(); //~ ERROR expected identifier, found reserved keyword `async`
    |             ^^^^^ expected identifier, found reserved keyword
 
 error: no rules expected the token `r#async`
-  --> $DIR/edition-keywords-2018-2015-parsing.rs:24:31
+  --> $DIR/edition-keywords-2018-2015-parsing.rs:22:31
    |
 LL |     r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async`
    |                               ^^^^^^^
 
 error: no rules expected the token `async`
-  --> $DIR/edition-keywords-2018-2015-parsing.rs:25:35
+  --> $DIR/edition-keywords-2018-2015-parsing.rs:23:35
    |
 LL |     r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async`
    |                                   ^^^^^
diff --git a/src/test/ui/edition-keywords-2018-2018-expansion.rs b/src/test/ui/edition-keywords-2018-2018-expansion.rs
index a1ae1b5d004..81bef913ac6 100644
--- a/src/test/ui/edition-keywords-2018-2018-expansion.rs
+++ b/src/test/ui/edition-keywords-2018-2018-expansion.rs
@@ -11,8 +11,6 @@
 // edition:2018
 // aux-build:edition-kw-macro-2018.rs
 
-#![feature(raw_identifiers)]
-
 #[macro_use]
 extern crate edition_kw_macro_2018;
 
diff --git a/src/test/ui/edition-keywords-2018-2018-expansion.stderr b/src/test/ui/edition-keywords-2018-2018-expansion.stderr
index 91d0b2d30b5..c6e0927a3a4 100644
--- a/src/test/ui/edition-keywords-2018-2018-expansion.stderr
+++ b/src/test/ui/edition-keywords-2018-2018-expansion.stderr
@@ -1,5 +1,5 @@
 error: expected identifier, found reserved keyword `async`
-  --> $DIR/edition-keywords-2018-2018-expansion.rs:20:5
+  --> $DIR/edition-keywords-2018-2018-expansion.rs:18:5
    |
 LL |     produces_async! {} //~ ERROR expected identifier, found reserved keyword `async`
    |     ^^^^^^^^^^^^^^^^^^ expected identifier, found reserved keyword
diff --git a/src/test/ui/edition-keywords-2018-2018-parsing.rs b/src/test/ui/edition-keywords-2018-2018-parsing.rs
index 263ec95caa7..565c2f2dc74 100644
--- a/src/test/ui/edition-keywords-2018-2018-parsing.rs
+++ b/src/test/ui/edition-keywords-2018-2018-parsing.rs
@@ -11,8 +11,6 @@
 // edition:2018
 // aux-build:edition-kw-macro-2018.rs
 
-#![feature(raw_identifiers)]
-
 #[macro_use]
 extern crate edition_kw_macro_2018;
 
diff --git a/src/test/ui/edition-keywords-2018-2018-parsing.stderr b/src/test/ui/edition-keywords-2018-2018-parsing.stderr
index e48aac0a2bb..435e395c291 100644
--- a/src/test/ui/edition-keywords-2018-2018-parsing.stderr
+++ b/src/test/ui/edition-keywords-2018-2018-parsing.stderr
@@ -1,23 +1,23 @@
 error: expected identifier, found reserved keyword `async`
-  --> $DIR/edition-keywords-2018-2018-parsing.rs:20:13
+  --> $DIR/edition-keywords-2018-2018-parsing.rs:18:13
    |
 LL |     let mut async = 1; //~ ERROR expected identifier, found reserved keyword `async`
    |             ^^^^^ expected identifier, found reserved keyword
 
 error: expected identifier, found reserved keyword `async`
-  --> $DIR/edition-keywords-2018-2018-parsing.rs:30:13
+  --> $DIR/edition-keywords-2018-2018-parsing.rs:28:13
    |
 LL |     module::async(); //~ ERROR expected identifier, found reserved keyword `async`
    |             ^^^^^ expected identifier, found reserved keyword
 
 error: no rules expected the token `r#async`
-  --> $DIR/edition-keywords-2018-2018-parsing.rs:24:31
+  --> $DIR/edition-keywords-2018-2018-parsing.rs:22:31
    |
 LL |     r#async = consumes_async!(r#async); //~ ERROR no rules expected the token `r#async`
    |                               ^^^^^^^
 
 error: no rules expected the token `async`
-  --> $DIR/edition-keywords-2018-2018-parsing.rs:25:35
+  --> $DIR/edition-keywords-2018-2018-parsing.rs:23:35
    |
 LL |     r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async`
    |                                   ^^^^^