Allow using inert attributes from `proc_macro_derive`s with `#![feature(proc_macro)]`.

11 files changed, 26 insertions, 28 deletions

diff --git a/src/test/compile-fail-fulldeps/gated-quote.rs b/src/test/compile-fail-fulldeps/gated-quote.rs
index 51a9a87744a..3480bd895bf 100644
--- a/src/test/compile-fail-fulldeps/gated-quote.rs
+++ b/src/test/compile-fail-fulldeps/gated-quote.rs
@@ -39,18 +39,18 @@ impl ParseSess {
 
 pub fn main() {
     let ecx = &ParseSess;
-    let x = quote_tokens!(ecx, 3);    //~ ERROR macro undefined: 'quote_tokens!'
-    let x = quote_expr!(ecx, 3);      //~ ERROR macro undefined: 'quote_expr!'
-    let x = quote_ty!(ecx, 3);        //~ ERROR macro undefined: 'quote_ty!'
-    let x = quote_method!(ecx, 3);    //~ ERROR macro undefined: 'quote_method!'
-    let x = quote_item!(ecx, 3);      //~ ERROR macro undefined: 'quote_item!'
-    let x = quote_pat!(ecx, 3);       //~ ERROR macro undefined: 'quote_pat!'
-    let x = quote_arm!(ecx, 3);       //~ ERROR macro undefined: 'quote_arm!'
-    let x = quote_stmt!(ecx, 3);      //~ ERROR macro undefined: 'quote_stmt!'
-    let x = quote_matcher!(ecx, 3);   //~ ERROR macro undefined: 'quote_matcher!'
-    let x = quote_attr!(ecx, 3);      //~ ERROR macro undefined: 'quote_attr!'
-    let x = quote_arg!(ecx, 3);       //~ ERROR macro undefined: 'quote_arg!'
-    let x = quote_block!(ecx, 3);     //~ ERROR macro undefined: 'quote_block!'
-    let x = quote_meta_item!(ecx, 3); //~ ERROR macro undefined: 'quote_meta_item!'
-    let x = quote_path!(ecx, 3);      //~ ERROR macro undefined: 'quote_path!'
+    let x = quote_tokens!(ecx, 3);    //~ ERROR macro undefined: `quote_tokens`
+    let x = quote_expr!(ecx, 3);      //~ ERROR macro undefined: `quote_expr`
+    let x = quote_ty!(ecx, 3);        //~ ERROR macro undefined: `quote_ty`
+    let x = quote_method!(ecx, 3);    //~ ERROR macro undefined: `quote_method`
+    let x = quote_item!(ecx, 3);      //~ ERROR macro undefined: `quote_item`
+    let x = quote_pat!(ecx, 3);       //~ ERROR macro undefined: `quote_pat`
+    let x = quote_arm!(ecx, 3);       //~ ERROR macro undefined: `quote_arm`
+    let x = quote_stmt!(ecx, 3);      //~ ERROR macro undefined: `quote_stmt`
+    let x = quote_matcher!(ecx, 3);   //~ ERROR macro undefined: `quote_matcher`
+    let x = quote_attr!(ecx, 3);      //~ ERROR macro undefined: `quote_attr`
+    let x = quote_arg!(ecx, 3);       //~ ERROR macro undefined: `quote_arg`
+    let x = quote_block!(ecx, 3);     //~ ERROR macro undefined: `quote_block`
+    let x = quote_meta_item!(ecx, 3); //~ ERROR macro undefined: `quote_meta_item`
+    let x = quote_path!(ecx, 3);      //~ ERROR macro undefined: `quote_path`
 }
diff --git a/src/test/compile-fail-fulldeps/macro-crate-unexported-macro.rs b/src/test/compile-fail-fulldeps/macro-crate-unexported-macro.rs
index b0cd4220532..d5d8d7b6ef8 100644
--- a/src/test/compile-fail-fulldeps/macro-crate-unexported-macro.rs
+++ b/src/test/compile-fail-fulldeps/macro-crate-unexported-macro.rs
@@ -14,5 +14,5 @@
 extern crate macro_crate_test;
 
 fn main() {
-    assert_eq!(3, unexported_macro!()); //~ ERROR macro undefined: 'unexported_macro!'
+    assert_eq!(3, unexported_macro!()); //~ ERROR macro undefined: `unexported_macro`
 }
diff --git a/src/test/compile-fail/feature-gate-rustc-diagnostic-macros.rs b/src/test/compile-fail/feature-gate-rustc-diagnostic-macros.rs
index 8286d833e8d..03c3960a1ef 100644
--- a/src/test/compile-fail/feature-gate-rustc-diagnostic-macros.rs
+++ b/src/test/compile-fail/feature-gate-rustc-diagnostic-macros.rs
@@ -12,12 +12,12 @@
 // gate
 
 __register_diagnostic!(E0001);
-//~^ ERROR macro undefined: '__register_diagnostic!'
+//~^ ERROR macro undefined: `__register_diagnostic`
 
 fn main() {
     __diagnostic_used!(E0001);
-    //~^ ERROR macro undefined: '__diagnostic_used!'
+    //~^ ERROR macro undefined: `__diagnostic_used`
 }
 
 __build_diagnostic_array!(DIAGNOSTICS);
-//~^ ERROR macro undefined: '__build_diagnostic_array!'
+//~^ ERROR macro undefined: `__build_diagnostic_array`
diff --git a/src/test/compile-fail/issue-11692.rs b/src/test/compile-fail/issue-11692.rs
index 09cf9739614..7819fd4c1ab 100644
--- a/src/test/compile-fail/issue-11692.rs
+++ b/src/test/compile-fail/issue-11692.rs
@@ -10,9 +10,9 @@
 
 fn main() {
     print!(test!());
-    //~^ ERROR: macro undefined: 'test!'
+    //~^ ERROR: macro undefined: `test`
     //~^^ ERROR: format argument must be a string literal
 
     concat!(test!());
-    //~^ ERROR: macro undefined: 'test!'
+    //~^ ERROR: macro undefined: `test`
 }
diff --git a/src/test/compile-fail/issue-19734.rs b/src/test/compile-fail/issue-19734.rs
index ab88b580ba1..fe0648c3713 100644
--- a/src/test/compile-fail/issue-19734.rs
+++ b/src/test/compile-fail/issue-19734.rs
@@ -11,5 +11,5 @@
 fn main() {}
 
 impl Type {
-    undef!(); //~ ERROR macro undefined: 'undef!'
+    undef!(); //~ ERROR macro undefined: `undef`
 }
diff --git a/src/test/compile-fail/macro-error.rs b/src/test/compile-fail/macro-error.rs
index f467ba3b1e1..3512b21961a 100644
--- a/src/test/compile-fail/macro-error.rs
+++ b/src/test/compile-fail/macro-error.rs
@@ -16,5 +16,5 @@ fn main() {
     foo!(0); // Check that we report errors at macro definition, not expansion.
 
     let _: cfg!(foo) = (); //~ ERROR non-type macro in type position
-    derive!(); //~ ERROR macro undefined: 'derive!'
+    derive!(); //~ ERROR macro undefined: `derive`
 }
diff --git a/src/test/compile-fail/macro_undefined.rs b/src/test/compile-fail/macro_undefined.rs
index d9f86e3e62a..d35428efacc 100644
--- a/src/test/compile-fail/macro_undefined.rs
+++ b/src/test/compile-fail/macro_undefined.rs
@@ -18,8 +18,8 @@ mod m {
 }
 
 fn main() {
-    k!(); //~ ERROR macro undefined: 'k!'
+    k!(); //~ ERROR macro undefined: `k`
           //~^ HELP did you mean `kl!`?
-    kl!(); //~ ERROR macro undefined: 'kl!'
+    kl!(); //~ ERROR macro undefined: `kl`
            //~^ HELP have you added the `#[macro_use]` on the module/import?
 }
diff --git a/src/test/compile-fail/self_type_keyword.rs b/src/test/compile-fail/self_type_keyword.rs
index db6bcc611b8..b3ab96b79c4 100644
--- a/src/test/compile-fail/self_type_keyword.rs
+++ b/src/test/compile-fail/self_type_keyword.rs
@@ -25,7 +25,7 @@ pub fn main() {
         ref mut Self => (),
         //~^ ERROR expected identifier, found keyword `Self`
         Self!() => (),
-        //~^ ERROR macro undefined: 'Self!'
+        //~^ ERROR macro undefined: `Self`
         Foo { Self } => (),
         //~^ ERROR expected identifier, found keyword `Self`
     }
diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-a.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-a.rs
index a253c6224aa..b7374a07e42 100644
--- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-a.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-a.rs
@@ -20,6 +20,5 @@ use proc_macro::TokenStream;
 pub fn derive(input: TokenStream) -> TokenStream {
     let input = input.to_string();
     assert!(input.contains("struct A;"));
-    assert!(input.contains("#[derive(Debug, PartialEq, Eq, Copy, Clone)]"));
     "".parse().unwrap()
 }
diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-atob.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-atob.rs
index 4624891c1a3..67d828d92a7 100644
--- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-atob.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-atob.rs
@@ -19,6 +19,6 @@ use proc_macro::TokenStream;
 #[proc_macro_derive(AToB)]
 pub fn derive(input: TokenStream) -> TokenStream {
     let input = input.to_string();
-    assert_eq!(input, "#[derive(Copy, Clone)]\nstruct A;");
+    assert_eq!(input, "struct A;");
     "struct B;".parse().unwrap()
 }
diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-b.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-b.rs
index c18cda89532..bf793534d50 100644
--- a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-b.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-b.rs
@@ -22,6 +22,5 @@ pub fn derive(input: TokenStream) -> TokenStream {
     assert!(input.contains("#[B]"));
     assert!(input.contains("struct B {"));
     assert!(input.contains("#[C]"));
-    assert!(input.contains("#[derive(Debug, PartialEq, Eq, Copy, Clone)]"));
     "".parse().unwrap()
 }