From d3ab4a74efad266155fcd402c8d159af9e443e3d Mon Sep 17 00:00:00 2001
From: Eduard-Mihai Burtescu <edy.burt@gmail.com>
Date: Tue, 20 Mar 2018 20:20:03 +0200
Subject: tests: remove ignore-stage1 where possible in proc_macro tests.

---
 src/test/rustdoc/proc-macro.rs | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/test/rustdoc/proc-macro.rs')

diff --git a/src/test/rustdoc/proc-macro.rs b/src/test/rustdoc/proc-macro.rs
index bfd194701c8..1b3b3c6bb14 100644
--- a/src/test/rustdoc/proc-macro.rs
+++ b/src/test/rustdoc/proc-macro.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-stage1
-
 #![crate_type="proc-macro"]
 #![crate_name="some_macros"]
 
-- 
cgit 1.4.1-3-g733a5


From 3369929ddb7a3be8048636ed376d05f1a3295378 Mon Sep 17 00:00:00 2001
From: Eduard-Mihai Burtescu <edy.burt@gmail.com>
Date: Sat, 24 Nov 2018 15:34:13 +0200
Subject: tests: use `force-host` and `no-prefer-dynamic` in all proc_macro
 tests.

---
 src/test/compile-fail/proc-macro/attribute.rs          |  3 +++
 .../proc-macro/auxiliary/attr-stmt-expr.rs             |  1 +
 .../compile-fail/proc-macro/auxiliary/derive-bad.rs    |  2 +-
 .../compile-fail/proc-macro/auxiliary/more-gates.rs    |  1 +
 .../proc-macro/auxiliary/proc-macro-gates.rs           |  2 +-
 .../compile-fail/proc-macro/auxiliary/test-macros.rs   |  1 +
 src/test/compile-fail/proc-macro/define-two.rs         |  1 +
 src/test/compile-fail/proc-macro/export-macro.rs       |  3 +++
 src/test/compile-fail/proc-macro/exports.rs            |  3 +++
 src/test/compile-fail/proc-macro/pub-at-crate-root.rs  |  3 +++
 src/test/compile-fail/proc-macro/shadow-builtin.rs     |  3 +++
 src/test/compile-fail/proc-macro/two-crate-types-1.rs  |  3 +++
 src/test/compile-fail/proc-macro/two-crate-types-2.rs  |  1 +
 .../auxiliary/incremental_proc_macro_aux.rs            |  1 +
 .../incremental/auxiliary/issue_49482_macro_def.rs     |  1 +
 src/test/incremental/auxiliary/issue_54059.rs          |  1 +
 src/test/pretty/auxiliary/derive-foo.rs                |  1 +
 src/test/run-pass/auxiliary/cond_plugin.rs             |  1 +
 src/test/run-pass/auxiliary/hello_macro.rs             |  1 +
 src/test/run-pass/auxiliary/proc_macro_def.rs          |  1 +
 src/test/run-pass/proc-macro/auxiliary/add-impl.rs     |  1 +
 src/test/run-pass/proc-macro/auxiliary/attr-args.rs    |  1 +
 src/test/run-pass/proc-macro/auxiliary/attr-cfg.rs     |  1 +
 .../run-pass/proc-macro/auxiliary/attr-on-trait.rs     |  1 +
 .../run-pass/proc-macro/auxiliary/attr-stmt-expr.rs    |  1 +
 src/test/run-pass/proc-macro/auxiliary/bang-macro.rs   |  1 +
 src/test/run-pass/proc-macro/auxiliary/call-site.rs    |  1 +
 .../proc-macro/auxiliary/count_compound_ops.rs         |  1 +
 .../auxiliary/custom-attr-only-one-derive.rs           |  1 +
 src/test/run-pass/proc-macro/auxiliary/derive-a.rs     |  1 +
 src/test/run-pass/proc-macro/auxiliary/derive-atob.rs  |  1 +
 .../run-pass/proc-macro/auxiliary/derive-attr-cfg.rs   |  1 +
 src/test/run-pass/proc-macro/auxiliary/derive-b.rs     |  1 +
 src/test/run-pass/proc-macro/auxiliary/derive-ctod.rs  |  1 +
 .../run-pass/proc-macro/auxiliary/derive-nothing.rs    |  1 +
 .../proc-macro/auxiliary/derive-same-struct.rs         |  4 +++-
 .../run-pass/proc-macro/auxiliary/derive-two-attrs.rs  |  1 +
 src/test/run-pass/proc-macro/auxiliary/derive-union.rs |  1 +
 src/test/run-pass/proc-macro/auxiliary/double.rs       |  1 +
 src/test/run-pass/proc-macro/auxiliary/empty-crate.rs  |  1 +
 .../proc-macro/auxiliary/expand-with-a-macro.rs        |  1 +
 .../proc-macro/auxiliary/gen-lifetime-token.rs         |  1 +
 .../proc-macro/auxiliary/hygiene_example_codegen.rs    |  1 +
 src/test/run-pass/proc-macro/auxiliary/issue-42708.rs  |  1 +
 src/test/run-pass/proc-macro/auxiliary/issue-50061.rs  |  1 +
 src/test/run-pass/proc-macro/auxiliary/lifetimes.rs    |  1 +
 src/test/run-pass/proc-macro/auxiliary/modify-ast.rs   |  1 +
 .../run-pass/proc-macro/auxiliary/negative-token.rs    |  1 +
 src/test/run-pass/proc-macro/auxiliary/not-joint.rs    |  1 +
 src/test/run-pass/proc-macro/auxiliary/test-macros.rs  |  1 +
 src/test/rustdoc/inline_cross/auxiliary/proc_macro.rs  |  1 +
 src/test/rustdoc/proc-macro.rs                         |  3 +++
 src/test/rustdoc/rustc-macro-crate.rs                  |  1 +
 src/test/ui/custom-derive/auxiliary/plugin.rs          |  1 +
 .../proc-macro/auxiliary/attribute-spans-preserved.rs  |  1 +
 src/test/ui/proc-macro/auxiliary/builtin-attrs.rs      |  1 +
 .../ui/proc-macro/auxiliary/derive-helper-shadowed.rs  |  1 +
 .../ui/proc-macro/auxiliary/derive-helper-shadowing.rs |  1 +
 src/test/ui/proc-macro/auxiliary/derive-panic.rs       |  2 +-
 src/test/ui/proc-macro/auxiliary/generate-mod.rs       |  1 +
 src/test/ui/proc-macro/auxiliary/issue-53481.rs        |  1 +
 src/test/ui/proc-macro/auxiliary/lifetimes.rs          |  1 +
 src/test/ui/proc-macro/auxiliary/macro-brackets.rs     |  1 +
 src/test/ui/proc-macro/auxiliary/multispan.rs          |  1 +
 src/test/ui/proc-macro/auxiliary/nested-item-spans.rs  |  1 +
 .../ui/proc-macro/auxiliary/parent-source-spans.rs     |  1 +
 src/test/ui/proc-macro/auxiliary/span-preservation.rs  |  1 +
 src/test/ui/proc-macro/auxiliary/subspan.rs            |  1 +
 src/test/ui/proc-macro/auxiliary/three-equals.rs       |  1 +
 src/test/ui/proc-macro/invalid-attributes.rs           |  1 +
 src/test/ui/proc-macro/invalid-attributes.stderr       | 12 ++++++------
 src/test/ui/proc-macro/macro-namespace-reserved-2.rs   |  1 +
 .../ui/proc-macro/macro-namespace-reserved-2.stderr    | 18 +++++++++---------
 src/test/ui/proc-macro/macro-namespace-reserved.rs     |  1 +
 src/test/ui/proc-macro/macro-namespace-reserved.stderr |  8 ++++----
 src/test/ui/proc-macro/non-root.rs                     |  1 +
 src/test/ui/proc-macro/non-root.stderr                 |  2 +-
 src/test/ui/proc-macro/reserved-macro-names.rs         |  3 +++
 src/test/ui/proc-macro/reserved-macro-names.stderr     |  6 +++---
 src/test/ui/proc-macro/signature.rs                    |  3 +++
 src/test/ui/proc-macro/signature.stderr                |  2 +-
 .../auxiliary/suggestions-not-always-applicable.rs     |  1 +
 src/test/ui/rust-2018/proc-macro-crate-in-paths.rs     |  2 ++
 83 files changed, 122 insertions(+), 28 deletions(-)

