Update tests to use new proc-macro header

author: Eric Huss <eric@huss.org> 2024-11-24 17:37:25 -0800
committer: Eric Huss <eric@huss.org> 2024-11-27 07:18:25 -0800
commit: f94142b366f9bc57c15e9ac274f83d0f9c03ffac (patch)
tree: e1f4e41efc3307e29c6098985f225f0522044dca
parent: f592dd95dbfc892c1153af67e0ab5b4e593d33e7 (diff)
download: rust-f94142b366f9bc57c15e9ac274f83d0f9c03ffac.tar.gz
rust-f94142b366f9bc57c15e9ac274f83d0f9c03ffac.zip
399 files changed, 425 insertions, 1084 deletions
diff --git a/tests/codegen/debuginfo-proc-macro/auxiliary/macro_def.rs b/tests/codegen/debuginfo-proc-macro/auxiliary/macro_def.rs
index 159ecfd0974..c0691b23275 100644
--- a/tests/codegen/debuginfo-proc-macro/auxiliary/macro_def.rs
+++ b/tests/codegen/debuginfo-proc-macro/auxiliary/macro_def.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::*;
 
diff --git a/tests/codegen/debuginfo-proc-macro/mir_inlined_twice_var_locs.rs b/tests/codegen/debuginfo-proc-macro/mir_inlined_twice_var_locs.rs
index c3858044c0c..0f6e99f9b1e 100644
--- a/tests/codegen/debuginfo-proc-macro/mir_inlined_twice_var_locs.rs
+++ b/tests/codegen/debuginfo-proc-macro/mir_inlined_twice_var_locs.rs
@@ -3,7 +3,7 @@
 // MSVC is different because of the individual allocas.
 //@ ignore-msvc
 
-//@ aux-build:macro_def.rs
+//@ proc-macro: macro_def.rs
 
 // Find the variable.
 // CHECK-DAG: ![[#var_dbg:]] = !DILocalVariable(name: "n",{{( arg: 1,)?}} scope: ![[#var_scope:]]
diff --git a/tests/incremental/auxiliary/incremental_proc_macro_aux.rs b/tests/incremental/auxiliary/incremental_proc_macro_aux.rs
index 505a9ee27a4..d0730eb00ee 100644
--- a/tests/incremental/auxiliary/incremental_proc_macro_aux.rs
+++ b/tests/incremental/auxiliary/incremental_proc_macro_aux.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/incremental/auxiliary/issue-49482-macro-def.rs b/tests/incremental/auxiliary/issue-49482-macro-def.rs
index 9218d6b62cb..6cd565c3a11 100644
--- a/tests/incremental/auxiliary/issue-49482-macro-def.rs
+++ b/tests/incremental/auxiliary/issue-49482-macro-def.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type="proc-macro"]
 #![allow(non_snake_case)]
 
 extern crate proc_macro;
diff --git a/tests/incremental/auxiliary/issue-49482-reexport.rs b/tests/incremental/auxiliary/issue-49482-reexport.rs
index 39f19e3f15f..686766de54f 100644
--- a/tests/incremental/auxiliary/issue-49482-reexport.rs
+++ b/tests/incremental/auxiliary/issue-49482-reexport.rs
@@ -1,3 +1,4 @@
+//@ proc-macro: issue-49482-macro-def.rs
 #[macro_use]
 extern crate issue_49482_macro_def;
 
diff --git a/tests/incremental/auxiliary/issue-54059.rs b/tests/incremental/auxiliary/issue-54059.rs
index 5f45403735c..6bbc94149e8 100644
--- a/tests/incremental/auxiliary/issue-54059.rs
+++ b/tests/incremental/auxiliary/issue-54059.rs
@@ -1,9 +1,5 @@
-//@ force-host
-//@ no-prefer-dynamic
-
 // check that having extern "C" functions in a proc macro doesn't crash.
 
-#![crate_type="proc-macro"]
 #![allow(non_snake_case)]
 
 extern crate proc_macro;
diff --git a/tests/incremental/incremental_proc_macro.rs b/tests/incremental/incremental_proc_macro.rs
index 97faf8e698a..3cf89cae652 100644
--- a/tests/incremental/incremental_proc_macro.rs
+++ b/tests/incremental/incremental_proc_macro.rs
@@ -1,4 +1,4 @@
-//@ aux-build:incremental_proc_macro_aux.rs
+//@ proc-macro: incremental_proc_macro_aux.rs
 //@ revisions: cfail1 cfail2
 //@ build-pass (FIXME(62277): could be check-pass?)
 
diff --git a/tests/incremental/issue-110457-same-span-closures/auxiliary/egui_inspect_derive.rs b/tests/incremental/issue-110457-same-span-closures/auxiliary/egui_inspect_derive.rs
index 3b4933811d3..877d74d731d 100644
--- a/tests/incremental/issue-110457-same-span-closures/auxiliary/egui_inspect_derive.rs
+++ b/tests/incremental/issue-110457-same-span-closures/auxiliary/egui_inspect_derive.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::{Delimiter, Group, Ident, Literal, Punct, Spacing, Span, TokenStream, TokenTree};
diff --git a/tests/incremental/issue-110457-same-span-closures/main.rs b/tests/incremental/issue-110457-same-span-closures/main.rs
index c36b7e3ca80..6a5e4b315ce 100644
--- a/tests/incremental/issue-110457-same-span-closures/main.rs
+++ b/tests/incremental/issue-110457-same-span-closures/main.rs
@@ -1,4 +1,4 @@
-//@ aux-build: egui_inspect_derive.rs
+//@ proc-macro: egui_inspect_derive.rs
 //@ revisions: cpass1 cpass2
 
 extern crate egui_inspect_derive;
diff --git a/tests/incremental/issue-49482.rs b/tests/incremental/issue-49482.rs
index 2dddde6c171..849f1c66600 100644
--- a/tests/incremental/issue-49482.rs
+++ b/tests/incremental/issue-49482.rs
@@ -1,4 +1,3 @@
-//@ aux-build:issue-49482-macro-def.rs
 //@ aux-build:issue-49482-reexport.rs
 //@ revisions: rpass1
 
diff --git a/tests/incremental/issue-54059.rs b/tests/incremental/issue-54059.rs
index bfce4d487db..b6668b4be28 100644
--- a/tests/incremental/issue-54059.rs
+++ b/tests/incremental/issue-54059.rs
@@ -1,4 +1,4 @@
-//@ aux-build:issue-54059.rs
+//@ proc-macro: issue-54059.rs
 //@ ignore-windows - dealing with weird symbols issues on dylibs isn't worth it
 //@ revisions: rpass1
 
diff --git a/tests/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-lib.rs b/tests/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-lib.rs
index f84c4fe9895..704193cffd0 100644
--- a/tests/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-lib.rs
+++ b/tests/incremental/issue-85197-invalid-span/auxiliary/invalid-span-helper-lib.rs
@@ -1,3 +1,4 @@
+//@ proc-macro: respan.rs
 //@ revisions: rpass1 rpass2
 
 extern crate respan;
diff --git a/tests/incremental/issue-85197-invalid-span/auxiliary/respan.rs b/tests/incremental/issue-85197-invalid-span/auxiliary/respan.rs
index c56d9052e32..5bedca8a265 100644
--- a/tests/incremental/issue-85197-invalid-span/auxiliary/respan.rs
+++ b/tests/incremental/issue-85197-invalid-span/auxiliary/respan.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::TokenStream;
 
diff --git a/tests/incremental/issue-85197-invalid-span/invalid_span_main.rs b/tests/incremental/issue-85197-invalid-span/invalid_span_main.rs
index eaad44780c7..6db5107cbe4 100644
--- a/tests/incremental/issue-85197-invalid-span/invalid_span_main.rs
+++ b/tests/incremental/issue-85197-invalid-span/invalid_span_main.rs
@@ -1,5 +1,4 @@
 //@ revisions: rpass1 rpass2
-//@ aux-build:respan.rs
 //@ aux-build:invalid-span-helper-lib.rs
 
 // This issue has several different parts. The high level idea is:
diff --git a/tests/pretty/attr-derive.rs b/tests/pretty/attr-derive.rs
index 79b6ea51446..afb86b29315 100644
--- a/tests/pretty/attr-derive.rs
+++ b/tests/pretty/attr-derive.rs
@@ -1,4 +1,4 @@
-//@ aux-build:derive-foo.rs
+//@ proc-macro: derive-foo.rs
 //@ pp-exact
 // Testing that both the inner item and next outer item are
 // preserved, and that the first outer item parsed in main is not
diff --git a/tests/pretty/auxiliary/derive-foo.rs b/tests/pretty/auxiliary/derive-foo.rs
index dc682beafad..16027508281 100644
--- a/tests/pretty/auxiliary/derive-foo.rs
+++ b/tests/pretty/auxiliary/derive-foo.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/annotate-snippet/auxiliary/multispan.rs b/tests/ui/annotate-snippet/auxiliary/multispan.rs
index b5f1ed9b56a..1eb379d3877 100644
--- a/tests/ui/annotate-snippet/auxiliary/multispan.rs
+++ b/tests/ui/annotate-snippet/auxiliary/multispan.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![feature(proc_macro_diagnostic, proc_macro_span, proc_macro_def_site)]
 
 extern crate proc_macro;
diff --git a/tests/ui/annotate-snippet/multispan.rs b/tests/ui/annotate-snippet/multispan.rs
index c9ec4043e37..b7cf22eebcb 100644
--- a/tests/ui/annotate-snippet/multispan.rs
+++ b/tests/ui/annotate-snippet/multispan.rs
@@ -1,4 +1,4 @@
-//@ aux-build:multispan.rs
+//@ proc-macro: multispan.rs
 //@ error-pattern:hello to you, too!
 //@ compile-flags: --error-format human-annotate-rs -Z unstable-options
 
diff --git a/tests/ui/async-await/issues/auxiliary/issue-60674.rs b/tests/ui/async-await/issues/auxiliary/issue-60674.rs
index da11142a3a4..a22f90e9516 100644
--- a/tests/ui/async-await/issues/auxiliary/issue-60674.rs
+++ b/tests/ui/async-await/issues/auxiliary/issue-60674.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::TokenStream;
 
diff --git a/tests/ui/async-await/issues/issue-60674.rs b/tests/ui/async-await/issues/issue-60674.rs
index 9def3552e67..d04fa23840e 100644
--- a/tests/ui/async-await/issues/issue-60674.rs
+++ b/tests/ui/async-await/issues/issue-60674.rs
@@ -1,4 +1,4 @@
-//@ aux-build:issue-60674.rs
+//@ proc-macro: issue-60674.rs
 //@ build-pass (FIXME(62277): could be check-pass?)
 //@ edition:2018
 
diff --git a/tests/ui/attributes/auxiliary/key-value-expansion.rs b/tests/ui/attributes/auxiliary/key-value-expansion.rs
index 9db82cec635..5ecc62ed3fa 100644
--- a/tests/ui/attributes/auxiliary/key-value-expansion.rs
+++ b/tests/ui/attributes/auxiliary/key-value-expansion.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::*;
 
diff --git a/tests/ui/attributes/key-value-expansion.rs b/tests/ui/attributes/key-value-expansion.rs
index dd408ebb77e..e5700a75935 100644
--- a/tests/ui/attributes/key-value-expansion.rs
+++ b/tests/ui/attributes/key-value-expansion.rs
@@ -1,7 +1,7 @@
 // Regression tests for issue #55414, expansion happens in the value of a key-value attribute,
 // and the expanded expression is more complex than simply a macro call.
 
-//@ aux-build:key-value-expansion.rs
+//@ proc-macro: key-value-expansion.rs
 
 #![feature(rustc_attrs)]
 
diff --git a/tests/ui/attributes/main-removed-2/auxiliary/tokyo.rs b/tests/ui/attributes/main-removed-2/auxiliary/tokyo.rs
index 25879d17027..038183a80b8 100644
--- a/tests/ui/attributes/main-removed-2/auxiliary/tokyo.rs
+++ b/tests/ui/attributes/main-removed-2/auxiliary/tokyo.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::TokenStream;
 
diff --git a/tests/ui/attributes/main-removed-2/main.rs b/tests/ui/attributes/main-removed-2/main.rs
index e4a3de79ec9..53696d68ced 100644
--- a/tests/ui/attributes/main-removed-2/main.rs
+++ b/tests/ui/attributes/main-removed-2/main.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:tokyo.rs
+//@ proc-macro: tokyo.rs
 //@ compile-flags:--extern tokyo
 //@ edition:2021
 
diff --git a/tests/ui/autodiff/auxiliary/my_macro.rs b/tests/ui/autodiff/auxiliary/my_macro.rs
index 417199611cc..217631a33c9 100644
--- a/tests/ui/autodiff/auxiliary/my_macro.rs
+++ b/tests/ui/autodiff/auxiliary/my_macro.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::TokenStream;
 
diff --git a/tests/ui/autodiff/visibility.rs b/tests/ui/autodiff/visibility.rs
index 6a4851de2dc..dfaec03aef0 100644
--- a/tests/ui/autodiff/visibility.rs
+++ b/tests/ui/autodiff/visibility.rs
@@ -1,7 +1,7 @@
 //@ ignore-enzyme
 //@ revisions: std_autodiff no_std_autodiff
 //@[no_std_autodiff] check-pass
-//@ aux-build: my_macro.rs
+//@ proc-macro: my_macro.rs
 #![crate_type = "lib"]
 #![feature(autodiff)]
 
diff --git a/tests/ui/cfg/assume-incomplete-release/assume-incomplete.rs b/tests/ui/cfg/assume-incomplete-release/assume-incomplete.rs
index b04b1e0c326..cafb7389e29 100644
--- a/tests/ui/cfg/assume-incomplete-release/assume-incomplete.rs
+++ b/tests/ui/cfg/assume-incomplete-release/assume-incomplete.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:ver-cfg-rel.rs
+//@ proc-macro: ver-cfg-rel.rs
 //@ revisions: assume no_assume
 //@ [assume]compile-flags: -Z assume-incomplete-release
 
diff --git a/tests/ui/cfg/assume-incomplete-release/auxiliary/ver-cfg-rel.rs b/tests/ui/cfg/assume-incomplete-release/auxiliary/ver-cfg-rel.rs
index e06ee94a1e9..5d3e9c7a32f 100644
--- a/tests/ui/cfg/assume-incomplete-release/auxiliary/ver-cfg-rel.rs
+++ b/tests/ui/cfg/assume-incomplete-release/auxiliary/ver-cfg-rel.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::{TokenStream, TokenTree as Tt};
 use std::str::FromStr;
diff --git a/tests/ui/crate-loading/auxiliary/proc-macro.rs b/tests/ui/crate-loading/auxiliary/proc-macro.rs
index ad227c069d2..a87a2b243a1 100644
--- a/tests/ui/crate-loading/auxiliary/proc-macro.rs
+++ b/tests/ui/crate-loading/auxiliary/proc-macro.rs
@@ -1,7 +1,4 @@
-//@ force-host
-//@ no-prefer-dynamic
 #![crate_name = "reproduction"]
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 use proc_macro::TokenStream;
diff --git a/tests/ui/crate-loading/cross-compiled-proc-macro.rs b/tests/ui/crate-loading/cross-compiled-proc-macro.rs
index 51431c05865..b727f22e188 100644
--- a/tests/ui/crate-loading/cross-compiled-proc-macro.rs
+++ b/tests/ui/crate-loading/cross-compiled-proc-macro.rs
@@ -1,6 +1,6 @@
 //@ edition:2018
 //@ compile-flags:--extern reproduction
-//@ aux-build:proc-macro.rs
+//@ proc-macro: proc-macro.rs
 //@ check-pass
 
 reproduction::mac!();
diff --git a/tests/ui/derives/auxiliary/derive-marker-tricky.rs b/tests/ui/derives/auxiliary/derive-marker-tricky.rs
index 0f1c30811a2..f31baa43c3d 100644
--- a/tests/ui/derives/auxiliary/derive-marker-tricky.rs
+++ b/tests/ui/derives/auxiliary/derive-marker-tricky.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::*;
 
diff --git a/tests/ui/derives/derive-marker-tricky.rs b/tests/ui/derives/derive-marker-tricky.rs
index ad03b6c2cd2..3831bd48581 100644
--- a/tests/ui/derives/derive-marker-tricky.rs
+++ b/tests/ui/derives/derive-marker-tricky.rs
@@ -2,7 +2,7 @@
 // a built-in derive in non-trivial scope (e.g. in a nested module).
 
 //@ check-pass
-//@ aux-build:derive-marker-tricky.rs
+//@ proc-macro: derive-marker-tricky.rs
 
 extern crate derive_marker_tricky;
 
diff --git a/tests/ui/deriving/auxiliary/another-proc-macro.rs b/tests/ui/deriving/auxiliary/another-proc-macro.rs
index c992cde4066..47f3c5b9c4b 100644
--- a/tests/ui/deriving/auxiliary/another-proc-macro.rs
+++ b/tests/ui/deriving/auxiliary/another-proc-macro.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![feature(proc_macro_quote)]
 
 extern crate proc_macro;
diff --git a/tests/ui/deriving/built-in-proc-macro-scope.rs b/tests/ui/deriving/built-in-proc-macro-scope.rs
index 6c473aefc5b..e67197b7e20 100644
--- a/tests/ui/deriving/built-in-proc-macro-scope.rs
+++ b/tests/ui/deriving/built-in-proc-macro-scope.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build: another-proc-macro.rs
+//@ proc-macro: another-proc-macro.rs
 //@ compile-flags: -Zunpretty=expanded
 
 #![feature(derive_coerce_pointee)]
diff --git a/tests/ui/deriving/built-in-proc-macro-scope.stdout b/tests/ui/deriving/built-in-proc-macro-scope.stdout
index 07767dc229f..db97c7145ea 100644
--- a/tests/ui/deriving/built-in-proc-macro-scope.stdout
+++ b/tests/ui/deriving/built-in-proc-macro-scope.stdout
@@ -1,7 +1,7 @@
 #![feature(prelude_import)]
 #![no_std]
 //@ check-pass
-//@ aux-build: another-proc-macro.rs
+//@ proc-macro: another-proc-macro.rs
 //@ compile-flags: -Zunpretty=expanded
 
 #![feature(derive_coerce_pointee)]
diff --git a/tests/ui/deriving/proc-macro-attribute-mixing.rs b/tests/ui/deriving/proc-macro-attribute-mixing.rs
index 80a0d068ce7..2c11c3f72ca 100644
--- a/tests/ui/deriving/proc-macro-attribute-mixing.rs
+++ b/tests/ui/deriving/proc-macro-attribute-mixing.rs
@@ -5,7 +5,7 @@
 // are in scope.
 
 //@ check-pass
-//@ aux-build: another-proc-macro.rs
+//@ proc-macro: another-proc-macro.rs
 //@ compile-flags: -Zunpretty=expanded
 
 #![feature(derive_coerce_pointee)]
diff --git a/tests/ui/deriving/proc-macro-attribute-mixing.stdout b/tests/ui/deriving/proc-macro-attribute-mixing.stdout
index 03128c6c957..ad743d013d2 100644
--- a/tests/ui/deriving/proc-macro-attribute-mixing.stdout
+++ b/tests/ui/deriving/proc-macro-attribute-mixing.stdout
@@ -7,7 +7,7 @@
 // are in scope.
 
 //@ check-pass
-//@ aux-build: another-proc-macro.rs
+//@ proc-macro: another-proc-macro.rs
 //@ compile-flags: -Zunpretty=expanded
 
 #![feature(derive_coerce_pointee)]
diff --git a/tests/ui/diagnostic_namespace/auxiliary/proc-macro-helper.rs b/tests/ui/diagnostic_namespace/auxiliary/proc-macro-helper.rs
index 4edae48923a..3fe84317d70 100644
--- a/tests/ui/diagnostic_namespace/auxiliary/proc-macro-helper.rs
+++ b/tests/ui/diagnostic_namespace/auxiliary/proc-macro-helper.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/diagnostic_namespace/existing_proc_macros.rs b/tests/ui/diagnostic_namespace/existing_proc_macros.rs
index 014ec46f1b9..55b6b0ab441 100644
--- a/tests/ui/diagnostic_namespace/existing_proc_macros.rs
+++ b/tests/ui/diagnostic_namespace/existing_proc_macros.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:proc-macro-helper.rs
+//@ proc-macro: proc-macro-helper.rs
 
 extern crate proc_macro_helper;
 
diff --git a/tests/ui/fmt/auxiliary/format-string-proc-macro.rs b/tests/ui/fmt/auxiliary/format-string-proc-macro.rs
index 5c00c9c0800..f473fee0987 100644
--- a/tests/ui/fmt/auxiliary/format-string-proc-macro.rs
+++ b/tests/ui/fmt/auxiliary/format-string-proc-macro.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::{Delimiter, Group, Ident, Literal, Punct, Spacing, Span, TokenStream, TokenTree};
diff --git a/tests/ui/fmt/format-args-capture-first-literal-is-macro.rs b/tests/ui/fmt/format-args-capture-first-literal-is-macro.rs
index 3a0b7ba4666..8ba6fcc46d4 100644
--- a/tests/ui/fmt/format-args-capture-first-literal-is-macro.rs
+++ b/tests/ui/fmt/format-args-capture-first-literal-is-macro.rs
@@ -1,4 +1,4 @@
-//@ aux-build:format-string-proc-macro.rs
+//@ proc-macro: format-string-proc-macro.rs
 
 #[macro_use]
 extern crate format_string_proc_macro;
diff --git a/tests/ui/fmt/format-args-capture-from-pm-first-arg-macro.rs b/tests/ui/fmt/format-args-capture-from-pm-first-arg-macro.rs
index 24531e4ece4..26d483e43ae 100644
--- a/tests/ui/fmt/format-args-capture-from-pm-first-arg-macro.rs
+++ b/tests/ui/fmt/format-args-capture-from-pm-first-arg-macro.rs
@@ -1,4 +1,4 @@
-//@ aux-build:format-string-proc-macro.rs
+//@ proc-macro: format-string-proc-macro.rs
 
 extern crate format_string_proc_macro;
 
diff --git a/tests/ui/fmt/format-args-capture-issue-106408.rs b/tests/ui/fmt/format-args-capture-issue-106408.rs
index 7c29e37441c..10f944dd9ba 100644
--- a/tests/ui/fmt/format-args-capture-issue-106408.rs
+++ b/tests/ui/fmt/format-args-capture-issue-106408.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:format-string-proc-macro.rs
+//@ proc-macro: format-string-proc-macro.rs
 
 extern crate format_string_proc_macro;
 
diff --git a/tests/ui/fmt/format-args-capture-macro-hygiene.rs b/tests/ui/fmt/format-args-capture-macro-hygiene.rs
index 2ef81f2cd42..21e445624a5 100644
--- a/tests/ui/fmt/format-args-capture-macro-hygiene.rs
+++ b/tests/ui/fmt/format-args-capture-macro-hygiene.rs
@@ -1,4 +1,4 @@
-//@ aux-build:format-string-proc-macro.rs
+//@ proc-macro: format-string-proc-macro.rs
 
 #[macro_use]
 extern crate format_string_proc_macro;
diff --git a/tests/ui/fmt/format-expanded-string.rs b/tests/ui/fmt/format-expanded-string.rs
index d9b96bdece3..1466dabd7f7 100644
--- a/tests/ui/fmt/format-expanded-string.rs
+++ b/tests/ui/fmt/format-expanded-string.rs
@@ -1,4 +1,4 @@
-//@ aux-build:format-string-proc-macro.rs
+//@ proc-macro: format-string-proc-macro.rs
 
 #[macro_use]
 extern crate format_string_proc_macro;
diff --git a/tests/ui/fmt/indoc-issue-106408.rs b/tests/ui/fmt/indoc-issue-106408.rs
index 36e5c23a394..8c302e5b03a 100644
--- a/tests/ui/fmt/indoc-issue-106408.rs
+++ b/tests/ui/fmt/indoc-issue-106408.rs
@@ -1,4 +1,4 @@
-//@ aux-build:format-string-proc-macro.rs
+//@ proc-macro: format-string-proc-macro.rs
 //@ check-pass
 
 extern crate format_string_proc_macro;
diff --git a/tests/ui/fmt/respanned-literal-issue-106191.rs b/tests/ui/fmt/respanned-literal-issue-106191.rs
index 0a127b1a0ca..39f09b6e63a 100644
--- a/tests/ui/fmt/respanned-literal-issue-106191.rs
+++ b/tests/ui/fmt/respanned-literal-issue-106191.rs
@@ -1,4 +1,4 @@
-//@ aux-build:format-string-proc-macro.rs
+//@ proc-macro: format-string-proc-macro.rs
 
 extern crate format_string_proc_macro;
 
diff --git a/tests/ui/hygiene/auxiliary/def-site-async-await.rs b/tests/ui/hygiene/auxiliary/def-site-async-await.rs
index 41c4b871e73..88042b484a1 100644
--- a/tests/ui/hygiene/auxiliary/def-site-async-await.rs
+++ b/tests/ui/hygiene/auxiliary/def-site-async-await.rs
@@ -1,6 +1,5 @@
 //@ edition:2018
