Remove the `proc` keyword again

25 files changed, 31 insertions, 451 deletions

diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs
index 35c94457e6e..a08f9b2e54a 100644
--- a/src/libsyntax_pos/symbol.rs
+++ b/src/libsyntax_pos/symbol.rs
@@ -386,25 +386,20 @@ declare_keywords! {
 
     // Edition-specific keywords reserved for future use.
     (55, Async,              "async") // >= 2018 Edition Only
-    (56, Proc,               "proc") // <= 2015 Edition Only
 
     // Special lifetime names
-    (57, UnderscoreLifetime, "'_")
-    (58, StaticLifetime,     "'static")
+    (56, UnderscoreLifetime, "'_")
+    (57, StaticLifetime,     "'static")
 
     // Weak keywords, have special meaning only in specific contexts.
-    (59, Auto,               "auto")
-    (60, Catch,              "catch")
-    (61, Default,            "default")
-    (62, Dyn,                "dyn")
-    (63, Union,              "union")
+    (58, Auto,               "auto")
+    (59, Catch,              "catch")
+    (60, Default,            "default")
+    (61, Dyn,                "dyn")
+    (62, Union,              "union")
 }
 
 impl Symbol {
-    fn is_unused_keyword_2015(self) -> bool {
-        self == keywords::Proc.name()
-    }
-
     fn is_unused_keyword_2018(self) -> bool {
         self == keywords::Async.name()
     }
@@ -426,7 +421,6 @@ impl Ident {
     pub fn is_unused_keyword(self) -> bool {
         // Note: `span.edition()` is relatively expensive, don't call it unless necessary.
         self.name >= keywords::Abstract.name() && self.name <= keywords::Yield.name() ||
-        self.name.is_unused_keyword_2015() && self.span.edition() == Edition::Edition2015 ||
         self.name.is_unused_keyword_2018() && self.span.edition() == Edition::Edition2018
     }
 
diff --git a/src/test/run-pass/auxiliary/edition-kw-macro-2015.rs b/src/test/run-pass/auxiliary/edition-kw-macro-2015.rs
index 1dc0562a9f0..9127c8e350a 100644
--- a/src/test/run-pass/auxiliary/edition-kw-macro-2015.rs
+++ b/src/test/run-pass/auxiliary/edition-kw-macro-2015.rs
@@ -12,7 +12,6 @@
 
 #![feature(raw_identifiers)]
 
-// `async`
 #[macro_export]
 macro_rules! produces_async {
     () => (pub fn async() {})
@@ -37,29 +36,3 @@ macro_rules! consumes_async_raw {
 macro_rules! passes_ident {
     ($i: ident) => ($i)
 }
-
-// `proc`
-#[macro_export]
-macro_rules! produces_proc {
-    () => (pub fn proc() {})
-}
-
-#[macro_export]
-macro_rules! produces_proc_raw {
-    () => (pub fn r#proc() {})
-}
-
-#[macro_export]
-macro_rules! consumes_proc {
-    (proc) => (1)
-}
-
-#[macro_export]
-macro_rules! consumes_proc_raw {
-    (r#proc) => (1)
-}
-
-#[macro_export]
-macro_rules! passes_ident {
-    ($i: ident) => ($i)
-}
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 fb018a36231..4fef77d67ea 100644
--- a/src/test/run-pass/auxiliary/edition-kw-macro-2018.rs
+++ b/src/test/run-pass/auxiliary/edition-kw-macro-2018.rs
@@ -12,7 +12,6 @@
 
 #![feature(raw_identifiers)]
 
-// `async`
 #[macro_export]
 macro_rules! produces_async {
     () => (pub fn async() {})
@@ -37,29 +36,3 @@ macro_rules! consumes_async_raw {
 macro_rules! passes_ident {
     ($i: ident) => ($i)
 }
-
-// `proc`
-#[macro_export]
-macro_rules! produces_proc {
-    () => (pub fn proc() {})
-}
-
-#[macro_export]
-macro_rules! produces_proc_raw {
-    () => (pub fn r#proc() {})
-}
-
-#[macro_export]
-macro_rules! consumes_proc {
-    (proc) => (1)
-}
-
-#[macro_export]
-macro_rules! consumes_proc_raw {
-    (r#proc) => (1)
-}
-
-#[macro_export]
-macro_rules! passes_ident {
-    ($i: ident) => ($i)
-}
diff --git a/src/test/run-pass/edition-keywords-2015-2015.rs b/src/test/run-pass/edition-keywords-2015-2015.rs
index b66d35cfc37..41480bb978e 100644
--- a/src/test/run-pass/edition-keywords-2015-2015.rs
+++ b/src/test/run-pass/edition-keywords-2015-2015.rs
@@ -16,7 +16,6 @@
 #[macro_use]
 extern crate edition_kw_macro_2015;
 
-// `async`
 pub fn check_async() {
     let mut async = 1; // OK
     let mut r#async = 1; // OK
@@ -41,29 +40,4 @@ mod two_async {
     produces_async_raw! {} // OK
 }
 
-// `proc`
-pub fn check_proc() {
-    // let mut proc = 1; // ERROR, reserved
-    let mut r#proc = 1; // OK
-
-    r#proc = consumes_proc!(proc); // OK
-    // r#proc = consumes_proc!(r#proc); // ERROR, not a match
-    // r#proc = consumes_proc_raw!(proc); // ERROR, not a match
-    r#proc = consumes_proc_raw!(r#proc); // OK
-
-    // if passes_ident!(proc) == 1 {} // ERROR, reserved
-    if passes_ident!(r#proc) == 1 {} // OK
-    // one_proc::proc(); // ERROR, reserved
-    // one_proc::r#proc(); // ERROR, unresolved name
-    // two_proc::proc(); // ERROR, reserved
-    two_proc::r#proc(); // OK
-}
-
-mod one_proc {
-    // produces_proc! {} // ERROR, reserved
-}
-mod two_proc {
-    produces_proc_raw! {} // OK
-}
-
 fn main() {}
diff --git a/src/test/run-pass/edition-keywords-2015-2018.rs b/src/test/run-pass/edition-keywords-2015-2018.rs
index ae208342772..78835d51063 100644
--- a/src/test/run-pass/edition-keywords-2015-2018.rs
+++ b/src/test/run-pass/edition-keywords-2015-2018.rs
@@ -16,7 +16,6 @@
 #[macro_use]
 extern crate edition_kw_macro_2018;
 
-// `async`
 pub fn check_async() {
     let mut async = 1; // OK
     let mut r#async = 1; // OK
@@ -41,29 +40,4 @@ mod two_async {
     produces_async_raw! {} // OK
 }
 
-// `proc`
-pub fn check_proc() {
-    // let mut proc = 1; // ERROR, reserved
-    let mut r#proc = 1; // OK
-
-    r#proc = consumes_proc!(proc); // OK
-    // r#proc = consumes_proc!(r#proc); // ERROR, not a match
-    // r#proc = consumes_proc_raw!(proc); // ERROR, not a match
-    r#proc = consumes_proc_raw!(r#proc); // OK
-
-    // if passes_ident!(proc) == 1 {} // ERROR, reserved
-    if passes_ident!(r#proc) == 1 {} // OK
-    // one_proc::proc(); // ERROR, reserved
-    one_proc::r#proc(); // OK
-    // two_proc::proc(); // ERROR, reserved
-    two_proc::r#proc(); // OK
-}
-
-mod one_proc {
-    produces_proc! {} // OK
-}
-mod two_proc {
-    produces_proc_raw! {} // OK
-}
-
 fn main() {}
diff --git a/src/test/run-pass/edition-keywords-2018-2015.rs b/src/test/run-pass/edition-keywords-2018-2015.rs
index b70ccd6b0f4..46d5f222cbb 100644
--- a/src/test/run-pass/edition-keywords-2018-2015.rs
+++ b/src/test/run-pass/edition-keywords-2018-2015.rs
@@ -16,7 +16,6 @@
 #[macro_use]
 extern crate edition_kw_macro_2015;
 
-// `async`
 pub fn check_async() {
     // let mut async = 1; // ERROR, reserved
     let mut r#async = 1; // OK
@@ -41,29 +40,4 @@ mod two_async {
     produces_async_raw! {} // OK
 }
 
-// `proc`
-pub fn check_proc() {
-    let mut proc = 1; // OK
-    let mut r#proc = 1; // OK
-
-    r#proc = consumes_proc!(proc); // OK
-    // r#proc = consumes_proc!(r#proc); // ERROR, not a match
-    // r#proc = consumes_proc_raw!(proc); // ERROR, not a match
-    r#proc = consumes_proc_raw!(r#proc); // OK
-
-    if passes_ident!(proc) == 1 {} // OK
-    if passes_ident!(r#proc) == 1 {} // OK
-    // one_proc::proc(); // ERROR, unresolved name
-    // one_proc::r#proc(); // ERROR, unresolved name
-    two_proc::proc(); // OK
-    two_proc::r#proc(); // OK
-}
-
-mod one_proc {
-    // produces_proc! {} // ERROR, reserved
-}
-mod two_proc {
-    produces_proc_raw! {} // OK
-}
-
 fn main() {}
diff --git a/src/test/run-pass/edition-keywords-2018-2018.rs b/src/test/run-pass/edition-keywords-2018-2018.rs
index e3da165eb35..06482988937 100644
--- a/src/test/run-pass/edition-keywords-2018-2018.rs
+++ b/src/test/run-pass/edition-keywords-2018-2018.rs
@@ -16,7 +16,6 @@
 #[macro_use]
 extern crate edition_kw_macro_2018;
 
-// `async`
 pub fn check_async() {
     // let mut async = 1; // ERROR, reserved
     let mut r#async = 1; // OK
@@ -41,29 +40,4 @@ mod two_async {
     produces_async_raw! {} // OK
 }
 
-// `proc`
-pub fn check_proc() {
-    let mut proc = 1; // OK
-    let mut r#proc = 1; // OK
-
-    r#proc = consumes_proc!(proc); // OK
-    // r#proc = consumes_proc!(r#proc); // ERROR, not a match
-    // r#proc = consumes_proc_raw!(proc); // ERROR, not a match
-    r#proc = consumes_proc_raw!(r#proc); // OK
-
-    if passes_ident!(proc) == 1 {} // OK
-    if passes_ident!(r#proc) == 1 {} // OK
-    one_proc::proc(); // OK
-    one_proc::r#proc(); // OK
-    two_proc::proc(); // OK
-    two_proc::r#proc(); // OK
-}
-
-mod one_proc {
-    produces_proc! {} // OK
-}
-mod two_proc {
-    produces_proc_raw! {} // OK
-}
-
 fn main() {}
diff --git a/src/test/ui/auxiliary/edition-kw-macro-2015.rs b/src/test/ui/auxiliary/edition-kw-macro-2015.rs
index 1dc0562a9f0..9127c8e350a 100644
--- a/src/test/ui/auxiliary/edition-kw-macro-2015.rs
+++ b/src/test/ui/auxiliary/edition-kw-macro-2015.rs
@@ -12,7 +12,6 @@
 
 #![feature(raw_identifiers)]
 
-// `async`
 #[macro_export]
 macro_rules! produces_async {
     () => (pub fn async() {})
@@ -37,29 +36,3 @@ macro_rules! consumes_async_raw {
 macro_rules! passes_ident {
     ($i: ident) => ($i)
 }
-
-// `proc`
-#[macro_export]
-macro_rules! produces_proc {
-    () => (pub fn proc() {})
-}
-
-#[macro_export]
-macro_rules! produces_proc_raw {
-    () => (pub fn r#proc() {})
-}
-
-#[macro_export]
-macro_rules! consumes_proc {
-    (proc) => (1)
-}
-
-#[macro_export]
-macro_rules! consumes_proc_raw {
-    (r#proc) => (1)
-}
-
-#[macro_export]
-macro_rules! passes_ident {
-    ($i: ident) => ($i)
-}
diff --git a/src/test/ui/auxiliary/edition-kw-macro-2018.rs b/src/test/ui/auxiliary/edition-kw-macro-2018.rs
index fb018a36231..4fef77d67ea 100644
--- a/src/test/ui/auxiliary/edition-kw-macro-2018.rs
+++ b/src/test/ui/auxiliary/edition-kw-macro-2018.rs
@@ -12,7 +12,6 @@
 
 #![feature(raw_identifiers)]
 
-// `async`
 #[macro_export]
 macro_rules! produces_async {
     () => (pub fn async() {})
@@ -37,29 +36,3 @@ macro_rules! consumes_async_raw {
 macro_rules! passes_ident {
     ($i: ident) => ($i)
 }
-
-// `proc`
-#[macro_export]
-macro_rules! produces_proc {
-    () => (pub fn proc() {})
-}
-
-#[macro_export]
-macro_rules! produces_proc_raw {
-    () => (pub fn r#proc() {})
-}
-
-#[macro_export]
-macro_rules! consumes_proc {
-    (proc) => (1)
-}
-
-#[macro_export]
-macro_rules! consumes_proc_raw {
-    (r#proc) => (1)
-}
-
-#[macro_export]
-macro_rules! passes_ident {
-    ($i: ident) => ($i)
-}
diff --git a/src/test/ui/edition-keywords-2015-2015-expansion.rs b/src/test/ui/edition-keywords-2015-2015-expansion.rs
index 13d95e6751e..b8a1994a105 100644
--- a/src/test/ui/edition-keywords-2015-2015-expansion.rs
+++ b/src/test/ui/edition-keywords-2015-2015-expansion.rs
@@ -10,13 +10,13 @@
 
 // compile-flags: --edition=2015
 // aux-build:edition-kw-macro-2015.rs
+// compile-pass
 
 #![feature(raw_identifiers)]
 
 #[macro_use]
 extern crate edition_kw_macro_2015;
 
-// `async`
 mod one_async {
     produces_async! {} // OK
 }
@@ -24,10 +24,4 @@ mod two_async {
     produces_async_raw! {} // OK
 }
 
-// `proc`
-mod one_proc {
-    produces_proc! {} // ERROR expected identifier, found reserved keyword `proc`
-}
-mod two_proc {
-    produces_proc_raw! {} // OK
-}
+fn main() {}
diff --git a/src/test/ui/edition-keywords-2015-2015-expansion.stderr b/src/test/ui/edition-keywords-2015-2015-expansion.stderr
deleted file mode 100644
index dd4a35c1f05..00000000000
--- a/src/test/ui/edition-keywords-2015-2015-expansion.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-error: expected identifier, found reserved keyword `proc`
-  --> $DIR/edition-keywords-2015-2015-expansion.rs:29:5
-   |
-LL |     produces_proc! {} // ERROR expected identifier, found reserved keyword `proc`
-   |     ^^^^^^^^^^^^^^^^^ expected identifier, found reserved keyword
-   |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/edition-keywords-2015-2015-parsing.rs b/src/test/ui/edition-keywords-2015-2015-parsing.rs
index 1f8390796d3..1fb91ca006c 100644
--- a/src/test/ui/edition-keywords-2015-2015-parsing.rs
+++ b/src/test/ui/edition-keywords-2015-2015-parsing.rs
@@ -16,7 +16,6 @@
 #[macro_use]
 extern crate edition_kw_macro_2015;
 
-// `async`
 pub fn check_async() {
     let mut async = 1; // OK
     let mut r#async = 1; // OK
@@ -31,19 +30,3 @@ pub fn check_async() {
     module::async(); // OK
     module::r#async(); // OK
 }
-
-// `proc`
-pub fn check_proc() {
-    let mut proc = 1; //~ ERROR expected identifier, found reserved keyword `proc`
-    let mut r#proc = 1; // OK
-
-    r#proc = consumes_proc!(proc); // OK
-    r#proc = consumes_proc!(r#proc); //~ ERROR no rules expected the token `r#proc`
-    r#proc = consumes_proc_raw!(proc); //~ ERROR no rules expected the token `proc`
-    r#proc = consumes_proc_raw!(r#proc); // OK
-
-    if passes_ident!(proc) == 1 {} //~ ERROR expected expression, found reserved keyword `proc`
-    if passes_ident!(r#proc) == 1 {} // OK
-    module::proc(); //~ ERROR expected identifier, found reserved keyword `proc`
-    module::r#proc(); // OK
-}
diff --git a/src/test/ui/edition-keywords-2015-2015-parsing.stderr b/src/test/ui/edition-keywords-2015-2015-parsing.stderr
index c40de006edc..5b6fd3e1c9c 100644
--- a/src/test/ui/edition-keywords-2015-2015-parsing.stderr
+++ b/src/test/ui/edition-keywords-2015-2015-parsing.stderr
@@ -1,44 +1,14 @@
-error: expected identifier, found reserved keyword `proc`
-  --> $DIR/edition-keywords-2015-2015-parsing.rs:37:13
-   |
-LL |     let mut proc = 1; //~ ERROR expected identifier, found reserved keyword `proc`
-   |             ^^^^ expected identifier, found reserved keyword
-
-error: expected identifier, found reserved keyword `proc`
-  --> $DIR/edition-keywords-2015-2015-parsing.rs:47:13
-   |
-LL |     module::proc(); //~ ERROR expected identifier, found reserved keyword `proc`
-   |             ^^^^ expected identifier, found reserved keyword
-
 error: no rules expected the token `r#async`
-  --> $DIR/edition-keywords-2015-2015-parsing.rs:25:31
+  --> $DIR/edition-keywords-2015-2015-parsing.rs:24: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-2015-2015-parsing.rs:26:35
+  --> $DIR/edition-keywords-2015-2015-parsing.rs:25:35
    |
 LL |     r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async`
    |                                   ^^^^^
 
-error: no rules expected the token `r#proc`
-  --> $DIR/edition-keywords-2015-2015-parsing.rs:41:29
-   |
-LL |     r#proc = consumes_proc!(r#proc); //~ ERROR no rules expected the token `r#proc`
-   |                             ^^^^^^
-
-error: no rules expected the token `proc`
-  --> $DIR/edition-keywords-2015-2015-parsing.rs:42:33
-   |
-LL |     r#proc = consumes_proc_raw!(proc); //~ ERROR no rules expected the token `proc`
-   |                                 ^^^^
-
-error: expected expression, found reserved keyword `proc`
-  --> $DIR/edition-keywords-2015-2015-parsing.rs:45:22
-   |
-LL |     if passes_ident!(proc) == 1 {} //~ ERROR expected expression, found reserved keyword `proc`
-   |                      ^^^^ expected expression
-
-error: aborting due to 7 previous errors
+error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/edition-keywords-2015-2018-expansion.rs b/src/test/ui/edition-keywords-2015-2018-expansion.rs
index 59117184686..bc14c104c49 100644
--- a/src/test/ui/edition-keywords-2015-2018-expansion.rs
+++ b/src/test/ui/edition-keywords-2015-2018-expansion.rs
@@ -16,18 +16,9 @@
 #[macro_use]
 extern crate edition_kw_macro_2018;
 
-// `async`
 mod one_async {
     produces_async! {} // ERROR expected identifier, found reserved keyword
 }
 mod two_async {
     produces_async_raw! {} // OK
 }
-
-// `proc`
-mod one_proc {
-    produces_proc! {} // OK
-}
-mod two_proc {
-    produces_proc_raw! {} // OK
-}
diff --git a/src/test/ui/edition-keywords-2015-2018-expansion.stderr b/src/test/ui/edition-keywords-2015-2018-expansion.stderr
index a1716efb537..13c4ee82537 100644
--- a/src/test/ui/edition-keywords-2015-2018-expansion.stderr
+++ b/src/test/ui/edition-keywords-2015-2018-expansion.stderr
@@ -1,5 +1,5 @@
 error: expected identifier, found reserved keyword `async`
-  --> $DIR/edition-keywords-2015-2018-expansion.rs:21:5
+  --> $DIR/edition-keywords-2015-2018-expansion.rs:20:5
    |
 LL |     produces_async! {} // ERROR expected identifier, found reserved keyword
    |     ^^^^^^^^^^^^^^^^^^ expected identifier, found reserved keyword
diff --git a/src/test/ui/edition-keywords-2015-2018-parsing.rs b/src/test/ui/edition-keywords-2015-2018-parsing.rs
index 6405a94f842..0b680eb16c7 100644
--- a/src/test/ui/edition-keywords-2015-2018-parsing.rs
+++ b/src/test/ui/edition-keywords-2015-2018-parsing.rs
@@ -16,7 +16,6 @@
 #[macro_use]
 extern crate edition_kw_macro_2018;
 
-// `async`
 pub fn check_async() {
     let mut async = 1; // OK
     let mut r#async = 1; // OK
@@ -31,19 +30,3 @@ pub fn check_async() {
     module::async(); // OK
     module::r#async(); // OK
 }
-
-// `proc`
-pub fn check_proc() {
-    let mut proc = 1; //~ ERROR expected identifier, found reserved keyword `proc`
-    let mut r#proc = 1; // OK
-
-    r#proc = consumes_proc!(proc); // OK
-    r#proc = consumes_proc!(r#proc); //~ ERROR no rules expected the token `r#proc`
-    r#proc = consumes_proc_raw!(proc); //~ ERROR no rules expected the token `proc`
-    r#proc = consumes_proc_raw!(r#proc); // OK
-
-    if passes_ident!(proc) == 1 {} //~ ERROR expected expression, found reserved keyword `proc`
-    if passes_ident!(r#proc) == 1 {} // OK
-    module::proc(); //~ ERROR expected identifier, found reserved keyword `proc`
-    module::r#proc(); // OK
-}
diff --git a/src/test/ui/edition-keywords-2015-2018-parsing.stderr b/src/test/ui/edition-keywords-2015-2018-parsing.stderr
index 3510f898025..60cfbce3ff0 100644
--- a/src/test/ui/edition-keywords-2015-2018-parsing.stderr
+++ b/src/test/ui/edition-keywords-2015-2018-parsing.stderr
@@ -1,44 +1,14 @@
-error: expected identifier, found reserved keyword `proc`
-  --> $DIR/edition-keywords-2015-2018-parsing.rs:37:13
-   |
-LL |     let mut proc = 1; //~ ERROR expected identifier, found reserved keyword `proc`
-   |             ^^^^ expected identifier, found reserved keyword
-
-error: expected identifier, found reserved keyword `proc`
-  --> $DIR/edition-keywords-2015-2018-parsing.rs:47:13
-   |
-LL |     module::proc(); //~ ERROR expected identifier, found reserved keyword `proc`
-   |             ^^^^ expected identifier, found reserved keyword
-
 error: no rules expected the token `r#async`
-  --> $DIR/edition-keywords-2015-2018-parsing.rs:25:31
+  --> $DIR/edition-keywords-2015-2018-parsing.rs:24: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-2015-2018-parsing.rs:26:35
+  --> $DIR/edition-keywords-2015-2018-parsing.rs:25:35
    |
 LL |     r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async`
    |                                   ^^^^^
 
-error: no rules expected the token `r#proc`
-  --> $DIR/edition-keywords-2015-2018-parsing.rs:41:29
-   |
-LL |     r#proc = consumes_proc!(r#proc); //~ ERROR no rules expected the token `r#proc`
-   |                             ^^^^^^
-
-error: no rules expected the token `proc`
-  --> $DIR/edition-keywords-2015-2018-parsing.rs:42:33
-   |
-LL |     r#proc = consumes_proc_raw!(proc); //~ ERROR no rules expected the token `proc`
-   |                                 ^^^^
-
-error: expected expression, found reserved keyword `proc`
-  --> $DIR/edition-keywords-2015-2018-parsing.rs:45:22
-   |
-LL |     if passes_ident!(proc) == 1 {} //~ ERROR expected expression, found reserved keyword `proc`
-   |                      ^^^^ expected expression
-
-error: aborting due to 7 previous errors
+error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/edition-keywords-2018-2015-expansion.rs b/src/test/ui/edition-keywords-2018-2015-expansion.rs
index 04de1018f15..6f85f427eb0 100644
--- a/src/test/ui/edition-keywords-2018-2015-expansion.rs
+++ b/src/test/ui/edition-keywords-2018-2015-expansion.rs
@@ -10,13 +10,13 @@
 
 // compile-flags: --edition=2018
 // aux-build:edition-kw-macro-2015.rs
+// compile-pass
 
 #![feature(raw_identifiers)]
 
 #[macro_use]
 extern crate edition_kw_macro_2015;
 
-// `async`
 mod one_async {
     produces_async! {} // OK
 }
@@ -24,10 +24,4 @@ mod two_async {
     produces_async_raw! {} // OK
 }
 
-// `proc`
-mod one_proc {
-    produces_proc! {} // ERROR expected identifier, found reserved keyword
-}
-mod two_proc {
-    produces_proc_raw! {} // OK
-}
+fn main() {}
diff --git a/src/test/ui/edition-keywords-2018-2015-expansion.stderr b/src/test/ui/edition-keywords-2018-2015-expansion.stderr
deleted file mode 100644
index 320022e526a..00000000000
--- a/src/test/ui/edition-keywords-2018-2015-expansion.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-error: expected identifier, found reserved keyword `proc`
-  --> $DIR/edition-keywords-2018-2015-expansion.rs:29:5
-   |
-LL |     produces_proc! {} // ERROR expected identifier, found reserved keyword
-   |     ^^^^^^^^^^^^^^^^^ expected identifier, found reserved keyword
-   |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/edition-keywords-2018-2015-parsing.rs b/src/test/ui/edition-keywords-2018-2015-parsing.rs
index 26a503d642d..29c5ea41f1f 100644
--- a/src/test/ui/edition-keywords-2018-2015-parsing.rs
+++ b/src/test/ui/edition-keywords-2018-2015-parsing.rs
@@ -16,23 +16,6 @@
 #[macro_use]
 extern crate edition_kw_macro_2015;
 
-// `proc`
-pub fn check_proc() {
-    let mut proc = 1; // OK
-    let mut r#proc = 1; // OK
-
-    r#proc = consumes_proc!(proc); // OK
-    r#proc = consumes_proc!(r#proc); //~ ERROR no rules expected the token `r#proc`
-    r#proc = consumes_proc_raw!(proc); //~ ERROR no rules expected the token `proc`
-    r#proc = consumes_proc_raw!(r#proc); // OK
-
-    if passes_ident!(proc) == 1 {} // OK
-    if passes_ident!(r#proc) == 1 {} // OK
-    module::proc(); // OK
-    module::r#proc(); // OK
-}
-
-// `async`
 pub fn check_async() {
     let mut async = 1; //~ ERROR expected identifier, found reserved keyword `async`
     let mut r#async = 1; // OK
diff --git a/src/test/ui/edition-keywords-2018-2015-parsing.stderr b/src/test/ui/edition-keywords-2018-2015-parsing.stderr
index d39d5a8a901..0b3ca57bfab 100644
--- a/src/test/ui/edition-keywords-2018-2015-parsing.stderr
+++ b/src/test/ui/edition-keywords-2018-2015-parsing.stderr
@@ -1,44 +1,32 @@
 error: expected identifier, found reserved keyword `async`
-  --> $DIR/edition-keywords-2018-2015-parsing.rs:37:13
+  --> $DIR/edition-keywords-2018-2015-parsing.rs:20: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:47:13
+  --> $DIR/edition-keywords-2018-2015-parsing.rs:30:13
    |
 LL |     module::async(); //~ ERROR expected identifier, found reserved keyword `async`
    |             ^^^^^ expected identifier, found reserved keyword
 
-error: no rules expected the token `r#proc`
-  --> $DIR/edition-keywords-2018-2015-parsing.rs:25:29
-   |
-LL |     r#proc = consumes_proc!(r#proc); //~ ERROR no rules expected the token `r#proc`
-   |                             ^^^^^^
-
-error: no rules expected the token `proc`
-  --> $DIR/edition-keywords-2018-2015-parsing.rs:26:33
-   |
-LL |     r#proc = consumes_proc_raw!(proc); //~ ERROR no rules expected the token `proc`
-   |                                 ^^^^
-
 error: no rules expected the token `r#async`
-  --> $DIR/edition-keywords-2018-2015-parsing.rs:41:31
+  --> $DIR/edition-keywords-2018-2015-parsing.rs:24: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:42:35
+  --> $DIR/edition-keywords-2018-2015-parsing.rs:25:35
    |
 LL |     r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async`
    |                                   ^^^^^
 
 error: expected expression, found reserved keyword `async`
-  --> $DIR/edition-keywords-2018-2015-parsing.rs:45:22
+  --> $DIR/edition-keywords-2018-2015-parsing.rs:28:22
    |
 LL |     if passes_ident!(async) == 1 {} //~ ERROR expected expression, found reserved keyword `async`
    |                      ^^^^^ expected expression
 
-error: aborting due to 7 previous errors
+error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/edition-keywords-2018-2018-expansion.rs b/src/test/ui/edition-keywords-2018-2018-expansion.rs
index 55732da8bc0..ef7f63e225c 100644
--- a/src/test/ui/edition-keywords-2018-2018-expansion.rs
+++ b/src/test/ui/edition-keywords-2018-2018-expansion.rs
@@ -16,18 +16,9 @@
 #[macro_use]
 extern crate edition_kw_macro_2018;
 
-// `async`
 mod one_async {
     produces_async! {} // ERROR expected identifier, found reserved keyword `async`
 }
 mod two_async {
     produces_async_raw! {} // OK
 }
-
-// `proc`
-mod one_proc {
-    produces_proc! {} // OK
-}
-mod two_proc {
-    produces_proc_raw! {} // OK
-}
diff --git a/src/test/ui/edition-keywords-2018-2018-expansion.stderr b/src/test/ui/edition-keywords-2018-2018-expansion.stderr
index 236409c9628..cd51030fd28 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:21:5
+  --> $DIR/edition-keywords-2018-2018-expansion.rs:20: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 7fc7450d5b2..a94808eb224 100644
--- a/src/test/ui/edition-keywords-2018-2018-parsing.rs
+++ b/src/test/ui/edition-keywords-2018-2018-parsing.rs
@@ -16,23 +16,6 @@
 #[macro_use]
 extern crate edition_kw_macro_2018;
 
-// `proc`
-pub fn check_proc() {
-    let mut proc = 1; // OK
-    let mut r#proc = 1; // OK
-
-    r#proc = consumes_proc!(proc); // OK
-    r#proc = consumes_proc!(r#proc); //~ ERROR no rules expected the token `r#proc`
-    r#proc = consumes_proc_raw!(proc); //~ ERROR no rules expected the token `proc`
-    r#proc = consumes_proc_raw!(r#proc); // OK
-
-    if passes_ident!(proc) == 1 {} // OK
-    if passes_ident!(r#proc) == 1 {} // OK
-    module::proc(); // OK
-    module::r#proc(); // OK
-}
-
-// `async`
 pub fn check_async() {
     let mut async = 1; //~ ERROR expected identifier, found reserved keyword `async`
     let mut r#async = 1; // OK
diff --git a/src/test/ui/edition-keywords-2018-2018-parsing.stderr b/src/test/ui/edition-keywords-2018-2018-parsing.stderr
index fba1ec6d18a..1b18d8a39be 100644
--- a/src/test/ui/edition-keywords-2018-2018-parsing.stderr
+++ b/src/test/ui/edition-keywords-2018-2018-parsing.stderr
@@ -1,44 +1,32 @@
 error: expected identifier, found reserved keyword `async`
-  --> $DIR/edition-keywords-2018-2018-parsing.rs:37:13
+  --> $DIR/edition-keywords-2018-2018-parsing.rs:20: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:47:13
+  --> $DIR/edition-keywords-2018-2018-parsing.rs:30:13
    |
 LL |     module::async(); //~ ERROR expected identifier, found reserved keyword `async`
    |             ^^^^^ expected identifier, found reserved keyword
 
-error: no rules expected the token `r#proc`
-  --> $DIR/edition-keywords-2018-2018-parsing.rs:25:29
-   |
-LL |     r#proc = consumes_proc!(r#proc); //~ ERROR no rules expected the token `r#proc`
-   |                             ^^^^^^
-
-error: no rules expected the token `proc`
-  --> $DIR/edition-keywords-2018-2018-parsing.rs:26:33
-   |
-LL |     r#proc = consumes_proc_raw!(proc); //~ ERROR no rules expected the token `proc`
-   |                                 ^^^^
-
 error: no rules expected the token `r#async`
-  --> $DIR/edition-keywords-2018-2018-parsing.rs:41:31
+  --> $DIR/edition-keywords-2018-2018-parsing.rs:24: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:42:35
+  --> $DIR/edition-keywords-2018-2018-parsing.rs:25:35
    |
 LL |     r#async = consumes_async_raw!(async); //~ ERROR no rules expected the token `async`
    |                                   ^^^^^
 
 error: expected expression, found reserved keyword `async`
-  --> $DIR/edition-keywords-2018-2018-parsing.rs:45:22
+  --> $DIR/edition-keywords-2018-2018-parsing.rs:28:22
    |
 LL |     if passes_ident!(async) == 1 {} //~ ERROR expected expression, found reserved keyword `async`
    |                      ^^^^^ expected expression
 
-error: aborting due to 7 previous errors
+error: aborting due to 5 previous errors