(limited to 'src/test/rustdoc/proc-macro.rs')

diff --git a/src/test/compile-fail/proc-macro/attribute.rs b/src/test/compile-fail/proc-macro/attribute.rs
index 5d5e61270b6..f89d74de50f 100644
--- a/src/test/compile-fail/proc-macro/attribute.rs
+++ b/src/test/compile-fail/proc-macro/attribute.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
+// no-prefer-dynamic
+
 #![crate_type = "proc-macro"]
 
 extern crate proc_macro;
diff --git a/src/test/compile-fail/proc-macro/auxiliary/attr-stmt-expr.rs b/src/test/compile-fail/proc-macro/auxiliary/attr-stmt-expr.rs
index 22ddc913995..4cfeec2f8a6 100644
--- a/src/test/compile-fail/proc-macro/auxiliary/attr-stmt-expr.rs
+++ b/src/test/compile-fail/proc-macro/auxiliary/attr-stmt-expr.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/compile-fail/proc-macro/auxiliary/derive-bad.rs b/src/test/compile-fail/proc-macro/auxiliary/derive-bad.rs
index 841b39eaed0..b2ded05eb51 100644
--- a/src/test/compile-fail/proc-macro/auxiliary/derive-bad.rs
+++ b/src/test/compile-fail/proc-macro/auxiliary/derive-bad.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// no-prefer-dynamic
 // force-host
+// no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
 
diff --git a/src/test/compile-fail/proc-macro/auxiliary/more-gates.rs b/src/test/compile-fail/proc-macro/auxiliary/more-gates.rs
index 67fe93058aa..cc9420e1537 100644
--- a/src/test/compile-fail/proc-macro/auxiliary/more-gates.rs
+++ b/src/test/compile-fail/proc-macro/auxiliary/more-gates.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/compile-fail/proc-macro/auxiliary/proc-macro-gates.rs b/src/test/compile-fail/proc-macro/auxiliary/proc-macro-gates.rs
index 0f8fd5b5709..7e4b7fe263d 100644
--- a/src/test/compile-fail/proc-macro/auxiliary/proc-macro-gates.rs
+++ b/src/test/compile-fail/proc-macro/auxiliary/proc-macro-gates.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// no-prefer-dynamic
 // force-host
+// no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
 