-
-extern crate opaque_hygiene;
+//@ proc-macro: opaque-hygiene.rs
 
 pub async fn serve() {
     opaque_hygiene::make_it!();
diff --git a/tests/ui/hygiene/auxiliary/opaque-hygiene.rs b/tests/ui/hygiene/auxiliary/opaque-hygiene.rs
index b6192d653f5..08dc592925a 100644
--- a/tests/ui/hygiene/auxiliary/opaque-hygiene.rs
+++ b/tests/ui/hygiene/auxiliary/opaque-hygiene.rs
@@ -1,8 +1,4 @@
-//@ force-host
-//@ no-prefer-dynamic
-
 #![feature(proc_macro_quote)]
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 use proc_macro::{TokenStream, quote};
diff --git a/tests/ui/hygiene/issue-77523-def-site-async-await.rs b/tests/ui/hygiene/issue-77523-def-site-async-await.rs
index 102112381d3..ad6bd5e0b78 100644
--- a/tests/ui/hygiene/issue-77523-def-site-async-await.rs
+++ b/tests/ui/hygiene/issue-77523-def-site-async-await.rs
@@ -1,5 +1,4 @@
 //@ build-pass
-//@ aux-build:opaque-hygiene.rs
 //@ aux-build:def-site-async-await.rs
 
 // Regression test for issue #77523
diff --git a/tests/ui/impl-trait/precise-capturing/auxiliary/no-use-pm.rs b/tests/ui/impl-trait/precise-capturing/auxiliary/no-use-pm.rs
index e197dcfef80..fab55f11a53 100644
--- a/tests/ui/impl-trait/precise-capturing/auxiliary/no-use-pm.rs
+++ b/tests/ui/impl-trait/precise-capturing/auxiliary/no-use-pm.rs
@@ -1,11 +1,6 @@
 // A proc-macro in 2015 that has an RPIT without `use<>` that would cause a
 // problem with 2024 capturing rules.
 
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::TokenStream;
 
diff --git a/tests/ui/impl-trait/precise-capturing/external-macro.rs b/tests/ui/impl-trait/precise-capturing/external-macro.rs
index 87bad7455eb..9d4d8a1bb11 100644
--- a/tests/ui/impl-trait/precise-capturing/external-macro.rs
+++ b/tests/ui/impl-trait/precise-capturing/external-macro.rs
@@ -2,7 +2,7 @@
 // has an RPIT will not fail when the call-site is 2024.
 // https://github.com/rust-lang/rust/issues/132917
 
-//@ aux-crate: no_use_pm=no-use-pm.rs
+//@ proc-macro: no-use-pm.rs
 //@ aux-crate: no_use_macro=no-use-macro.rs
 //@ edition: 2024
 //@ check-pass
diff --git a/tests/ui/inherent-impls-overlap-check/auxiliary/repeat.rs b/tests/ui/inherent-impls-overlap-check/auxiliary/repeat.rs
index a2970cb5c80..b87c4b14abc 100644
--- a/tests/ui/inherent-impls-overlap-check/auxiliary/repeat.rs
+++ b/tests/ui/inherent-impls-overlap-check/auxiliary/repeat.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::{Ident, Group, TokenStream, TokenTree as Tt};
 
diff --git a/tests/ui/inherent-impls-overlap-check/no-overlap.rs b/tests/ui/inherent-impls-overlap-check/no-overlap.rs
index 85565a221ac..df60031bae0 100644
--- a/tests/ui/inherent-impls-overlap-check/no-overlap.rs
+++ b/tests/ui/inherent-impls-overlap-check/no-overlap.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:repeat.rs
+//@ proc-macro: repeat.rs
 
 // This tests the allocating algo branch of the
 // inherent impls overlap checker.
diff --git a/tests/ui/inherent-impls-overlap-check/overlap.rs b/tests/ui/inherent-impls-overlap-check/overlap.rs
index 32653943698..114035a13b6 100644
--- a/tests/ui/inherent-impls-overlap-check/overlap.rs
+++ b/tests/ui/inherent-impls-overlap-check/overlap.rs
@@ -1,4 +1,4 @@
-//@ aux-build:repeat.rs
+//@ proc-macro: repeat.rs
 
 #![allow(unused)]
 
diff --git a/tests/ui/lifetimes/auxiliary/issue-91763-aux.rs b/tests/ui/lifetimes/auxiliary/issue-91763-aux.rs
index 35ef6fc019d..4e4b7f61f1e 100644
--- a/tests/ui/lifetimes/auxiliary/issue-91763-aux.rs
+++ b/tests/ui/lifetimes/auxiliary/issue-91763-aux.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 //#![feature(proc_macro_diagnostic, proc_macro_span, proc_macro_def_site)]
 
 extern crate proc_macro;
diff --git a/tests/ui/lifetimes/issue-91763.rs b/tests/ui/lifetimes/issue-91763.rs
index 5df69cff3be..6abb64db5fe 100644
--- a/tests/ui/lifetimes/issue-91763.rs
+++ b/tests/ui/lifetimes/issue-91763.rs
@@ -1,4 +1,4 @@
-//@ aux-build:issue-91763-aux.rs
+//@ proc-macro: issue-91763-aux.rs
 
 #![deny(elided_lifetimes_in_paths)]
 
diff --git a/tests/ui/lint/auxiliary/add-impl.rs b/tests/ui/lint/auxiliary/add-impl.rs
index 7ee4a4e4fde..d0f2baf94bf 100644
--- a/tests/ui/lint/auxiliary/add-impl.rs
+++ b/tests/ui/lint/auxiliary/add-impl.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/lint/redundant-semicolon/auxiliary/redundant-semi-proc-macro-def.rs b/tests/ui/lint/redundant-semicolon/auxiliary/redundant-semi-proc-macro-def.rs
index 2a58af0fedc..72303f12b7e 100644
--- a/tests/ui/lint/redundant-semicolon/auxiliary/redundant-semi-proc-macro-def.rs
+++ b/tests/ui/lint/redundant-semicolon/auxiliary/redundant-semi-proc-macro-def.rs
@@ -1,6 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-#![crate_type="proc-macro"]
 #![crate_name="redundant_semi_proc_macro"]
 extern crate proc_macro;
 use proc_macro::TokenStream;
diff --git a/tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.rs b/tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.rs
index 33c7e26ba47..3469614aab0 100644
--- a/tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.rs
+++ b/tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.rs
@@ -1,4 +1,4 @@
-//@ aux-build:redundant-semi-proc-macro-def.rs
+//@ proc-macro: redundant-semi-proc-macro-def.rs
 
 #![deny(redundant_semicolons)]
 extern crate redundant_semi_proc_macro;
diff --git a/tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr b/tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr
index d42aa1d613f..1ec440b4e45 100644
--- a/tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr
+++ b/tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr
@@ -1,4 +1,4 @@
-TokenStream [Ident { ident: "fn", span: #0 bytes(199..201) }, Ident { ident: "span_preservation", span: #0 bytes(202..219) }, Group { delimiter: Parenthesis, stream: TokenStream [], span: #0 bytes(219..221) }, Group { delimiter: Brace, stream: TokenStream [Ident { ident: "let", span: #0 bytes(229..232) }, Ident { ident: "tst", span: #0 bytes(233..236) }, Punct { ch: '=', spacing: Alone, span: #0 bytes(237..238) }, Literal { kind: Integer, symbol: "123", suffix: None, span: #0 bytes(239..242) }, Punct { ch: ';', spacing: Joint, span: #0 bytes(242..243) }, Punct { ch: ';', spacing: Alone, span: #0 bytes(243..244) }, Ident { ident: "match", span: #0 bytes(290..295) }, Ident { ident: "tst", span: #0 bytes(296..299) }, Group { delimiter: Brace, stream: TokenStream [Literal { kind: Integer, symbol: "123", suffix: None, span: #0 bytes(484..487) }, Punct { ch: '=', spacing: Joint, span: #0 bytes(488..489) }, Punct { ch: '>', spacing: Alone, span: #0 bytes(489..490) }, Group { delimiter: Parenthesis, stream: TokenStream [], span: #0 bytes(491..493) }, Punct { ch: ',', spacing: Alone, span: #0 bytes(493..494) }, Ident { ident: "_", span: #0 bytes(503..504) }, Punct { ch: '=', spacing: Joint, span: #0 bytes(505..506) }, Punct { ch: '>', spacing: Alone, span: #0 bytes(506..507) }, Group { delimiter: Parenthesis, stream: TokenStream [], span: #0 bytes(508..510) }], span: #0 bytes(300..516) }, Punct { ch: ';', spacing: Joint, span: #0 bytes(516..517) }, Punct { ch: ';', spacing: Joint, span: #0 bytes(517..518) }, Punct { ch: ';', spacing: Alone, span: #0 bytes(518..519) }], span: #0 bytes(223..563) }]
+TokenStream [Ident { ident: "fn", span: #0 bytes(201..203) }, Ident { ident: "span_preservation", span: #0 bytes(204..221) }, Group { delimiter: Parenthesis, stream: TokenStream [], span: #0 bytes(221..223) }, Group { delimiter: Brace, stream: TokenStream [Ident { ident: "let", span: #0 bytes(231..234) }, Ident { ident: "tst", span: #0 bytes(235..238) }, Punct { ch: '=', spacing: Alone, span: #0 bytes(239..240) }, Literal { kind: Integer, symbol: "123", suffix: None, span: #0 bytes(241..244) }, Punct { ch: ';', spacing: Joint, span: #0 bytes(244..245) }, Punct { ch: ';', spacing: Alone, span: #0 bytes(245..246) }, Ident { ident: "match", span: #0 bytes(292..297) }, Ident { ident: "tst", span: #0 bytes(298..301) }, Group { delimiter: Brace, stream: TokenStream [Literal { kind: Integer, symbol: "123", suffix: None, span: #0 bytes(486..489) }, Punct { ch: '=', spacing: Joint, span: #0 bytes(490..491) }, Punct { ch: '>', spacing: Alone, span: #0 bytes(491..492) }, Group { delimiter: Parenthesis, stream: TokenStream [], span: #0 bytes(493..495) }, Punct { ch: ',', spacing: Alone, span: #0 bytes(495..496) }, Ident { ident: "_", span: #0 bytes(505..506) }, Punct { ch: '=', spacing: Joint, span: #0 bytes(507..508) }, Punct { ch: '>', spacing: Alone, span: #0 bytes(508..509) }, Group { delimiter: Parenthesis, stream: TokenStream [], span: #0 bytes(510..512) }], span: #0 bytes(302..518) }, Punct { ch: ';', spacing: Joint, span: #0 bytes(518..519) }, Punct { ch: ';', spacing: Joint, span: #0 bytes(519..520) }, Punct { ch: ';', spacing: Alone, span: #0 bytes(520..521) }], span: #0 bytes(225..565) }]
 error: unnecessary trailing semicolon
   --> $DIR/redundant-semi-proc-macro.rs:9:19
    |
diff --git a/tests/ui/lint/unsafe_code/auxiliary/forge_unsafe_block.rs b/tests/ui/lint/unsafe_code/auxiliary/forge_unsafe_block.rs
index 6849e9170c1..b00f5838749 100644
--- a/tests/ui/lint/unsafe_code/auxiliary/forge_unsafe_block.rs
+++ b/tests/ui/lint/unsafe_code/auxiliary/forge_unsafe_block.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::{Delimiter, Group, Ident, Span, TokenStream, TokenTree};
diff --git a/tests/ui/lint/unsafe_code/forge_unsafe_block.rs b/tests/ui/lint/unsafe_code/forge_unsafe_block.rs
index 6392849f915..93b2b60647d 100644
--- a/tests/ui/lint/unsafe_code/forge_unsafe_block.rs
+++ b/tests/ui/lint/unsafe_code/forge_unsafe_block.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:forge_unsafe_block.rs
+//@ proc-macro: forge_unsafe_block.rs
 
 #[macro_use]
 extern crate forge_unsafe_block;
diff --git a/tests/ui/lint/unused-qualification-in-derive-expansion.rs b/tests/ui/lint/unused-qualification-in-derive-expansion.rs
index 5cea9086d12..b2067e22c44 100644
--- a/tests/ui/lint/unused-qualification-in-derive-expansion.rs
+++ b/tests/ui/lint/unused-qualification-in-derive-expansion.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:add-impl.rs
+//@ proc-macro: add-impl.rs
 
 #![forbid(unused_qualifications)]
 
diff --git a/tests/ui/macros/auxiliary/hello_macro.rs b/tests/ui/macros/auxiliary/hello_macro.rs
index 10f474bd1b3..79125a1f86e 100644
--- a/tests/ui/macros/auxiliary/hello_macro.rs
+++ b/tests/ui/macros/auxiliary/hello_macro.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![feature(proc_macro_quote)]
 
 extern crate proc_macro;
diff --git a/tests/ui/macros/auxiliary/issue-100199.rs b/tests/ui/macros/auxiliary/issue-100199.rs
index 9ee9a2f5039..f05c4f0722c 100644
--- a/tests/ui/macros/auxiliary/issue-100199.rs
+++ b/tests/ui/macros/auxiliary/issue-100199.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![feature(proc_macro_quote)]
 
 extern crate proc_macro;
diff --git a/tests/ui/macros/auxiliary/proc_macro_def.rs b/tests/ui/macros/auxiliary/proc_macro_def.rs
index 6574bf184fb..38a1f6fa3c1 100644
--- a/tests/ui/macros/auxiliary/proc_macro_def.rs
+++ b/tests/ui/macros/auxiliary/proc_macro_def.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![feature(proc_macro_quote)]
 
 extern crate proc_macro;
diff --git a/tests/ui/macros/auxiliary/proc_macro_sequence.rs b/tests/ui/macros/auxiliary/proc_macro_sequence.rs
index de2efdfecf1..0f543540171 100644
--- a/tests/ui/macros/auxiliary/proc_macro_sequence.rs
+++ b/tests/ui/macros/auxiliary/proc_macro_sequence.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![feature(proc_macro_span, proc_macro_quote)]
 
 extern crate proc_macro;
diff --git a/tests/ui/macros/issue-100199.rs b/tests/ui/macros/issue-100199.rs
index b1bcc535d74..78a6ff149e2 100644
--- a/tests/ui/macros/issue-100199.rs
+++ b/tests/ui/macros/issue-100199.rs
@@ -5,7 +5,7 @@ struct Foo {}
 // an unexpected dummy span (lo == 0 == hi) while attempting to print a
 // suggestion.
 
-//@ aux-build: issue-100199.rs
+//@ proc-macro: issue-100199.rs
 
 extern crate issue_100199;
 
diff --git a/tests/ui/macros/macro-quote-test.rs b/tests/ui/macros/macro-quote-test.rs
index dd7b10f6322..a4b667b4af6 100644
--- a/tests/ui/macros/macro-quote-test.rs
+++ b/tests/ui/macros/macro-quote-test.rs
@@ -1,7 +1,7 @@
 // Test that a macro can emit delimiters with nothing inside - `()`, `{}`
 
 //@ run-pass
-//@ aux-build:hello_macro.rs
+//@ proc-macro: hello_macro.rs
 
 extern crate hello_macro;
 
diff --git a/tests/ui/macros/proc_macro.rs b/tests/ui/macros/proc_macro.rs
index 8fea4ca282c..b73f3112536 100644
--- a/tests/ui/macros/proc_macro.rs
+++ b/tests/ui/macros/proc_macro.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:proc_macro_def.rs
+//@ proc-macro: proc_macro_def.rs
 
 extern crate proc_macro_def;
 
diff --git a/tests/ui/macros/same-sequence-span.rs b/tests/ui/macros/same-sequence-span.rs
index 67f6b6ad1cd..dfaf669a769 100644
--- a/tests/ui/macros/same-sequence-span.rs
+++ b/tests/ui/macros/same-sequence-span.rs
@@ -1,4 +1,4 @@
-//@ aux-build:proc_macro_sequence.rs
+//@ proc-macro: proc_macro_sequence.rs
 
 // Regression test for issue #62831: Check that multiple sequences with the same span in the
 // left-hand side of a macro definition behave as if they had unique spans, and in particular that
diff --git a/tests/ui/macros/same-sequence-span.stderr b/tests/ui/macros/same-sequence-span.stderr
index 3242a32e2f4..ff32ef94386 100644
--- a/tests/ui/macros/same-sequence-span.stderr
+++ b/tests/ui/macros/same-sequence-span.stderr
@@ -17,9 +17,9 @@ LL |                $(= $z:tt)*
 error: `$x:expr` may be followed by `$y:tt`, which is not allowed for `expr` fragments
   --> $DIR/same-sequence-span.rs:19:1
    |
-LL | | }
+LL | | macro_rules! manual_foo {
    | |_________________________________^ not allowed after `expr` fragments
-LL |
+...
 LL |   proc_macro_sequence::make_foo!();
    |   ^-------------------------------
    |   |
diff --git a/tests/ui/parser/issues/auxiliary/issue-89971-outer-attr-following-inner-attr-ice.rs b/tests/ui/parser/issues/auxiliary/issue-89971-outer-attr-following-inner-attr-ice.rs
index 44697afcfed..2df0b3a17dc 100644
--- a/tests/ui/parser/issues/auxiliary/issue-89971-outer-attr-following-inner-attr-ice.rs
+++ b/tests/ui/parser/issues/auxiliary/issue-89971-outer-attr-following-inner-attr-ice.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.rs b/tests/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.rs
index 51bb04dba19..461890e63e3 100644
--- a/tests/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.rs
+++ b/tests/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.rs
@@ -1,4 +1,4 @@
-//@ aux-build:issue-89971-outer-attr-following-inner-attr-ice.rs
+//@ proc-macro: issue-89971-outer-attr-following-inner-attr-ice.rs
 
 #[macro_use]
 extern crate issue_89971_outer_attr_following_inner_attr_ice;
diff --git a/tests/ui/proc-macro/add-impl.rs b/tests/ui/proc-macro/add-impl.rs
index 7780c39f0c1..2299f05c2e7 100644
--- a/tests/ui/proc-macro/add-impl.rs
+++ b/tests/ui/proc-macro/add-impl.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:add-impl.rs
+//@ proc-macro: add-impl.rs
 
 #[macro_use]
 extern crate add_impl;
diff --git a/tests/ui/proc-macro/allowed-attr-stmt-expr.rs b/tests/ui/proc-macro/allowed-attr-stmt-expr.rs
index c5e3ffa1672..10c2d3f9d13 100644
--- a/tests/ui/proc-macro/allowed-attr-stmt-expr.rs
+++ b/tests/ui/proc-macro/allowed-attr-stmt-expr.rs
@@ -1,5 +1,5 @@
-//@ aux-build:attr-stmt-expr.rs
-//@ aux-build:test-macros.rs
+//@ proc-macro: attr-stmt-expr.rs
+//@ proc-macro: test-macros.rs
 //@ compile-flags: -Z span-debug
 //@ check-pass
 
diff --git a/tests/ui/proc-macro/ambiguous-builtin-attrs-test.rs b/tests/ui/proc-macro/ambiguous-builtin-attrs-test.rs
index 3f191cba745..8ee2223822a 100644
--- a/tests/ui/proc-macro/ambiguous-builtin-attrs-test.rs
+++ b/tests/ui/proc-macro/ambiguous-builtin-attrs-test.rs
@@ -1,4 +1,4 @@
-//@ aux-build:builtin-attrs.rs
+//@ proc-macro: builtin-attrs.rs
 //@ compile-flags:--test
 
 #![feature(decl_macro, test)]
diff --git a/tests/ui/proc-macro/ambiguous-builtin-attrs.rs b/tests/ui/proc-macro/ambiguous-builtin-attrs.rs
index c82663541a7..edc7748eff3 100644
--- a/tests/ui/proc-macro/ambiguous-builtin-attrs.rs
+++ b/tests/ui/proc-macro/ambiguous-builtin-attrs.rs
@@ -1,5 +1,5 @@
 //@ edition:2018
-//@ aux-build:builtin-attrs.rs
+//@ proc-macro: builtin-attrs.rs
 #![feature(decl_macro)] //~ ERROR `feature` is ambiguous
 
 extern crate builtin_attrs;
diff --git a/tests/ui/proc-macro/amputate-span.fixed b/tests/ui/proc-macro/amputate-span.fixed
index 0fdaf01357c..9742f585d49 100644
--- a/tests/ui/proc-macro/amputate-span.fixed
+++ b/tests/ui/proc-macro/amputate-span.fixed
@@ -1,4 +1,4 @@
-//@ aux-build:amputate-span.rs
+//@ proc-macro: amputate-span.rs
 //@ run-rustfix
 //@ edition:2018
 //@ compile-flags: --extern amputate_span
diff --git a/tests/ui/proc-macro/amputate-span.rs b/tests/ui/proc-macro/amputate-span.rs
index 7081660bc29..6cdde46962e 100644
--- a/tests/ui/proc-macro/amputate-span.rs
+++ b/tests/ui/proc-macro/amputate-span.rs
@@ -1,4 +1,4 @@
-//@ aux-build:amputate-span.rs
+//@ proc-macro: amputate-span.rs
 //@ run-rustfix
 //@ edition:2018
 //@ compile-flags: --extern amputate_span
diff --git a/tests/ui/proc-macro/append-impl.rs b/tests/ui/proc-macro/append-impl.rs
index f5163e965a0..c0f208460b2 100644
--- a/tests/ui/proc-macro/append-impl.rs
+++ b/tests/ui/proc-macro/append-impl.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:append-impl.rs
+//@ proc-macro: append-impl.rs
 
 #![allow(warnings)]
 
diff --git a/tests/ui/proc-macro/attr-args.rs b/tests/ui/proc-macro/attr-args.rs
index ed7e96bcc89..1d3e0f725d2 100644
--- a/tests/ui/proc-macro/attr-args.rs
+++ b/tests/ui/proc-macro/attr-args.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:attr-args.rs
+//@ proc-macro: attr-args.rs
 
 #![allow(warnings)]
 
diff --git a/tests/ui/proc-macro/attr-cfg.rs b/tests/ui/proc-macro/attr-cfg.rs
index 4679807ad79..af0c6e1b541 100644
--- a/tests/ui/proc-macro/attr-cfg.rs
+++ b/tests/ui/proc-macro/attr-cfg.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:attr-cfg.rs
+//@ proc-macro: attr-cfg.rs
 //@ revisions: foo bar
 
 extern crate attr_cfg;
diff --git a/tests/ui/proc-macro/attr-complex-fn.rs b/tests/ui/proc-macro/attr-complex-fn.rs
index 7baf469d7d0..bf100401a65 100644
--- a/tests/ui/proc-macro/attr-complex-fn.rs
+++ b/tests/ui/proc-macro/attr-complex-fn.rs
@@ -1,6 +1,6 @@
 //@ check-pass
 //@ compile-flags: -Z span-debug --error-format human
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![feature(stmt_expr_attributes)]
 #![feature(custom_inner_attributes)]
diff --git a/tests/ui/proc-macro/attr-invalid-exprs.rs b/tests/ui/proc-macro/attr-invalid-exprs.rs
index ec0b79469a4..f476858a32b 100644
--- a/tests/ui/proc-macro/attr-invalid-exprs.rs
+++ b/tests/ui/proc-macro/attr-invalid-exprs.rs
@@ -1,6 +1,6 @@
 //! Attributes producing expressions in invalid locations
 
-//@ aux-build:attr-stmt-expr.rs
+//@ proc-macro: attr-stmt-expr.rs
 
 #![feature(proc_macro_hygiene)]
 #![feature(stmt_expr_attributes)]
diff --git a/tests/ui/proc-macro/attr-on-trait.rs b/tests/ui/proc-macro/attr-on-trait.rs
index 659b461f759..e95760a837c 100644
--- a/tests/ui/proc-macro/attr-on-trait.rs
+++ b/tests/ui/proc-macro/attr-on-trait.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:attr-on-trait.rs
+//@ proc-macro: attr-on-trait.rs
 
 extern crate attr_on_trait;
 
diff --git a/tests/ui/proc-macro/attr-stmt-expr-rpass.rs b/tests/ui/proc-macro/attr-stmt-expr-rpass.rs
index 18e477f0129..c4188bde309 100644
--- a/tests/ui/proc-macro/attr-stmt-expr-rpass.rs
+++ b/tests/ui/proc-macro/attr-stmt-expr-rpass.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:attr-stmt-expr-rpass.rs
+//@ proc-macro: attr-stmt-expr-rpass.rs
 
 #![feature(stmt_expr_attributes, proc_macro_hygiene)]
 
diff --git a/tests/ui/proc-macro/attr-stmt-expr.rs b/tests/ui/proc-macro/attr-stmt-expr.rs
index f33c686f284..1ed2bd048e6 100644
--- a/tests/ui/proc-macro/attr-stmt-expr.rs
+++ b/tests/ui/proc-macro/attr-stmt-expr.rs
@@ -1,5 +1,5 @@
-//@ aux-build:attr-stmt-expr.rs
-//@ aux-build:test-macros.rs
+//@ proc-macro: attr-stmt-expr.rs
+//@ proc-macro: test-macros.rs
 //@ compile-flags: -Z span-debug
 
 #![feature(proc_macro_hygiene)]
diff --git a/tests/ui/proc-macro/attribute-after-derive.rs b/tests/ui/proc-macro/attribute-after-derive.rs
index 3120b23e97e..f2e2eb12a19 100644
--- a/tests/ui/proc-macro/attribute-after-derive.rs
+++ b/tests/ui/proc-macro/attribute-after-derive.rs
@@ -3,7 +3,7 @@
 
 //@ check-pass
 //@ compile-flags: -Z span-debug
-//@ aux-build: test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![no_std] // Don't load unnecessary hygiene information from std
 extern crate std;
diff --git a/tests/ui/proc-macro/attribute-spans-preserved.rs b/tests/ui/proc-macro/attribute-spans-preserved.rs
index 946b16a0c80..4d5b93797e6 100644
--- a/tests/ui/proc-macro/attribute-spans-preserved.rs
+++ b/tests/ui/proc-macro/attribute-spans-preserved.rs
@@ -1,4 +1,4 @@
-//@ aux-build:attribute-spans-preserved.rs
+//@ proc-macro: attribute-spans-preserved.rs
 
 extern crate attribute_spans_preserved as foo;
 
diff --git a/tests/ui/proc-macro/attribute-with-error.rs b/tests/ui/proc-macro/attribute-with-error.rs
index 5e81a9c7011..d44d558badd 100644
--- a/tests/ui/proc-macro/attribute-with-error.rs
+++ b/tests/ui/proc-macro/attribute-with-error.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![feature(custom_inner_attributes)]
 
diff --git a/tests/ui/proc-macro/attributes-included.rs b/tests/ui/proc-macro/attributes-included.rs
index 47fd21fdd24..73d1c1a8f05 100644
--- a/tests/ui/proc-macro/attributes-included.rs
+++ b/tests/ui/proc-macro/attributes-included.rs
@@ -1,4 +1,4 @@
-//@ aux-build:attributes-included.rs
+//@ proc-macro: attributes-included.rs
 //@ check-pass
 
 #![warn(unused)]
diff --git a/tests/ui/proc-macro/attributes-on-definitions.rs b/tests/ui/proc-macro/attributes-on-definitions.rs
index 187d1be2364..d9700434b51 100644
--- a/tests/ui/proc-macro/attributes-on-definitions.rs
+++ b/tests/ui/proc-macro/attributes-on-definitions.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:attributes-on-definitions.rs
+//@ proc-macro: attributes-on-definitions.rs
 
 #![forbid(unsafe_code)]
 
diff --git a/tests/ui/proc-macro/attributes-on-modules-fail.rs b/tests/ui/proc-macro/attributes-on-modules-fail.rs
index 9b2eb703eac..80300b47c5f 100644
--- a/tests/ui/proc-macro/attributes-on-modules-fail.rs
+++ b/tests/ui/proc-macro/attributes-on-modules-fail.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/attributes-on-modules.rs b/tests/ui/proc-macro/attributes-on-modules.rs
index 26c8d8e113b..f1be7e44a47 100644
--- a/tests/ui/proc-macro/attributes-on-modules.rs
+++ b/tests/ui/proc-macro/attributes-on-modules.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/auxiliary/add-impl.rs b/tests/ui/proc-macro/auxiliary/add-impl.rs
index 23a86e76ef9..327e6065ef2 100644
--- a/tests/ui/proc-macro/auxiliary/add-impl.rs
+++ b/tests/ui/proc-macro/auxiliary/add-impl.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/amputate-span.rs b/tests/ui/proc-macro/auxiliary/amputate-span.rs
index c1ab0477ba2..969176eaa67 100644
--- a/tests/ui/proc-macro/auxiliary/amputate-span.rs
+++ b/tests/ui/proc-macro/auxiliary/amputate-span.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/api/mod.rs b/tests/ui/proc-macro/auxiliary/api/proc_macro_api_tests.rs
index e0a381cb6c1..abd667d8ce1 100644
--- a/tests/ui/proc-macro/auxiliary/api/mod.rs
+++ b/tests/ui/proc-macro/auxiliary/api/proc_macro_api_tests.rs
@@ -1,9 +1,5 @@
-//@ force-host
-//@ no-prefer-dynamic
 //@ edition: 2021
 
-#![crate_type = "proc-macro"]
-#![crate_name = "proc_macro_api_tests"]
 #![feature(proc_macro_span)]
 #![deny(dead_code)] // catch if a test function is never called
 
diff --git a/tests/ui/proc-macro/auxiliary/append-impl.rs b/tests/ui/proc-macro/auxiliary/append-impl.rs
index 30657d2738e..e286f01a971 100644
--- a/tests/ui/proc-macro/auxiliary/append-impl.rs
+++ b/tests/ui/proc-macro/auxiliary/append-impl.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/assert-span-pos.rs b/tests/ui/proc-macro/auxiliary/assert-span-pos.rs
index 8935ce2bc0a..6459d2169a9 100644
--- a/tests/ui/proc-macro/auxiliary/assert-span-pos.rs
+++ b/tests/ui/proc-macro/auxiliary/assert-span-pos.rs
@@ -1,8 +1,4 @@
-//@ force-host
-//@ no-prefer-dynamic
-
 #![feature(proc_macro_diagnostic, proc_macro_span)]
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 
diff --git a/tests/ui/proc-macro/auxiliary/attr-args.rs b/tests/ui/proc-macro/auxiliary/attr-args.rs
index 1fac41c3721..6a1041603f1 100644
--- a/tests/ui/proc-macro/auxiliary/attr-args.rs
+++ b/tests/ui/proc-macro/auxiliary/attr-args.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/attr-cfg.rs b/tests/ui/proc-macro/auxiliary/attr-cfg.rs
index 3645128b509..0e625932512 100644
--- a/tests/ui/proc-macro/auxiliary/attr-cfg.rs
+++ b/tests/ui/proc-macro/auxiliary/attr-cfg.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/attr-on-trait.rs b/tests/ui/proc-macro/auxiliary/attr-on-trait.rs
index c4581359da1..012243febce 100644
--- a/tests/ui/proc-macro/auxiliary/attr-on-trait.rs
+++ b/tests/ui/proc-macro/auxiliary/attr-on-trait.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/attr-stmt-expr-rpass.rs b/tests/ui/proc-macro/auxiliary/attr-stmt-expr-rpass.rs
index c8b7aa412b5..022f10e5615 100644
--- a/tests/ui/proc-macro/auxiliary/attr-stmt-expr-rpass.rs
+++ b/tests/ui/proc-macro/auxiliary/attr-stmt-expr-rpass.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/attr-stmt-expr.rs b/tests/ui/proc-macro/auxiliary/attr-stmt-expr.rs
index 888aab848d4..7efeda16b9c 100644
--- a/tests/ui/proc-macro/auxiliary/attr-stmt-expr.rs
+++ b/tests/ui/proc-macro/auxiliary/attr-stmt-expr.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/attribute-spans-preserved.rs b/tests/ui/proc-macro/auxiliary/attribute-spans-preserved.rs
index d06903c2708..76cf959279c 100644
--- a/tests/ui/proc-macro/auxiliary/attribute-spans-preserved.rs
+++ b/tests/ui/proc-macro/auxiliary/attribute-spans-preserved.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::*;
diff --git a/tests/ui/proc-macro/auxiliary/attributes-included.rs b/tests/ui/proc-macro/auxiliary/attributes-included.rs
index cc29818380b..3a129c8185e 100644
--- a/tests/ui/proc-macro/auxiliary/attributes-included.rs
+++ b/tests/ui/proc-macro/auxiliary/attributes-included.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::{TokenStream, TokenTree, Delimiter, Literal, Spacing, Group};
diff --git a/tests/ui/proc-macro/auxiliary/attributes-on-definitions.rs b/tests/ui/proc-macro/auxiliary/attributes-on-definitions.rs
index c7e6e681da3..ef981ba8500 100644
--- a/tests/ui/proc-macro/auxiliary/attributes-on-definitions.rs
+++ b/tests/ui/proc-macro/auxiliary/attributes-on-definitions.rs
@@ -1,11 +1,6 @@
-//@ force-host
-//@ no-prefer-dynamic
-
 #![feature(allow_internal_unsafe)]
 #![feature(allow_internal_unstable)]
 
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::*;
 
diff --git a/tests/ui/proc-macro/auxiliary/bang-macro.rs b/tests/ui/proc-macro/auxiliary/bang-macro.rs
index 361643aa8e5..3ac30ab8e32 100644
--- a/tests/ui/proc-macro/auxiliary/bang-macro.rs
+++ b/tests/ui/proc-macro/auxiliary/bang-macro.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/bang_proc_macro2.rs b/tests/ui/proc-macro/auxiliary/bang_proc_macro2.rs
index 3df2676ddab..7a094c2d477 100644
--- a/tests/ui/proc-macro/auxiliary/bang_proc_macro2.rs
+++ b/tests/ui/proc-macro/auxiliary/bang_proc_macro2.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/builtin-attrs.rs b/tests/ui/proc-macro/auxiliary/builtin-attrs.rs
index bd634b4f41c..9743ec78c96 100644
--- a/tests/ui/proc-macro/auxiliary/builtin-attrs.rs
+++ b/tests/ui/proc-macro/auxiliary/builtin-attrs.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::*;
 
diff --git a/tests/ui/proc-macro/auxiliary/call-deprecated.rs b/tests/ui/proc-macro/auxiliary/call-deprecated.rs
index 8864de17ed3..28919ab29ec 100644
--- a/tests/ui/proc-macro/auxiliary/call-deprecated.rs
+++ b/tests/ui/proc-macro/auxiliary/call-deprecated.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::*;
 
diff --git a/tests/ui/proc-macro/auxiliary/call-site.rs b/tests/ui/proc-macro/auxiliary/call-site.rs
index ce0fc70c1a6..8201ec5c48f 100644
--- a/tests/ui/proc-macro/auxiliary/call-site.rs
+++ b/tests/ui/proc-macro/auxiliary/call-site.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::*;
 
diff --git a/tests/ui/proc-macro/auxiliary/cond_plugin.rs b/tests/ui/proc-macro/auxiliary/cond_plugin.rs
index c6cdc8ce8ba..9858be230c9 100644
--- a/tests/ui/proc-macro/auxiliary/cond_plugin.rs
+++ b/tests/ui/proc-macro/auxiliary/cond_plugin.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![feature(proc_macro_quote)]
 
 extern crate proc_macro;
diff --git a/tests/ui/proc-macro/auxiliary/count_compound_ops.rs b/tests/ui/proc-macro/auxiliary/count_compound_ops.rs
index 86c27f2d818..c5a1c561976 100644
--- a/tests/ui/proc-macro/auxiliary/count_compound_ops.rs
+++ b/tests/ui/proc-macro/auxiliary/count_compound_ops.rs
@@ -1,8 +1,4 @@
-//@ force-host
-//@ no-prefer-dynamic
-
 #![feature(proc_macro_quote)]
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 
diff --git a/tests/ui/proc-macro/auxiliary/custom-attr-only-one-derive.rs b/tests/ui/proc-macro/auxiliary/custom-attr-only-one-derive.rs
index eab7d903e91..0f50aedcd9e 100644
--- a/tests/ui/proc-macro/auxiliary/custom-attr-only-one-derive.rs
+++ b/tests/ui/proc-macro/auxiliary/custom-attr-only-one-derive.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/custom-quote.rs b/tests/ui/proc-macro/auxiliary/custom-quote.rs
index 88800596ce5..bccbed8a6b4 100644
--- a/tests/ui/proc-macro/auxiliary/custom-quote.rs
+++ b/tests/ui/proc-macro/auxiliary/custom-quote.rs
@@ -1,9 +1,6 @@
-//@ force-host
-//@ no-prefer-dynamic
 // ignore-tidy-linelength
 
 #![feature(proc_macro_quote)]
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 use std::iter::FromIterator;
diff --git a/tests/ui/proc-macro/auxiliary/derive-a.rs b/tests/ui/proc-macro/auxiliary/derive-a.rs
index 50e963a0a41..89d0263c9e2 100644
--- a/tests/ui/proc-macro/auxiliary/derive-a.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-a.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/derive-atob.rs b/tests/ui/proc-macro/auxiliary/derive-atob.rs
index 8a1f81450fa..0ed62565771 100644
--- a/tests/ui/proc-macro/auxiliary/derive-atob.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-atob.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/derive-attr-cfg.rs b/tests/ui/proc-macro/auxiliary/derive-attr-cfg.rs
index b9c0b5e6f77..cb60c182a43 100644
--- a/tests/ui/proc-macro/auxiliary/derive-attr-cfg.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-attr-cfg.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/derive-b-rpass.rs b/tests/ui/proc-macro/auxiliary/derive-b-rpass.rs
index 82f0b4f19ed..de2935eb9c1 100644
--- a/tests/ui/proc-macro/auxiliary/derive-b-rpass.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-b-rpass.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/derive-b.rs b/tests/ui/proc-macro/auxiliary/derive-b.rs
index 0b2cf31b059..efdb785c23b 100644
--- a/tests/ui/proc-macro/auxiliary/derive-b.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-b.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/derive-bad.rs b/tests/ui/proc-macro/auxiliary/derive-bad.rs
index 3fd2bfc4b63..bd25478fb1d 100644
--- a/tests/ui/proc-macro/auxiliary/derive-bad.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-bad.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/derive-clona.rs b/tests/ui/proc-macro/auxiliary/derive-clona.rs
index 83bcc5b08be..b38bf31dbcc 100644
--- a/tests/ui/proc-macro/auxiliary/derive-clona.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-clona.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/derive-ctod.rs b/tests/ui/proc-macro/auxiliary/derive-ctod.rs
index 78b1b8615b0..1e08ec61262 100644
--- a/tests/ui/proc-macro/auxiliary/derive-ctod.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-ctod.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/derive-foo.rs b/tests/ui/proc-macro/auxiliary/derive-foo.rs
index 5c63c3937e4..22fbc4bc54f 100644
--- a/tests/ui/proc-macro/auxiliary/derive-foo.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-foo.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/derive-helper-shadowing-2.rs b/tests/ui/proc-macro/auxiliary/derive-helper-shadowing-2.rs
index d09ff6cadc5..da474cf5614 100644
--- a/tests/ui/proc-macro/auxiliary/derive-helper-shadowing-2.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-helper-shadowing-2.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::*;
 
diff --git a/tests/ui/proc-macro/auxiliary/derive-helper-shadowing.rs b/tests/ui/proc-macro/auxiliary/derive-helper-shadowing.rs
index d1f5b67cf85..32136f79ff2 100644
--- a/tests/ui/proc-macro/auxiliary/derive-helper-shadowing.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-helper-shadowing.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::*;
 
diff --git a/tests/ui/proc-macro/auxiliary/derive-nothing.rs b/tests/ui/proc-macro/auxiliary/derive-nothing.rs
index adf9b4e83fd..eefa2c40ac3 100644
--- a/tests/ui/proc-macro/auxiliary/derive-nothing.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-nothing.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/derive-same-struct.rs b/tests/ui/proc-macro/auxiliary/derive-same-struct.rs
index bfdd71e9a15..8e7bcb6aaba 100644
--- a/tests/ui/proc-macro/auxiliary/derive-same-struct.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-same-struct.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/derive-two-attrs.rs b/tests/ui/proc-macro/auxiliary/derive-two-attrs.rs
index 24a88dceb4b..532c72dacff 100644
--- a/tests/ui/proc-macro/auxiliary/derive-two-attrs.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-two-attrs.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::*;
diff --git a/tests/ui/proc-macro/auxiliary/derive-union.rs b/tests/ui/proc-macro/auxiliary/derive-union.rs
index 8bf7041ebad..da4132604a7 100644
--- a/tests/ui/proc-macro/auxiliary/derive-union.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-union.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/derive-unstable-2.rs b/tests/ui/proc-macro/auxiliary/derive-unstable-2.rs
index f80a2cfdd99..4bc56efecdb 100644
--- a/tests/ui/proc-macro/auxiliary/derive-unstable-2.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-unstable-2.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/derive-unstable.rs b/tests/ui/proc-macro/auxiliary/derive-unstable.rs
index c92df49191b..8ba3a06e354 100644
--- a/tests/ui/proc-macro/auxiliary/derive-unstable.rs
+++ b/tests/ui/proc-macro/auxiliary/derive-unstable.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/double.rs b/tests/ui/proc-macro/auxiliary/double.rs
index ffde0bce245..b6d952437ea 100644
--- a/tests/ui/proc-macro/auxiliary/double.rs
+++ b/tests/ui/proc-macro/auxiliary/double.rs
@@ -1,10 +1,5 @@
-//@ force-host
-//@ no-prefer-dynamic
-
 #![feature(proc_macro_quote)]
 
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::*;
 
diff --git a/tests/ui/proc-macro/auxiliary/duplicate.rs b/tests/ui/proc-macro/auxiliary/duplicate.rs
index bcbb1c7474c..0474aed2266 100644
--- a/tests/ui/proc-macro/auxiliary/duplicate.rs
+++ b/tests/ui/proc-macro/auxiliary/duplicate.rs
@@ -1,8 +1,4 @@
-//@ force-host
-//@ no-prefer-dynamic
-
 #![deny(unused)]
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 use proc_macro::*;
diff --git a/tests/ui/proc-macro/auxiliary/edition-gated-async-move-syntax.rs b/tests/ui/proc-macro/auxiliary/edition-gated-async-move-syntax.rs
index da6584e31e5..9347a2e975b 100644
--- a/tests/ui/proc-macro/auxiliary/edition-gated-async-move-syntax.rs
+++ b/tests/ui/proc-macro/auxiliary/edition-gated-async-move-syntax.rs
@@ -1,12 +1,7 @@
-//@ force-host
-//@ no-prefer-dynamic
-
 // Proc macro helper for issue #89699, used by tests/ui/proc-macro/edition-gated-async-move-
 // syntax-issue89699.rs, emitting an `async move` closure. This syntax is only available in
 // editions 2018 and up, but is used in edition 2015 in the test.
 
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::*;
 
diff --git a/tests/ui/proc-macro/auxiliary/edition-imports-2015.rs b/tests/ui/proc-macro/auxiliary/edition-imports-2015.rs
index c33736a74a7..6d584f4e6ab 100644
--- a/tests/ui/proc-macro/auxiliary/edition-imports-2015.rs
+++ b/tests/ui/proc-macro/auxiliary/edition-imports-2015.rs
@@ -1,8 +1,4 @@
 //@ edition:2015
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 
diff --git a/tests/ui/proc-macro/auxiliary/empty-crate.rs b/tests/ui/proc-macro/auxiliary/empty-crate.rs
index c502cd921cc..5e15112a9cb 100644
--- a/tests/ui/proc-macro/auxiliary/empty-crate.rs
+++ b/tests/ui/proc-macro/auxiliary/empty-crate.rs
@@ -1,5 +1 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![deny(unused_variables)]
diff --git a/tests/ui/proc-macro/auxiliary/env.rs b/tests/ui/proc-macro/auxiliary/env.rs
index da9aaa5cb56..d01e3b42d4c 100644
--- a/tests/ui/proc-macro/auxiliary/env.rs
+++ b/tests/ui/proc-macro/auxiliary/env.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![feature(proc_macro_tracked_env)]
 
 extern crate proc_macro;
diff --git a/tests/ui/proc-macro/auxiliary/expand-expr.rs b/tests/ui/proc-macro/auxiliary/expand-expr.rs
index 68d0843be5a..78c9fa75d9f 100644
--- a/tests/ui/proc-macro/auxiliary/expand-expr.rs
+++ b/tests/ui/proc-macro/auxiliary/expand-expr.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![deny(warnings)]
 #![feature(proc_macro_expand, proc_macro_span)]
 
diff --git a/tests/ui/proc-macro/auxiliary/expand-with-a-macro.rs b/tests/ui/proc-macro/auxiliary/expand-with-a-macro.rs
index 9096fd71397..c6281a42d2a 100644
--- a/tests/ui/proc-macro/auxiliary/expand-with-a-macro.rs
+++ b/tests/ui/proc-macro/auxiliary/expand-with-a-macro.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![deny(warnings)]
 
 extern crate proc_macro;
diff --git a/tests/ui/proc-macro/auxiliary/first-second.rs b/tests/ui/proc-macro/auxiliary/first-second.rs
index c8c1defa9f1..110d054add7 100644
--- a/tests/ui/proc-macro/auxiliary/first-second.rs
+++ b/tests/ui/proc-macro/auxiliary/first-second.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::{TokenStream, TokenTree, Group, Delimiter};
diff --git a/tests/ui/proc-macro/auxiliary/gen-lifetime-token.rs b/tests/ui/proc-macro/auxiliary/gen-lifetime-token.rs
index fb05c97833c..b0728b8a0b8 100644
--- a/tests/ui/proc-macro/auxiliary/gen-lifetime-token.rs
+++ b/tests/ui/proc-macro/auxiliary/gen-lifetime-token.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::*;
diff --git a/tests/ui/proc-macro/auxiliary/gen-macro-rules-hygiene.rs b/tests/ui/proc-macro/auxiliary/gen-macro-rules-hygiene.rs
index 9d6767dc11f..40ecf4ef704 100644
--- a/tests/ui/proc-macro/auxiliary/gen-macro-rules-hygiene.rs
+++ b/tests/ui/proc-macro/auxiliary/gen-macro-rules-hygiene.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::*;
 
diff --git a/tests/ui/proc-macro/auxiliary/gen-macro-rules.rs b/tests/ui/proc-macro/auxiliary/gen-macro-rules.rs
index d2f82c52c58..855cb1d7095 100644
--- a/tests/ui/proc-macro/auxiliary/gen-macro-rules.rs
+++ b/tests/ui/proc-macro/auxiliary/gen-macro-rules.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::TokenStream;
 
diff --git a/tests/ui/proc-macro/auxiliary/generate-dollar-ident.rs b/tests/ui/proc-macro/auxiliary/generate-dollar-ident.rs
index 855084be84d..28d35c82148 100644
--- a/tests/ui/proc-macro/auxiliary/generate-dollar-ident.rs
+++ b/tests/ui/proc-macro/auxiliary/generate-dollar-ident.rs
@@ -1,8 +1,4 @@
-//@ force-host
-//@ no-prefer-dynamic
-
 #![feature(proc_macro_quote)]
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 use proc_macro::*;
diff --git a/tests/ui/proc-macro/auxiliary/generate-mod.rs b/tests/ui/proc-macro/auxiliary/generate-mod.rs
index 2ef1faffaa6..62710bd1e2d 100644
--- a/tests/ui/proc-macro/auxiliary/generate-mod.rs
+++ b/tests/ui/proc-macro/auxiliary/generate-mod.rs
@@ -1,10 +1,6 @@
 //@ run-pass
-//@ force-host
-//@ no-prefer-dynamic
 //@ ignore-pass
 
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::*;
 
diff --git a/tests/ui/proc-macro/auxiliary/helper-attr.rs b/tests/ui/proc-macro/auxiliary/helper-attr.rs
index 79ccefd9844..ee2968688f9 100644
--- a/tests/ui/proc-macro/auxiliary/helper-attr.rs
+++ b/tests/ui/proc-macro/auxiliary/helper-attr.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 // Doesn't do anything, but has a helper attribute.
diff --git a/tests/ui/proc-macro/auxiliary/hygiene_example.rs b/tests/ui/proc-macro/auxiliary/hygiene_example.rs
index f7e7e0b5751..b690dbfaae7 100644
--- a/tests/ui/proc-macro/auxiliary/hygiene_example.rs
+++ b/tests/ui/proc-macro/auxiliary/hygiene_example.rs
@@ -1,3 +1,5 @@
+//@ proc-macro: hygiene_example_codegen.rs
+
 extern crate hygiene_example_codegen;
 
 pub use hygiene_example_codegen::hello;
diff --git a/tests/ui/proc-macro/auxiliary/hygiene_example_codegen.rs b/tests/ui/proc-macro/auxiliary/hygiene_example_codegen.rs
index e324e3f3129..dde997bf3ea 100644
--- a/tests/ui/proc-macro/auxiliary/hygiene_example_codegen.rs
+++ b/tests/ui/proc-macro/auxiliary/hygiene_example_codegen.rs
@@ -1,8 +1,4 @@
-//@ force-host
-//@ no-prefer-dynamic
-
 #![feature(proc_macro_quote)]
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro as proc_macro_renamed; // This does not break `quote!`
 
diff --git a/tests/ui/proc-macro/auxiliary/invalid-punct-ident.rs b/tests/ui/proc-macro/auxiliary/invalid-punct-ident.rs
index 19b3632dc3f..47d06086467 100644
--- a/tests/ui/proc-macro/auxiliary/invalid-punct-ident.rs
+++ b/tests/ui/proc-macro/auxiliary/invalid-punct-ident.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![feature(proc_macro_raw_ident)]
 
 extern crate proc_macro;
diff --git a/tests/ui/proc-macro/auxiliary/is-available.rs b/tests/ui/proc-macro/auxiliary/is-available.rs
index f1d0e3c78f5..1eeffa50913 100644
--- a/tests/ui/proc-macro/auxiliary/is-available.rs
+++ b/tests/ui/proc-macro/auxiliary/is-available.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::{Literal, TokenStream, TokenTree};
diff --git a/tests/ui/proc-macro/auxiliary/issue-104884.rs b/tests/ui/proc-macro/auxiliary/issue-104884.rs
index 55d0d76ad18..64922d997b6 100644
--- a/tests/ui/proc-macro/auxiliary/issue-104884.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-104884.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/issue-107113.rs b/tests/ui/proc-macro/auxiliary/issue-107113.rs
index 5662277acce..f7c2c856435 100644
--- a/tests/ui/proc-macro/auxiliary/issue-107113.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-107113.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/issue-118809.rs b/tests/ui/proc-macro/auxiliary/issue-118809.rs
index f662f623b19..2751b16b6b5 100644
--- a/tests/ui/proc-macro/auxiliary/issue-118809.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-118809.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::TokenStream;
 
diff --git a/tests/ui/proc-macro/auxiliary/issue-38586.rs b/tests/ui/proc-macro/auxiliary/issue-38586.rs
index e2bba3e13d1..7e30ba371d1 100644
--- a/tests/ui/proc-macro/auxiliary/issue-38586.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-38586.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 #[proc_macro_derive(A)]
diff --git a/tests/ui/proc-macro/auxiliary/issue-39889.rs b/tests/ui/proc-macro/auxiliary/issue-39889.rs
index b1659d6168e..e4975fddd4c 100644
--- a/tests/ui/proc-macro/auxiliary/issue-39889.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-39889.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::TokenStream;
 
diff --git a/tests/ui/proc-macro/auxiliary/issue-42708.rs b/tests/ui/proc-macro/auxiliary/issue-42708.rs
index ed5ba530341..c055409ba06 100644
--- a/tests/ui/proc-macro/auxiliary/issue-42708.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-42708.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/issue-50061.rs b/tests/ui/proc-macro/auxiliary/issue-50061.rs
index 9ecbb383d4b..9137a78f530 100644
--- a/tests/ui/proc-macro/auxiliary/issue-50061.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-50061.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::TokenStream;
 
diff --git a/tests/ui/proc-macro/auxiliary/issue-50493.rs b/tests/ui/proc-macro/auxiliary/issue-50493.rs
index e9ad8600533..22bf1428e56 100644
--- a/tests/ui/proc-macro/auxiliary/issue-50493.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-50493.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::TokenStream;
 
diff --git a/tests/ui/proc-macro/auxiliary/issue-59191.rs b/tests/ui/proc-macro/auxiliary/issue-59191.rs
index 40ba0063e43..84b156d61e5 100644
--- a/tests/ui/proc-macro/auxiliary/issue-59191.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-59191.rs
@@ -1,8 +1,4 @@
 //@ edition:2018
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/issue-66286.rs b/tests/ui/proc-macro/auxiliary/issue-66286.rs
index d224dcda590..a317e68a3d7 100644
--- a/tests/ui/proc-macro/auxiliary/issue-66286.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-66286.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/issue-75801.rs b/tests/ui/proc-macro/auxiliary/issue-75801.rs
index bd553b7ab84..f1554f0fe75 100644
--- a/tests/ui/proc-macro/auxiliary/issue-75801.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-75801.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/issue-79242.rs b/tests/ui/proc-macro/auxiliary/issue-79242.rs
index 7b24e5a2ef2..165318d67b0 100644
--- a/tests/ui/proc-macro/auxiliary/issue-79242.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-79242.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/issue-79825.rs b/tests/ui/proc-macro/auxiliary/issue-79825.rs
index 4326712458b..912a3c2147c 100644
--- a/tests/ui/proc-macro/auxiliary/issue-79825.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-79825.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/issue-83510.rs b/tests/ui/proc-macro/auxiliary/issue-83510.rs
index 6e8e2d1f780..50bdd36607d 100644
--- a/tests/ui/proc-macro/auxiliary/issue-83510.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-83510.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/issue-91800-macro.rs b/tests/ui/proc-macro/auxiliary/issue-91800-macro.rs
index a638a33cf25..e6f91a52de5 100644
--- a/tests/ui/proc-macro/auxiliary/issue-91800-macro.rs
+++ b/tests/ui/proc-macro/auxiliary/issue-91800-macro.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/lifetimes-rpass.rs b/tests/ui/proc-macro/auxiliary/lifetimes-rpass.rs
index 4f605ed07b3..d487d8f989c 100644
--- a/tests/ui/proc-macro/auxiliary/lifetimes-rpass.rs
+++ b/tests/ui/proc-macro/auxiliary/lifetimes-rpass.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::*;
diff --git a/tests/ui/proc-macro/auxiliary/lifetimes.rs b/tests/ui/proc-macro/auxiliary/lifetimes.rs
index 79885a92f68..5d7ebecf832 100644
--- a/tests/ui/proc-macro/auxiliary/lifetimes.rs
+++ b/tests/ui/proc-macro/auxiliary/lifetimes.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::*;
diff --git a/tests/ui/proc-macro/auxiliary/macro-only-syntax.rs b/tests/ui/proc-macro/auxiliary/macro-only-syntax.rs
index 501a03985cb..4971de284b7 100644
--- a/tests/ui/proc-macro/auxiliary/macro-only-syntax.rs
+++ b/tests/ui/proc-macro/auxiliary/macro-only-syntax.rs
@@ -1,6 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
 // These are tests for syntax that is accepted by the Rust parser but
 // unconditionally rejected semantically after macro expansion. Attribute macros
 // are permitted to accept such syntax as long as they replace it with something
@@ -9,7 +6,6 @@
 // We also inspect some of the spans to verify the syntax is not triggering the
 // lossy string reparse hack (https://github.com/rust-lang/rust/issues/43081).
 
-#![crate_type = "proc-macro"]
 #![feature(proc_macro_span)]
 
 extern crate proc_macro;
diff --git a/tests/ui/proc-macro/auxiliary/macro_rules_edition_pm.rs b/tests/ui/proc-macro/auxiliary/macro_rules_edition_pm.rs
index a4fd76b9c9d..fb244d09d9c 100644
--- a/tests/ui/proc-macro/auxiliary/macro_rules_edition_pm.rs
+++ b/tests/ui/proc-macro/auxiliary/macro_rules_edition_pm.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/meta-macro.rs b/tests/ui/proc-macro/auxiliary/meta-macro.rs
index cbe882c173f..3436b1944d0 100644
--- a/tests/ui/proc-macro/auxiliary/meta-macro.rs
+++ b/tests/ui/proc-macro/auxiliary/meta-macro.rs
@@ -1,9 +1,6 @@
-//@ force-host
-//@ no-prefer-dynamic
 //@ edition:2018
 
 #![feature(proc_macro_def_site)]
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 extern crate make_macro;
diff --git a/tests/ui/proc-macro/auxiliary/mixed-site-span.rs b/tests/ui/proc-macro/auxiliary/mixed-site-span.rs
index c143e2d40f3..d837c88c955 100644
--- a/tests/ui/proc-macro/auxiliary/mixed-site-span.rs
+++ b/tests/ui/proc-macro/auxiliary/mixed-site-span.rs
@@ -1,10 +1,5 @@
-//@ force-host
-//@ no-prefer-dynamic
-
 #![feature(proc_macro_quote)]
 
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::*;
 
diff --git a/tests/ui/proc-macro/auxiliary/modify-ast.rs b/tests/ui/proc-macro/auxiliary/modify-ast.rs
index 174c588e8bf..389b0968814 100644
--- a/tests/ui/proc-macro/auxiliary/modify-ast.rs
+++ b/tests/ui/proc-macro/auxiliary/modify-ast.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::*;
diff --git a/tests/ui/proc-macro/auxiliary/multiple-derives.rs b/tests/ui/proc-macro/auxiliary/multiple-derives.rs
index 84a826cf1f6..6f03f0a08f0 100644
--- a/tests/ui/proc-macro/auxiliary/multiple-derives.rs
+++ b/tests/ui/proc-macro/auxiliary/multiple-derives.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/multispan.rs b/tests/ui/proc-macro/auxiliary/multispan.rs
index b5f1ed9b56a..1eb379d3877 100644
--- a/tests/ui/proc-macro/auxiliary/multispan.rs
+++ b/tests/ui/proc-macro/auxiliary/multispan.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![feature(proc_macro_diagnostic, proc_macro_span, proc_macro_def_site)]
 
 extern crate proc_macro;
diff --git a/tests/ui/proc-macro/auxiliary/negative-token.rs b/tests/ui/proc-macro/auxiliary/negative-token.rs
index 43355bfd20b..d3731c1c8cc 100644
--- a/tests/ui/proc-macro/auxiliary/negative-token.rs
+++ b/tests/ui/proc-macro/auxiliary/negative-token.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::*;
diff --git a/tests/ui/proc-macro/auxiliary/nonterminal-recollect-attr.rs b/tests/ui/proc-macro/auxiliary/nonterminal-recollect-attr.rs
index 48ae3600192..96aed8625aa 100644
--- a/tests/ui/proc-macro/auxiliary/nonterminal-recollect-attr.rs
+++ b/tests/ui/proc-macro/auxiliary/nonterminal-recollect-attr.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![feature(proc_macro_quote)]
 
 extern crate proc_macro;
diff --git a/tests/ui/proc-macro/auxiliary/not-joint.rs b/tests/ui/proc-macro/auxiliary/not-joint.rs
index 5f94805361a..bc15ced0566 100644
--- a/tests/ui/proc-macro/auxiliary/not-joint.rs
+++ b/tests/ui/proc-macro/auxiliary/not-joint.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::*;
diff --git a/tests/ui/proc-macro/auxiliary/parent-source-spans.rs b/tests/ui/proc-macro/auxiliary/parent-source-spans.rs
index 3ec92d71332..257d1489ce2 100644
--- a/tests/ui/proc-macro/auxiliary/parent-source-spans.rs
+++ b/tests/ui/proc-macro/auxiliary/parent-source-spans.rs
@@ -1,8 +1,4 @@
-//@ force-host
-//@ no-prefer-dynamic
-
 #![feature(proc_macro_diagnostic, proc_macro_span)]
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 
diff --git a/tests/ui/proc-macro/auxiliary/parse-invis-delim-issue-128895.rs b/tests/ui/proc-macro/auxiliary/parse-invis-delim-issue-128895.rs
index 07e135ee8eb..2b77b45565a 100644
--- a/tests/ui/proc-macro/auxiliary/parse-invis-delim-issue-128895.rs
+++ b/tests/ui/proc-macro/auxiliary/parse-invis-delim-issue-128895.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::*;
diff --git a/tests/ui/proc-macro/auxiliary/print-tokens.rs b/tests/ui/proc-macro/auxiliary/print-tokens.rs
index 6d25f1f8471..171ff6e61fb 100644
--- a/tests/ui/proc-macro/auxiliary/print-tokens.rs
+++ b/tests/ui/proc-macro/auxiliary/print-tokens.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::{TokenStream, TokenTree};
diff --git a/tests/ui/proc-macro/auxiliary/proc-macro-panic.rs b/tests/ui/proc-macro/auxiliary/proc-macro-panic.rs
index cfd6464661e..8506c9f0de0 100644
--- a/tests/ui/proc-macro/auxiliary/proc-macro-panic.rs
+++ b/tests/ui/proc-macro/auxiliary/proc-macro-panic.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::{TokenStream, Ident, Span};
 
diff --git a/tests/ui/proc-macro/auxiliary/raw-ident.rs b/tests/ui/proc-macro/auxiliary/raw-ident.rs
index 1fec6179756..7fd73dd97ba 100644
--- a/tests/ui/proc-macro/auxiliary/raw-ident.rs
+++ b/tests/ui/proc-macro/auxiliary/raw-ident.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::{TokenStream, TokenTree, Ident, Punct, Spacing, Span};
 
diff --git a/tests/ui/proc-macro/auxiliary/re-export.rs b/tests/ui/proc-macro/auxiliary/re-export.rs
index a886015a031..ae88e2f3e11 100644
--- a/tests/ui/proc-macro/auxiliary/re-export.rs
+++ b/tests/ui/proc-macro/auxiliary/re-export.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/proc-macro/auxiliary/recollect.rs b/tests/ui/proc-macro/auxiliary/recollect.rs
index 7db29035f71..439f37c8832 100644
--- a/tests/ui/proc-macro/auxiliary/recollect.rs
+++ b/tests/ui/proc-macro/auxiliary/recollect.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::TokenStream;
 
diff --git a/tests/ui/proc-macro/auxiliary/resolved-located-at.rs b/tests/ui/proc-macro/auxiliary/resolved-located-at.rs
index 032d41688af..493956c00e9 100644
--- a/tests/ui/proc-macro/auxiliary/resolved-located-at.rs
+++ b/tests/ui/proc-macro/auxiliary/resolved-located-at.rs
@@ -1,10 +1,6 @@
-//@ force-host
-//@ no-prefer-dynamic
-
 #![feature(proc_macro_def_site)]
 #![feature(proc_macro_diagnostic)]
 #![feature(proc_macro_quote)]
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 use proc_macro::*;
diff --git a/tests/ui/proc-macro/auxiliary/span-api-tests.rs b/tests/ui/proc-macro/auxiliary/span-api-tests.rs
index 16640a32098..99db66ed6a9 100644
--- a/tests/ui/proc-macro/auxiliary/span-api-tests.rs
+++ b/tests/ui/proc-macro/auxiliary/span-api-tests.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![feature(proc_macro_span)]
 
 extern crate proc_macro;
diff --git a/tests/ui/proc-macro/auxiliary/span-from-proc-macro.rs b/tests/ui/proc-macro/auxiliary/span-from-proc-macro.rs
index fdcca29e177..16ca5e3f9e2 100644
--- a/tests/ui/proc-macro/auxiliary/span-from-proc-macro.rs
+++ b/tests/ui/proc-macro/auxiliary/span-from-proc-macro.rs
@@ -1,9 +1,5 @@
-//@ force-host
-//@ no-prefer-dynamic
-
 #![feature(proc_macro_quote)]
 #![feature(proc_macro_internals)] // FIXME - this shouldn't be necessary
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 extern crate custom_quote;
diff --git a/tests/ui/proc-macro/auxiliary/subspan.rs b/tests/ui/proc-macro/auxiliary/subspan.rs
index 69a9c8a9fa8..edfb053d6f1 100644
--- a/tests/ui/proc-macro/auxiliary/subspan.rs
+++ b/tests/ui/proc-macro/auxiliary/subspan.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![feature(proc_macro_diagnostic, proc_macro_span)]
 
 extern crate proc_macro;
diff --git a/tests/ui/proc-macro/auxiliary/test-macros.rs b/tests/ui/proc-macro/auxiliary/test-macros.rs
index 69a89e94cd6..8375767d6fb 100644
--- a/tests/ui/proc-macro/auxiliary/test-macros.rs
+++ b/tests/ui/proc-macro/auxiliary/test-macros.rs
@@ -1,11 +1,6 @@
-//@ force-host
-//@ no-prefer-dynamic
-
 // Proc macros commonly used by tests.
 // `panic`/`print` -> `panic_bang`/`print_bang` to avoid conflicts with standard macros.
 
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 use proc_macro::{TokenStream, TokenTree};
 
diff --git a/tests/ui/proc-macro/auxiliary/three-equals.rs b/tests/ui/proc-macro/auxiliary/three-equals.rs
index f0ff0437a8b..56cfd4a2828 100644
--- a/tests/ui/proc-macro/auxiliary/three-equals.rs
+++ b/tests/ui/proc-macro/auxiliary/three-equals.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![feature(proc_macro_diagnostic, proc_macro_span, proc_macro_def_site)]
 
 extern crate proc_macro;
diff --git a/tests/ui/proc-macro/auxiliary/weird-hygiene.rs b/tests/ui/proc-macro/auxiliary/weird-hygiene.rs
index f401f7d55ba..c37eed360f0 100644
--- a/tests/ui/proc-macro/auxiliary/weird-hygiene.rs
+++ b/tests/ui/proc-macro/auxiliary/weird-hygiene.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::{TokenStream, TokenTree, Group};
diff --git a/tests/ui/proc-macro/bang-macro.rs b/tests/ui/proc-macro/bang-macro.rs
index 03d4174d652..2287e34c5dd 100644
--- a/tests/ui/proc-macro/bang-macro.rs
+++ b/tests/ui/proc-macro/bang-macro.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:bang-macro.rs
+//@ proc-macro: bang-macro.rs
 
 extern crate bang_macro;
 use bang_macro::rewrite;
diff --git a/tests/ui/proc-macro/break-token-spans.rs b/tests/ui/proc-macro/break-token-spans.rs
index ae90e04e081..efbd0c0d7e2 100644
--- a/tests/ui/proc-macro/break-token-spans.rs
+++ b/tests/ui/proc-macro/break-token-spans.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 // Regression test for issues #68489 and #70987
 // Tests that we properly break tokens in `probably_equal_for_proc_macro`
 // See #72306
diff --git a/tests/ui/proc-macro/call-deprecated.rs b/tests/ui/proc-macro/call-deprecated.rs
index 1779e33f3b1..fc9354331cc 100644
--- a/tests/ui/proc-macro/call-deprecated.rs
+++ b/tests/ui/proc-macro/call-deprecated.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:call-deprecated.rs
+//@ proc-macro: call-deprecated.rs
 
 extern crate call_deprecated;
 
diff --git a/tests/ui/proc-macro/call-site.rs b/tests/ui/proc-macro/call-site.rs
index 31fa78902d5..9c285e1ed11 100644
--- a/tests/ui/proc-macro/call-site.rs
+++ b/tests/ui/proc-macro/call-site.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:call-site.rs
+//@ proc-macro: call-site.rs
 
 extern crate call_site;
 
diff --git a/tests/ui/proc-macro/capture-macro-rules-invoke.rs b/tests/ui/proc-macro/capture-macro-rules-invoke.rs
index 71a290c1fc0..101461854c4 100644
--- a/tests/ui/proc-macro/capture-macro-rules-invoke.rs
+++ b/tests/ui/proc-macro/capture-macro-rules-invoke.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ check-pass
 //@ compile-flags: -Z span-debug
 
diff --git a/tests/ui/proc-macro/capture-unglued-token.rs b/tests/ui/proc-macro/capture-unglued-token.rs
index 32286ed084c..586fb934931 100644
--- a/tests/ui/proc-macro/capture-unglued-token.rs
+++ b/tests/ui/proc-macro/capture-unglued-token.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ compile-flags: -Z span-debug
 //@ check-pass
 
diff --git a/tests/ui/proc-macro/cfg-eval-inner.rs b/tests/ui/proc-macro/cfg-eval-inner.rs
index d0a6c1afa23..7493f3ea523 100644
--- a/tests/ui/proc-macro/cfg-eval-inner.rs
+++ b/tests/ui/proc-macro/cfg-eval-inner.rs
@@ -1,5 +1,5 @@
 //@ compile-flags: -Z span-debug
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ check-pass
 
 #![feature(cfg_eval)]
diff --git a/tests/ui/proc-macro/cfg-eval.rs b/tests/ui/proc-macro/cfg-eval.rs
index bbf11949e7e..1d9b4f23ea5 100644
--- a/tests/ui/proc-macro/cfg-eval.rs
+++ b/tests/ui/proc-macro/cfg-eval.rs
@@ -1,6 +1,6 @@
 //@ check-pass
 //@ compile-flags: -Z span-debug
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![feature(cfg_eval)]
 #![feature(proc_macro_hygiene)]
diff --git a/tests/ui/proc-macro/count_compound_ops.rs b/tests/ui/proc-macro/count_compound_ops.rs
index e58c36e047d..20b0b87817e 100644
--- a/tests/ui/proc-macro/count_compound_ops.rs
+++ b/tests/ui/proc-macro/count_compound_ops.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:count_compound_ops.rs
+//@ proc-macro: count_compound_ops.rs
 
 extern crate count_compound_ops;
 use count_compound_ops::count_compound_ops;
diff --git a/tests/ui/proc-macro/crate-attrs-multiple.rs b/tests/ui/proc-macro/crate-attrs-multiple.rs
index 24f46b0a2fa..ebd14590a21 100644
--- a/tests/ui/proc-macro/crate-attrs-multiple.rs
+++ b/tests/ui/proc-macro/crate-attrs-multiple.rs
@@ -1,7 +1,7 @@
 // Multiple custom crate-level attributes, both inert and active.
 
 //@ check-pass
-//@ aux-crate:test_macros=test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![feature(custom_inner_attributes)]
 #![feature(prelude_import)]
diff --git a/tests/ui/proc-macro/crate-var.rs b/tests/ui/proc-macro/crate-var.rs
index 7388ca68358..cea5d48e080 100644
--- a/tests/ui/proc-macro/crate-var.rs
+++ b/tests/ui/proc-macro/crate-var.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:double.rs
+//@ proc-macro: double.rs
 //@ aux-build:external-crate-var.rs
 
 #![allow(unused)]
diff --git a/tests/ui/proc-macro/custom-attr-only-one-derive.rs b/tests/ui/proc-macro/custom-attr-only-one-derive.rs
index 2616c122a65..f0e82f36757 100644
--- a/tests/ui/proc-macro/custom-attr-only-one-derive.rs
+++ b/tests/ui/proc-macro/custom-attr-only-one-derive.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:custom-attr-only-one-derive.rs
+//@ proc-macro: custom-attr-only-one-derive.rs
 
 #[macro_use]
 extern crate custom_attr_only_one_derive;
diff --git a/tests/ui/proc-macro/custom-attr-panic.rs b/tests/ui/proc-macro/custom-attr-panic.rs
index 23bcb66319d..560af228c2a 100644
--- a/tests/ui/proc-macro/custom-attr-panic.rs
+++ b/tests/ui/proc-macro/custom-attr-panic.rs
@@ -1,4 +1,4 @@
-//@ aux-build: test-macros.rs
+//@ proc-macro: test-macros.rs
 
 extern crate test_macros;
 
diff --git a/tests/ui/proc-macro/debug/auxiliary/macro-dump-debug.rs b/tests/ui/proc-macro/debug/auxiliary/macro-dump-debug.rs
index 2d7bff83681..1e261ea3213 100644
--- a/tests/ui/proc-macro/debug/auxiliary/macro-dump-debug.rs
+++ b/tests/ui/proc-macro/debug/auxiliary/macro-dump-debug.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 #![crate_name = "macro_dump_debug"]
 
 extern crate proc_macro;
diff --git a/tests/ui/proc-macro/debug/dump-debug-span-debug.rs b/tests/ui/proc-macro/debug/dump-debug-span-debug.rs
index d4d9199bf3b..618e13c0f15 100644
--- a/tests/ui/proc-macro/debug/dump-debug-span-debug.rs
+++ b/tests/ui/proc-macro/debug/dump-debug-span-debug.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:macro-dump-debug.rs
+//@ proc-macro: macro-dump-debug.rs
 //@ compile-flags: -Z span-debug
 
 
diff --git a/tests/ui/proc-macro/debug/dump-debug.rs b/tests/ui/proc-macro/debug/dump-debug.rs
index 7a5cc979df9..b20cd2dc948 100644
--- a/tests/ui/proc-macro/debug/dump-debug.rs
+++ b/tests/ui/proc-macro/debug/dump-debug.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:macro-dump-debug.rs
+//@ proc-macro: macro-dump-debug.rs
 
 extern crate macro_dump_debug;
 use macro_dump_debug::dump_debug;
diff --git a/tests/ui/proc-macro/debug/dump-debug.stderr b/tests/ui/proc-macro/debug/dump-debug.stderr
index 6aefacacd00..abcbfbfd5ec 100644
--- a/tests/ui/proc-macro/debug/dump-debug.stderr
+++ b/tests/ui/proc-macro/debug/dump-debug.stderr
@@ -1,166 +1,166 @@
-TokenStream [Ident { ident: "ident", span: #0 bytes(132..137) }, Ident { ident: "r#ident", span: #0 bytes(153..160) }, Punct { ch: ',', spacing: Alone, span: #0 bytes(178..179) }, Punct { ch: '=', spacing: Joint, span: #0 bytes(205..206) }, Punct { ch: '=', spacing: Joint, span: #0 bytes(206..207) }, Punct { ch: '>', spacing: Alone, span: #0 bytes(207..208) }, Group { delimiter: Parenthesis, stream: TokenStream [], span: #0 bytes(232..234) }, Group { delimiter: Bracket, stream: TokenStream [Ident { ident: "_", span: #0 bytes(260..261) }], span: #0 bytes(259..262) }, Literal { kind: Integer, symbol: "0", suffix: None, span: #0 bytes(317..318) }, Literal { kind: Float, symbol: "1.0", suffix: None, span: #0 bytes(323..326) }, Literal { kind: Str, symbol: "S", suffix: None, span: #0 bytes(331..334) }, Literal { kind: ByteStr, symbol: "B", suffix: None, span: #0 bytes(339..343) }, Literal { kind: StrRaw(0), symbol: "R", suffix: None, span: #0 bytes(348..352) }, Literal { kind: StrRaw(2), symbol: "R", suffix: None, span: #0 bytes(357..365) }, Literal { kind: ByteStrRaw(0), symbol: "BR", suffix: None, span: #0 bytes(370..376) }, Literal { kind: ByteStrRaw(2), symbol: "BR", suffix: None, span: #0 bytes(381..391) }, Literal { kind: Char, symbol: "C", suffix: None, span: #0 bytes(396..399) }, Literal { kind: Byte, symbol: "B", suffix: None, span: #0 bytes(404..408) }, Literal { kind: Integer, symbol: "0", suffix: Some("q"), span: #0 bytes(439..441) }, Literal { kind: Float, symbol: "1.0", suffix: Some("q"), span: #0 bytes(446..450) }, Literal { kind: Str, symbol: "S", suffix: Some("q"), span: #0 bytes(455..459) }, Literal { kind: ByteStr, symbol: "B", suffix: Some("q"), span: #0 bytes(464..469) }, Literal { kind: StrRaw(0), symbol: "R", suffix: Some("q"), span: #0 bytes(474..479) }, Literal { kind: StrRaw(2), symbol: "R", suffix: Some("q"), span: #0 bytes(484..493) }, Literal { kind: ByteStrRaw(0), symbol: "BR", suffix: Some("q"), span: #0 bytes(498..505) }, Literal { kind: ByteStrRaw(2), symbol: "BR", suffix: Some("q"), span: #0 bytes(510..521) }, Literal { kind: Char, symbol: "C", suffix: Some("q"), span: #0 bytes(526..530) }, Literal { kind: Byte, symbol: "B", suffix: Some("q"), span: #0 bytes(535..540) }]
+TokenStream [Ident { ident: "ident", span: #0 bytes(134..139) }, Ident { ident: "r#ident", span: #0 bytes(155..162) }, Punct { ch: ',', spacing: Alone, span: #0 bytes(180..181) }, Punct { ch: '=', spacing: Joint, span: #0 bytes(207..208) }, Punct { ch: '=', spacing: Joint, span: #0 bytes(208..209) }, Punct { ch: '>', spacing: Alone, span: #0 bytes(209..210) }, Group { delimiter: Parenthesis, stream: TokenStream [], span: #0 bytes(234..236) }, Group { delimiter: Bracket, stream: TokenStream [Ident { ident: "_", span: #0 bytes(262..263) }], span: #0 bytes(261..264) }, Literal { kind: Integer, symbol: "0", suffix: None, span: #0 bytes(319..320) }, Literal { kind: Float, symbol: "1.0", suffix: None, span: #0 bytes(325..328) }, Literal { kind: Str, symbol: "S", suffix: None, span: #0 bytes(333..336) }, Literal { kind: ByteStr, symbol: "B", suffix: None, span: #0 bytes(341..345) }, Literal { kind: StrRaw(0), symbol: "R", suffix: None, span: #0 bytes(350..354) }, Literal { kind: StrRaw(2), symbol: "R", suffix: None, span: #0 bytes(359..367) }, Literal { kind: ByteStrRaw(0), symbol: "BR", suffix: None, span: #0 bytes(372..378) }, Literal { kind: ByteStrRaw(2), symbol: "BR", suffix: None, span: #0 bytes(383..393) }, Literal { kind: Char, symbol: "C", suffix: None, span: #0 bytes(398..401) }, Literal { kind: Byte, symbol: "B", suffix: None, span: #0 bytes(406..410) }, Literal { kind: Integer, symbol: "0", suffix: Some("q"), span: #0 bytes(441..443) }, Literal { kind: Float, symbol: "1.0", suffix: Some("q"), span: #0 bytes(448..452) }, Literal { kind: Str, symbol: "S", suffix: Some("q"), span: #0 bytes(457..461) }, Literal { kind: ByteStr, symbol: "B", suffix: Some("q"), span: #0 bytes(466..471) }, Literal { kind: StrRaw(0), symbol: "R", suffix: Some("q"), span: #0 bytes(476..481) }, Literal { kind: StrRaw(2), symbol: "R", suffix: Some("q"), span: #0 bytes(486..495) }, Literal { kind: ByteStrRaw(0), symbol: "BR", suffix: Some("q"), span: #0 bytes(500..507) }, Literal { kind: ByteStrRaw(2), symbol: "BR", suffix: Some("q"), span: #0 bytes(512..523) }, Literal { kind: Char, symbol: "C", suffix: Some("q"), span: #0 bytes(528..532) }, Literal { kind: Byte, symbol: "B", suffix: Some("q"), span: #0 bytes(537..542) }]
 TokenStream [
     Ident {
         ident: "ident",
-        span: #0 bytes(132..137),
+        span: #0 bytes(134..139),
     },
     Ident {
         ident: "r#ident",
-        span: #0 bytes(153..160),
+        span: #0 bytes(155..162),
     },
     Punct {
         ch: ',',
         spacing: Alone,
-        span: #0 bytes(178..179),
+        span: #0 bytes(180..181),
     },
     Punct {
         ch: '=',
         spacing: Joint,
-        span: #0 bytes(205..206),
+        span: #0 bytes(207..208),
     },
     Punct {
         ch: '=',
         spacing: Joint,
-        span: #0 bytes(206..207),
+        span: #0 bytes(208..209),
     },
     Punct {
         ch: '>',
         spacing: Alone,
-        span: #0 bytes(207..208),
+        span: #0 bytes(209..210),
     },
     Group {
         delimiter: Parenthesis,
         stream: TokenStream [],
-        span: #0 bytes(232..234),
+        span: #0 bytes(234..236),
     },
     Group {
         delimiter: Bracket,
         stream: TokenStream [
             Ident {
                 ident: "_",
-                span: #0 bytes(260..261),
+                span: #0 bytes(262..263),
             },
         ],
-        span: #0 bytes(259..262),
+        span: #0 bytes(261..264),
     },
     Literal {
         kind: Integer,
         symbol: "0",
         suffix: None,
-        span: #0 bytes(317..318),
+        span: #0 bytes(319..320),
     },
     Literal {
         kind: Float,
         symbol: "1.0",
         suffix: None,
-        span: #0 bytes(323..326),
+        span: #0 bytes(325..328),
     },
     Literal {
         kind: Str,
         symbol: "S",
         suffix: None,
-        span: #0 bytes(331..334),
+        span: #0 bytes(333..336),
     },
     Literal {
         kind: ByteStr,
         symbol: "B",
         suffix: None,
-        span: #0 bytes(339..343),
+        span: #0 bytes(341..345),
     },
     Literal {
         kind: StrRaw(0),
         symbol: "R",
         suffix: None,
-        span: #0 bytes(348..352),
+        span: #0 bytes(350..354),
     },
     Literal {
         kind: StrRaw(2),
         symbol: "R",
         suffix: None,
-        span: #0 bytes(357..365),
+        span: #0 bytes(359..367),
     },
     Literal {
         kind: ByteStrRaw(0),
         symbol: "BR",
         suffix: None,
-        span: #0 bytes(370..376),
+        span: #0 bytes(372..378),
     },
     Literal {
         kind: ByteStrRaw(2),
         symbol: "BR",
         suffix: None,
-        span: #0 bytes(381..391),
+        span: #0 bytes(383..393),
     },
     Literal {
         kind: Char,
         symbol: "C",
         suffix: None,
-        span: #0 bytes(396..399),
+        span: #0 bytes(398..401),
     },
     Literal {
         kind: Byte,
         symbol: "B",
         suffix: None,
-        span: #0 bytes(404..408),
+        span: #0 bytes(406..410),
     },
     Literal {
         kind: Integer,
         symbol: "0",
         suffix: Some("q"),
-        span: #0 bytes(439..441),
+        span: #0 bytes(441..443),
     },
     Literal {
         kind: Float,
         symbol: "1.0",
         suffix: Some("q"),
-        span: #0 bytes(446..450),
+        span: #0 bytes(448..452),
     },
     Literal {
         kind: Str,
         symbol: "S",
         suffix: Some("q"),
-        span: #0 bytes(455..459),
+        span: #0 bytes(457..461),
     },
     Literal {
         kind: ByteStr,
         symbol: "B",
         suffix: Some("q"),
-        span: #0 bytes(464..469),
+        span: #0 bytes(466..471),
     },
     Literal {
         kind: StrRaw(0),
         symbol: "R",
         suffix: Some("q"),
-        span: #0 bytes(474..479),
+        span: #0 bytes(476..481),
     },
     Literal {
         kind: StrRaw(2),
         symbol: "R",
         suffix: Some("q"),
-        span: #0 bytes(484..493),
+        span: #0 bytes(486..495),
     },
     Literal {
         kind: ByteStrRaw(0),
         symbol: "BR",
         suffix: Some("q"),
-        span: #0 bytes(498..505),
+        span: #0 bytes(500..507),
     },
     Literal {
         kind: ByteStrRaw(2),
         symbol: "BR",
         suffix: Some("q"),
-        span: #0 bytes(510..521),
+        span: #0 bytes(512..523),
     },
     Literal {
         kind: Char,
         symbol: "C",
         suffix: Some("q"),
-        span: #0 bytes(526..530),
+        span: #0 bytes(528..532),
     },
     Literal {
         kind: Byte,
         symbol: "B",
         suffix: Some("q"),
-        span: #0 bytes(535..540),
+        span: #0 bytes(537..542),
     },
 ]
diff --git a/tests/ui/proc-macro/derive-attr-cfg.rs b/tests/ui/proc-macro/derive-attr-cfg.rs
index 162be0754d9..2f3516cabae 100644
--- a/tests/ui/proc-macro/derive-attr-cfg.rs
+++ b/tests/ui/proc-macro/derive-attr-cfg.rs
@@ -1,7 +1,7 @@
 //@ run-pass
 
 #![allow(dead_code)]
-//@ aux-build:derive-attr-cfg.rs
+//@ proc-macro: derive-attr-cfg.rs
 
 extern crate derive_attr_cfg;
 use derive_attr_cfg::Foo;
diff --git a/tests/ui/proc-macro/derive-b.rs b/tests/ui/proc-macro/derive-b.rs
index 6cbe1fd0a3f..68d341478f1 100644
--- a/tests/ui/proc-macro/derive-b.rs
+++ b/tests/ui/proc-macro/derive-b.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:derive-b-rpass.rs
+//@ proc-macro: derive-b-rpass.rs
 
 extern crate derive_b_rpass as derive_b;
 
diff --git a/tests/ui/proc-macro/derive-bad.rs b/tests/ui/proc-macro/derive-bad.rs
index c8f3a77ea4c..9b237c731db 100644
--- a/tests/ui/proc-macro/derive-bad.rs
+++ b/tests/ui/proc-macro/derive-bad.rs
@@ -1,4 +1,4 @@
-//@ aux-build:derive-bad.rs
+//@ proc-macro: derive-bad.rs
 
 #[macro_use]
 extern crate derive_bad;
diff --git a/tests/ui/proc-macro/derive-expand-order.rs b/tests/ui/proc-macro/derive-expand-order.rs
index 75981f16a7f..076590bdb4c 100644
--- a/tests/ui/proc-macro/derive-expand-order.rs
+++ b/tests/ui/proc-macro/derive-expand-order.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:multiple-derives.rs
+//@ proc-macro: multiple-derives.rs
 
 extern crate multiple_derives;
 
diff --git a/tests/ui/proc-macro/derive-helper-configured.rs b/tests/ui/proc-macro/derive-helper-configured.rs
index 45e6e64d392..b753e29b8bf 100644
--- a/tests/ui/proc-macro/derive-helper-configured.rs
+++ b/tests/ui/proc-macro/derive-helper-configured.rs
@@ -1,7 +1,7 @@
 // Derive helpers are resolved successfully inside `cfg_attr`.
 
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/derive-helper-legacy-limits.rs b/tests/ui/proc-macro/derive-helper-legacy-limits.rs
index ff09095a60f..76b09f33ecc 100644
--- a/tests/ui/proc-macro/derive-helper-legacy-limits.rs
+++ b/tests/ui/proc-macro/derive-helper-legacy-limits.rs
@@ -2,7 +2,7 @@
 // (that's exactly the reason why they are deprecated).
 
 //@ edition:2018
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/derive-helper-legacy-spurious.rs b/tests/ui/proc-macro/derive-helper-legacy-spurious.rs
index 2b5bb905e83..8e902f30419 100644
--- a/tests/ui/proc-macro/derive-helper-legacy-spurious.rs
+++ b/tests/ui/proc-macro/derive-helper-legacy-spurious.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![dummy] //~ ERROR cannot find attribute `dummy` in this scope
 
diff --git a/tests/ui/proc-macro/derive-helper-shadowed.rs b/tests/ui/proc-macro/derive-helper-shadowed.rs
index 9b2a4ab6bc7..ea2c56b0b73 100644
--- a/tests/ui/proc-macro/derive-helper-shadowed.rs
+++ b/tests/ui/proc-macro/derive-helper-shadowed.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ aux-build:derive-helper-shadowed-2.rs
 
 #[macro_use]
diff --git a/tests/ui/proc-macro/derive-helper-shadowing-2.rs b/tests/ui/proc-macro/derive-helper-shadowing-2.rs
index dc35dd05498..6aba061acf3 100644
--- a/tests/ui/proc-macro/derive-helper-shadowing-2.rs
+++ b/tests/ui/proc-macro/derive-helper-shadowing-2.rs
@@ -2,7 +2,7 @@
 // then make sure that it's usable without ambiguities.
 
 //@ check-pass
-//@ aux-build:derive-helper-shadowing-2.rs
+//@ proc-macro: derive-helper-shadowing-2.rs
 
 #[macro_use]
 extern crate derive_helper_shadowing_2;
diff --git a/tests/ui/proc-macro/derive-helper-shadowing.rs b/tests/ui/proc-macro/derive-helper-shadowing.rs
index 1c66a60b294..e774e464053 100644
--- a/tests/ui/proc-macro/derive-helper-shadowing.rs
+++ b/tests/ui/proc-macro/derive-helper-shadowing.rs
@@ -1,6 +1,6 @@
 //@ edition:2018
-//@ aux-build:test-macros.rs
-//@ aux-build:derive-helper-shadowing.rs
+//@ proc-macro: test-macros.rs
+//@ proc-macro: derive-helper-shadowing.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/derive-helper-vs-legacy.rs b/tests/ui/proc-macro/derive-helper-vs-legacy.rs
index feae7adda68..83917a2fbf7 100644
--- a/tests/ui/proc-macro/derive-helper-vs-legacy.rs
+++ b/tests/ui/proc-macro/derive-helper-vs-legacy.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/derive-in-mod.rs b/tests/ui/proc-macro/derive-in-mod.rs
index 3bd70f1090d..7ec7cf62fb4 100644
--- a/tests/ui/proc-macro/derive-in-mod.rs
+++ b/tests/ui/proc-macro/derive-in-mod.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 extern crate test_macros;
 
diff --git a/tests/ui/proc-macro/derive-same-struct.rs b/tests/ui/proc-macro/derive-same-struct.rs
index 432476d1ebb..f7669ba1480 100644
--- a/tests/ui/proc-macro/derive-same-struct.rs
+++ b/tests/ui/proc-macro/derive-same-struct.rs
@@ -2,7 +2,7 @@
 
 #![allow(path_statements)]
 #![allow(dead_code)]
-//@ aux-build:derive-same-struct.rs
+//@ proc-macro: derive-same-struct.rs
 
 #[macro_use]
 extern crate derive_same_struct;
diff --git a/tests/ui/proc-macro/derive-still-gated.rs b/tests/ui/proc-macro/derive-still-gated.rs
index bce7badeffe..518ed9d51be 100644
--- a/tests/ui/proc-macro/derive-still-gated.rs
+++ b/tests/ui/proc-macro/derive-still-gated.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/derive-two-attrs.rs b/tests/ui/proc-macro/derive-two-attrs.rs
index 91116097665..33a8fef2ac7 100644
--- a/tests/ui/proc-macro/derive-two-attrs.rs
+++ b/tests/ui/proc-macro/derive-two-attrs.rs
@@ -1,7 +1,7 @@
 //@ run-pass
 
 #![allow(dead_code)]
-//@ aux-build:derive-two-attrs.rs
+//@ proc-macro: derive-two-attrs.rs
 
 extern crate derive_two_attrs as foo;
 
diff --git a/tests/ui/proc-macro/derive-union.rs b/tests/ui/proc-macro/derive-union.rs
index d1e65bf4595..e0fe9dee85c 100644
--- a/tests/ui/proc-macro/derive-union.rs
+++ b/tests/ui/proc-macro/derive-union.rs
@@ -1,7 +1,7 @@
 //@ run-pass
 
 #![allow(unused_variables)]
-//@ aux-build:derive-union.rs
+//@ proc-macro: derive-union.rs
 
 #[macro_use]
 extern crate derive_union;
diff --git a/tests/ui/proc-macro/disappearing-resolution.rs b/tests/ui/proc-macro/disappearing-resolution.rs
index b8bc2953576..8e7fa85eba1 100644
--- a/tests/ui/proc-macro/disappearing-resolution.rs
+++ b/tests/ui/proc-macro/disappearing-resolution.rs
@@ -1,6 +1,6 @@
 // Regression test for issue #64803 (initial attribute resolution can disappear later).
 
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/disappearing-resolution.stderr b/tests/ui/proc-macro/disappearing-resolution.stderr
index e6d0868687e..e66f721444f 100644
--- a/tests/ui/proc-macro/disappearing-resolution.stderr
+++ b/tests/ui/proc-macro/disappearing-resolution.stderr
@@ -16,7 +16,7 @@ note: the derive macro import `Empty` is defined here...
 LL |     use test_macros::Empty;
    |         ^^^^^^^^^^^^^^^^^^
 note: ...and refers to the derive macro `Empty` which is defined here
-  --> $DIR/auxiliary/test-macros.rs:25:1
+  --> $DIR/auxiliary/test-macros.rs:20:1
    |
 LL | pub fn empty_derive(_: TokenStream) -> TokenStream {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ you could import this directly
diff --git a/tests/ui/proc-macro/doc-comment-preserved.rs b/tests/ui/proc-macro/doc-comment-preserved.rs
index f0891e7d6a7..a4bfd105d36 100644
--- a/tests/ui/proc-macro/doc-comment-preserved.rs
+++ b/tests/ui/proc-macro/doc-comment-preserved.rs
@@ -1,6 +1,6 @@
 //@ check-pass
 //@ compile-flags: -Z span-debug
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![no_std] // Don't load unnecessary hygiene information from std
 extern crate std;
diff --git a/tests/ui/proc-macro/dollar-crate-issue-101211.rs b/tests/ui/proc-macro/dollar-crate-issue-101211.rs
index fd5768dc7d1..ca871d57a69 100644
--- a/tests/ui/proc-macro/dollar-crate-issue-101211.rs
+++ b/tests/ui/proc-macro/dollar-crate-issue-101211.rs
@@ -1,6 +1,6 @@
 //@ check-pass
 //@ edition:2021
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![no_std] // Don't load unnecessary hygiene information from std
 extern crate std;
diff --git a/tests/ui/proc-macro/dollar-crate-issue-57089.rs b/tests/ui/proc-macro/dollar-crate-issue-57089.rs
index d4540643e02..52f41b78375 100644
--- a/tests/ui/proc-macro/dollar-crate-issue-57089.rs
+++ b/tests/ui/proc-macro/dollar-crate-issue-57089.rs
@@ -1,7 +1,7 @@
 //@ check-pass
 //@ edition:2018
 //@ compile-flags: -Z span-debug
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![no_std] // Don't load unnecessary hygiene information from std
 extern crate std;
diff --git a/tests/ui/proc-macro/dollar-crate-issue-62325.rs b/tests/ui/proc-macro/dollar-crate-issue-62325.rs
index ee2e0c3973d..716bf6790fe 100644
--- a/tests/ui/proc-macro/dollar-crate-issue-62325.rs
+++ b/tests/ui/proc-macro/dollar-crate-issue-62325.rs
@@ -1,7 +1,7 @@
 //@ check-pass
 //@ edition:2018
 //@ compile-flags: -Z span-debug
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ aux-build:dollar-crate-external.rs
 
 
diff --git a/tests/ui/proc-macro/dollar-crate.rs b/tests/ui/proc-macro/dollar-crate.rs
index a487e77a833..0d13bbd8967 100644
--- a/tests/ui/proc-macro/dollar-crate.rs
+++ b/tests/ui/proc-macro/dollar-crate.rs
@@ -1,7 +1,7 @@
 //@ check-pass
 //@ edition:2018
 //@ compile-flags: -Z span-debug
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ aux-build:dollar-crate-external.rs
 
 #![no_std] // Don't load unnecessary hygiene information from std
diff --git a/tests/ui/proc-macro/edition-gated-async-move-syntax-issue89699.rs b/tests/ui/proc-macro/edition-gated-async-move-syntax-issue89699.rs
index 0f302708537..e4878a93af1 100644
--- a/tests/ui/proc-macro/edition-gated-async-move-syntax-issue89699.rs
+++ b/tests/ui/proc-macro/edition-gated-async-move-syntax-issue89699.rs
@@ -1,4 +1,4 @@
-//@ aux-build:edition-gated-async-move-syntax.rs
+//@ proc-macro: edition-gated-async-move-syntax.rs
 //@ edition: 2015
 
 // Non-regression test for issue #89699, where a proc-macro emitting syntax only available in
diff --git a/tests/ui/proc-macro/edition-imports-2018.rs b/tests/ui/proc-macro/edition-imports-2018.rs
index de05868ebf9..a3808d9dce8 100644
--- a/tests/ui/proc-macro/edition-imports-2018.rs
+++ b/tests/ui/proc-macro/edition-imports-2018.rs
@@ -1,6 +1,6 @@
 //@ check-pass
 //@ edition:2018
-//@ aux-build:edition-imports-2015.rs
+//@ proc-macro: edition-imports-2015.rs
 
 #[macro_use]
 extern crate edition_imports_2015;
diff --git a/tests/ui/proc-macro/empty-crate.rs b/tests/ui/proc-macro/empty-crate.rs
index ba4de590e63..f82660ac4fd 100644
--- a/tests/ui/proc-macro/empty-crate.rs
+++ b/tests/ui/proc-macro/empty-crate.rs
@@ -1,7 +1,7 @@
 //@ run-pass
 
 #![allow(unused_imports)]
-//@ aux-build:empty-crate.rs
+//@ proc-macro: empty-crate.rs
 
 #[macro_use]
 extern crate empty_crate;
diff --git a/tests/ui/proc-macro/empty-where-clause.rs b/tests/ui/proc-macro/empty-where-clause.rs
index 4e432934e3c..770b44515f9 100644
--- a/tests/ui/proc-macro/empty-where-clause.rs
+++ b/tests/ui/proc-macro/empty-where-clause.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 extern crate test_macros;
 use test_macros::recollect_attr;
diff --git a/tests/ui/proc-macro/env.rs b/tests/ui/proc-macro/env.rs
index 85bcf4521fe..94e3b09e526 100644
--- a/tests/ui/proc-macro/env.rs
+++ b/tests/ui/proc-macro/env.rs
@@ -1,4 +1,4 @@
-//@ aux-build:env.rs
+//@ proc-macro: env.rs
 //@ run-pass
 //@ rustc-env: THE_CONST=1
 //@ compile-flags: -Zunstable-options --env-set THE_CONST=12 --env-set ANOTHER=4
diff --git a/tests/ui/proc-macro/expand-expr.rs b/tests/ui/proc-macro/expand-expr.rs
index e06ddc51a29..8a4ed9768d5 100644
--- a/tests/ui/proc-macro/expand-expr.rs
+++ b/tests/ui/proc-macro/expand-expr.rs
@@ -1,4 +1,4 @@
-//@ aux-build:expand-expr.rs
+//@ proc-macro: expand-expr.rs
 // no-remap-src-base: check_expand_expr_file!() fails when enabled.
 
 #![feature(concat_bytes)]
diff --git a/tests/ui/proc-macro/expand-to-derive.rs b/tests/ui/proc-macro/expand-to-derive.rs
index 0b603cd4bcc..0e38e471980 100644
--- a/tests/ui/proc-macro/expand-to-derive.rs
+++ b/tests/ui/proc-macro/expand-to-derive.rs
@@ -1,6 +1,6 @@
 //@ check-pass
 //@ compile-flags: -Z span-debug --error-format human
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![feature(rustc_attrs)]
 
diff --git a/tests/ui/proc-macro/expand-to-unstable.rs b/tests/ui/proc-macro/expand-to-unstable.rs
index c4eaba6bba2..8968471ebd8 100644
--- a/tests/ui/proc-macro/expand-to-unstable.rs
+++ b/tests/ui/proc-macro/expand-to-unstable.rs
@@ -1,4 +1,4 @@
-//@ aux-build:derive-unstable.rs
+//@ proc-macro: derive-unstable.rs
 
 #![allow(warnings)]
 
diff --git a/tests/ui/proc-macro/expand-with-a-macro.rs b/tests/ui/proc-macro/expand-with-a-macro.rs
index fcaafbbc149..e5baf3601db 100644
--- a/tests/ui/proc-macro/expand-with-a-macro.rs
+++ b/tests/ui/proc-macro/expand-with-a-macro.rs
@@ -1,6 +1,6 @@
 //@ run-pass
 //@ needs-unwind
-//@ aux-build:expand-with-a-macro.rs
+//@ proc-macro: expand-with-a-macro.rs
 
 
 #![deny(warnings)]
diff --git a/tests/ui/proc-macro/expr-stmt-nonterminal-tokens.rs b/tests/ui/proc-macro/expr-stmt-nonterminal-tokens.rs
index 0b34b07edbe..6f31c07ff89 100644
--- a/tests/ui/proc-macro/expr-stmt-nonterminal-tokens.rs
+++ b/tests/ui/proc-macro/expr-stmt-nonterminal-tokens.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![feature(decl_macro)]
 #![feature(stmt_expr_attributes)]
diff --git a/tests/ui/proc-macro/expr-stmt-nonterminal-tokens.stdout b/tests/ui/proc-macro/expr-stmt-nonterminal-tokens.stdout
index 0168689b605..7555ef8f632 100644
--- a/tests/ui/proc-macro/expr-stmt-nonterminal-tokens.stdout
+++ b/tests/ui/proc-macro/expr-stmt-nonterminal-tokens.stdout
@@ -2,39 +2,39 @@ PRINT-DERIVE INPUT (DISPLAY): enum E { V = { let _ = #[allow(warnings)] 0; 0 },
 PRINT-DERIVE INPUT (DEBUG): TokenStream [
     Ident {
         ident: "enum",
-        span: #3 bytes(301..305),
+        span: #3 bytes(303..307),
     },
     Ident {
         ident: "E",
-        span: #3 bytes(306..307),
+        span: #3 bytes(308..309),
     },
     Group {
         delimiter: Brace,
         stream: TokenStream [
             Ident {
                 ident: "V",
-                span: #3 bytes(322..323),
+                span: #3 bytes(324..325),
             },
             Punct {
                 ch: '=',
                 spacing: Alone,
-                span: #3 bytes(324..325),
+                span: #3 bytes(326..327),
             },
             Group {
                 delimiter: Brace,
                 stream: TokenStream [
                     Ident {
                         ident: "let",
-                        span: #3 bytes(328..331),
+                        span: #3 bytes(330..333),
                     },
                     Ident {
                         ident: "_",
-                        span: #3 bytes(332..333),
+                        span: #3 bytes(334..335),
                     },
                     Punct {
                         ch: '=',
                         spacing: Alone,
-                        span: #3 bytes(334..335),
+                        span: #3 bytes(336..337),
                     },
                     Group {
                         delimiter: None,
@@ -42,97 +42,97 @@ PRINT-DERIVE INPUT (DEBUG): TokenStream [
                             Punct {
                                 ch: '#',
                                 spacing: Alone,
-                                span: #0 bytes(543..544),
+                                span: #0 bytes(545..546),
                             },
                             Group {
                                 delimiter: Bracket,
                                 stream: TokenStream [
                                     Ident {
                                         ident: "allow",
-                                        span: #0 bytes(545..550),
+                                        span: #0 bytes(547..552),
                                     },
                                     Group {
                                         delimiter: Parenthesis,
                                         stream: TokenStream [
                                             Ident {
                                                 ident: "warnings",
-                                                span: #0 bytes(551..559),
+                                                span: #0 bytes(553..561),
                                             },
                                         ],
-                                        span: #0 bytes(550..560),
+                                        span: #0 bytes(552..562),
                                     },
                                 ],
-                                span: #0 bytes(544..561),
+                                span: #0 bytes(546..563),
                             },
                             Literal {
                                 kind: Integer,
                                 symbol: "0",
                                 suffix: None,
-                                span: #0 bytes(562..563),
+                                span: #0 bytes(564..565),
                             },
                         ],
-                        span: #3 bytes(336..341),
+                        span: #3 bytes(338..343),
                     },
                     Punct {
                         ch: ';',
                         spacing: Alone,
-                        span: #3 bytes(341..342),
+                        span: #3 bytes(343..344),
                     },
                     Literal {
                         kind: Integer,
                         symbol: "0",
                         suffix: None,
-                        span: #3 bytes(343..344),
+                        span: #3 bytes(345..346),
                     },
                 ],
-                span: #3 bytes(326..346),
+                span: #3 bytes(328..348),
             },
             Punct {
                 ch: ',',
                 spacing: Alone,
-                span: #3 bytes(346..347),
+                span: #3 bytes(348..349),
             },
         ],
-        span: #3 bytes(308..357),
+        span: #3 bytes(310..359),
     },
 ]
 PRINT-DERIVE INPUT (DISPLAY): enum E { V = { let _ = { 0 }; 0 }, }
 PRINT-DERIVE INPUT (DEBUG): TokenStream [
     Ident {
         ident: "enum",
-        span: #7 bytes(425..429),
+        span: #7 bytes(427..431),
     },
     Ident {
         ident: "E",
-        span: #7 bytes(430..431),
+        span: #7 bytes(432..433),
     },
     Group {
         delimiter: Brace,
         stream: TokenStream [
             Ident {
                 ident: "V",
-                span: #7 bytes(446..447),
+                span: #7 bytes(448..449),
             },
             Punct {
                 ch: '=',
                 spacing: Alone,
-                span: #7 bytes(448..449),
+                span: #7 bytes(450..451),
             },
             Group {
                 delimiter: Brace,
                 stream: TokenStream [
                     Ident {
                         ident: "let",
-                        span: #7 bytes(452..455),
+                        span: #7 bytes(454..457),
                     },
                     Ident {
                         ident: "_",
-                        span: #7 bytes(456..457),
+                        span: #7 bytes(458..459),
                     },
                     Punct {
                         ch: '=',
                         spacing: Alone,
-                        span: #7 bytes(458..459),
+                        span: #7 bytes(460..461),
                     },
                     Group {
                         delimiter: Brace,
@@ -144,74 +144,74 @@ PRINT-DERIVE INPUT (DEBUG): TokenStream [
                                         kind: Integer,
                                         symbol: "0",
                                         suffix: None,
-                                        span: #0 bytes(580..581),
+                                        span: #0 bytes(582..583),
                                     },
                                 ],
-                                span: #7 bytes(462..467),
+                                span: #7 bytes(464..469),
                             },
                         ],
-                        span: #7 bytes(460..469),
+                        span: #7 bytes(462..471),
                     },
                     Punct {
                         ch: ';',
                         spacing: Alone,
-                        span: #7 bytes(469..470),
+                        span: #7 bytes(471..472),
                     },
                     Literal {
                         kind: Integer,
                         symbol: "0",
                         suffix: None,
-                        span: #7 bytes(471..472),
+                        span: #7 bytes(473..474),
                     },
                 ],
-                span: #7 bytes(450..474),
+                span: #7 bytes(452..476),
             },
             Punct {
                 ch: ',',
                 spacing: Alone,
-                span: #7 bytes(474..475),
+                span: #7 bytes(476..477),
             },
         ],
-        span: #7 bytes(432..485),
+        span: #7 bytes(434..487),
     },
 ]
 PRINT-DERIVE INPUT (DISPLAY): enum E { V = { let _ = { {} }; 0 }, }
 PRINT-DERIVE INPUT (DEBUG): TokenStream [
     Ident {
         ident: "enum",
-        span: #11 bytes(425..429),
+        span: #11 bytes(427..431),
     },
     Ident {
         ident: "E",
-        span: #11 bytes(430..431),
+        span: #11 bytes(432..433),
     },
     Group {
         delimiter: Brace,
         stream: TokenStream [
             Ident {
                 ident: "V",
-                span: #11 bytes(446..447),
+                span: #11 bytes(448..449),
             },
             Punct {
                 ch: '=',
                 spacing: Alone,
-                span: #11 bytes(448..449),
+                span: #11 bytes(450..451),
             },
             Group {
                 delimiter: Brace,
                 stream: TokenStream [
                     Ident {
                         ident: "let",
-                        span: #11 bytes(452..455),
+                        span: #11 bytes(454..457),
                     },
                     Ident {
                         ident: "_",
-                        span: #11 bytes(456..457),
+                        span: #11 bytes(458..459),
                     },
                     Punct {
                         ch: '=',
                         spacing: Alone,
-                        span: #11 bytes(458..459),
+                        span: #11 bytes(460..461),
                     },
                     Group {
                         delimiter: Brace,
@@ -222,74 +222,74 @@ PRINT-DERIVE INPUT (DEBUG): TokenStream [
                                     Group {
                                         delimiter: Brace,
                                         stream: TokenStream [],
-                                        span: #0 bytes(598..600),
+                                        span: #0 bytes(600..602),
                                     },
                                 ],
-                                span: #11 bytes(462..467),
+                                span: #11 bytes(464..469),
                             },
                         ],
-                        span: #11 bytes(460..469),
+                        span: #11 bytes(462..471),
                     },
                     Punct {
                         ch: ';',
                         spacing: Alone,
-                        span: #11 bytes(469..470),
+                        span: #11 bytes(471..472),
                     },
                     Literal {
                         kind: Integer,
                         symbol: "0",
                         suffix: None,
-                        span: #11 bytes(471..472),
+                        span: #11 bytes(473..474),
                     },
                 ],
-                span: #11 bytes(450..474),
+                span: #11 bytes(452..476),
             },
             Punct {
                 ch: ',',
                 spacing: Alone,
-                span: #11 bytes(474..475),
+                span: #11 bytes(476..477),
             },
         ],
-        span: #11 bytes(432..485),
+        span: #11 bytes(434..487),
     },
 ]
 PRINT-DERIVE INPUT (DISPLAY): enum E { V = { let _ = { PATH }; 0 }, }
 PRINT-DERIVE INPUT (DEBUG): TokenStream [
     Ident {
         ident: "enum",
-        span: #15 bytes(425..429),
+        span: #15 bytes(427..431),
     },
     Ident {
         ident: "E",
-        span: #15 bytes(430..431),
+        span: #15 bytes(432..433),
     },
     Group {
         delimiter: Brace,
         stream: TokenStream [
             Ident {
                 ident: "V",
-                span: #15 bytes(446..447),
+                span: #15 bytes(448..449),
             },
             Punct {
                 ch: '=',
                 spacing: Alone,
-                span: #15 bytes(448..449),
+                span: #15 bytes(450..451),
             },
             Group {
                 delimiter: Brace,
                 stream: TokenStream [
                     Ident {
                         ident: "let",
-                        span: #15 bytes(452..455),
+                        span: #15 bytes(454..457),
                     },
                     Ident {
                         ident: "_",
-                        span: #15 bytes(456..457),
+                        span: #15 bytes(458..459),
                     },
                     Punct {
                         ch: '=',
                         spacing: Alone,
-                        span: #15 bytes(458..459),
+                        span: #15 bytes(460..461),
                     },
                     Group {
                         delimiter: Brace,
@@ -299,74 +299,74 @@ PRINT-DERIVE INPUT (DEBUG): TokenStream [
                                 stream: TokenStream [
                                     Ident {
                                         ident: "PATH",
-                                        span: #0 bytes(617..621),
+                                        span: #0 bytes(619..623),
                                     },
                                 ],
-                                span: #15 bytes(462..467),
+                                span: #15 bytes(464..469),
                             },
                         ],
-                        span: #15 bytes(460..469),
+                        span: #15 bytes(462..471),
                     },
                     Punct {
                         ch: ';',
                         spacing: Alone,
-                        span: #15 bytes(469..470),
+                        span: #15 bytes(471..472),
                     },
                     Literal {
                         kind: Integer,
                         symbol: "0",
                         suffix: None,
-                        span: #15 bytes(471..472),
+                        span: #15 bytes(473..474),
                     },
                 ],
-                span: #15 bytes(450..474),
+                span: #15 bytes(452..476),
             },
             Punct {
                 ch: ',',
                 spacing: Alone,
-                span: #15 bytes(474..475),
+                span: #15 bytes(476..477),
             },
         ],
-        span: #15 bytes(432..485),
+        span: #15 bytes(434..487),
     },
 ]
 PRINT-DERIVE INPUT (DISPLAY): enum E { V = { let _ = { 0 + 1 }; 0 }, }
 PRINT-DERIVE INPUT (DEBUG): TokenStream [
     Ident {
         ident: "enum",
-        span: #19 bytes(425..429),
+        span: #19 bytes(427..431),
     },
     Ident {
         ident: "E",
-        span: #19 bytes(430..431),
+        span: #19 bytes(432..433),
     },
     Group {
         delimiter: Brace,
         stream: TokenStream [
             Ident {
                 ident: "V",
-                span: #19 bytes(446..447),
+                span: #19 bytes(448..449),
             },
             Punct {
                 ch: '=',
                 spacing: Alone,
-                span: #19 bytes(448..449),
+                span: #19 bytes(450..451),
             },
             Group {
                 delimiter: Brace,
                 stream: TokenStream [
                     Ident {
                         ident: "let",
-                        span: #19 bytes(452..455),
+                        span: #19 bytes(454..457),
                     },
                     Ident {
                         ident: "_",
-                        span: #19 bytes(456..457),
+                        span: #19 bytes(458..459),
                     },
                     Punct {
                         ch: '=',
                         spacing: Alone,
-                        span: #19 bytes(458..459),
+                        span: #19 bytes(460..461),
                     },
                     Group {
                         delimiter: Brace,
@@ -378,85 +378,85 @@ PRINT-DERIVE INPUT (DEBUG): TokenStream [
                                         kind: Integer,
                                         symbol: "0",
                                         suffix: None,
-                                        span: #0 bytes(638..639),
+                                        span: #0 bytes(640..641),
                                     },
                                     Punct {
                                         ch: '+',
                                         spacing: Alone,
-                                        span: #0 bytes(640..641),
+                                        span: #0 bytes(642..643),
                                     },
                                     Literal {
                                         kind: Integer,
                                         symbol: "1",
                                         suffix: None,
-                                        span: #0 bytes(642..643),
+                                        span: #0 bytes(644..645),
                                     },
                                 ],
-                                span: #19 bytes(462..467),
+                                span: #19 bytes(464..469),
                             },
                         ],
-                        span: #19 bytes(460..469),
+                        span: #19 bytes(462..471),
                     },
                     Punct {
                         ch: ';',
                         spacing: Alone,
-                        span: #19 bytes(469..470),
+                        span: #19 bytes(471..472),
                     },
                     Literal {
                         kind: Integer,
                         symbol: "0",
                         suffix: None,
-                        span: #19 bytes(471..472),
+                        span: #19 bytes(473..474),
                     },
                 ],
-                span: #19 bytes(450..474),
+                span: #19 bytes(452..476),
             },
             Punct {
                 ch: ',',
                 spacing: Alone,
-                span: #19 bytes(474..475),
+                span: #19 bytes(476..477),
             },
         ],
-        span: #19 bytes(432..485),
+        span: #19 bytes(434..487),
     },
 ]
 PRINT-DERIVE INPUT (DISPLAY): enum E { V = { let _ = { PATH + 1 }; 0 }, }
 PRINT-DERIVE INPUT (DEBUG): TokenStream [
     Ident {
         ident: "enum",
-        span: #23 bytes(425..429),
+        span: #23 bytes(427..431),
     },
     Ident {
         ident: "E",
-        span: #23 bytes(430..431),
+        span: #23 bytes(432..433),
     },
     Group {
         delimiter: Brace,
         stream: TokenStream [
             Ident {
                 ident: "V",
-                span: #23 bytes(446..447),
+                span: #23 bytes(448..449),
             },
             Punct {
                 ch: '=',
                 spacing: Alone,
-                span: #23 bytes(448..449),
+                span: #23 bytes(450..451),
             },
             Group {
                 delimiter: Brace,
                 stream: TokenStream [
                     Ident {
                         ident: "let",
-                        span: #23 bytes(452..455),
+                        span: #23 bytes(454..457),
                     },
                     Ident {
                         ident: "_",
-                        span: #23 bytes(456..457),
+                        span: #23 bytes(458..459),
                     },
                     Punct {
                         ch: '=',
                         spacing: Alone,
-                        span: #23 bytes(458..459),
+                        span: #23 bytes(460..461),
                     },
                     Group {
                         delimiter: Brace,
@@ -466,45 +466,45 @@ PRINT-DERIVE INPUT (DEBUG): TokenStream [
                                 stream: TokenStream [
                                     Ident {
                                         ident: "PATH",
-                                        span: #0 bytes(660..664),
+                                        span: #0 bytes(662..666),
                                     },
                                     Punct {
                                         ch: '+',
                                         spacing: Alone,
-                                        span: #0 bytes(665..666),
+                                        span: #0 bytes(667..668),
                                     },
                                     Literal {
                                         kind: Integer,
                                         symbol: "1",
                                         suffix: None,
-                                        span: #0 bytes(667..668),
+                                        span: #0 bytes(669..670),
                                     },
                                 ],
-                                span: #23 bytes(462..467),
+                                span: #23 bytes(464..469),
                             },
                         ],
-                        span: #23 bytes(460..469),
+                        span: #23 bytes(462..471),
                     },
                     Punct {
                         ch: ';',
                         spacing: Alone,
-                        span: #23 bytes(469..470),
+                        span: #23 bytes(471..472),
                     },
                     Literal {
                         kind: Integer,
                         symbol: "0",
                         suffix: None,
-                        span: #23 bytes(471..472),
+                        span: #23 bytes(473..474),
                     },
                 ],
-                span: #23 bytes(450..474),
+                span: #23 bytes(452..476),
             },
             Punct {
                 ch: ',',
                 spacing: Alone,
-                span: #23 bytes(474..475),
+                span: #23 bytes(476..477),
             },
         ],
-        span: #23 bytes(432..485),
+        span: #23 bytes(434..487),
     },
 ]
diff --git a/tests/ui/proc-macro/gen-lifetime-token.rs b/tests/ui/proc-macro/gen-lifetime-token.rs
index d65efb5c464..4296d58df0d 100644
--- a/tests/ui/proc-macro/gen-lifetime-token.rs
+++ b/tests/ui/proc-macro/gen-lifetime-token.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:gen-lifetime-token.rs
+//@ proc-macro: gen-lifetime-token.rs
 
 extern crate gen_lifetime_token as bar;
 
diff --git a/tests/ui/proc-macro/gen-macro-rules-hygiene.rs b/tests/ui/proc-macro/gen-macro-rules-hygiene.rs
index 2bfbf9dccca..3deec94fa34 100644
--- a/tests/ui/proc-macro/gen-macro-rules-hygiene.rs
+++ b/tests/ui/proc-macro/gen-macro-rules-hygiene.rs
@@ -2,7 +2,7 @@
 // Local variables and labels are hygienic, items are not hygienic.
 // `$crate` refers to the crate that defines `macro_rules` and not the outer transparent macro.
 
-//@ aux-build:gen-macro-rules-hygiene.rs
+//@ proc-macro: gen-macro-rules-hygiene.rs
 
 #[macro_use]
 extern crate gen_macro_rules_hygiene;
diff --git a/tests/ui/proc-macro/gen-macro-rules.rs b/tests/ui/proc-macro/gen-macro-rules.rs
index 5f2cfc70d8e..121d029e2e3 100644
--- a/tests/ui/proc-macro/gen-macro-rules.rs
+++ b/tests/ui/proc-macro/gen-macro-rules.rs
@@ -1,7 +1,7 @@
 // Derive macros can generate `macro_rules` items, regression test for issue #63651.
 
 //@ check-pass
-//@ aux-build:gen-macro-rules.rs
+//@ proc-macro: gen-macro-rules.rs
 
 extern crate gen_macro_rules as repro;
 
diff --git a/tests/ui/proc-macro/generate-dollar-ident.rs b/tests/ui/proc-macro/generate-dollar-ident.rs
index c087a206566..54e872fefb6 100644
--- a/tests/ui/proc-macro/generate-dollar-ident.rs
+++ b/tests/ui/proc-macro/generate-dollar-ident.rs
@@ -2,7 +2,7 @@
 // without it being recognized as an unknown macro variable.
 
 //@ check-pass
-//@ aux-build:generate-dollar-ident.rs
+//@ proc-macro: generate-dollar-ident.rs
 
 extern crate generate_dollar_ident;
 use generate_dollar_ident::*;
diff --git a/tests/ui/proc-macro/generate-mod.rs b/tests/ui/proc-macro/generate-mod.rs
index ab93666f28a..729bfc1db66 100644
--- a/tests/ui/proc-macro/generate-mod.rs
+++ b/tests/ui/proc-macro/generate-mod.rs
@@ -1,6 +1,6 @@
 // Modules generated by transparent proc macros still acts as barriers for names (issue #50504).
 
-//@ aux-build:generate-mod.rs
+//@ proc-macro: generate-mod.rs
 
 extern crate generate_mod;
 
diff --git a/tests/ui/proc-macro/helper-attr-blocked-by-import-ambig.rs b/tests/ui/proc-macro/helper-attr-blocked-by-import-ambig.rs
index 03bb04b7786..1197dd7f3bf 100644
--- a/tests/ui/proc-macro/helper-attr-blocked-by-import-ambig.rs
+++ b/tests/ui/proc-macro/helper-attr-blocked-by-import-ambig.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use(Empty)]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/helper-attr-blocked-by-import.rs b/tests/ui/proc-macro/helper-attr-blocked-by-import.rs
index 03c30783411..53c079fd19c 100644
--- a/tests/ui/proc-macro/helper-attr-blocked-by-import.rs
+++ b/tests/ui/proc-macro/helper-attr-blocked-by-import.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use(Empty)]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/helper-attr-builtin-derive.rs b/tests/ui/proc-macro/helper-attr-builtin-derive.rs
index eb7292e093c..7d36e055c14 100644
--- a/tests/ui/proc-macro/helper-attr-builtin-derive.rs
+++ b/tests/ui/proc-macro/helper-attr-builtin-derive.rs
@@ -2,7 +2,7 @@
 // other built-in derive macros.
 // issue: rust-lang/rust#132561
 //@ check-pass
