Update tests to use new proc-macro header

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::*;
 

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:]]

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;

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;

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;
 

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;

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?)
 

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};

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;

tests/incremental/issue-49482.rs

@@ -1,4 +1,3 @@
-//@ aux-build:issue-49482-macro-def.rs
 //@ aux-build:issue-49482-reexport.rs
 //@ revisions: rpass1
 

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
 

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;

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;
 

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:

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

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;

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;

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
 

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;
 

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
 

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::*;
 

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)]
 

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;
 

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
 

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;
 

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)]
 

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
 

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;

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;

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!();

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::*;
 

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;
 

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;

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)]

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)]

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)]

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)]

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;

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;
 

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};

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;

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;
 

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;
 

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;

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;

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;

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;
 

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!();

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};

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

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;
 

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