diff --git a/src/test/compile-fail/proc-macro/auxiliary/test-macros.rs b/src/test/compile-fail/proc-macro/auxiliary/test-macros.rs
index 581c7cb15a5..0e4343a90d6 100644
--- a/src/test/compile-fail/proc-macro/auxiliary/test-macros.rs
+++ b/src/test/compile-fail/proc-macro/auxiliary/test-macros.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/compile-fail/proc-macro/define-two.rs b/src/test/compile-fail/proc-macro/define-two.rs
index 8321c471b2a..f8c287b6b72 100644
--- a/src/test/compile-fail/proc-macro/define-two.rs
+++ b/src/test/compile-fail/proc-macro/define-two.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/compile-fail/proc-macro/export-macro.rs b/src/test/compile-fail/proc-macro/export-macro.rs
index 477039bd7a2..d8bb3571c08 100644
--- a/src/test/compile-fail/proc-macro/export-macro.rs
+++ b/src/test/compile-fail/proc-macro/export-macro.rs
@@ -10,6 +10,9 @@
 
 // error-pattern: cannot export macro_rules! macros from a `proc-macro` crate
 
+// force-host
+// no-prefer-dynamic
+
 #![crate_type = "proc-macro"]
 
 #[macro_export]
diff --git a/src/test/compile-fail/proc-macro/exports.rs b/src/test/compile-fail/proc-macro/exports.rs
index 41b94d04e8c..07e5723c1c1 100644
--- a/src/test/compile-fail/proc-macro/exports.rs
+++ b/src/test/compile-fail/proc-macro/exports.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
+// no-prefer-dynamic
+
 #![crate_type = "proc-macro"]
 #![allow(warnings)]
 
diff --git a/src/test/compile-fail/proc-macro/pub-at-crate-root.rs b/src/test/compile-fail/proc-macro/pub-at-crate-root.rs
index 238dde5160c..e995eb549fa 100644
--- a/src/test/compile-fail/proc-macro/pub-at-crate-root.rs
+++ b/src/test/compile-fail/proc-macro/pub-at-crate-root.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
+// no-prefer-dynamic
+
 #![crate_type = "proc-macro"]
 
 extern crate proc_macro;
diff --git a/src/test/compile-fail/proc-macro/shadow-builtin.rs b/src/test/compile-fail/proc-macro/shadow-builtin.rs
index 8c5affb7b5a..a5fcfde1dda 100644
--- a/src/test/compile-fail/proc-macro/shadow-builtin.rs
+++ b/src/test/compile-fail/proc-macro/shadow-builtin.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
+// no-prefer-dynamic
+
 #![crate_type = "proc-macro"]
 
 extern crate proc_macro;
diff --git a/src/test/compile-fail/proc-macro/two-crate-types-1.rs b/src/test/compile-fail/proc-macro/two-crate-types-1.rs
index db646fb7815..06bd3f9dd6a 100644
--- a/src/test/compile-fail/proc-macro/two-crate-types-1.rs
+++ b/src/test/compile-fail/proc-macro/two-crate-types-1.rs
@@ -10,5 +10,8 @@
 
 // error-pattern: cannot mix `proc-macro` crate type with others
 
+// force-host
+// no-prefer-dynamic
+
 #![crate_type = "proc-macro"]
 #![crate_type = "rlib"]
diff --git a/src/test/compile-fail/proc-macro/two-crate-types-2.rs b/src/test/compile-fail/proc-macro/two-crate-types-2.rs
index 97b0f844604..dd5e5acbec8 100644
--- a/src/test/compile-fail/proc-macro/two-crate-types-2.rs
+++ b/src/test/compile-fail/proc-macro/two-crate-types-2.rs
@@ -10,3 +10,4 @@
 
 // error-pattern: cannot mix `proc-macro` crate type with others
 // compile-flags: --crate-type rlib --crate-type proc-macro