-//@ aux-build:helper-attr.rs
+//@ proc-macro: helper-attr.rs
 //@ edition:2021
 
 #[macro_use]
diff --git a/tests/ui/proc-macro/hygiene_example.rs b/tests/ui/proc-macro/hygiene_example.rs
index 6c3e1067436..84b5e345608 100644
--- a/tests/ui/proc-macro/hygiene_example.rs
+++ b/tests/ui/proc-macro/hygiene_example.rs
@@ -1,5 +1,4 @@
 //@ check-pass
-//@ aux-build:hygiene_example_codegen.rs
 //@ aux-build:hygiene_example.rs
 
 extern crate hygiene_example;
diff --git a/tests/ui/proc-macro/import.rs b/tests/ui/proc-macro/import.rs
index 53dc0f4cbed..44a37dad5c5 100644
--- a/tests/ui/proc-macro/import.rs
+++ b/tests/ui/proc-macro/import.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 extern crate test_macros;
 
diff --git a/tests/ui/proc-macro/inert-attribute-order.rs b/tests/ui/proc-macro/inert-attribute-order.rs
index bca4df96040..5a4eae03594 100644
--- a/tests/ui/proc-macro/inert-attribute-order.rs
+++ b/tests/ui/proc-macro/inert-attribute-order.rs
@@ -2,7 +2,7 @@
 
 //@ check-pass
 //@ compile-flags: -Z span-debug
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![no_std] // Don't load unnecessary hygiene information from std
 extern crate std;
