about summary refs log tree commit diff
path: root/src/test/ui/macros
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-07-03 12:47:24 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-07-11 00:12:08 +0300
commit3041ec61185d6f9795ff16cc345e8f11b06edbbf (patch)
tree4b64ce98429b47fcc3001ea7aaa4006c5694596a /src/test/ui/macros
parentf16993d4acaf90285f6c86268a0ec2e7167c2a58 (diff)
downloadrust-3041ec61185d6f9795ff16cc345e8f11b06edbbf.tar.gz
rust-3041ec61185d6f9795ff16cc345e8f11b06edbbf.zip
resolve/expand: Catch macro kind mismatches early in resolve
This way we are processing all of them in a single point, rather than separately for each syntax extension kind.
Also, the standard expected/found wording is used.
Diffstat (limited to 'src/test/ui/macros')
-rw-r--r--src/test/ui/macros/macro-path-prelude-fail-4.rs2
-rw-r--r--src/test/ui/macros/macro-path-prelude-fail-4.stderr4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/ui/macros/macro-path-prelude-fail-4.rs b/src/test/ui/macros/macro-path-prelude-fail-4.rs
index 44f0f2d7ec0..0f93fcdaa5f 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-4.rs
+++ b/src/test/ui/macros/macro-path-prelude-fail-4.rs
@@ -1,4 +1,4 @@
-#[derive(inline)] //~ ERROR macro `inline` may not be used for derive attributes
+#[derive(inline)] //~ ERROR expected derive macro, found built-in attribute `inline`
 struct S;
 
 fn main() {}
diff --git a/src/test/ui/macros/macro-path-prelude-fail-4.stderr b/src/test/ui/macros/macro-path-prelude-fail-4.stderr
index fdd7bf3235c..dfd6818b678 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-4.stderr
+++ b/src/test/ui/macros/macro-path-prelude-fail-4.stderr
@@ -1,8 +1,8 @@
-error: macro `inline` may not be used for derive attributes
+error: expected derive macro, found built-in attribute `inline`
   --> $DIR/macro-path-prelude-fail-4.rs:1:10
    |
 LL | #[derive(inline)]
-   |          ^^^^^^
+   |          ^^^^^^ not a derive macro
 
 error: aborting due to previous error