+// force-host
diff --git a/src/test/incremental/auxiliary/incremental_proc_macro_aux.rs b/src/test/incremental/auxiliary/incremental_proc_macro_aux.rs
index e9f9ba86f23..34d20098205 100644
--- a/src/test/incremental/auxiliary/incremental_proc_macro_aux.rs
+++ b/src/test/incremental/auxiliary/incremental_proc_macro_aux.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/incremental/auxiliary/issue_49482_macro_def.rs b/src/test/incremental/auxiliary/issue_49482_macro_def.rs
index 763c9eb138e..fa6bff4660a 100644
--- a/src/test/incremental/auxiliary/issue_49482_macro_def.rs
+++ b/src/test/incremental/auxiliary/issue_49482_macro_def.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type="proc-macro"]
diff --git a/src/test/incremental/auxiliary/issue_54059.rs b/src/test/incremental/auxiliary/issue_54059.rs
index ec0d044d4bf..635501fd60c 100644
--- a/src/test/incremental/auxiliary/issue_54059.rs
+++ b/src/test/incremental/auxiliary/issue_54059.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 // check that having extern "C" functions in a proc macro doesn't crash.
diff --git a/src/test/pretty/auxiliary/derive-foo.rs b/src/test/pretty/auxiliary/derive-foo.rs
index bd81d3e5a3b..3552b20fd41 100644
--- a/src/test/pretty/auxiliary/derive-foo.rs
+++ b/src/test/pretty/auxiliary/derive-foo.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/auxiliary/cond_plugin.rs b/src/test/run-pass/auxiliary/cond_plugin.rs
index e7545f954da..940b1ea5df4 100644
--- a/src/test/run-pass/auxiliary/cond_plugin.rs
+++ b/src/test/run-pass/auxiliary/cond_plugin.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/auxiliary/hello_macro.rs b/src/test/run-pass/auxiliary/hello_macro.rs
index caf56dabf79..f3a0f2cc625 100644
--- a/src/test/run-pass/auxiliary/hello_macro.rs
+++ b/src/test/run-pass/auxiliary/hello_macro.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/auxiliary/proc_macro_def.rs b/src/test/run-pass/auxiliary/proc_macro_def.rs
index 847db0098ff..d111db841a5 100644
--- a/src/test/run-pass/auxiliary/proc_macro_def.rs
+++ b/src/test/run-pass/auxiliary/proc_macro_def.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/add-impl.rs b/src/test/run-pass/proc-macro/auxiliary/add-impl.rs
index 3959eccd81e..806d70eebde 100644
--- a/src/test/run-pass/proc-macro/auxiliary/add-impl.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/add-impl.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/attr-args.rs b/src/test/run-pass/proc-macro/auxiliary/attr-args.rs
index 655bfa3ff63..1f45a799a17 100644
--- a/src/test/run-pass/proc-macro/auxiliary/attr-args.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/attr-args.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/attr-cfg.rs b/src/test/run-pass/proc-macro/auxiliary/attr-cfg.rs
index f9037aa8bf9..553d2ca42f8 100644
--- a/src/test/run-pass/proc-macro/auxiliary/attr-cfg.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/attr-cfg.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/attr-on-trait.rs b/src/test/run-pass/proc-macro/auxiliary/attr-on-trait.rs
index 5e5c775b1ff..f5431ddb2a3 100644
--- a/src/test/run-pass/proc-macro/auxiliary/attr-on-trait.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/attr-on-trait.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/attr-stmt-expr.rs b/src/test/run-pass/proc-macro/auxiliary/attr-stmt-expr.rs
index 4d5e22b4eb6..4704bd16cbc 100644
--- a/src/test/run-pass/proc-macro/auxiliary/attr-stmt-expr.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/attr-stmt-expr.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/bang-macro.rs b/src/test/run-pass/proc-macro/auxiliary/bang-macro.rs
index 8b7c6cd10b8..45301879e99 100644
--- a/src/test/run-pass/proc-macro/auxiliary/bang-macro.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/bang-macro.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/call-site.rs b/src/test/run-pass/proc-macro/auxiliary/call-site.rs
index 65eb8f4bec2..ed878a25e99 100644
--- a/src/test/run-pass/proc-macro/auxiliary/call-site.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/call-site.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/count_compound_ops.rs b/src/test/run-pass/proc-macro/auxiliary/count_compound_ops.rs
index 77d0d9339fe..b0d71f248d7 100644
--- a/src/test/run-pass/proc-macro/auxiliary/count_compound_ops.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/count_compound_ops.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![feature(proc_macro_hygiene, proc_macro_quote)]
diff --git a/src/test/run-pass/proc-macro/auxiliary/custom-attr-only-one-derive.rs b/src/test/run-pass/proc-macro/auxiliary/custom-attr-only-one-derive.rs
index 4609f57bddf..250d9508c23 100644
--- a/src/test/run-pass/proc-macro/auxiliary/custom-attr-only-one-derive.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/custom-attr-only-one-derive.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-a.rs b/src/test/run-pass/proc-macro/auxiliary/derive-a.rs
index b7374a07e42..55c2b3c575e 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-a.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/derive-a.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-atob.rs b/src/test/run-pass/proc-macro/auxiliary/derive-atob.rs
index 67d828d92a7..406f169c24d 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-atob.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/derive-atob.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-attr-cfg.rs b/src/test/run-pass/proc-macro/auxiliary/derive-attr-cfg.rs
index 2b413579a9a..20ba0de5e38 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-attr-cfg.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/derive-attr-cfg.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-b.rs b/src/test/run-pass/proc-macro/auxiliary/derive-b.rs
index e1aabad4142..d69e69de1c2 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-b.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/derive-b.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-ctod.rs b/src/test/run-pass/proc-macro/auxiliary/derive-ctod.rs
index 550ffe9400d..91a82ba52c8 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-ctod.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/derive-ctod.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-nothing.rs b/src/test/run-pass/proc-macro/auxiliary/derive-nothing.rs
index cfe428bf5f3..635d3364f0d 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-nothing.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/derive-nothing.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-same-struct.rs b/src/test/run-pass/proc-macro/auxiliary/derive-same-struct.rs
index cf96f52823f..f62e0cd12a1 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-same-struct.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/derive-same-struct.rs
@@ -8,8 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
-// compile-flags:--crate-type proc-macro
+
+#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-two-attrs.rs b/src/test/run-pass/proc-macro/auxiliary/derive-two-attrs.rs
index d02edb50fb2..eafd457675f 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-two-attrs.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/derive-two-attrs.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-union.rs b/src/test/run-pass/proc-macro/auxiliary/derive-union.rs
index 41bb88a0a92..e6d3d918503 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-union.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/derive-union.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/double.rs b/src/test/run-pass/proc-macro/auxiliary/double.rs
index a6c9817f247..f37679552ec 100644
--- a/src/test/run-pass/proc-macro/auxiliary/double.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/double.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/empty-crate.rs b/src/test/run-pass/proc-macro/auxiliary/empty-crate.rs
index b45d4bf41d6..943acd9cecf 100644
--- a/src/test/run-pass/proc-macro/auxiliary/empty-crate.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/empty-crate.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/expand-with-a-macro.rs b/src/test/run-pass/proc-macro/auxiliary/expand-with-a-macro.rs
index e6831b6bfdf..d7f8ec43e52 100644
--- a/src/test/run-pass/proc-macro/auxiliary/expand-with-a-macro.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/expand-with-a-macro.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/gen-lifetime-token.rs b/src/test/run-pass/proc-macro/auxiliary/gen-lifetime-token.rs
index 978de27b70a..9f300837315 100644
--- a/src/test/run-pass/proc-macro/auxiliary/gen-lifetime-token.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/gen-lifetime-token.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/hygiene_example_codegen.rs b/src/test/run-pass/proc-macro/auxiliary/hygiene_example_codegen.rs
index 551ac3863e1..af3b60173ac 100644
--- a/src/test/run-pass/proc-macro/auxiliary/hygiene_example_codegen.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/hygiene_example_codegen.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![feature(proc_macro_quote, proc_macro_hygiene)]
diff --git a/src/test/run-pass/proc-macro/auxiliary/issue-42708.rs b/src/test/run-pass/proc-macro/auxiliary/issue-42708.rs
index 906caceb869..e74b9dc7454 100644
--- a/src/test/run-pass/proc-macro/auxiliary/issue-42708.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/issue-42708.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/issue-50061.rs b/src/test/run-pass/proc-macro/auxiliary/issue-50061.rs
index 6de17522fc9..a8a03ca540c 100644
--- a/src/test/run-pass/proc-macro/auxiliary/issue-50061.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/issue-50061.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/lifetimes.rs b/src/test/run-pass/proc-macro/auxiliary/lifetimes.rs
index 0ee26b6a1b9..c52496d0b30 100644
--- a/src/test/run-pass/proc-macro/auxiliary/lifetimes.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/lifetimes.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/modify-ast.rs b/src/test/run-pass/proc-macro/auxiliary/modify-ast.rs
index 498c6811d9c..ff28c1db4f0 100644
--- a/src/test/run-pass/proc-macro/auxiliary/modify-ast.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/modify-ast.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/negative-token.rs b/src/test/run-pass/proc-macro/auxiliary/negative-token.rs
index fd639696991..ef4fd8d84a2 100644
--- a/src/test/run-pass/proc-macro/auxiliary/negative-token.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/negative-token.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/not-joint.rs b/src/test/run-pass/proc-macro/auxiliary/not-joint.rs
index e00a4d89e8d..90209e042b2 100644
--- a/src/test/run-pass/proc-macro/auxiliary/not-joint.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/not-joint.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/run-pass/proc-macro/auxiliary/test-macros.rs b/src/test/run-pass/proc-macro/auxiliary/test-macros.rs
index 581c7cb15a5..0e4343a90d6 100644
--- a/src/test/run-pass/proc-macro/auxiliary/test-macros.rs
+++ b/src/test/run-pass/proc-macro/auxiliary/test-macros.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/rustdoc/inline_cross/auxiliary/proc_macro.rs b/src/test/rustdoc/inline_cross/auxiliary/proc_macro.rs
index 6aac070c45b..bde1fd8b1e4 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/proc_macro.rs
+++ b/src/test/rustdoc/inline_cross/auxiliary/proc_macro.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type="proc-macro"]
diff --git a/src/test/rustdoc/proc-macro.rs b/src/test/rustdoc/proc-macro.rs
index 1b3b3c6bb14..23d0d005807 100644
--- a/src/test/rustdoc/proc-macro.rs
+++ b/src/test/rustdoc/proc-macro.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
+// no-prefer-dynamic
+
 #![crate_type="proc-macro"]
 #![crate_name="some_macros"]
 