diff --git a/tests/ui/proc-macro/inner-attr-non-inline-mod.rs b/tests/ui/proc-macro/inner-attr-non-inline-mod.rs
index df006a4d7a9..714463b6225 100644
--- a/tests/ui/proc-macro/inner-attr-non-inline-mod.rs
+++ b/tests/ui/proc-macro/inner-attr-non-inline-mod.rs
@@ -2,7 +2,7 @@
 //@ error-pattern:custom inner attributes are unstable
 //@ error-pattern:inner macro attributes are unstable
 //@ error-pattern:this was previously accepted
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![no_std] // Don't load unnecessary hygiene information from std
 extern crate std;
diff --git a/tests/ui/proc-macro/inner-attrs.rs b/tests/ui/proc-macro/inner-attrs.rs
index 45bb4d3c5bf..34c37ddfac3 100644
--- a/tests/ui/proc-macro/inner-attrs.rs
+++ b/tests/ui/proc-macro/inner-attrs.rs
@@ -1,7 +1,7 @@
 // gate-test-custom_inner_attributes
 //@ compile-flags: -Z span-debug --error-format human
 //@ error-pattern:expected non-macro inner attribute
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ edition:2018
 
 #![feature(custom_inner_attributes)]
diff --git a/tests/ui/proc-macro/input-interpolated.rs b/tests/ui/proc-macro/input-interpolated.rs
index d84572a6afe..a20fe72c6d5 100644
--- a/tests/ui/proc-macro/input-interpolated.rs
+++ b/tests/ui/proc-macro/input-interpolated.rs
@@ -2,7 +2,7 @@
 
 //@ check-pass
 //@ edition:2018
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![no_std] // Don't load unnecessary hygiene information from std
 extern crate std;
