From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Fri, 7 Dec 2018 21:53:15 +0000 (+0300)
Subject: Fix rebase + Add missing `// force-host`
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=44fe5860607243da202dc97c167c9786d84b0a8d;p=rust.git

Fix rebase + Add missing `// force-host`
---

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