diff --git a/src/test/rustdoc/rustc-macro-crate.rs b/src/test/rustdoc/rustc-macro-crate.rs
index dc28732b55e..6ad5556b8f5 100644
--- a/src/test/rustdoc/rustc-macro-crate.rs
+++ b/src/test/rustdoc/rustc-macro-crate.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/custom-derive/auxiliary/plugin.rs b/src/test/ui/custom-derive/auxiliary/plugin.rs
index 124bc05b7a3..921e2ce2fe0 100644
--- a/src/test/ui/custom-derive/auxiliary/plugin.rs
+++ b/src/test/ui/custom-derive/auxiliary/plugin.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/auxiliary/attribute-spans-preserved.rs b/src/test/ui/proc-macro/auxiliary/attribute-spans-preserved.rs
index e725cc7afb8..9f7a7e4f222 100644
--- a/src/test/ui/proc-macro/auxiliary/attribute-spans-preserved.rs
+++ b/src/test/ui/proc-macro/auxiliary/attribute-spans-preserved.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/auxiliary/builtin-attrs.rs b/src/test/ui/proc-macro/auxiliary/builtin-attrs.rs
index e18ca57aab1..571ea1bc5f3 100644
--- a/src/test/ui/proc-macro/auxiliary/builtin-attrs.rs
+++ b/src/test/ui/proc-macro/auxiliary/builtin-attrs.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/auxiliary/derive-helper-shadowed.rs b/src/test/ui/proc-macro/auxiliary/derive-helper-shadowed.rs
index 4e701710f42..5b5243dd60e 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-helper-shadowed.rs
+++ b/src/test/ui/proc-macro/auxiliary/derive-helper-shadowed.rs
@@ -1,3 +1,4 @@
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/auxiliary/derive-helper-shadowing.rs b/src/test/ui/proc-macro/auxiliary/derive-helper-shadowing.rs
index 0fd8aa5638a..6e0bdcba9c5 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-helper-shadowing.rs
+++ b/src/test/ui/proc-macro/auxiliary/derive-helper-shadowing.rs
@@ -1,3 +1,4 @@
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/auxiliary/derive-panic.rs b/src/test/ui/proc-macro/auxiliary/derive-panic.rs
index 3274f0324e1..d7fa5b6bed1 100644
--- a/src/test/ui/proc-macro/auxiliary/derive-panic.rs
+++ b/src/test/ui/proc-macro/auxiliary/derive-panic.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// no-prefer-dynamic
 // force-host
+// no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
 
