about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2018-12-08 00:53:15 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2018-12-09 21:10:19 +0300
commit44fe5860607243da202dc97c167c9786d84b0a8d (patch)
treef3f70a6938c14a32427ee587c95ef297cb820dc2
parent654cd09453dbdf63a853a62a3c7c945ac6f0d21a (diff)
downloadrust-44fe5860607243da202dc97c167c9786d84b0a8d.tar.gz
rust-44fe5860607243da202dc97c167c9786d84b0a8d.zip
Fix rebase + Add missing `// force-host`
-rw-r--r--src/test/ui/proc-macro/auxiliary/edition-imports-2015.rs1
-rw-r--r--src/test/ui/proc-macro/derive-still-gated.stderr6
2 files changed, 4 insertions, 3 deletions
diff --git a/src/test/ui/proc-macro/auxiliary/edition-imports-2015.rs b/src/test/ui/proc-macro/auxiliary/edition-imports-2015.rs
index 5bb818f7d23..27c59b805e2 100644
--- a/src/test/ui/proc-macro/auxiliary/edition-imports-2015.rs
+++ b/src/test/ui/proc-macro/auxiliary/edition-imports-2015.rs
@@ -1,4 +1,5 @@
 // edition:2015
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/derive-still-gated.stderr b/src/test/ui/proc-macro/derive-still-gated.stderr
index f2e92b992ed..4e5dd34b004 100644
--- a/src/test/ui/proc-macro/derive-still-gated.stderr
+++ b/src/test/ui/proc-macro/derive-still-gated.stderr
@@ -1,10 +1,10 @@
-error[E0658]: attributes of the form `#[derive_*]` are reserved for the compiler (see issue #29644)
+error[E0658]: The attribute `derive_A` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642)
   --> $DIR/derive-still-gated.rs:18:3
    |
-LL | #[derive_A] //~ ERROR: attributes of the form `#[derive_*]` are reserved for the compiler
+LL | #[derive_A] //~ ERROR attribute `derive_A` is currently unknown
    |   ^^^^^^^^
    |
-   = help: add #![feature(custom_derive)] to the crate attributes to enable
+   = help: add #![feature(custom_attribute)] to the crate attributes to enable
 
 error: aborting due to previous error