diff --git a/tests/ui/proc-macro/input-interpolated.stdout b/tests/ui/proc-macro/input-interpolated.stdout
index 1bccd8806be..b567292ea9a 100644
--- a/tests/ui/proc-macro/input-interpolated.stdout
+++ b/tests/ui/proc-macro/input-interpolated.stdout
@@ -2,58 +2,58 @@ PRINT-BANG INPUT (DISPLAY): A
 PRINT-BANG INPUT (DEBUG): TokenStream [
     Ident {
         ident: "A",
-        span: #0 bytes(506..507),
+        span: #0 bytes(508..509),
     },
 ]
 PRINT-ATTR INPUT (DISPLAY): const A : u8 = 0;
 PRINT-ATTR INPUT (DEBUG): TokenStream [
     Ident {
         ident: "const",
-        span: #3 bytes(419..424),
+        span: #3 bytes(421..426),
     },
     Ident {
         ident: "A",
-        span: #0 bytes(506..507),
+        span: #0 bytes(508..509),
     },
     Punct {
         ch: ':',
         spacing: Alone,
-        span: #3 bytes(427..428),
+        span: #3 bytes(429..430),
     },
     Ident {
         ident: "u8",
-        span: #3 bytes(429..431),
+        span: #3 bytes(431..433),
     },
     Punct {
         ch: '=',
         spacing: Alone,
-        span: #3 bytes(432..433),
+        span: #3 bytes(434..435),
     },
     Literal {
         kind: Integer,
         symbol: "0",
         suffix: None,
-        span: #3 bytes(434..435),
+        span: #3 bytes(436..437),
     },
     Punct {
         ch: ';',
         spacing: Alone,
-        span: #3 bytes(435..436),
+        span: #3 bytes(437..438),
     },
 ]
 PRINT-DERIVE INPUT (DISPLAY): struct A {}
 PRINT-DERIVE INPUT (DEBUG): TokenStream [
     Ident {
         ident: "struct",
-        span: #3 bytes(471..477),
+        span: #3 bytes(473..479),
     },
     Ident {
         ident: "A",
-        span: #0 bytes(506..507),
+        span: #0 bytes(508..509),
     },
     Group {
         delimiter: Brace,
         stream: TokenStream [],
-        span: #3 bytes(481..483),
+        span: #3 bytes(483..485),
     },
 ]