diff --git a/src/test/ui/proc-macro/auxiliary/generate-mod.rs b/src/test/ui/proc-macro/auxiliary/generate-mod.rs
index 1ed8ef52027..a1f025de3be 100644
--- a/src/test/ui/proc-macro/auxiliary/generate-mod.rs
+++ b/src/test/ui/proc-macro/auxiliary/generate-mod.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // run-pass
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/auxiliary/issue-53481.rs b/src/test/ui/proc-macro/auxiliary/issue-53481.rs
index 9554cdde490..d9f290dec7e 100644
--- a/src/test/ui/proc-macro/auxiliary/issue-53481.rs
+++ b/src/test/ui/proc-macro/auxiliary/issue-53481.rs
@@ -1,3 +1,4 @@
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/auxiliary/lifetimes.rs b/src/test/ui/proc-macro/auxiliary/lifetimes.rs
index fc59a622bfa..8348d0888e4 100644
--- a/src/test/ui/proc-macro/auxiliary/lifetimes.rs
+++ b/src/test/ui/proc-macro/auxiliary/lifetimes.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/auxiliary/macro-brackets.rs b/src/test/ui/proc-macro/auxiliary/macro-brackets.rs
index be1777f3ebd..08ff604fead 100644
--- a/src/test/ui/proc-macro/auxiliary/macro-brackets.rs
+++ b/src/test/ui/proc-macro/auxiliary/macro-brackets.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/auxiliary/multispan.rs b/src/test/ui/proc-macro/auxiliary/multispan.rs
index 383016f990e..e122b22e080 100644
--- a/src/test/ui/proc-macro/auxiliary/multispan.rs
+++ b/src/test/ui/proc-macro/auxiliary/multispan.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/auxiliary/nested-item-spans.rs b/src/test/ui/proc-macro/auxiliary/nested-item-spans.rs
index 6b893150b45..e195f425ab3 100644
--- a/src/test/ui/proc-macro/auxiliary/nested-item-spans.rs
+++ b/src/test/ui/proc-macro/auxiliary/nested-item-spans.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/auxiliary/parent-source-spans.rs b/src/test/ui/proc-macro/auxiliary/parent-source-spans.rs
index f5590405e61..a007fad3675 100644
--- a/src/test/ui/proc-macro/auxiliary/parent-source-spans.rs
+++ b/src/test/ui/proc-macro/auxiliary/parent-source-spans.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![feature(proc_macro_diagnostic, proc_macro_span)]
diff --git a/src/test/ui/proc-macro/auxiliary/span-preservation.rs b/src/test/ui/proc-macro/auxiliary/span-preservation.rs
index 65ed9cf7372..33c7968104b 100644
--- a/src/test/ui/proc-macro/auxiliary/span-preservation.rs
+++ b/src/test/ui/proc-macro/auxiliary/span-preservation.rs
@@ -1,3 +1,4 @@
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/auxiliary/subspan.rs b/src/test/ui/proc-macro/auxiliary/subspan.rs
index 134b04d7333..dbf355fea50 100644
--- a/src/test/ui/proc-macro/auxiliary/subspan.rs
+++ b/src/test/ui/proc-macro/auxiliary/subspan.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/auxiliary/three-equals.rs b/src/test/ui/proc-macro/auxiliary/three-equals.rs
index 569a458f55a..b23841077e3 100644
--- a/src/test/ui/proc-macro/auxiliary/three-equals.rs
+++ b/src/test/ui/proc-macro/auxiliary/three-equals.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/invalid-attributes.rs b/src/test/ui/proc-macro/invalid-attributes.rs
index 8b940a0f405..cca954fdc6b 100644
--- a/src/test/ui/proc-macro/invalid-attributes.rs
+++ b/src/test/ui/proc-macro/invalid-attributes.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/invalid-attributes.stderr b/src/test/ui/proc-macro/invalid-attributes.stderr
index 5fd87362db2..c480bcb5df9 100644
--- a/src/test/ui/proc-macro/invalid-attributes.stderr
+++ b/src/test/ui/proc-macro/invalid-attributes.stderr
@@ -1,35 +1,35 @@
 error: `#[proc_macro]` attribute does not take any arguments
-  --> $DIR/invalid-attributes.rs:19:1
+  --> $DIR/invalid-attributes.rs:20:1
    |
 LL | #[proc_macro = "test"] //~ ERROR: does not take any arguments
    | ^^^^^^^^^^^^^^^^^^^^^^
 
 error: `#[proc_macro]` attribute does not take any arguments
-  --> $DIR/invalid-attributes.rs:22:1
+  --> $DIR/invalid-attributes.rs:23:1
    |
 LL | #[proc_macro()] //~ ERROR: does not take any arguments
    | ^^^^^^^^^^^^^^^
 
 error: `#[proc_macro]` attribute does not take any arguments
-  --> $DIR/invalid-attributes.rs:25:1
+  --> $DIR/invalid-attributes.rs:26:1
    |
 LL | #[proc_macro(x)] //~ ERROR: does not take any arguments
    | ^^^^^^^^^^^^^^^^
 
 error: `#[proc_macro_attribute]` attribute does not take any arguments
-  --> $DIR/invalid-attributes.rs:28:1
+  --> $DIR/invalid-attributes.rs:29:1
    |
 LL | #[proc_macro_attribute = "test"] //~ ERROR: does not take any arguments
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: `#[proc_macro_attribute]` attribute does not take any arguments
-  --> $DIR/invalid-attributes.rs:31:1
+  --> $DIR/invalid-attributes.rs:32:1
    |
 LL | #[proc_macro_attribute()] //~ ERROR: does not take any arguments
    | ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: `#[proc_macro_attribute]` attribute does not take any arguments
-  --> $DIR/invalid-attributes.rs:34:1
+  --> $DIR/invalid-attributes.rs:35:1
    |
 LL | #[proc_macro_attribute(x)] //~ ERROR: does not take any arguments
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/proc-macro/macro-namespace-reserved-2.rs b/src/test/ui/proc-macro/macro-namespace-reserved-2.rs
index fa05ad2fc60..02526b60db0 100644
--- a/src/test/ui/proc-macro/macro-namespace-reserved-2.rs
+++ b/src/test/ui/proc-macro/macro-namespace-reserved-2.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr b/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr
index 9def03e9450..9e989ebdd31 100644
--- a/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr
+++ b/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr
@@ -1,53 +1,53 @@
 error: can't use a procedural macro from the same crate that defines it
-  --> $DIR/macro-namespace-reserved-2.rs:34:5
+  --> $DIR/macro-namespace-reserved-2.rs:35:5
    |
 LL |     my_macro!(); //~ ERROR can't use a procedural macro from the same crate that defines it
    |     ^^^^^^^^
 
 error: can't use a procedural macro from the same crate that defines it
-  --> $DIR/macro-namespace-reserved-2.rs:37:5
+  --> $DIR/macro-namespace-reserved-2.rs:38:5
    |
 LL |     my_macro_attr!(); //~ ERROR can't use a procedural macro from the same crate that defines it
    |     ^^^^^^^^^^^^^
 
 error: can't use a procedural macro from the same crate that defines it
-  --> $DIR/macro-namespace-reserved-2.rs:40:5
+  --> $DIR/macro-namespace-reserved-2.rs:41:5
    |
 LL |     MyTrait!(); //~ ERROR can't use a procedural macro from the same crate that defines it
    |     ^^^^^^^
 
 error: can't use a procedural macro from the same crate that defines it
-  --> $DIR/macro-namespace-reserved-2.rs:43:3
+  --> $DIR/macro-namespace-reserved-2.rs:44:3
    |
 LL | #[my_macro] //~ ERROR can't use a procedural macro from the same crate that defines it
    |   ^^^^^^^^
 
 error: can't use a procedural macro from the same crate that defines it
-  --> $DIR/macro-namespace-reserved-2.rs:45:3
+  --> $DIR/macro-namespace-reserved-2.rs:46:3
    |
 LL | #[my_macro_attr] //~ ERROR can't use a procedural macro from the same crate that defines it
    |   ^^^^^^^^^^^^^
 
 error: can't use a procedural macro from the same crate that defines it
-  --> $DIR/macro-namespace-reserved-2.rs:47:3
+  --> $DIR/macro-namespace-reserved-2.rs:48:3
    |
 LL | #[MyTrait] //~ ERROR can't use a procedural macro from the same crate that defines it
    |   ^^^^^^^
 
 error: can't use a procedural macro from the same crate that defines it
-  --> $DIR/macro-namespace-reserved-2.rs:50:10
+  --> $DIR/macro-namespace-reserved-2.rs:51:10
    |
 LL | #[derive(my_macro)] //~ ERROR can't use a procedural macro from the same crate that defines it
    |          ^^^^^^^^
 
 error: can't use a procedural macro from the same crate that defines it
-  --> $DIR/macro-namespace-reserved-2.rs:52:10
+  --> $DIR/macro-namespace-reserved-2.rs:53:10
    |
 LL | #[derive(my_macro_attr)] //~ ERROR can't use a procedural macro from the same crate that defines it
    |          ^^^^^^^^^^^^^
 
 error: can't use a procedural macro from the same crate that defines it
-  --> $DIR/macro-namespace-reserved-2.rs:54:10
+  --> $DIR/macro-namespace-reserved-2.rs:55:10
    |
 LL | #[derive(MyTrait)] //~ ERROR can't use a procedural macro from the same crate that defines it
    |          ^^^^^^^
diff --git a/src/test/ui/proc-macro/macro-namespace-reserved.rs b/src/test/ui/proc-macro/macro-namespace-reserved.rs
index e7bb05de88c..b0a3dbf0c1f 100644
--- a/src/test/ui/proc-macro/macro-namespace-reserved.rs
+++ b/src/test/ui/proc-macro/macro-namespace-reserved.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![feature(decl_macro)]
diff --git a/src/test/ui/proc-macro/macro-namespace-reserved.stderr b/src/test/ui/proc-macro/macro-namespace-reserved.stderr
index 44b51edcc0b..c453bde6c17 100644
--- a/src/test/ui/proc-macro/macro-namespace-reserved.stderr
+++ b/src/test/ui/proc-macro/macro-namespace-reserved.stderr
@@ -1,5 +1,5 @@
 error[E0428]: the name `my_macro` is defined multiple times