diff --git a/tests/ui/proc-macro/invalid-punct-ident-1.rs b/tests/ui/proc-macro/invalid-punct-ident-1.rs
index b0f163adc02..e7306a7e8ba 100644
--- a/tests/ui/proc-macro/invalid-punct-ident-1.rs
+++ b/tests/ui/proc-macro/invalid-punct-ident-1.rs
@@ -1,4 +1,4 @@
-//@ aux-build:invalid-punct-ident.rs
+//@ proc-macro: invalid-punct-ident.rs
 //@ needs-unwind proc macro panics to report errors
 
 #[macro_use]
diff --git a/tests/ui/proc-macro/invalid-punct-ident-2.rs b/tests/ui/proc-macro/invalid-punct-ident-2.rs
index b1f7f570d3f..14656652e1d 100644
--- a/tests/ui/proc-macro/invalid-punct-ident-2.rs
+++ b/tests/ui/proc-macro/invalid-punct-ident-2.rs
@@ -1,4 +1,4 @@
-//@ aux-build:invalid-punct-ident.rs
+//@ proc-macro: invalid-punct-ident.rs
 //@ needs-unwind proc macro panics to report errors
 
 #[macro_use]
diff --git a/tests/ui/proc-macro/invalid-punct-ident-3.rs b/tests/ui/proc-macro/invalid-punct-ident-3.rs
index 7698d2c4b39..266e8d3d925 100644
--- a/tests/ui/proc-macro/invalid-punct-ident-3.rs
+++ b/tests/ui/proc-macro/invalid-punct-ident-3.rs
@@ -1,4 +1,4 @@
-//@ aux-build:invalid-punct-ident.rs
+//@ proc-macro: invalid-punct-ident.rs
 //@ needs-unwind proc macro panics to report errors
 
 #[macro_use]
diff --git a/tests/ui/proc-macro/invalid-punct-ident-4.rs b/tests/ui/proc-macro/invalid-punct-ident-4.rs
index 042fe6c600d..dbffddd1585 100644
--- a/tests/ui/proc-macro/invalid-punct-ident-4.rs
+++ b/tests/ui/proc-macro/invalid-punct-ident-4.rs
@@ -1,4 +1,4 @@
-//@ aux-build:invalid-punct-ident.rs
+//@ proc-macro: invalid-punct-ident.rs
 //@ needs-unwind proc macro panics to report errors
 
 #[macro_use]
diff --git a/tests/ui/proc-macro/is-available.rs b/tests/ui/proc-macro/is-available.rs
index 36fd44b266f..faee560d7a9 100644
--- a/tests/ui/proc-macro/is-available.rs
+++ b/tests/ui/proc-macro/is-available.rs
@@ -2,7 +2,7 @@
 
 extern crate proc_macro;
 