-  --> $DIR/macro-namespace-reserved.rs:34:1
+  --> $DIR/macro-namespace-reserved.rs:35:1
    |
 LL | pub fn my_macro(input: TokenStream) -> TokenStream {
    | -------------------------------------------------- previous definition of the macro `my_macro` here
@@ -10,7 +10,7 @@ LL | macro my_macro() {} //~ ERROR the name `my_macro` is defined multiple times
    = note: `my_macro` must be defined only once in the macro namespace of this module
 
 error[E0428]: the name `my_macro_attr` is defined multiple times
-  --> $DIR/macro-namespace-reserved.rs:35:1
+  --> $DIR/macro-namespace-reserved.rs:36:1
    |
 LL | pub fn my_macro_attr(input: TokenStream, _: TokenStream) -> TokenStream {
    | ----------------------------------------------------------------------- previous definition of the macro `my_macro_attr` here
@@ -21,7 +21,7 @@ LL | macro my_macro_attr() {} //~ ERROR the name `my_macro_attr` is defined mult
    = note: `my_macro_attr` must be defined only once in the macro namespace of this module
 
 error[E0428]: the name `MyTrait` is defined multiple times
-  --> $DIR/macro-namespace-reserved.rs:36:1
+  --> $DIR/macro-namespace-reserved.rs:37:1
    |
 LL | #[proc_macro_derive(MyTrait)]
    |                     ------- previous definition of the macro `MyTrait` here
@@ -32,7 +32,7 @@ LL | macro MyTrait() {} //~ ERROR the name `MyTrait` is defined multiple times
    = note: `MyTrait` must be defined only once in the macro namespace of this module
 
 error[E0428]: the name `SameName` is defined multiple times
-  --> $DIR/macro-namespace-reserved.rs:44:1
+  --> $DIR/macro-namespace-reserved.rs:45:1
    |
 LL | #[proc_macro_derive(SameName)]
    |                     -------- previous definition of the macro `SameName` here
diff --git a/src/test/ui/proc-macro/non-root.rs b/src/test/ui/proc-macro/non-root.rs
index 24404885788..437973a426e 100644
--- a/src/test/ui/proc-macro/non-root.rs
+++ b/src/test/ui/proc-macro/non-root.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/proc-macro/non-root.stderr b/src/test/ui/proc-macro/non-root.stderr
index 23222a2b851..8c14f644d7a 100644
--- a/src/test/ui/proc-macro/non-root.stderr
+++ b/src/test/ui/proc-macro/non-root.stderr
@@ -1,5 +1,5 @@
 error: functions tagged with `#[proc_macro]` must currently reside in the root of the crate
-  --> $DIR/non-root.rs:20:5
+  --> $DIR/non-root.rs:21:5
    |
 LL |     pub fn foo(arg: TokenStream) -> TokenStream { arg }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/proc-macro/reserved-macro-names.rs b/src/test/ui/proc-macro/reserved-macro-names.rs
index ff5984aa67c..7c66af172fd 100644
--- a/src/test/ui/proc-macro/reserved-macro-names.rs
+++ b/src/test/ui/proc-macro/reserved-macro-names.rs
@@ -1,3 +1,6 @@
+// force-host
+// no-prefer-dynamic
+
 #![crate_type = "proc-macro"]
 
 extern crate proc_macro;
diff --git a/src/test/ui/proc-macro/reserved-macro-names.stderr b/src/test/ui/proc-macro/reserved-macro-names.stderr
index be6e80c3878..5ebe62a4969 100644
--- a/src/test/ui/proc-macro/reserved-macro-names.stderr
+++ b/src/test/ui/proc-macro/reserved-macro-names.stderr
@@ -1,17 +1,17 @@
 error: name `cfg` is reserved in macro namespace
-  --> $DIR/reserved-macro-names.rs:7:8
+  --> $DIR/reserved-macro-names.rs:10:8
    |
 LL | pub fn cfg(_: TokenStream, input: TokenStream) -> TokenStream {
    |        ^^^
 
 error: name `cfg_attr` is reserved in macro namespace
-  --> $DIR/reserved-macro-names.rs:13:8
+  --> $DIR/reserved-macro-names.rs:16:8
    |
 LL | pub fn cfg_attr(_: TokenStream, input: TokenStream) -> TokenStream {
    |        ^^^^^^^^
 
 error: name `derive` is reserved in macro namespace
-  --> $DIR/reserved-macro-names.rs:19:8
+  --> $DIR/reserved-macro-names.rs:22:8
    |
 LL | pub fn derive(_: TokenStream, input: TokenStream) -> TokenStream {
    |        ^^^^^^
diff --git a/src/test/ui/proc-macro/signature.rs b/src/test/ui/proc-macro/signature.rs
index f2ea6f778cd..4d6903187e4 100644
--- a/src/test/ui/proc-macro/signature.rs
+++ b/src/test/ui/proc-macro/signature.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
+// no-prefer-dynamic
+
 #![crate_type = "proc-macro"]
 #![allow(warnings)]
 
diff --git a/src/test/ui/proc-macro/signature.stderr b/src/test/ui/proc-macro/signature.stderr
index fdd10c3c5b9..681e72c08c4 100644
--- a/src/test/ui/proc-macro/signature.stderr
+++ b/src/test/ui/proc-macro/signature.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/signature.rs:17:1
+  --> $DIR/signature.rs:20:1
    |
 LL | / pub unsafe extern fn foo(a: i32, b: u32) -> u32 {
 LL | |     //~^ ERROR: mismatched types
diff --git a/src/test/ui/rust-2018/auxiliary/suggestions-not-always-applicable.rs b/src/test/ui/rust-2018/auxiliary/suggestions-not-always-applicable.rs
index 7ae4731fde1..b8a05e89a66 100644
--- a/src/test/ui/rust-2018/auxiliary/suggestions-not-always-applicable.rs
+++ b/src/test/ui/rust-2018/auxiliary/suggestions-not-always-applicable.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// force-host
 // no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
diff --git a/src/test/ui/rust-2018/proc-macro-crate-in-paths.rs b/src/test/ui/rust-2018/proc-macro-crate-in-paths.rs
index 1068c058745..51314abaad2 100644
--- a/src/test/ui/rust-2018/proc-macro-crate-in-paths.rs
+++ b/src/test/ui/rust-2018/proc-macro-crate-in-paths.rs
@@ -9,6 +9,8 @@
 // except according to those terms.
 
 // compile-pass
+// force-host
+// no-prefer-dynamic
 
 #![crate_type = "proc-macro"]
 #![deny(rust_2018_compatibility)]
-- 
cgit 1.4.1-3-g733a5