-//@ aux-build:is-available.rs
+//@ proc-macro: is-available.rs
 extern crate is_available;
 
 fn main() {
diff --git a/tests/ui/proc-macro/issue-104884-trait-impl-sugg-err.rs b/tests/ui/proc-macro/issue-104884-trait-impl-sugg-err.rs
index 29793e9f734..abdd6bf136d 100644
--- a/tests/ui/proc-macro/issue-104884-trait-impl-sugg-err.rs
+++ b/tests/ui/proc-macro/issue-104884-trait-impl-sugg-err.rs
@@ -1,4 +1,4 @@
-//@ aux-build:issue-104884.rs
+//@ proc-macro: issue-104884.rs
 
 use std::collections::BinaryHeap;
 
diff --git a/tests/ui/proc-macro/issue-107113-wrap.rs b/tests/ui/proc-macro/issue-107113-wrap.rs
index 01bf3615acf..2799e79bb1c 100644
--- a/tests/ui/proc-macro/issue-107113-wrap.rs
+++ b/tests/ui/proc-macro/issue-107113-wrap.rs
@@ -1,5 +1,5 @@
 //@ edition:2021
-//@ aux-build:issue-107113.rs
+//@ proc-macro: issue-107113.rs
 
 #[macro_use]
 extern crate issue_107113;
diff --git a/tests/ui/proc-macro/issue-118809.rs b/tests/ui/proc-macro/issue-118809.rs
index 770b19e8172..a6a3956981a 100644
--- a/tests/ui/proc-macro/issue-118809.rs
+++ b/tests/ui/proc-macro/issue-118809.rs
@@ -1,4 +1,4 @@
-//@ aux-build: issue-118809.rs
+//@ proc-macro: issue-118809.rs
 
 #[macro_use]
 extern crate issue_118809;
diff --git a/tests/ui/proc-macro/issue-36935.rs b/tests/ui/proc-macro/issue-36935.rs
index eb019d1e174..51d85c7dfa9 100644
--- a/tests/ui/proc-macro/issue-36935.rs
+++ b/tests/ui/proc-macro/issue-36935.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ needs-unwind proc macro panics to report errors
 
 #[macro_use]
diff --git a/tests/ui/proc-macro/issue-37788.rs b/tests/ui/proc-macro/issue-37788.rs
index c32ab6b8116..b44525b3b20 100644
--- a/tests/ui/proc-macro/issue-37788.rs
+++ b/tests/ui/proc-macro/issue-37788.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/issue-38586.rs b/tests/ui/proc-macro/issue-38586.rs
index 54d5d1038a6..88dbb8037be 100644
--- a/tests/ui/proc-macro/issue-38586.rs
+++ b/tests/ui/proc-macro/issue-38586.rs
@@ -1,4 +1,4 @@
-//@ aux-build:issue-38586.rs
+//@ proc-macro: issue-38586.rs
 
 #[macro_use]
 extern crate issue_38586;
diff --git a/tests/ui/proc-macro/issue-39889.rs b/tests/ui/proc-macro/issue-39889.rs
index 687aefbc068..a10fa02e14a 100644
--- a/tests/ui/proc-macro/issue-39889.rs
+++ b/tests/ui/proc-macro/issue-39889.rs
@@ -1,7 +1,7 @@
 //@ run-pass
 
 #![allow(dead_code, unused_macros)]
-//@ aux-build:issue-39889.rs
+//@ proc-macro: issue-39889.rs
 
 extern crate issue_39889;
 use issue_39889::Issue39889;
diff --git a/tests/ui/proc-macro/issue-42708.rs b/tests/ui/proc-macro/issue-42708.rs
index 27cb2f73d56..9eb616008de 100644
--- a/tests/ui/proc-macro/issue-42708.rs
+++ b/tests/ui/proc-macro/issue-42708.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:issue-42708.rs
+//@ proc-macro: issue-42708.rs
 
 #![feature(decl_macro)]
 #![allow(unused)]
diff --git a/tests/ui/proc-macro/issue-50061.rs b/tests/ui/proc-macro/issue-50061.rs
index 34999bb5070..8a660c2f350 100644
--- a/tests/ui/proc-macro/issue-50061.rs
+++ b/tests/ui/proc-macro/issue-50061.rs
@@ -1,7 +1,7 @@
 //@ run-pass
 
 #![allow(path_statements)]
-//@ aux-build:issue-50061.rs
+//@ proc-macro: issue-50061.rs
 
 #![feature(decl_macro)]
 
diff --git a/tests/ui/proc-macro/issue-50493.rs b/tests/ui/proc-macro/issue-50493.rs
index 5456eddb78d..e23f1f7c7d8 100644
--- a/tests/ui/proc-macro/issue-50493.rs
+++ b/tests/ui/proc-macro/issue-50493.rs
@@ -1,4 +1,4 @@
-//@ aux-build:issue-50493.rs
+//@ proc-macro: issue-50493.rs
 
 #[macro_use]
 extern crate issue_50493;
diff --git a/tests/ui/proc-macro/issue-53481.rs b/tests/ui/proc-macro/issue-53481.rs
index 636b8e0c0ae..11e11e2e6b6 100644
--- a/tests/ui/proc-macro/issue-53481.rs
+++ b/tests/ui/proc-macro/issue-53481.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/issue-59191-replace-root-with-fn.rs b/tests/ui/proc-macro/issue-59191-replace-root-with-fn.rs
index 24e3be0ed2e..c1b55fd99df 100644
--- a/tests/ui/proc-macro/issue-59191-replace-root-with-fn.rs
+++ b/tests/ui/proc-macro/issue-59191-replace-root-with-fn.rs
@@ -2,7 +2,7 @@
 // `issue_59191::no_main` replaces whatever's passed in with `fn main() {}`.
 
 //@ edition:2018
-//@ aux-crate:issue_59191=issue-59191.rs
+//@ proc-macro: issue-59191.rs
 //@ error-pattern: requires `sized` lang_item
 
 #![feature(custom_inner_attributes)]
diff --git a/tests/ui/proc-macro/issue-66286.rs b/tests/ui/proc-macro/issue-66286.rs
index 3ca064768b2..57d1af26e93 100644
--- a/tests/ui/proc-macro/issue-66286.rs
+++ b/tests/ui/proc-macro/issue-66286.rs
@@ -1,4 +1,4 @@
-//@ aux-build:issue-66286.rs
+//@ proc-macro: issue-66286.rs
 
 // Regression test for #66286.
 
diff --git a/tests/ui/proc-macro/issue-73933-procedural-masquerade.rs b/tests/ui/proc-macro/issue-73933-procedural-masquerade.rs
index 8f07cd34cc9..3421d13f4d9 100644
--- a/tests/ui/proc-macro/issue-73933-procedural-masquerade.rs
+++ b/tests/ui/proc-macro/issue-73933-procedural-masquerade.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ check-pass
 
 #[macro_use]
diff --git a/tests/ui/proc-macro/issue-73933-procedural-masquerade.stdout b/tests/ui/proc-macro/issue-73933-procedural-masquerade.stdout
index 5e39c01ab5e..83a3f580958 100644
--- a/tests/ui/proc-macro/issue-73933-procedural-masquerade.stdout
+++ b/tests/ui/proc-macro/issue-73933-procedural-masquerade.stdout
@@ -2,20 +2,20 @@ PRINT-DERIVE INPUT (DISPLAY): enum ProceduralMasqueradeDummyType { Input }
 PRINT-DERIVE INPUT (DEBUG): TokenStream [
     Ident {
         ident: "enum",
-        span: #0 bytes(102..106),
+        span: #0 bytes(104..108),
     },
     Ident {
         ident: "ProceduralMasqueradeDummyType",
-        span: #0 bytes(107..136),
+        span: #0 bytes(109..138),
     },
     Group {
         delimiter: Brace,
         stream: TokenStream [
             Ident {
                 ident: "Input",
-                span: #0 bytes(143..148),
+                span: #0 bytes(145..150),
             },
         ],
-        span: #0 bytes(137..150),
+        span: #0 bytes(139..152),
     },
 ]
diff --git a/tests/ui/proc-macro/issue-75734-pp-paren.rs b/tests/ui/proc-macro/issue-75734-pp-paren.rs
index ab0f4f72e62..d084c4a2873 100644
--- a/tests/ui/proc-macro/issue-75734-pp-paren.rs
+++ b/tests/ui/proc-macro/issue-75734-pp-paren.rs
@@ -3,7 +3,7 @@
 // normally insert extra parentheses.
 
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ compile-flags: -Z span-debug
 
 #![no_std] // Don't load unnecessary hygiene information from std
diff --git a/tests/ui/proc-macro/issue-75801.rs b/tests/ui/proc-macro/issue-75801.rs
index f0a1940cb5c..feda5e60b0d 100644
--- a/tests/ui/proc-macro/issue-75801.rs
+++ b/tests/ui/proc-macro/issue-75801.rs
@@ -1,4 +1,4 @@
-//@ aux-build: issue-75801.rs
+//@ proc-macro: issue-75801.rs
 
 // Regression test for #75801.
 
diff --git a/tests/ui/proc-macro/issue-75930-derive-cfg.rs b/tests/ui/proc-macro/issue-75930-derive-cfg.rs
index f480de24e3e..376a8ea4278 100644
--- a/tests/ui/proc-macro/issue-75930-derive-cfg.rs
+++ b/tests/ui/proc-macro/issue-75930-derive-cfg.rs
@@ -1,6 +1,6 @@
 //@ check-pass
 //@ compile-flags: -Z span-debug
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 // Regression test for issue #75930
 // Tests that we cfg-strip all targets before invoking
diff --git a/tests/ui/proc-macro/issue-76182-leading-vert-pat.rs b/tests/ui/proc-macro/issue-76182-leading-vert-pat.rs
index dc40a1715a6..218debf3e7c 100644
--- a/tests/ui/proc-macro/issue-76182-leading-vert-pat.rs
+++ b/tests/ui/proc-macro/issue-76182-leading-vert-pat.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ compile-flags: -Z span-debug
 //
 // Regression test for issue #76182
diff --git a/tests/ui/proc-macro/issue-76270-panic-in-libproc-macro.rs b/tests/ui/proc-macro/issue-76270-panic-in-libproc-macro.rs
index 001a09fc552..2a003c30bf9 100644
--- a/tests/ui/proc-macro/issue-76270-panic-in-libproc-macro.rs
+++ b/tests/ui/proc-macro/issue-76270-panic-in-libproc-macro.rs
@@ -1,4 +1,4 @@
-//@ aux-build:proc-macro-panic.rs
+//@ proc-macro: proc-macro-panic.rs
 //@ edition:2018
 //@ needs-unwind proc macro panics to report errors
 
diff --git a/tests/ui/proc-macro/issue-78675-captured-inner-attrs.rs b/tests/ui/proc-macro/issue-78675-captured-inner-attrs.rs
index d3716b22729..63e8af31027 100644
--- a/tests/ui/proc-macro/issue-78675-captured-inner-attrs.rs
+++ b/tests/ui/proc-macro/issue-78675-captured-inner-attrs.rs
@@ -1,7 +1,7 @@
 //@ check-pass
 //@ edition:2018
 //@ compile-flags: -Z span-debug
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![no_std] // Don't load unnecessary hygiene information from std
 extern crate std;
diff --git a/tests/ui/proc-macro/issue-79148.rs b/tests/ui/proc-macro/issue-79148.rs
index 96ee5e033e1..b2248759b5f 100644
--- a/tests/ui/proc-macro/issue-79148.rs
+++ b/tests/ui/proc-macro/issue-79148.rs
@@ -1,4 +1,4 @@
-//@ aux-build:re-export.rs
+//@ proc-macro: re-export.rs
 //@ edition:2018
 
 extern crate re_export;
diff --git a/tests/ui/proc-macro/issue-79242-slow-retokenize-check.rs b/tests/ui/proc-macro/issue-79242-slow-retokenize-check.rs
index d0c14d8b5d0..3306bc21e3a 100644
--- a/tests/ui/proc-macro/issue-79242-slow-retokenize-check.rs
+++ b/tests/ui/proc-macro/issue-79242-slow-retokenize-check.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:issue-79242.rs
+//@ proc-macro: issue-79242.rs
 
 // Regression test for issue #79242
 // Tests that compilation time doesn't blow up for a proc-macro
diff --git a/tests/ui/proc-macro/issue-79825.rs b/tests/ui/proc-macro/issue-79825.rs
index f846bb40486..67b79172bb3 100644
--- a/tests/ui/proc-macro/issue-79825.rs
+++ b/tests/ui/proc-macro/issue-79825.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:issue-79825.rs
+//@ proc-macro: issue-79825.rs
 #![feature(trait_alias)]
 
 extern crate issue_79825;
diff --git a/tests/ui/proc-macro/issue-80760-empty-stmt.rs b/tests/ui/proc-macro/issue-80760-empty-stmt.rs
index 59244e12eb8..b940da6778a 100644
--- a/tests/ui/proc-macro/issue-80760-empty-stmt.rs
+++ b/tests/ui/proc-macro/issue-80760-empty-stmt.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ compile-flags: -Z span-debug
 
 #![no_std] // Don't load unnecessary hygiene information from std
diff --git a/tests/ui/proc-macro/issue-81007-item-attrs.rs b/tests/ui/proc-macro/issue-81007-item-attrs.rs
index ab47c9df081..f3b8aa8c7c5 100644
--- a/tests/ui/proc-macro/issue-81007-item-attrs.rs
+++ b/tests/ui/proc-macro/issue-81007-item-attrs.rs
@@ -1,7 +1,7 @@
 //@ check-pass
 //@ edition:2018
 //@ compile-flags: -Z span-debug
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![feature(rustc_attrs)]
 
diff --git a/tests/ui/proc-macro/issue-81543-item-parse-err.rs b/tests/ui/proc-macro/issue-81543-item-parse-err.rs
index f3c307318a0..6cd8c0d6c40 100644
--- a/tests/ui/proc-macro/issue-81543-item-parse-err.rs
+++ b/tests/ui/proc-macro/issue-81543-item-parse-err.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 // Regression test for issue #81543
 // Tests that we emit a properly spanned error
diff --git a/tests/ui/proc-macro/issue-81555.rs b/tests/ui/proc-macro/issue-81555.rs
index 7a61a31952f..bbc7542cb24 100644
--- a/tests/ui/proc-macro/issue-81555.rs
+++ b/tests/ui/proc-macro/issue-81555.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 #![feature(stmt_expr_attributes, proc_macro_hygiene)]
 
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/issue-83510.rs b/tests/ui/proc-macro/issue-83510.rs
index ea8a334f57c..67469511fc3 100644
--- a/tests/ui/proc-macro/issue-83510.rs
+++ b/tests/ui/proc-macro/issue-83510.rs
@@ -1,4 +1,4 @@
-//@ aux-build: issue-83510.rs
+//@ proc-macro: issue-83510.rs
 
 extern crate issue_83510;
 
diff --git a/tests/ui/proc-macro/issue-86781-bad-inner-doc.fixed b/tests/ui/proc-macro/issue-86781-bad-inner-doc.fixed
index 367ad66a1a6..b8b3e6f3f7e 100644
--- a/tests/ui/proc-macro/issue-86781-bad-inner-doc.fixed
+++ b/tests/ui/proc-macro/issue-86781-bad-inner-doc.fixed
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ run-rustfix
 
 #[macro_use]
diff --git a/tests/ui/proc-macro/issue-86781-bad-inner-doc.rs b/tests/ui/proc-macro/issue-86781-bad-inner-doc.rs
index c49619ef2ac..ce1a0da6cad 100644
--- a/tests/ui/proc-macro/issue-86781-bad-inner-doc.rs
+++ b/tests/ui/proc-macro/issue-86781-bad-inner-doc.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ run-rustfix
 
 #[macro_use]
diff --git a/tests/ui/proc-macro/issue-91800.rs b/tests/ui/proc-macro/issue-91800.rs
index b69fce4cf77..bc78bcacfd0 100644
--- a/tests/ui/proc-macro/issue-91800.rs
+++ b/tests/ui/proc-macro/issue-91800.rs
@@ -1,4 +1,4 @@
-//@ aux-build: issue-91800-macro.rs
+//@ proc-macro: issue-91800-macro.rs
 
 #[macro_use]
 extern crate issue_91800_macro;
diff --git a/tests/ui/proc-macro/item-error.rs b/tests/ui/proc-macro/item-error.rs
index f3e3eafcd8d..5f798faf436 100644
--- a/tests/ui/proc-macro/item-error.rs
+++ b/tests/ui/proc-macro/item-error.rs
@@ -1,4 +1,4 @@
-//@ aux-build:derive-b.rs
+//@ proc-macro: derive-b.rs
 
 #![allow(warnings)]
 
diff --git a/tests/ui/proc-macro/keep-expr-tokens.rs b/tests/ui/proc-macro/keep-expr-tokens.rs
index ced7fad47b9..2bd66da90e2 100644
--- a/tests/ui/proc-macro/keep-expr-tokens.rs
+++ b/tests/ui/proc-macro/keep-expr-tokens.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ compile-flags: -Z span-debug
 
 #![feature(stmt_expr_attributes)]
diff --git a/tests/ui/proc-macro/lifetimes-rpass.rs b/tests/ui/proc-macro/lifetimes-rpass.rs
index a6b1f46a5d1..c462b27722f 100644
--- a/tests/ui/proc-macro/lifetimes-rpass.rs
+++ b/tests/ui/proc-macro/lifetimes-rpass.rs
@@ -1,7 +1,7 @@
 //@ run-pass
 
 #![allow(unused_variables)]
-//@ aux-build:lifetimes-rpass.rs
+//@ proc-macro: lifetimes-rpass.rs
 
 extern crate lifetimes_rpass as lifetimes;
 use lifetimes::*;
diff --git a/tests/ui/proc-macro/lifetimes.rs b/tests/ui/proc-macro/lifetimes.rs
index 0c5d3e2f72f..cfff3cb1785 100644
--- a/tests/ui/proc-macro/lifetimes.rs
+++ b/tests/ui/proc-macro/lifetimes.rs
@@ -1,4 +1,4 @@
-//@ aux-build:lifetimes.rs
+//@ proc-macro: lifetimes.rs
 
 extern crate lifetimes;
 
diff --git a/tests/ui/proc-macro/lints_in_proc_macros.rs b/tests/ui/proc-macro/lints_in_proc_macros.rs
index 13ae7239a14..6714b8b6e1d 100644
--- a/tests/ui/proc-macro/lints_in_proc_macros.rs
+++ b/tests/ui/proc-macro/lints_in_proc_macros.rs
@@ -1,4 +1,4 @@
-//@ aux-build:bang_proc_macro2.rs
+//@ proc-macro: bang_proc_macro2.rs
 
 extern crate bang_proc_macro2;
 
diff --git a/tests/ui/proc-macro/literal-to-string.rs b/tests/ui/proc-macro/literal-to-string.rs
index e87315fe144..7a56e08109c 100644
--- a/tests/ui/proc-macro/literal-to-string.rs
+++ b/tests/ui/proc-macro/literal-to-string.rs
@@ -1,7 +1,7 @@
 //@ check-pass
 //@ edition: 2021
 
-//@ aux-build: print-tokens.rs
+//@ proc-macro: print-tokens.rs
 extern crate print_tokens;
 
 fn main() {
diff --git a/tests/ui/proc-macro/literal-to-string.stdout b/tests/ui/proc-macro/literal-to-string.stdout
index c3114265e0a..18c0c20dde4 100644
--- a/tests/ui/proc-macro/literal-to-string.stdout
+++ b/tests/ui/proc-macro/literal-to-string.stdout
@@ -3,91 +3,91 @@ TokenStream [
         kind: Integer,
         symbol: "1",
         suffix: None,
-        span: #0 bytes(147..148),
+        span: #0 bytes(148..149),
     },
     Literal {
         kind: Integer,
         symbol: "17",
         suffix: Some("u8"),
-        span: #0 bytes(157..161),
+        span: #0 bytes(158..162),
     },
     Literal {
         kind: Float,
         symbol: "42.",
         suffix: None,
-        span: #0 bytes(170..173),
+        span: #0 bytes(171..174),
     },
     Literal {
         kind: Float,
         symbol: "3.14",
         suffix: Some("f32"),
-        span: #0 bytes(182..189),
+        span: #0 bytes(183..190),
     },
     Literal {
         kind: Byte,
         symbol: "a",
         suffix: None,
-        span: #0 bytes(198..202),
+        span: #0 bytes(199..203),
     },
     Literal {
         kind: Byte,
         symbol: "\xFF",
         suffix: None,
-        span: #0 bytes(211..218),
+        span: #0 bytes(212..219),
     },
     Literal {
         kind: Char,
         symbol: "c",
         suffix: None,
-        span: #0 bytes(227..230),
+        span: #0 bytes(228..231),
     },
     Literal {
         kind: Char,
         symbol: "\x32",
         suffix: None,
-        span: #0 bytes(239..245),
+        span: #0 bytes(240..246),
     },
     Literal {
         kind: Str,
         symbol: "\\"str\\"",
         suffix: None,
-        span: #0 bytes(254..263),
+        span: #0 bytes(255..264),
     },
     Literal {
         kind: StrRaw(1),
         symbol: "\"raw\" str",
         suffix: None,
-        span: #0 bytes(272..286),
+        span: #0 bytes(273..287),
     },
     Literal {
         kind: StrRaw(3),
         symbol: "very ##\"raw\"## str",
         suffix: None,
-        span: #0 bytes(295..322),
+        span: #0 bytes(296..323),
     },
     Literal {
         kind: ByteStr,
         symbol: "\\"byte\\" str",
         suffix: None,
-        span: #0 bytes(331..346),
+        span: #0 bytes(332..347),
     },
     Literal {
         kind: ByteStrRaw(1),
         symbol: "\"raw\" \"byte\" str",
         suffix: None,
-        span: #0 bytes(355..377),
+        span: #0 bytes(356..378),
     },
     Literal {
         kind: CStr,
         symbol: "\\"c\\" str",
         suffix: None,
-        span: #0 bytes(386..398),
+        span: #0 bytes(387..399),
     },
     Literal {
         kind: CStrRaw(1),
         symbol: "\"raw\" \"c\" str",
         suffix: None,
-        span: #0 bytes(407..426),
+        span: #0 bytes(408..427),
     },
 ]
 1
diff --git a/tests/ui/proc-macro/load-panic-backtrace.rs b/tests/ui/proc-macro/load-panic-backtrace.rs
index 15badedef97..302bcaea75e 100644
--- a/tests/ui/proc-macro/load-panic-backtrace.rs
+++ b/tests/ui/proc-macro/load-panic-backtrace.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ compile-flags: -Z proc-macro-backtrace
 //@ rustc-env:RUST_BACKTRACE=0
 //@ normalize-stderr-test: "thread '.*' panicked " -> ""
diff --git a/tests/ui/proc-macro/load-panic-backtrace.stderr b/tests/ui/proc-macro/load-panic-backtrace.stderr
index 18f51358672..0f3db6c831e 100644
--- a/tests/ui/proc-macro/load-panic-backtrace.stderr
+++ b/tests/ui/proc-macro/load-panic-backtrace.stderr
@@ -1,4 +1,4 @@
-at $DIR/auxiliary/test-macros.rs:43:5:
+at $DIR/auxiliary/test-macros.rs:38:5:
 panic-derive
 error: proc-macro derive panicked
   --> $DIR/load-panic-backtrace.rs:11:10
diff --git a/tests/ui/proc-macro/load-panic.rs b/tests/ui/proc-macro/load-panic.rs
index 50475a34226..18bfb71050b 100644
--- a/tests/ui/proc-macro/load-panic.rs
+++ b/tests/ui/proc-macro/load-panic.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ needs-unwind proc macro panics to report errors
 
 #[macro_use]
diff --git a/tests/ui/proc-macro/load-two.rs b/tests/ui/proc-macro/load-two.rs
index 44fcdb056dd..608379949e6 100644
--- a/tests/ui/proc-macro/load-two.rs
+++ b/tests/ui/proc-macro/load-two.rs
@@ -2,8 +2,8 @@
 
 #![allow(path_statements)]
 #![allow(dead_code)]
-//@ aux-build:derive-atob.rs
-//@ aux-build:derive-ctod.rs
+//@ proc-macro: derive-atob.rs
+//@ proc-macro: derive-ctod.rs
 
 #[macro_use]
 extern crate derive_atob;
diff --git a/tests/ui/proc-macro/macro-brackets.rs b/tests/ui/proc-macro/macro-brackets.rs
index 91bd652d37b..70686eed0bd 100644
--- a/tests/ui/proc-macro/macro-brackets.rs
+++ b/tests/ui/proc-macro/macro-brackets.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/macro-crate-multi-decorator.rs b/tests/ui/proc-macro/macro-crate-multi-decorator.rs
index 26a2d1592ab..c4f02e7adfc 100644
--- a/tests/ui/proc-macro/macro-crate-multi-decorator.rs
+++ b/tests/ui/proc-macro/macro-crate-multi-decorator.rs
@@ -1,7 +1,7 @@
 // The duplicate macro will create a copy of the item with the given identifier.
 
 //@ check-pass
-//@ aux-build:duplicate.rs
+//@ proc-macro: duplicate.rs
 
 #[macro_use]
 extern crate duplicate;
diff --git a/tests/ui/proc-macro/macro-quote-cond.rs b/tests/ui/proc-macro/macro-quote-cond.rs
index 3658e2a28f2..062511eec9b 100644
--- a/tests/ui/proc-macro/macro-quote-cond.rs
+++ b/tests/ui/proc-macro/macro-quote-cond.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:cond_plugin.rs
+//@ proc-macro: cond_plugin.rs
 
 #![allow(unused_parens)]
 
diff --git a/tests/ui/proc-macro/macro-rules-derive-cfg.rs b/tests/ui/proc-macro/macro-rules-derive-cfg.rs
index c34f1695761..ab504bc63a2 100644
--- a/tests/ui/proc-macro/macro-rules-derive-cfg.rs
+++ b/tests/ui/proc-macro/macro-rules-derive-cfg.rs
@@ -1,6 +1,6 @@
 //@ check-pass
 //@ compile-flags: -Z span-debug --error-format human
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![feature(rustc_attrs)]
 #![feature(stmt_expr_attributes)]
diff --git a/tests/ui/proc-macro/macro-rules-derive.rs b/tests/ui/proc-macro/macro-rules-derive.rs
index 4023a9a044a..c4e906fb5ed 100644
--- a/tests/ui/proc-macro/macro-rules-derive.rs
+++ b/tests/ui/proc-macro/macro-rules-derive.rs
@@ -1,4 +1,4 @@
-//@ aux-build:first-second.rs
+//@ proc-macro: first-second.rs
 
 extern crate first_second;
 use first_second::*;
diff --git a/tests/ui/proc-macro/macro-use-attr.rs b/tests/ui/proc-macro/macro-use-attr.rs
index fe071b26383..b2d4b9e6ffa 100644
--- a/tests/ui/proc-macro/macro-use-attr.rs
+++ b/tests/ui/proc-macro/macro-use-attr.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/macro-use-bang.rs b/tests/ui/proc-macro/macro-use-bang.rs
index f8ccba6b094..9397baff1d6 100644
--- a/tests/ui/proc-macro/macro-use-bang.rs
+++ b/tests/ui/proc-macro/macro-use-bang.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/macro_rules_edition_from_pm.rs b/tests/ui/proc-macro/macro_rules_edition_from_pm.rs
index 3ba80f5177a..57ed54fd1df 100644
--- a/tests/ui/proc-macro/macro_rules_edition_from_pm.rs
+++ b/tests/ui/proc-macro/macro_rules_edition_from_pm.rs
@@ -2,7 +2,7 @@
 // proc-macro.
 // See https://github.com/rust-lang/rust/issues/132906
 
-//@ aux-crate: macro_rules_edition_pm=macro_rules_edition_pm.rs
+//@ proc-macro: macro_rules_edition_pm.rs
 //@ revisions: edition2021 edition2024
 //@[edition2021] edition:2021
 //@[edition2024] edition:2024
diff --git a/tests/ui/proc-macro/macros-in-extern.rs b/tests/ui/proc-macro/macros-in-extern.rs
index da384d1b141..f39322d126e 100644
--- a/tests/ui/proc-macro/macros-in-extern.rs
+++ b/tests/ui/proc-macro/macros-in-extern.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/macros-in-type.rs b/tests/ui/proc-macro/macros-in-type.rs
index 4db7cf273f7..1874bb80db3 100644
--- a/tests/ui/proc-macro/macros-in-type.rs
+++ b/tests/ui/proc-macro/macros-in-type.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/meta-macro-hygiene.rs b/tests/ui/proc-macro/meta-macro-hygiene.rs
index 98496d5a4c6..9fbe9763b44 100644
--- a/tests/ui/proc-macro/meta-macro-hygiene.rs
+++ b/tests/ui/proc-macro/meta-macro-hygiene.rs
@@ -1,5 +1,5 @@
 //@ aux-build:make-macro.rs
-//@ aux-build:meta-macro.rs
+//@ proc-macro: meta-macro.rs
 //@ edition:2018
 //@ compile-flags: -Z span-debug -Z macro-backtrace -Z unpretty=expanded,hygiene -Z trim-diagnostic-paths=no
 //@ check-pass
diff --git a/tests/ui/proc-macro/meta-macro-hygiene.stdout b/tests/ui/proc-macro/meta-macro-hygiene.stdout
index 3c6ec6fbdd4..ae02b24e1d0 100644
--- a/tests/ui/proc-macro/meta-macro-hygiene.stdout
+++ b/tests/ui/proc-macro/meta-macro-hygiene.stdout
@@ -3,7 +3,7 @@ Input: TokenStream [Ident { ident: "$crate", span: $DIR/meta-macro-hygiene.rs:26
 Respanned: TokenStream [Ident { ident: "$crate", span: $DIR/auxiliary/make-macro.rs:7:9: 7:56 (#4) }, Punct { ch: ':', spacing: Joint, span: $DIR/auxiliary/make-macro.rs:7:9: 7:56 (#4) }, Punct { ch: ':', spacing: Alone, span: $DIR/auxiliary/make-macro.rs:7:9: 7:56 (#4) }, Ident { ident: "dummy", span: $DIR/auxiliary/make-macro.rs:7:9: 7:56 (#4) }, Punct { ch: '!', spacing: Alone, span: $DIR/auxiliary/make-macro.rs:7:9: 7:56 (#4) }, Group { delimiter: Parenthesis, stream: TokenStream [], span: $DIR/auxiliary/make-macro.rs:7:9: 7:56 (#4) }]
 #![feature /* 0#0 */(prelude_import)]
 //@ aux-build:make-macro.rs
-//@ aux-build:meta-macro.rs
+//@ proc-macro: meta-macro.rs
 //@ edition:2018
 //@ compile-flags: -Z span-debug -Z macro-backtrace -Z unpretty=expanded,hygiene -Z trim-diagnostic-paths=no
 //@ check-pass
diff --git a/tests/ui/proc-macro/meta-macro.rs b/tests/ui/proc-macro/meta-macro.rs
index abe63c60fb8..02ef45c0c21 100644
--- a/tests/ui/proc-macro/meta-macro.rs
+++ b/tests/ui/proc-macro/meta-macro.rs
@@ -1,5 +1,5 @@
 //@ aux-build:make-macro.rs
-//@ aux-build:meta-macro.rs
+//@ proc-macro: meta-macro.rs
 //@ edition:2018
 //@ compile-flags: -Z span-debug
 //@ run-pass
diff --git a/tests/ui/proc-macro/mixed-site-span.rs b/tests/ui/proc-macro/mixed-site-span.rs
index bab76a8c433..2b5d9757043 100644
--- a/tests/ui/proc-macro/mixed-site-span.rs
+++ b/tests/ui/proc-macro/mixed-site-span.rs
@@ -1,6 +1,6 @@
 // Proc macros using `mixed_site` spans exhibit usual properties of `macro_rules` hygiene.
 
-//@ aux-build:mixed-site-span.rs
+//@ proc-macro: mixed-site-span.rs
 
 #[macro_use]
 extern crate mixed_site_span;
diff --git a/tests/ui/proc-macro/modify-ast.rs b/tests/ui/proc-macro/modify-ast.rs
index 4c125c1c6e8..9e890f3ebaa 100644
--- a/tests/ui/proc-macro/modify-ast.rs
+++ b/tests/ui/proc-macro/modify-ast.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:modify-ast.rs
+//@ proc-macro: modify-ast.rs
 
 extern crate modify_ast;
 
diff --git a/tests/ui/proc-macro/multispan.rs b/tests/ui/proc-macro/multispan.rs
index 60f67c8c67c..e06aa9f7c5a 100644
--- a/tests/ui/proc-macro/multispan.rs
+++ b/tests/ui/proc-macro/multispan.rs
@@ -1,4 +1,4 @@
-//@ aux-build:multispan.rs
+//@ proc-macro: multispan.rs
 
 extern crate multispan;
 
diff --git a/tests/ui/proc-macro/negative-token.rs b/tests/ui/proc-macro/negative-token.rs
index 32408e0d936..8c6fa9ca689 100644
--- a/tests/ui/proc-macro/negative-token.rs
+++ b/tests/ui/proc-macro/negative-token.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:negative-token.rs
+//@ proc-macro: negative-token.rs
 
 extern crate negative_token;
 
diff --git a/tests/ui/proc-macro/nested-derive-cfg.rs b/tests/ui/proc-macro/nested-derive-cfg.rs
index 696a5024ec2..bd8f231ac2c 100644
--- a/tests/ui/proc-macro/nested-derive-cfg.rs
+++ b/tests/ui/proc-macro/nested-derive-cfg.rs
@@ -1,5 +1,5 @@
 //@ compile-flags: -Z span-debug --error-format human
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ check-pass
 
 #![no_std] // Don't load unnecessary hygiene information from std
diff --git a/tests/ui/proc-macro/nested-item-spans.rs b/tests/ui/proc-macro/nested-item-spans.rs
index c19af0f9796..f7e2365586d 100644
--- a/tests/ui/proc-macro/nested-item-spans.rs
+++ b/tests/ui/proc-macro/nested-item-spans.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/nested-macro-rules.rs b/tests/ui/proc-macro/nested-macro-rules.rs
index 2f0d85c4bbf..95a38e4c1b6 100644
--- a/tests/ui/proc-macro/nested-macro-rules.rs
+++ b/tests/ui/proc-macro/nested-macro-rules.rs
@@ -1,6 +1,6 @@
 //@ run-pass
 //@ aux-build:nested-macro-rules.rs
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ compile-flags: -Z span-debug -Z macro-backtrace
 //@ edition:2018
 
diff --git a/tests/ui/proc-macro/nested-nonterminal-tokens.rs b/tests/ui/proc-macro/nested-nonterminal-tokens.rs
index 6e28cabd2fe..630e33dbd83 100644
--- a/tests/ui/proc-macro/nested-nonterminal-tokens.rs
+++ b/tests/ui/proc-macro/nested-nonterminal-tokens.rs
@@ -1,7 +1,7 @@
 //@ check-pass
 //@ edition:2018
 //@ compile-flags: -Z span-debug
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 // Tests that we properly pass tokens to proc-macro when nested
 // nonterminals are involved.
diff --git a/tests/ui/proc-macro/no-macro-use-attr.rs b/tests/ui/proc-macro/no-macro-use-attr.rs
index ae507a31ba7..d44f51bfd8d 100644
--- a/tests/ui/proc-macro/no-macro-use-attr.rs
+++ b/tests/ui/proc-macro/no-macro-use-attr.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![feature(rustc_attrs)]
 #![warn(unused_extern_crates)]
diff --git a/tests/ui/proc-macro/nodelim-groups.rs b/tests/ui/proc-macro/nodelim-groups.rs
index f13d97aaff5..9acdc7023c0 100644
--- a/tests/ui/proc-macro/nodelim-groups.rs
+++ b/tests/ui/proc-macro/nodelim-groups.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ compile-flags: -Z span-debug
 //@ edition:2018
 //
diff --git a/tests/ui/proc-macro/nonterminal-expansion.rs b/tests/ui/proc-macro/nonterminal-expansion.rs
index 96ea4aef85b..99a68996c30 100644
--- a/tests/ui/proc-macro/nonterminal-expansion.rs
+++ b/tests/ui/proc-macro/nonterminal-expansion.rs
@@ -1,6 +1,6 @@
 //@ check-pass
 //@ compile-flags: -Z span-debug
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![no_std] // Don't load unnecessary hygiene information from std
 extern crate std;
diff --git a/tests/ui/proc-macro/nonterminal-recollect-attr.rs b/tests/ui/proc-macro/nonterminal-recollect-attr.rs
index 7d922bafdcd..3f3348b18c1 100644
--- a/tests/ui/proc-macro/nonterminal-recollect-attr.rs
+++ b/tests/ui/proc-macro/nonterminal-recollect-attr.rs
@@ -1,6 +1,6 @@
 //@ check-pass
 //@ compile-flags: -Z span-debug
-//@ aux-build:nonterminal-recollect-attr.rs
+//@ proc-macro: nonterminal-recollect-attr.rs
 
 #![no_std] // Don't load unnecessary hygiene information from std
 extern crate std;
diff --git a/tests/ui/proc-macro/nonterminal-token-hygiene.rs b/tests/ui/proc-macro/nonterminal-token-hygiene.rs
index 6a4406b053d..76c71441c80 100644
--- a/tests/ui/proc-macro/nonterminal-token-hygiene.rs
+++ b/tests/ui/proc-macro/nonterminal-token-hygiene.rs
@@ -7,7 +7,7 @@
 //@ normalize-stdout-test: "\d+#" -> "0#"
 //@ normalize-stdout-test: "expn\d{3,}" -> "expnNNN"
 //@ normalize-stdout-test: "extern crate compiler_builtins /\* \d+ \*/" -> "extern crate compiler_builtins /* NNN */"
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![feature(decl_macro)]
 #![no_std] // Don't load unnecessary hygiene information from std
diff --git a/tests/ui/proc-macro/nonterminal-token-hygiene.stdout b/tests/ui/proc-macro/nonterminal-token-hygiene.stdout
index de3265e9281..1ad14059028 100644
--- a/tests/ui/proc-macro/nonterminal-token-hygiene.stdout
+++ b/tests/ui/proc-macro/nonterminal-token-hygiene.stdout
@@ -31,7 +31,7 @@ PRINT-BANG INPUT (DEBUG): TokenStream [
 //@ normalize-stdout-test: "\d+#" -> "0#"
 //@ normalize-stdout-test: "expn\d{3,}" -> "expnNNN"
 //@ normalize-stdout-test: "extern crate compiler_builtins /\* \d+ \*/" -> "extern crate compiler_builtins /* NNN */"
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![feature /* 0#0 */(decl_macro)]
 #![no_std /* 0#0 */]
diff --git a/tests/ui/proc-macro/not-joint.rs b/tests/ui/proc-macro/not-joint.rs
index 16b89bc6e81..c585e7e33dc 100644
--- a/tests/ui/proc-macro/not-joint.rs
+++ b/tests/ui/proc-macro/not-joint.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:not-joint.rs
+//@ proc-macro: not-joint.rs
 
 extern crate not_joint as bar;
 use bar::{tokens, nothing};
diff --git a/tests/ui/proc-macro/out-of-line-mod.rs b/tests/ui/proc-macro/out-of-line-mod.rs
index 2a4fb16a09a..efe9588bef6 100644
--- a/tests/ui/proc-macro/out-of-line-mod.rs
+++ b/tests/ui/proc-macro/out-of-line-mod.rs
@@ -1,7 +1,7 @@
 // Out-of-line module is found on the filesystem if passed through a proc macro (issue #58818).
 
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/parent-source-spans.rs b/tests/ui/proc-macro/parent-source-spans.rs
index 12a1ab1a43d..cc3ac795f7f 100644
--- a/tests/ui/proc-macro/parent-source-spans.rs
+++ b/tests/ui/proc-macro/parent-source-spans.rs
@@ -1,4 +1,4 @@
-//@ aux-build:parent-source-spans.rs
+//@ proc-macro: parent-source-spans.rs
 
 #![feature(decl_macro)]
 
diff --git a/tests/ui/proc-macro/parse-invis-delim-issue-128895.rs b/tests/ui/proc-macro/parse-invis-delim-issue-128895.rs
index 3d5af5fee21..2dc32202465 100644
--- a/tests/ui/proc-macro/parse-invis-delim-issue-128895.rs
+++ b/tests/ui/proc-macro/parse-invis-delim-issue-128895.rs
@@ -1,4 +1,4 @@
-//@ aux-build:parse-invis-delim-issue-128895.rs
+//@ proc-macro: parse-invis-delim-issue-128895.rs
 //@ check-pass
 
 #![no_std] // Don't load unnecessary hygiene information from std
diff --git a/tests/ui/proc-macro/pretty-print-hack-hide.rs b/tests/ui/proc-macro/pretty-print-hack-hide.rs
index 26db43341ab..fd98f16a780 100644
--- a/tests/ui/proc-macro/pretty-print-hack-hide.rs
+++ b/tests/ui/proc-macro/pretty-print-hack-hide.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ compile-flags: -Z span-debug
 //@ check-pass
 
diff --git a/tests/ui/proc-macro/pretty-print-hack-show.rs b/tests/ui/proc-macro/pretty-print-hack-show.rs
index 1b6794ae698..de6453c6a82 100644
--- a/tests/ui/proc-macro/pretty-print-hack-show.rs
+++ b/tests/ui/proc-macro/pretty-print-hack-show.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ compile-flags: -Z span-debug
 //@ revisions: local remapped
 // [local] no-remap-src-base: The hack should work regardless of remapping.
diff --git a/tests/ui/proc-macro/pretty-print-tts.rs b/tests/ui/proc-macro/pretty-print-tts.rs
index e3240e27c2a..b1b4f278e2a 100644
--- a/tests/ui/proc-macro/pretty-print-tts.rs
+++ b/tests/ui/proc-macro/pretty-print-tts.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ compile-flags: -Z span-debug
 
 #![feature(rustc_attrs)]
diff --git a/tests/ui/proc-macro/proc-macro-attributes.rs b/tests/ui/proc-macro/proc-macro-attributes.rs
index 6d5e7b67c78..455fcc56e58 100644
--- a/tests/ui/proc-macro/proc-macro-attributes.rs
+++ b/tests/ui/proc-macro/proc-macro-attributes.rs
@@ -1,4 +1,4 @@
-//@ aux-build:derive-b.rs
+//@ proc-macro: derive-b.rs
 
 #[macro_use]
 extern crate derive_b;
diff --git a/tests/ui/proc-macro/proc-macro-gates.rs b/tests/ui/proc-macro/proc-macro-gates.rs
index 585d9a3c9be..bf384bc479b 100644
--- a/tests/ui/proc-macro/proc-macro-gates.rs
+++ b/tests/ui/proc-macro/proc-macro-gates.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 // gate-test-proc_macro_hygiene
 
 #![feature(stmt_expr_attributes)]
diff --git a/tests/ui/proc-macro/proc-macro-gates2.rs b/tests/ui/proc-macro/proc-macro-gates2.rs
index 76d8036d8a4..450f64982b0 100644
--- a/tests/ui/proc-macro/proc-macro-gates2.rs
+++ b/tests/ui/proc-macro/proc-macro-gates2.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![feature(stmt_expr_attributes)]
 
diff --git a/tests/ui/proc-macro/raw-ident.rs b/tests/ui/proc-macro/raw-ident.rs
index 2ea2d3079dc..95ada295f5c 100644
--- a/tests/ui/proc-macro/raw-ident.rs
+++ b/tests/ui/proc-macro/raw-ident.rs
@@ -1,4 +1,4 @@
-//@ aux-build:raw-ident.rs
+//@ proc-macro: raw-ident.rs
 
 #[macro_use] extern crate raw_ident;
 
diff --git a/tests/ui/proc-macro/resolve-error.rs b/tests/ui/proc-macro/resolve-error.rs
index 2670d8884ae..0ca250194f0 100644
--- a/tests/ui/proc-macro/resolve-error.rs
+++ b/tests/ui/proc-macro/resolve-error.rs
@@ -1,6 +1,6 @@
-//@ aux-build:derive-foo.rs
-//@ aux-build:derive-clona.rs
-//@ aux-build:test-macros.rs
+//@ proc-macro: derive-foo.rs
+//@ proc-macro: derive-clona.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate derive_foo;
diff --git a/tests/ui/proc-macro/resolve-error.stderr b/tests/ui/proc-macro/resolve-error.stderr
index e7639f474c7..963298311ef 100644
--- a/tests/ui/proc-macro/resolve-error.stderr
+++ b/tests/ui/proc-macro/resolve-error.stderr
@@ -4,7 +4,7 @@ error: cannot find macro `bang_proc_macrp` in this scope
 LL |     bang_proc_macrp!();
    |     ^^^^^^^^^^^^^^^ help: a macro with a similar name exists: `bang_proc_macro`
    |
-  ::: $DIR/auxiliary/test-macros.rs:15:1
+  ::: $DIR/auxiliary/test-macros.rs:10:1
    |
 LL | pub fn empty(_: TokenStream) -> TokenStream {
    | ------------------------------------------- similarly named macro `bang_proc_macro` defined here
@@ -53,7 +53,7 @@ error: cannot find derive macro `Dlona` in this scope
 LL | #[derive(Dlona)]
    |          ^^^^^ help: a derive macro with a similar name exists: `Clona`
    |
-  ::: $DIR/auxiliary/derive-clona.rs:11:1
+  ::: $DIR/auxiliary/derive-clona.rs:6:1
    |
 LL | pub fn derive_clonea(input: TokenStream) -> TokenStream {
    | ------------------------------------------------------- similarly named derive macro `Clona` defined here
@@ -64,7 +64,7 @@ error: cannot find derive macro `Dlona` in this scope
 LL | #[derive(Dlona)]
    |          ^^^^^ help: a derive macro with a similar name exists: `Clona`
    |
-  ::: $DIR/auxiliary/derive-clona.rs:11:1
+  ::: $DIR/auxiliary/derive-clona.rs:6:1
    |
 LL | pub fn derive_clonea(input: TokenStream) -> TokenStream {
    | ------------------------------------------------------- similarly named derive macro `Clona` defined here
@@ -103,7 +103,7 @@ error: cannot find attribute `attr_proc_macra` in this scope
 LL | #[attr_proc_macra]
    |   ^^^^^^^^^^^^^^^ help: an attribute macro with a similar name exists: `attr_proc_macro`
    |
-  ::: $DIR/auxiliary/test-macros.rs:20:1
+  ::: $DIR/auxiliary/test-macros.rs:15:1
    |
 LL | pub fn empty_attr(_: TokenStream, _: TokenStream) -> TokenStream {
    | ---------------------------------------------------------------- similarly named attribute macro `attr_proc_macro` defined here
@@ -114,7 +114,7 @@ error: cannot find derive macro `FooWithLongNan` in this scope
 LL | #[derive(FooWithLongNan)]
    |          ^^^^^^^^^^^^^^ help: a derive macro with a similar name exists: `FooWithLongName`
    |
-  ::: $DIR/auxiliary/derive-foo.rs:11:1
+  ::: $DIR/auxiliary/derive-foo.rs:6:1
    |
 LL | pub fn derive_foo(input: TokenStream) -> TokenStream {
    | ---------------------------------------------------- similarly named derive macro `FooWithLongName` defined here
@@ -125,7 +125,7 @@ error: cannot find derive macro `FooWithLongNan` in this scope
 LL | #[derive(FooWithLongNan)]
    |          ^^^^^^^^^^^^^^ help: a derive macro with a similar name exists: `FooWithLongName`
    |
-  ::: $DIR/auxiliary/derive-foo.rs:11:1
+  ::: $DIR/auxiliary/derive-foo.rs:6:1
    |
 LL | pub fn derive_foo(input: TokenStream) -> TokenStream {
    | ---------------------------------------------------- similarly named derive macro `FooWithLongName` defined here
diff --git a/tests/ui/proc-macro/resolved-located-at.rs b/tests/ui/proc-macro/resolved-located-at.rs
index 2f906d91e6b..c932c401896 100644
--- a/tests/ui/proc-macro/resolved-located-at.rs
+++ b/tests/ui/proc-macro/resolved-located-at.rs
@@ -1,4 +1,4 @@
-//@ aux-build:resolved-located-at.rs
+//@ proc-macro: resolved-located-at.rs
 
 #[macro_use]
 extern crate resolved_located_at;
diff --git a/tests/ui/proc-macro/shadow.rs b/tests/ui/proc-macro/shadow.rs
index 22aecb7c05f..bcb38f97dbf 100644
--- a/tests/ui/proc-macro/shadow.rs
+++ b/tests/ui/proc-macro/shadow.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/smoke.rs b/tests/ui/proc-macro/smoke.rs
index dc32adb2e27..667112837c1 100644
--- a/tests/ui/proc-macro/smoke.rs
+++ b/tests/ui/proc-macro/smoke.rs
@@ -2,7 +2,7 @@
 
 #![allow(unused_must_use)]
 #![allow(path_statements)]
-//@ aux-build:derive-a.rs
+//@ proc-macro: derive-a.rs
 
 #[macro_use]
 extern crate derive_a;
diff --git a/tests/ui/proc-macro/span-absolute-posititions.rs b/tests/ui/proc-macro/span-absolute-posititions.rs
index ddbc5902d6b..fc9f06a9e9f 100644
--- a/tests/ui/proc-macro/span-absolute-posititions.rs
+++ b/tests/ui/proc-macro/span-absolute-posititions.rs
@@ -1,4 +1,4 @@
-//@ aux-build:assert-span-pos.rs
+//@ proc-macro: assert-span-pos.rs
 // ignore-tidy-tab
 extern crate assert_span_pos;
 
diff --git a/tests/ui/proc-macro/span-api-tests.rs b/tests/ui/proc-macro/span-api-tests.rs
index 1e00f3ad7ac..ac42a7ea611 100644
--- a/tests/ui/proc-macro/span-api-tests.rs
+++ b/tests/ui/proc-macro/span-api-tests.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:span-api-tests.rs
+//@ proc-macro: span-api-tests.rs
 //@ aux-build:span-test-macros.rs
 //@ compile-flags: -Ztranslate-remapped-path-to-local-path=yes
 
diff --git a/tests/ui/proc-macro/span-from-proc-macro.rs b/tests/ui/proc-macro/span-from-proc-macro.rs
index 9d851d62d12..4e12a695a5c 100644
--- a/tests/ui/proc-macro/span-from-proc-macro.rs
+++ b/tests/ui/proc-macro/span-from-proc-macro.rs
@@ -1,5 +1,5 @@
-//@ aux-build:custom-quote.rs
-//@ aux-build:span-from-proc-macro.rs
+//@ proc-macro: custom-quote.rs
+//@ proc-macro: span-from-proc-macro.rs
 //@ compile-flags: -Z macro-backtrace
 
 #[macro_use]
diff --git a/tests/ui/proc-macro/span-from-proc-macro.stderr b/tests/ui/proc-macro/span-from-proc-macro.stderr
index 7beed505a7e..452c04df877 100644
--- a/tests/ui/proc-macro/span-from-proc-macro.stderr
+++ b/tests/ui/proc-macro/span-from-proc-macro.stderr
@@ -1,5 +1,5 @@
 error[E0412]: cannot find type `MissingType` in this scope
-  --> $DIR/auxiliary/span-from-proc-macro.rs:37:20
+  --> $DIR/auxiliary/span-from-proc-macro.rs:33:20
    |
 LL | pub fn error_from_attribute(_args: TokenStream, _input: TokenStream) -> TokenStream {
    | ----------------------------------------------------------------------------------- in this expansion of `#[error_from_attribute]`
@@ -13,7 +13,7 @@ LL | #[error_from_attribute]
    | ----------------------- in this procedural macro expansion
 
 error[E0412]: cannot find type `OtherMissingType` in this scope
-  --> $DIR/auxiliary/span-from-proc-macro.rs:46:21
+  --> $DIR/auxiliary/span-from-proc-macro.rs:42:21
    |
 LL | pub fn error_from_derive(_input: TokenStream) -> TokenStream {
    | ------------------------------------------------------------ in this expansion of `#[derive(ErrorFromDerive)]`
@@ -27,7 +27,7 @@ LL | #[derive(ErrorFromDerive)]
    |          --------------- in this derive macro expansion
 
 error[E0425]: cannot find value `my_ident` in this scope
-  --> $DIR/auxiliary/span-from-proc-macro.rs:29:9
+  --> $DIR/auxiliary/span-from-proc-macro.rs:25:9
    |
 LL | pub fn other_error_from_bang(_input: TokenStream) -> TokenStream {
    | ---------------------------------------------------------------- in this expansion of `other_error_from_bang!`
@@ -41,7 +41,7 @@ LL |     other_error_from_bang!();
    |     ------------------------ in this macro invocation
 
 error[E0308]: mismatched types
-  --> $DIR/auxiliary/span-from-proc-macro.rs:16:36
+  --> $DIR/auxiliary/span-from-proc-macro.rs:12:36
    |
 LL |             let bang_error: bool = 25;
    |                             ----   ^^ expected `bool`, found integer
diff --git a/tests/ui/proc-macro/span-preservation.rs b/tests/ui/proc-macro/span-preservation.rs
index 25a44505c77..fc914865678 100644
--- a/tests/ui/proc-macro/span-preservation.rs
+++ b/tests/ui/proc-macro/span-preservation.rs
@@ -1,7 +1,7 @@
 // For each of these, we should get the appropriate type mismatch error message,
 // and the function should be echoed.
 
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #[macro_use]
 extern crate test_macros;
diff --git a/tests/ui/proc-macro/struct-field-macro.rs b/tests/ui/proc-macro/struct-field-macro.rs
index b2c3dd49de9..9b1ddcaf274 100644
--- a/tests/ui/proc-macro/struct-field-macro.rs
+++ b/tests/ui/proc-macro/struct-field-macro.rs
@@ -1,7 +1,7 @@
 //@ run-pass
 
 #![allow(dead_code)]
-//@ aux-build:derive-nothing.rs
+//@ proc-macro: derive-nothing.rs
 
 #[macro_use]
 extern crate derive_nothing;
diff --git a/tests/ui/proc-macro/subspan.rs b/tests/ui/proc-macro/subspan.rs
index 78804cba342..a87b11f3288 100644
--- a/tests/ui/proc-macro/subspan.rs
+++ b/tests/ui/proc-macro/subspan.rs
@@ -1,4 +1,4 @@
-//@ aux-build:subspan.rs
+//@ proc-macro: subspan.rs
 
 extern crate subspan;
 
diff --git a/tests/ui/proc-macro/test.rs b/tests/ui/proc-macro/test.rs
index 9e76deab9ce..b36910a414b 100644
--- a/tests/ui/proc-macro/test.rs
+++ b/tests/ui/proc-macro/test.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:api/mod.rs
+//@ proc-macro: api/proc_macro_api_tests.rs
 //@ edition: 2021
 
 //! This is for everything that *would* be a #[test] inside of libproc_macro,
diff --git a/tests/ui/proc-macro/three-equals.rs b/tests/ui/proc-macro/three-equals.rs
index d16fc55656c..ad528e144b0 100644
--- a/tests/ui/proc-macro/three-equals.rs
+++ b/tests/ui/proc-macro/three-equals.rs
@@ -1,4 +1,4 @@
-//@ aux-build:three-equals.rs
+//@ proc-macro: three-equals.rs
 
 extern crate three_equals;
 
diff --git a/tests/ui/proc-macro/trailing-plus.rs b/tests/ui/proc-macro/trailing-plus.rs
index 875225c15ca..a69ec510bed 100644
--- a/tests/ui/proc-macro/trailing-plus.rs
+++ b/tests/ui/proc-macro/trailing-plus.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ compile-flags: -Z span-debug
 
 #![no_std] // Don't load unnecessary hygiene information from std
diff --git a/tests/ui/proc-macro/trait-fn-args-2015.rs b/tests/ui/proc-macro/trait-fn-args-2015.rs
index 389bb5b6a92..c25bd768efe 100644
--- a/tests/ui/proc-macro/trait-fn-args-2015.rs
+++ b/tests/ui/proc-macro/trait-fn-args-2015.rs
@@ -1,7 +1,7 @@
 // Unnamed arguments in trait functions can be passed through proc macros on 2015 edition.
 
 //@ check-pass
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 
 #![allow(anonymous_parameters)]
 
diff --git a/tests/ui/proc-macro/unsafe-foreign-mod.rs b/tests/ui/proc-macro/unsafe-foreign-mod.rs
index b863b0fc114..e1e4ce96f1f 100644
--- a/tests/ui/proc-macro/unsafe-foreign-mod.rs
+++ b/tests/ui/proc-macro/unsafe-foreign-mod.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:macro-only-syntax.rs
+//@ proc-macro: macro-only-syntax.rs
 
 extern crate macro_only_syntax;
 
diff --git a/tests/ui/proc-macro/unsafe-mod.rs b/tests/ui/proc-macro/unsafe-mod.rs
index 00ea388af93..f8453c2f62c 100644
--- a/tests/ui/proc-macro/unsafe-mod.rs
+++ b/tests/ui/proc-macro/unsafe-mod.rs
@@ -1,5 +1,5 @@
 //@ run-pass
-//@ aux-build:macro-only-syntax.rs
+//@ proc-macro: macro-only-syntax.rs
 
 #![feature(proc_macro_hygiene)]
 
diff --git a/tests/ui/proc-macro/weird-braces.rs b/tests/ui/proc-macro/weird-braces.rs
index b17b90742b5..1197156f6b0 100644
--- a/tests/ui/proc-macro/weird-braces.rs
+++ b/tests/ui/proc-macro/weird-braces.rs
@@ -1,4 +1,4 @@
-//@ aux-build:test-macros.rs
+//@ proc-macro: test-macros.rs
 //@ check-pass
 //@ compile-flags: -Z span-debug
 
diff --git a/tests/ui/proc-macro/weird-hygiene.rs b/tests/ui/proc-macro/weird-hygiene.rs
index 8b35898a4d2..de55484109a 100644
--- a/tests/ui/proc-macro/weird-hygiene.rs
+++ b/tests/ui/proc-macro/weird-hygiene.rs
@@ -1,4 +1,4 @@
-//@ aux-build:weird-hygiene.rs
+//@ proc-macro: weird-hygiene.rs
 
 #![feature(stmt_expr_attributes)]
 #![feature(proc_macro_hygiene)]
diff --git a/tests/ui/resolve/auxiliary/issue-112831-aux.rs b/tests/ui/resolve/auxiliary/issue-112831-aux.rs
index e5c1486d8ae..7d258299c18 100644
--- a/tests/ui/resolve/auxiliary/issue-112831-aux.rs
+++ b/tests/ui/resolve/auxiliary/issue-112831-aux.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 struct Zeroable;
diff --git a/tests/ui/resolve/auxiliary/proc_macro_generate_packed.rs b/tests/ui/resolve/auxiliary/proc_macro_generate_packed.rs
index c0b24706dcb..9a9e0eb3ff7 100644
--- a/tests/ui/resolve/auxiliary/proc_macro_generate_packed.rs
+++ b/tests/ui/resolve/auxiliary/proc_macro_generate_packed.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-//@ compile-flags: --crate-type proc-macro
-
 extern crate proc_macro;
 
 use proc_macro::*;
diff --git a/tests/ui/resolve/derive-macro-1.rs b/tests/ui/resolve/derive-macro-1.rs
index f4fbb1d2c7c..d39eeba2e6c 100644
--- a/tests/ui/resolve/derive-macro-1.rs
+++ b/tests/ui/resolve/derive-macro-1.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:issue-112831-aux.rs
+//@ proc-macro: issue-112831-aux.rs
 
 mod z {
     pub trait Zeroable {}
diff --git a/tests/ui/resolve/derive-macro-2.rs b/tests/ui/resolve/derive-macro-2.rs
index 126f5ae107f..71d791eaef8 100644
--- a/tests/ui/resolve/derive-macro-2.rs
+++ b/tests/ui/resolve/derive-macro-2.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:issue-112831-aux.rs
+//@ proc-macro: issue-112831-aux.rs
 
 extern crate issue_112831_aux;
 use issue_112831_aux::Zeroable;
diff --git a/tests/ui/resolve/proc_macro_generated_packed.rs b/tests/ui/resolve/proc_macro_generated_packed.rs
index e8d04f808d0..8459fb79f1e 100644
--- a/tests/ui/resolve/proc_macro_generated_packed.rs
+++ b/tests/ui/resolve/proc_macro_generated_packed.rs
@@ -1,7 +1,7 @@
 //! This test ICEs because the `repr(packed)` attribute
 //! was generated by a proc macro, so `#[derive]` didn't see it.
 
-//@aux-build: proc_macro_generate_packed.rs
+//@proc-macro: proc_macro_generate_packed.rs
 //@known-bug: #120873
 //@ failure-status: 101
 //@ normalize-stderr-test: "note: .*\n\n" -> ""
diff --git a/tests/ui/rfcs/rfc-2565-param-attrs/auxiliary/ident-mac.rs b/tests/ui/rfcs/rfc-2565-param-attrs/auxiliary/ident-mac.rs
index 93c2901fe66..176ba837043 100644
--- a/tests/ui/rfcs/rfc-2565-param-attrs/auxiliary/ident-mac.rs
+++ b/tests/ui/rfcs/rfc-2565-param-attrs/auxiliary/ident-mac.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/rfcs/rfc-2565-param-attrs/auxiliary/param-attrs.rs b/tests/ui/rfcs/rfc-2565-param-attrs/auxiliary/param-attrs.rs
index c427cf7af6d..9a813666c33 100644
--- a/tests/ui/rfcs/rfc-2565-param-attrs/auxiliary/param-attrs.rs
+++ b/tests/ui/rfcs/rfc-2565-param-attrs/auxiliary/param-attrs.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::TokenStream;
diff --git a/tests/ui/rfcs/rfc-2565-param-attrs/issue-64682-dropping-first-attrs-in-impl-fns.rs b/tests/ui/rfcs/rfc-2565-param-attrs/issue-64682-dropping-first-attrs-in-impl-fns.rs
index 17b59009bb8..cd97587bf03 100644
--- a/tests/ui/rfcs/rfc-2565-param-attrs/issue-64682-dropping-first-attrs-in-impl-fns.rs
+++ b/tests/ui/rfcs/rfc-2565-param-attrs/issue-64682-dropping-first-attrs-in-impl-fns.rs
@@ -1,4 +1,4 @@
-//@ aux-build:param-attrs.rs
+//@ proc-macro: param-attrs.rs
 
 //@ check-pass
 
diff --git a/tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-pretty.rs b/tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-pretty.rs
index 6ed2d4fad0e..89864348eda 100644
--- a/tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-pretty.rs
+++ b/tests/ui/rfcs/rfc-2565-param-attrs/param-attrs-pretty.rs
@@ -1,4 +1,4 @@
-//@ aux-build:param-attrs.rs
+//@ proc-macro: param-attrs.rs
 
 //@ check-pass
 
diff --git a/tests/ui/rfcs/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs b/tests/ui/rfcs/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs
index c1e6a92e317..049c5b32cb3 100644
--- a/tests/ui/rfcs/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs
+++ b/tests/ui/rfcs/rfc-2565-param-attrs/proc-macro-cannot-be-used.rs
@@ -1,4 +1,4 @@
-//@ aux-build:ident-mac.rs
+//@ proc-macro: ident-mac.rs
 
 #![feature(c_variadic)]
 #![allow(anonymous_parameters)]
diff --git a/tests/ui/rfcs/rfc-3348-c-string-literals/auxiliary/count.rs b/tests/ui/rfcs/rfc-3348-c-string-literals/auxiliary/count.rs
index e7c560a2c35..aebf8d1e0fc 100644
--- a/tests/ui/rfcs/rfc-3348-c-string-literals/auxiliary/count.rs
+++ b/tests/ui/rfcs/rfc-3348-c-string-literals/auxiliary/count.rs
@@ -1,7 +1,4 @@
-//@ force-host
 //@ edition: 2018
-//@ no-prefer-dynamic
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 
diff --git a/tests/ui/rfcs/rfc-3348-c-string-literals/edition-spans.rs b/tests/ui/rfcs/rfc-3348-c-string-literals/edition-spans.rs
index 57c1ba05560..414d5518e1f 100644
--- a/tests/ui/rfcs/rfc-3348-c-string-literals/edition-spans.rs
+++ b/tests/ui/rfcs/rfc-3348-c-string-literals/edition-spans.rs
@@ -6,7 +6,7 @@
 //@ edition: 2021
 //@ check-pass
 
-//@ aux-build: count.rs
+//@ proc-macro: count.rs
 extern crate count;
 
 const _: () = {
diff --git a/tests/ui/rust-2018/auxiliary/suggestions-not-always-applicable.rs b/tests/ui/rust-2018/auxiliary/suggestions-not-always-applicable.rs
index d8e5eb884cf..bccde8e8de7 100644
--- a/tests/ui/rust-2018/auxiliary/suggestions-not-always-applicable.rs
+++ b/tests/ui/rust-2018/auxiliary/suggestions-not-always-applicable.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::*;
diff --git a/tests/ui/rust-2018/suggestions-not-always-applicable.fixed b/tests/ui/rust-2018/suggestions-not-always-applicable.fixed
index f94bf2d66d3..e3070ba150b 100644
--- a/tests/ui/rust-2018/suggestions-not-always-applicable.fixed
+++ b/tests/ui/rust-2018/suggestions-not-always-applicable.fixed
@@ -1,4 +1,4 @@
-//@ aux-build:suggestions-not-always-applicable.rs
+//@ proc-macro: suggestions-not-always-applicable.rs
 //@ edition:2015
 //@ run-rustfix
 //@ rustfix-only-machine-applicable
diff --git a/tests/ui/rust-2018/suggestions-not-always-applicable.rs b/tests/ui/rust-2018/suggestions-not-always-applicable.rs
index f94bf2d66d3..e3070ba150b 100644
--- a/tests/ui/rust-2018/suggestions-not-always-applicable.rs
+++ b/tests/ui/rust-2018/suggestions-not-always-applicable.rs
@@ -1,4 +1,4 @@
-//@ aux-build:suggestions-not-always-applicable.rs
+//@ proc-macro: suggestions-not-always-applicable.rs
 //@ edition:2015
 //@ run-rustfix
 //@ rustfix-only-machine-applicable
diff --git a/tests/ui/rust-2021/auxiliary/reserved-prefixes-macro-2018.rs b/tests/ui/rust-2021/auxiliary/reserved-prefixes-macro-2018.rs
index 1273969c4af..469c2e7f8d9 100644
--- a/tests/ui/rust-2021/auxiliary/reserved-prefixes-macro-2018.rs
+++ b/tests/ui/rust-2021/auxiliary/reserved-prefixes-macro-2018.rs
@@ -1,8 +1,4 @@
-//@ force-host
 //@ edition:2018
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 
diff --git a/tests/ui/rust-2021/auxiliary/reserved-prefixes-macro-2021.rs b/tests/ui/rust-2021/auxiliary/reserved-prefixes-macro-2021.rs
index b68701a5165..cfc39d5208b 100644
--- a/tests/ui/rust-2021/auxiliary/reserved-prefixes-macro-2021.rs
+++ b/tests/ui/rust-2021/auxiliary/reserved-prefixes-macro-2021.rs
@@ -1,8 +1,4 @@
-//@ force-host
 //@ edition:2021
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 
diff --git a/tests/ui/rust-2021/reserved-prefixes-via-macro-2.rs b/tests/ui/rust-2021/reserved-prefixes-via-macro-2.rs
index b64761b55e9..6c0c7b38c01 100644
--- a/tests/ui/rust-2021/reserved-prefixes-via-macro-2.rs
+++ b/tests/ui/rust-2021/reserved-prefixes-via-macro-2.rs
@@ -1,6 +1,6 @@
 //@ edition:2018
-//@ aux-build:reserved-prefixes-macro-2018.rs
-//@ aux-build:reserved-prefixes-macro-2021.rs
+//@ proc-macro: reserved-prefixes-macro-2018.rs
+//@ proc-macro: reserved-prefixes-macro-2021.rs
 
 extern crate reserved_prefixes_macro_2018 as m2018;
 extern crate reserved_prefixes_macro_2021 as m2021;
diff --git a/tests/ui/rust-2021/reserved-prefixes-via-macro.rs b/tests/ui/rust-2021/reserved-prefixes-via-macro.rs
index 85f894d7f79..eec1b859c20 100644
--- a/tests/ui/rust-2021/reserved-prefixes-via-macro.rs
+++ b/tests/ui/rust-2021/reserved-prefixes-via-macro.rs
@@ -1,6 +1,6 @@
 //@ run-pass
 //@ edition:2021
-//@ aux-build:reserved-prefixes-macro-2018.rs
+//@ proc-macro: reserved-prefixes-macro-2018.rs
 
 extern crate reserved_prefixes_macro_2018 as m2018;
 
diff --git a/tests/ui/rust-2024/auxiliary/reserved-guarded-strings-macro-2021.rs b/tests/ui/rust-2024/auxiliary/reserved-guarded-strings-macro-2021.rs
index 81080fcdce3..ab23e63c0da 100644
--- a/tests/ui/rust-2024/auxiliary/reserved-guarded-strings-macro-2021.rs
+++ b/tests/ui/rust-2024/auxiliary/reserved-guarded-strings-macro-2021.rs
@@ -1,8 +1,4 @@
-//@ force-host
 //@ edition:2021
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 
diff --git a/tests/ui/rust-2024/auxiliary/reserved-guarded-strings-macro-2024.rs b/tests/ui/rust-2024/auxiliary/reserved-guarded-strings-macro-2024.rs
index aa655942150..0fa908411f5 100644
--- a/tests/ui/rust-2024/auxiliary/reserved-guarded-strings-macro-2024.rs
+++ b/tests/ui/rust-2024/auxiliary/reserved-guarded-strings-macro-2024.rs
@@ -1,8 +1,4 @@
-//@ force-host
 //@ edition:2024
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
 
 extern crate proc_macro;
 
diff --git a/tests/ui/rust-2024/reserved-guarded-strings-via-macro-2.rs b/tests/ui/rust-2024/reserved-guarded-strings-via-macro-2.rs
index 3f9f373ba22..6b0103d4a50 100644
--- a/tests/ui/rust-2024/reserved-guarded-strings-via-macro-2.rs
+++ b/tests/ui/rust-2024/reserved-guarded-strings-via-macro-2.rs
@@ -1,6 +1,6 @@
 //@ edition:2021
-//@ aux-build:reserved-guarded-strings-macro-2021.rs
-//@ aux-build:reserved-guarded-strings-macro-2024.rs
+//@ proc-macro: reserved-guarded-strings-macro-2021.rs
+//@ proc-macro: reserved-guarded-strings-macro-2024.rs
 
 extern crate reserved_guarded_strings_macro_2021 as m2021;
 extern crate reserved_guarded_strings_macro_2024 as m2024;
diff --git a/tests/ui/rust-2024/reserved-guarded-strings-via-macro.rs b/tests/ui/rust-2024/reserved-guarded-strings-via-macro.rs
index 882f52c48a6..ead2ab40b77 100644
--- a/tests/ui/rust-2024/reserved-guarded-strings-via-macro.rs
+++ b/tests/ui/rust-2024/reserved-guarded-strings-via-macro.rs
@@ -1,6 +1,6 @@
 //@ run-pass
 //@ edition:2024
-//@ aux-build:reserved-guarded-strings-macro-2021.rs
+//@ proc-macro: reserved-guarded-strings-macro-2021.rs
 
 extern crate reserved_guarded_strings_macro_2021 as m2021;
 
diff --git a/tests/ui/rust-2024/unsafe-attributes/auxiliary/unsafe-attributes-pm.rs b/tests/ui/rust-2024/unsafe-attributes/auxiliary/unsafe-attributes-pm.rs
index 557731d82d3..cab6af57cb1 100644
--- a/tests/ui/rust-2024/unsafe-attributes/auxiliary/unsafe-attributes-pm.rs
+++ b/tests/ui/rust-2024/unsafe-attributes/auxiliary/unsafe-attributes-pm.rs
@@ -1,7 +1,4 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
+//@ edition: 2018
 
 extern crate proc_macro;
 
diff --git a/tests/ui/rust-2024/unsafe-attributes/unsafe-attributes-from-pm.rs b/tests/ui/rust-2024/unsafe-attributes/unsafe-attributes-from-pm.rs
index 782a3942236..4f369a8305b 100644
--- a/tests/ui/rust-2024/unsafe-attributes/unsafe-attributes-from-pm.rs
+++ b/tests/ui/rust-2024/unsafe-attributes/unsafe-attributes-from-pm.rs
@@ -6,7 +6,7 @@
 //@[edition2021] edition:2021
 //@[edition2024] edition:2024
 //@[edition2024] compile-flags: -Zunstable-options
-//@ aux-crate: unsafe_attributes_pm=unsafe-attributes-pm.rs
+//@ proc-macro: unsafe-attributes-pm.rs
 
 unsafe_attributes_pm::missing_unsafe!();
 
diff --git a/tests/ui/suggestions/auxiliary/issue-61963-1.rs b/tests/ui/suggestions/auxiliary/issue-61963-1.rs
index 33e5f9db2c3..2e7b0dbef19 100644
--- a/tests/ui/suggestions/auxiliary/issue-61963-1.rs
+++ b/tests/ui/suggestions/auxiliary/issue-61963-1.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::{Group, TokenStream, TokenTree};
diff --git a/tests/ui/suggestions/auxiliary/issue-61963.rs b/tests/ui/suggestions/auxiliary/issue-61963.rs
index bfea8061c4b..07e6f319585 100644
--- a/tests/ui/suggestions/auxiliary/issue-61963.rs
+++ b/tests/ui/suggestions/auxiliary/issue-61963.rs
@@ -1,7 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::{Group, Spacing, Punct, TokenTree, TokenStream};
diff --git a/tests/ui/suggestions/auxiliary/proc-macro-type-error.rs b/tests/ui/suggestions/auxiliary/proc-macro-type-error.rs
index aebc5a6aaa9..2930b87d1bb 100644
--- a/tests/ui/suggestions/auxiliary/proc-macro-type-error.rs
+++ b/tests/ui/suggestions/auxiliary/proc-macro-type-error.rs
@@ -1,6 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-#![crate_type = "proc-macro"]
 #![feature(proc_macro_quote)]
 
 extern crate proc_macro;
diff --git a/tests/ui/suggestions/issue-61963.rs b/tests/ui/suggestions/issue-61963.rs
index de82700d7e4..2fafe629db9 100644
--- a/tests/ui/suggestions/issue-61963.rs
+++ b/tests/ui/suggestions/issue-61963.rs
@@ -1,5 +1,5 @@
-//@ aux-build:issue-61963.rs
-//@ aux-build:issue-61963-1.rs
+//@ proc-macro: issue-61963.rs
+//@ proc-macro: issue-61963-1.rs
 #![deny(bare_trait_objects)]
 
 #[macro_use]
diff --git a/tests/ui/suggestions/suggest-ref-macro.rs b/tests/ui/suggestions/suggest-ref-macro.rs
index e5084e54115..2f31af33782 100644
--- a/tests/ui/suggestions/suggest-ref-macro.rs
+++ b/tests/ui/suggestions/suggest-ref-macro.rs
@@ -1,5 +1,5 @@
 // run-check
-//@ aux-build:proc-macro-type-error.rs
+//@ proc-macro: proc-macro-type-error.rs
 
 extern crate proc_macro_type_error;
 
diff --git a/tests/ui/underscore-imports/auxiliary/duplicate.rs b/tests/ui/underscore-imports/auxiliary/duplicate.rs
index 61613d24b9e..b346522b721 100644
--- a/tests/ui/underscore-imports/auxiliary/duplicate.rs
+++ b/tests/ui/underscore-imports/auxiliary/duplicate.rs
@@ -1,8 +1,3 @@
-//@ force-host
-//@ no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
 extern crate proc_macro;
 
 use proc_macro::*;
diff --git a/tests/ui/underscore-imports/duplicate.rs b/tests/ui/underscore-imports/duplicate.rs
index 4afad77ee4f..125ccdf52b0 100644
--- a/tests/ui/underscore-imports/duplicate.rs
+++ b/tests/ui/underscore-imports/duplicate.rs
@@ -1,5 +1,5 @@
 //@ check-pass
-//@ aux-build:duplicate.rs
+//@ proc-macro: duplicate.rs
 
 extern crate duplicate;
author	Eric Huss <eric@huss.org>	2024-11-24 17:37:25 -0800
committer	Eric Huss <eric@huss.org>	2024-11-27 07:18:25 -0800
commit	f94142b366f9bc57c15e9ac274f83d0f9c03ffac (patch)
tree	e1f4e41efc3307e29c6098985f225f0522044dca
parent	f592dd95dbfc892c1153af67e0ab5b4e593d33e7 (diff)
download	rust-f94142b366f9bc57c15e9ac274f83d0f9c03ffac.tar.gz rust-f94142b366f9bc57c15e9ac274f83d0f9c03ffac.zip