[AUTO-GENERATED] Migrate ui tests from `//` to `//@` directives

132 files changed, 187 insertions, 187 deletions

diff --git a/tests/ui/structs-enums/align-enum.rs b/tests/ui/structs-enums/align-enum.rs
index fa872caa3b4..ff80a19211c 100644
--- a/tests/ui/structs-enums/align-enum.rs
+++ b/tests/ui/structs-enums/align-enum.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 use std::mem;
diff --git a/tests/ui/structs-enums/align-struct.rs b/tests/ui/structs-enums/align-struct.rs
index 54092542f98..3d8dad6e324 100644
--- a/tests/ui/structs-enums/align-struct.rs
+++ b/tests/ui/structs-enums/align-struct.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code, unused_allocation)]
 
 use std::mem;
diff --git a/tests/ui/structs-enums/borrow-tuple-fields.rs b/tests/ui/structs-enums/borrow-tuple-fields.rs
index b1d8f91646b..6db583b09a1 100644
--- a/tests/ui/structs-enums/borrow-tuple-fields.rs
+++ b/tests/ui/structs-enums/borrow-tuple-fields.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 struct Foo(isize, isize);
 
diff --git a/tests/ui/structs-enums/class-cast-to-trait-cross-crate-2.rs b/tests/ui/structs-enums/class-cast-to-trait-cross-crate-2.rs
index 989f0a275f7..d4caa19135e 100644
--- a/tests/ui/structs-enums/class-cast-to-trait-cross-crate-2.rs
+++ b/tests/ui/structs-enums/class-cast-to-trait-cross-crate-2.rs
@@ -1,5 +1,5 @@
-// run-pass
-// aux-build:cci_class_cast.rs
+//@ run-pass
+//@ aux-build:cci_class_cast.rs
 
 extern crate cci_class_cast;
 
diff --git a/tests/ui/structs-enums/class-cast-to-trait-multiple-types.rs b/tests/ui/structs-enums/class-cast-to-trait-multiple-types.rs
index ca35a615d21..658e9d2117d 100644
--- a/tests/ui/structs-enums/class-cast-to-trait-multiple-types.rs
+++ b/tests/ui/structs-enums/class-cast-to-trait-multiple-types.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 
diff --git a/tests/ui/structs-enums/class-cast-to-trait.rs b/tests/ui/structs-enums/class-cast-to-trait.rs
index 1019bb30015..bbbde34ec09 100644
--- a/tests/ui/structs-enums/class-cast-to-trait.rs
+++ b/tests/ui/structs-enums/class-cast-to-trait.rs
@@ -1,9 +1,9 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(unused_mut)]
 #![allow(non_camel_case_types)]
 
-// ignore-freebsd FIXME fails on BSD
+//@ ignore-freebsd FIXME fails on BSD
 
 
 trait noisy {
diff --git a/tests/ui/structs-enums/class-dtor.rs b/tests/ui/structs-enums/class-dtor.rs
index 583a5e24098..ee6220b6fa4 100644
--- a/tests/ui/structs-enums/class-dtor.rs
+++ b/tests/ui/structs-enums/class-dtor.rs
@@ -1,8 +1,8 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 struct cat {
   done : extern "C" fn(usize),
diff --git a/tests/ui/structs-enums/class-exports.rs b/tests/ui/structs-enums/class-exports.rs
index ee20887cbfb..53d0e3db6f5 100644
--- a/tests/ui/structs-enums/class-exports.rs
+++ b/tests/ui/structs-enums/class-exports.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/structs-enums/class-impl-very-parameterized-trait.rs b/tests/ui/structs-enums/class-impl-very-parameterized-trait.rs
index 5e7830296da..0b37192fc3b 100644
--- a/tests/ui/structs-enums/class-impl-very-parameterized-trait.rs
+++ b/tests/ui/structs-enums/class-impl-very-parameterized-trait.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/structs-enums/class-implement-trait-cross-crate.rs b/tests/ui/structs-enums/class-implement-trait-cross-crate.rs
index 31b79517566..7a5969451cb 100644
--- a/tests/ui/structs-enums/class-implement-trait-cross-crate.rs
+++ b/tests/ui/structs-enums/class-implement-trait-cross-crate.rs
@@ -1,8 +1,8 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
-// aux-build:cci_class_trait.rs
+//@ aux-build:cci_class_trait.rs
 extern crate cci_class_trait;
 use cci_class_trait::animals::noisy;
 
diff --git a/tests/ui/structs-enums/class-implement-traits.rs b/tests/ui/structs-enums/class-implement-traits.rs
index 732aa146ce4..04a7b706edb 100644
--- a/tests/ui/structs-enums/class-implement-traits.rs
+++ b/tests/ui/structs-enums/class-implement-traits.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 
diff --git a/tests/ui/structs-enums/class-method-cross-crate.rs b/tests/ui/structs-enums/class-method-cross-crate.rs
index 519f0685fdf..f73999a2450 100644
--- a/tests/ui/structs-enums/class-method-cross-crate.rs
+++ b/tests/ui/structs-enums/class-method-cross-crate.rs
@@ -1,5 +1,5 @@
-// run-pass
-// aux-build:cci_class_2.rs
+//@ run-pass
+//@ aux-build:cci_class_2.rs
 
 extern crate cci_class_2;
 use cci_class_2::kitties::cat;
diff --git a/tests/ui/structs-enums/class-methods-cross-crate.rs b/tests/ui/structs-enums/class-methods-cross-crate.rs
index c342af31351..b2c48248a67 100644
--- a/tests/ui/structs-enums/class-methods-cross-crate.rs
+++ b/tests/ui/structs-enums/class-methods-cross-crate.rs
@@ -1,5 +1,5 @@
-// run-pass
-// aux-build:cci_class_3.rs
+//@ run-pass
+//@ aux-build:cci_class_3.rs
 
 extern crate cci_class_3;
 use cci_class_3::kitties::cat;
diff --git a/tests/ui/structs-enums/class-methods.rs b/tests/ui/structs-enums/class-methods.rs
index 83f4a5fd39e..b0dbbbec522 100644
--- a/tests/ui/structs-enums/class-methods.rs
+++ b/tests/ui/structs-enums/class-methods.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 
 
diff --git a/tests/ui/structs-enums/class-poly-methods-cross-crate.rs b/tests/ui/structs-enums/class-poly-methods-cross-crate.rs
index 0307ba78d02..dc99de95456 100644
--- a/tests/ui/structs-enums/class-poly-methods-cross-crate.rs
+++ b/tests/ui/structs-enums/class-poly-methods-cross-crate.rs
@@ -1,5 +1,5 @@
-// run-pass
-// aux-build:cci_class_6.rs
+//@ run-pass
+//@ aux-build:cci_class_6.rs
 
 extern crate cci_class_6;
 use cci_class_6::kitties::cat;
diff --git a/tests/ui/structs-enums/class-poly-methods.rs b/tests/ui/structs-enums/class-poly-methods.rs
index da2870b58a4..28374a68ad4 100644
--- a/tests/ui/structs-enums/class-poly-methods.rs
+++ b/tests/ui/structs-enums/class-poly-methods.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/structs-enums/class-separate-impl.rs b/tests/ui/structs-enums/class-separate-impl.rs
index 3d6da1cc280..2768e284c17 100644
--- a/tests/ui/structs-enums/class-separate-impl.rs
+++ b/tests/ui/structs-enums/class-separate-impl.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/structs-enums/class-str-field.rs b/tests/ui/structs-enums/class-str-field.rs
index a3dc66aab12..a33a635344e 100644
--- a/tests/ui/structs-enums/class-str-field.rs
+++ b/tests/ui/structs-enums/class-str-field.rs
@@ -1,8 +1,8 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 struct cat {
 
diff --git a/tests/ui/structs-enums/class-typarams.rs b/tests/ui/structs-enums/class-typarams.rs
index 4b2d4b12ec9..01cfa47024f 100644
--- a/tests/ui/structs-enums/class-typarams.rs
+++ b/tests/ui/structs-enums/class-typarams.rs
@@ -1,8 +1,8 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 use std::marker::PhantomData;
 
diff --git a/tests/ui/structs-enums/classes-cross-crate.rs b/tests/ui/structs-enums/classes-cross-crate.rs
index ca362c7a7d8..0160d3fd85c 100644
--- a/tests/ui/structs-enums/classes-cross-crate.rs
+++ b/tests/ui/structs-enums/classes-cross-crate.rs
@@ -1,5 +1,5 @@
-// run-pass
-// aux-build:cci_class_4.rs
+//@ run-pass
+//@ aux-build:cci_class_4.rs
 
 extern crate cci_class_4;
 use cci_class_4::kitties::cat;
diff --git a/tests/ui/structs-enums/classes-self-referential.rs b/tests/ui/structs-enums/classes-self-referential.rs
index 27d6ebf2c2a..35696a9cff9 100644
--- a/tests/ui/structs-enums/classes-self-referential.rs
+++ b/tests/ui/structs-enums/classes-self-referential.rs
@@ -1,9 +1,9 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 struct kitten {
     cat: Option<cat>,
diff --git a/tests/ui/structs-enums/classes-simple-cross-crate.rs b/tests/ui/structs-enums/classes-simple-cross-crate.rs
index 6ff0970c0f0..1548f768b6f 100644
--- a/tests/ui/structs-enums/classes-simple-cross-crate.rs
+++ b/tests/ui/structs-enums/classes-simple-cross-crate.rs
@@ -1,5 +1,5 @@
-// run-pass
-// aux-build:cci_class.rs
+//@ run-pass
+//@ aux-build:cci_class.rs
 
 extern crate cci_class;
 use cci_class::kitties::cat;
diff --git a/tests/ui/structs-enums/classes-simple-method.rs b/tests/ui/structs-enums/classes-simple-method.rs
index f3d98337dba..562fd590981 100644
--- a/tests/ui/structs-enums/classes-simple-method.rs
+++ b/tests/ui/structs-enums/classes-simple-method.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/structs-enums/classes-simple.rs b/tests/ui/structs-enums/classes-simple.rs
index 568fbb29f0d..d870a3101f1 100644
--- a/tests/ui/structs-enums/classes-simple.rs
+++ b/tests/ui/structs-enums/classes-simple.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/structs-enums/classes.rs b/tests/ui/structs-enums/classes.rs
index 51d84b9091d..d1c1922f4b5 100644
--- a/tests/ui/structs-enums/classes.rs
+++ b/tests/ui/structs-enums/classes.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/structs-enums/codegen-tag-static-padding.rs b/tests/ui/structs-enums/codegen-tag-static-padding.rs
index 8aa087c018b..7fe5367f358 100644
--- a/tests/ui/structs-enums/codegen-tag-static-padding.rs
+++ b/tests/ui/structs-enums/codegen-tag-static-padding.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_upper_case_globals)]
 
 // Issue #13186
diff --git a/tests/ui/structs-enums/compare-generic-enums.rs b/tests/ui/structs-enums/compare-generic-enums.rs
index 84f953b1f8e..243cb4a21f5 100644
--- a/tests/ui/structs-enums/compare-generic-enums.rs
+++ b/tests/ui/structs-enums/compare-generic-enums.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 
 
diff --git a/tests/ui/structs-enums/cross-crate-newtype-struct-pat.rs b/tests/ui/structs-enums/cross-crate-newtype-struct-pat.rs
index eabffc16170..e66042ec83c 100644
--- a/tests/ui/structs-enums/cross-crate-newtype-struct-pat.rs
+++ b/tests/ui/structs-enums/cross-crate-newtype-struct-pat.rs
@@ -1,5 +1,5 @@
-// run-pass
-// aux-build:newtype_struct_xc.rs
+//@ run-pass
+//@ aux-build:newtype_struct_xc.rs
 
 
 extern crate newtype_struct_xc;
diff --git a/tests/ui/structs-enums/discrim-explicit-23030.rs b/tests/ui/structs-enums/discrim-explicit-23030.rs
index e17025e9e88..1d3a8cd6b9e 100644
--- a/tests/ui/structs-enums/discrim-explicit-23030.rs
+++ b/tests/ui/structs-enums/discrim-explicit-23030.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // Issue 23030: Workaround overflowing discriminant
 // with explicit assignments.
 
diff --git a/tests/ui/structs-enums/empty-struct-braces.rs b/tests/ui/structs-enums/empty-struct-braces.rs
index 0663687c958..0449fb51af5 100644
--- a/tests/ui/structs-enums/empty-struct-braces.rs
+++ b/tests/ui/structs-enums/empty-struct-braces.rs
@@ -1,11 +1,11 @@
-// run-pass
+//@ run-pass
 #![allow(unused_variables)]
 #![allow(non_upper_case_globals)]
 
 // Empty struct defined with braces add names into type namespace
 // Empty struct defined without braces add names into both type and value namespaces
 
-// aux-build:empty-struct.rs
+//@ aux-build:empty-struct.rs
 
 extern crate empty_struct;
 use empty_struct::*;
diff --git a/tests/ui/structs-enums/empty-tag.rs b/tests/ui/structs-enums/empty-tag.rs
index 271ab72c74f..5c3e6717306 100644
--- a/tests/ui/structs-enums/empty-tag.rs
+++ b/tests/ui/structs-enums/empty-tag.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(unused_braces)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/structs-enums/enum-alignment.rs b/tests/ui/structs-enums/enum-alignment.rs
index 108dfe2e62d..bb779b1e0cd 100644
--- a/tests/ui/structs-enums/enum-alignment.rs
+++ b/tests/ui/structs-enums/enum-alignment.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(deprecated)]
 
diff --git a/tests/ui/structs-enums/enum-clike-ffi-as-int.rs b/tests/ui/structs-enums/enum-clike-ffi-as-int.rs
index e2b2b43dee3..39b34903090 100644
--- a/tests/ui/structs-enums/enum-clike-ffi-as-int.rs
+++ b/tests/ui/structs-enums/enum-clike-ffi-as-int.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 /*!
diff --git a/tests/ui/structs-enums/enum-discr.rs b/tests/ui/structs-enums/enum-discr.rs
index bdd6df82d0f..51c3e9ec27c 100644
--- a/tests/ui/structs-enums/enum-discr.rs
+++ b/tests/ui/structs-enums/enum-discr.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 enum Animal {
diff --git a/tests/ui/structs-enums/enum-discrim-autosizing.rs b/tests/ui/structs-enums/enum-discrim-autosizing.rs
index f68fdda6053..a6ade028f0c 100644
--- a/tests/ui/structs-enums/enum-discrim-autosizing.rs
+++ b/tests/ui/structs-enums/enum-discrim-autosizing.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(overflowing_literals)]
 
diff --git a/tests/ui/structs-enums/enum-discrim-manual-sizing.rs b/tests/ui/structs-enums/enum-discrim-manual-sizing.rs
index c8b362c9917..e41ff78cb65 100644
--- a/tests/ui/structs-enums/enum-discrim-manual-sizing.rs
+++ b/tests/ui/structs-enums/enum-discrim-manual-sizing.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 use std::mem::{size_of, align_of};
diff --git a/tests/ui/structs-enums/enum-discrim-range-overflow.rs b/tests/ui/structs-enums/enum-discrim-range-overflow.rs
index 9c4c61e684b..51cabd10e30 100644
--- a/tests/ui/structs-enums/enum-discrim-range-overflow.rs
+++ b/tests/ui/structs-enums/enum-discrim-range-overflow.rs
@@ -1,7 +1,7 @@
-// run-pass
+//@ run-pass
 #![allow(overflowing_literals)]
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 pub enum E64 {
     H64 = 0x7FFF_FFFF_FFFF_FFFF,
diff --git a/tests/ui/structs-enums/enum-discrim-width-stuff.rs b/tests/ui/structs-enums/enum-discrim-width-stuff.rs
index f278ae2d0a8..98948f8b3df 100644
--- a/tests/ui/structs-enums/enum-discrim-width-stuff.rs
+++ b/tests/ui/structs-enums/enum-discrim-width-stuff.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(overflowing_literals)]
 #![allow(dead_code)]
 
diff --git a/tests/ui/structs-enums/enum-disr-val-pretty.rs b/tests/ui/structs-enums/enum-disr-val-pretty.rs
index ef1333e0eeb..f889460e5e2 100644
--- a/tests/ui/structs-enums/enum-disr-val-pretty.rs
+++ b/tests/ui/structs-enums/enum-disr-val-pretty.rs
@@ -1,6 +1,6 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
-// pp-exact
+//@ pp-exact
 
 
 enum color { red = 1, green, blue, imaginary = -1, }
diff --git a/tests/ui/structs-enums/enum-export-inheritance.rs b/tests/ui/structs-enums/enum-export-inheritance.rs
index 6a36a004a7c..5bb689260c2 100644
--- a/tests/ui/structs-enums/enum-export-inheritance.rs
+++ b/tests/ui/structs-enums/enum-export-inheritance.rs
@@ -1,6 +1,6 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 mod a {
     pub enum Foo {
diff --git a/tests/ui/structs-enums/enum-layout-optimization.rs b/tests/ui/structs-enums/enum-layout-optimization.rs
index 05d297906c3..56055e952ce 100644
--- a/tests/ui/structs-enums/enum-layout-optimization.rs
+++ b/tests/ui/structs-enums/enum-layout-optimization.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // Test that we will do various size optimizations to enum layout, but
 // *not* if `#[repr(u8)]` or `#[repr(C)]` is passed. See also #40029.
 
diff --git a/tests/ui/structs-enums/enum-non-c-like-repr-c-and-int.rs b/tests/ui/structs-enums/enum-non-c-like-repr-c-and-int.rs
index 7d15d607dd6..142d0ee3287 100644
--- a/tests/ui/structs-enums/enum-non-c-like-repr-c-and-int.rs
+++ b/tests/ui/structs-enums/enum-non-c-like-repr-c-and-int.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // This test deserializes an enum in-place by transmuting to a union that
 // should have the same layout, and manipulating the tag and payloads
 // independently. This verifies that `repr(some_int)` has a stable representation,
diff --git a/tests/ui/structs-enums/enum-non-c-like-repr-c.rs b/tests/ui/structs-enums/enum-non-c-like-repr-c.rs
index fc9efdeca7d..15c9784dbb9 100644
--- a/tests/ui/structs-enums/enum-non-c-like-repr-c.rs
+++ b/tests/ui/structs-enums/enum-non-c-like-repr-c.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // This test deserializes an enum in-place by transmuting to a union that
 // should have the same layout, and manipulating the tag and payloads
 // independently. This verifies that `repr(some_int)` has a stable representation,
diff --git a/tests/ui/structs-enums/enum-non-c-like-repr-int.rs b/tests/ui/structs-enums/enum-non-c-like-repr-int.rs
index f9e96c1a0f4..64338b2aba7 100644
--- a/tests/ui/structs-enums/enum-non-c-like-repr-int.rs
+++ b/tests/ui/structs-enums/enum-non-c-like-repr-int.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // This test deserializes an enum in-place by transmuting to a union that
 // should have the same layout, and manipulating the tag and payloads
 // independently. This verifies that `repr(some_int)` has a stable representation,
diff --git a/tests/ui/structs-enums/enum-null-pointer-opt.rs b/tests/ui/structs-enums/enum-null-pointer-opt.rs
index 21564eeec29..6f8c8168968 100644
--- a/tests/ui/structs-enums/enum-null-pointer-opt.rs
+++ b/tests/ui/structs-enums/enum-null-pointer-opt.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![feature(transparent_unions)]
 
 use std::mem::size_of;
diff --git a/tests/ui/structs-enums/enum-nullable-const-null-with-fields.rs b/tests/ui/structs-enums/enum-nullable-const-null-with-fields.rs
index 1d52d44d169..e76afa49f5e 100644
--- a/tests/ui/structs-enums/enum-nullable-const-null-with-fields.rs
+++ b/tests/ui/structs-enums/enum-nullable-const-null-with-fields.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 static C: Result<(), Box<isize>> = Ok(());
 
diff --git a/tests/ui/structs-enums/enum-nullable-simplifycfg-misopt.rs b/tests/ui/structs-enums/enum-nullable-simplifycfg-misopt.rs
index 4bd7ee45dfe..be8e00fa1bb 100644
--- a/tests/ui/structs-enums/enum-nullable-simplifycfg-misopt.rs
+++ b/tests/ui/structs-enums/enum-nullable-simplifycfg-misopt.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 /*!
  * This is a regression test for a bug in LLVM, fixed in upstream r179587,
diff --git a/tests/ui/structs-enums/enum-rec/issue-17431-6.rs b/tests/ui/structs-enums/enum-rec/issue-17431-6.rs
index 20231dc83db..d8343704f12 100644
--- a/tests/ui/structs-enums/enum-rec/issue-17431-6.rs
+++ b/tests/ui/structs-enums/enum-rec/issue-17431-6.rs
@@ -1,4 +1,4 @@
-// ignore-macos: cycle error does not appear on apple
+//@ ignore-macos: cycle error does not appear on apple
 
 use std::sync::Mutex;
 
diff --git a/tests/ui/structs-enums/enum-univariant-repr.rs b/tests/ui/structs-enums/enum-univariant-repr.rs
index 1e0f6788778..b77b66b4f58 100644
--- a/tests/ui/structs-enums/enum-univariant-repr.rs
+++ b/tests/ui/structs-enums/enum-univariant-repr.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 use std::mem;
 
diff --git a/tests/ui/structs-enums/enum-variants.rs b/tests/ui/structs-enums/enum-variants.rs
index 9ac5aae726a..1f5206b8de5 100644
--- a/tests/ui/structs-enums/enum-variants.rs
+++ b/tests/ui/structs-enums/enum-variants.rs
@@ -1,7 +1,7 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(unused_assignments)]
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 #![allow(unused_variables)]
 
diff --git a/tests/ui/structs-enums/enum-vec-initializer.rs b/tests/ui/structs-enums/enum-vec-initializer.rs
index 42ee8ba971e..2fa77ec6ecd 100644
--- a/tests/ui/structs-enums/enum-vec-initializer.rs
+++ b/tests/ui/structs-enums/enum-vec-initializer.rs
@@ -1,5 +1,5 @@
-// run-pass
-// pretty-expanded FIXME #23616
+//@ run-pass
+//@ pretty-expanded FIXME #23616
 
 enum Flopsy {
     Bunny = 2
diff --git a/tests/ui/structs-enums/export-abstract-tag.rs b/tests/ui/structs-enums/export-abstract-tag.rs
index 76ac73321d3..ff36fa95903 100644
--- a/tests/ui/structs-enums/export-abstract-tag.rs
+++ b/tests/ui/structs-enums/export-abstract-tag.rs
@@ -1,10 +1,10 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 
 // We can export tags without exporting the variants to create a simple
 // sort of ADT.
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 mod foo {
     pub enum t { t1, }
diff --git a/tests/ui/structs-enums/export-tag-variant.rs b/tests/ui/structs-enums/export-tag-variant.rs
index 52e0aba0979..bd762a0166e 100644
--- a/tests/ui/structs-enums/export-tag-variant.rs
+++ b/tests/ui/structs-enums/export-tag-variant.rs
@@ -1,6 +1,6 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 mod foo {
     pub enum t { t1, }
diff --git a/tests/ui/structs-enums/expr-if-struct.rs b/tests/ui/structs-enums/expr-if-struct.rs
index e62d47c6f5d..c9fc682ab01 100644
--- a/tests/ui/structs-enums/expr-if-struct.rs
+++ b/tests/ui/structs-enums/expr-if-struct.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 
 
diff --git a/tests/ui/structs-enums/expr-match-struct.rs b/tests/ui/structs-enums/expr-match-struct.rs
index f0e8d897274..3ebd8321846 100644
--- a/tests/ui/structs-enums/expr-match-struct.rs
+++ b/tests/ui/structs-enums/expr-match-struct.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 
 
diff --git a/tests/ui/structs-enums/field-destruction-order.rs b/tests/ui/structs-enums/field-destruction-order.rs
index a75a742d90f..b496dcc6e3a 100644
--- a/tests/ui/structs-enums/field-destruction-order.rs
+++ b/tests/ui/structs-enums/field-destruction-order.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]
 
diff --git a/tests/ui/structs-enums/foreign-struct.rs b/tests/ui/structs-enums/foreign-struct.rs
index 00a23b354a9..4f2e413ab40 100644
--- a/tests/ui/structs-enums/foreign-struct.rs
+++ b/tests/ui/structs-enums/foreign-struct.rs
@@ -1,10 +1,10 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
 // Passing enums by value
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 pub enum void {}
 
diff --git a/tests/ui/structs-enums/functional-struct-upd.rs b/tests/ui/structs-enums/functional-struct-upd.rs
index 68ff73a0805..4128db0ab9e 100644
--- a/tests/ui/structs-enums/functional-struct-upd.rs
+++ b/tests/ui/structs-enums/functional-struct-upd.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![allow(dead_code)]
 
diff --git a/tests/ui/structs-enums/issue-103869.fixed b/tests/ui/structs-enums/issue-103869.fixed
index 49fe32c7109..074d7519392 100644
--- a/tests/ui/structs-enums/issue-103869.fixed
+++ b/tests/ui/structs-enums/issue-103869.fixed
@@ -1,4 +1,4 @@
-// run-rustfix
+//@ run-rustfix
 
 struct VecOrMap {
     //~^ HELP: perhaps you meant to use `struct` here
diff --git a/tests/ui/structs-enums/issue-103869.rs b/tests/ui/structs-enums/issue-103869.rs
index 729079e0501..fe23d2d5191 100644
--- a/tests/ui/structs-enums/issue-103869.rs
+++ b/tests/ui/structs-enums/issue-103869.rs
@@ -1,4 +1,4 @@
-// run-rustfix
+//@ run-rustfix
 
 enum VecOrMap {
     //~^ HELP: perhaps you meant to use `struct` here
diff --git a/tests/ui/structs-enums/issue-1701.rs b/tests/ui/structs-enums/issue-1701.rs
index bae32a77765..7888e082240 100644
--- a/tests/ui/structs-enums/issue-1701.rs
+++ b/tests/ui/structs-enums/issue-1701.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/structs-enums/issue-38002.rs b/tests/ui/structs-enums/issue-38002.rs
index fdb31fc44a1..5ed70dbbb7f 100644
--- a/tests/ui/structs-enums/issue-38002.rs
+++ b/tests/ui/structs-enums/issue-38002.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 // Check that constant ADTs are codegened OK, part k of N.
 
diff --git a/tests/ui/structs-enums/issue-50731.rs b/tests/ui/structs-enums/issue-50731.rs
index 209c1e1279b..c00ef6d5f74 100644
--- a/tests/ui/structs-enums/issue-50731.rs
+++ b/tests/ui/structs-enums/issue-50731.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 enum Void {}
 fn foo(_: Result<(Void, u32), (Void, String)>) {}
 fn main() {
diff --git a/tests/ui/structs-enums/ivec-tag.rs b/tests/ui/structs-enums/ivec-tag.rs
index c39368a2bb8..9185a0cbb6e 100644
--- a/tests/ui/structs-enums/ivec-tag.rs
+++ b/tests/ui/structs-enums/ivec-tag.rs
@@ -1,6 +1,6 @@
-// run-pass
+//@ run-pass
 #![allow(unused_must_use)]
-// ignore-emscripten no threads support
+//@ ignore-emscripten no threads support
 
 use std::thread;
 use std::sync::mpsc::{channel, Sender};
diff --git a/tests/ui/structs-enums/module-qualified-struct-destructure.rs b/tests/ui/structs-enums/module-qualified-struct-destructure.rs
index 57be37cdf2b..b90acb1b98c 100644
--- a/tests/ui/structs-enums/module-qualified-struct-destructure.rs
+++ b/tests/ui/structs-enums/module-qualified-struct-destructure.rs
@@ -1,5 +1,5 @@
-// run-pass
-// pretty-expanded FIXME #23616
+//@ run-pass
+//@ pretty-expanded FIXME #23616
 
 mod m {
     pub struct S {
diff --git a/tests/ui/structs-enums/multiple-reprs.rs b/tests/ui/structs-enums/multiple-reprs.rs
index 4be503a0ef4..1528db126ae 100644
--- a/tests/ui/structs-enums/multiple-reprs.rs
+++ b/tests/ui/structs-enums/multiple-reprs.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![allow(dead_code)]
 
diff --git a/tests/ui/structs-enums/namespaced-enum-emulate-flat-xc.rs b/tests/ui/structs-enums/namespaced-enum-emulate-flat-xc.rs
index 30cf645821d..ea56faef09c 100644
--- a/tests/ui/structs-enums/namespaced-enum-emulate-flat-xc.rs
+++ b/tests/ui/structs-enums/namespaced-enum-emulate-flat-xc.rs
@@ -1,9 +1,9 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 
-// aux-build:namespaced_enum_emulate_flat.rs
+//@ aux-build:namespaced_enum_emulate_flat.rs
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 extern crate namespaced_enum_emulate_flat;
 
diff --git a/tests/ui/structs-enums/namespaced-enum-emulate-flat.rs b/tests/ui/structs-enums/namespaced-enum-emulate-flat.rs
index f6c395059ed..4a6352b328a 100644
--- a/tests/ui/structs-enums/namespaced-enum-emulate-flat.rs
+++ b/tests/ui/structs-enums/namespaced-enum-emulate-flat.rs
@@ -1,6 +1,6 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 pub use Foo::*;
 use nest::{Bar, D, E, F};
diff --git a/tests/ui/structs-enums/namespaced-enum-glob-import-xcrate.rs b/tests/ui/structs-enums/namespaced-enum-glob-import-xcrate.rs
index d2ccadea007..4e58c1f717f 100644
--- a/tests/ui/structs-enums/namespaced-enum-glob-import-xcrate.rs
+++ b/tests/ui/structs-enums/namespaced-enum-glob-import-xcrate.rs
@@ -1,7 +1,7 @@
-// run-pass
-// aux-build:namespaced_enums.rs
+//@ run-pass
+//@ aux-build:namespaced_enums.rs
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 extern crate namespaced_enums;
 
diff --git a/tests/ui/structs-enums/namespaced-enum-glob-import.rs b/tests/ui/structs-enums/namespaced-enum-glob-import.rs
index f36ac69dc08..d02ee5a122d 100644
--- a/tests/ui/structs-enums/namespaced-enum-glob-import.rs
+++ b/tests/ui/structs-enums/namespaced-enum-glob-import.rs
@@ -1,6 +1,6 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 mod m2 {
     pub enum Foo {
diff --git a/tests/ui/structs-enums/namespaced-enums-xcrate.rs b/tests/ui/structs-enums/namespaced-enums-xcrate.rs
index 5e10c3ec1d0..b5655e68a47 100644
--- a/tests/ui/structs-enums/namespaced-enums-xcrate.rs
+++ b/tests/ui/structs-enums/namespaced-enums-xcrate.rs
@@ -1,7 +1,7 @@
-// run-pass
-// aux-build:namespaced_enums.rs
+//@ run-pass
+//@ aux-build:namespaced_enums.rs
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 extern crate namespaced_enums;
 
diff --git a/tests/ui/structs-enums/namespaced-enums.rs b/tests/ui/structs-enums/namespaced-enums.rs
index 6a2602501a5..1ce9319b8ec 100644
--- a/tests/ui/structs-enums/namespaced-enums.rs
+++ b/tests/ui/structs-enums/namespaced-enums.rs
@@ -1,6 +1,6 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 enum Foo {
     A,
diff --git a/tests/ui/structs-enums/nested-enum-same-names.rs b/tests/ui/structs-enums/nested-enum-same-names.rs
index 111b9ba9477..e24073c38e9 100644
--- a/tests/ui/structs-enums/nested-enum-same-names.rs
+++ b/tests/ui/structs-enums/nested-enum-same-names.rs
@@ -1,6 +1,6 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 /*
 
diff --git a/tests/ui/structs-enums/newtype-struct-drop-run.rs b/tests/ui/structs-enums/newtype-struct-drop-run.rs
index 0754f318701..8df34de3d84 100644
--- a/tests/ui/structs-enums/newtype-struct-drop-run.rs
+++ b/tests/ui/structs-enums/newtype-struct-drop-run.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // Make sure the destructor is run for newtype structs.
 
 use std::cell::Cell;
diff --git a/tests/ui/structs-enums/newtype-struct-with-dtor.rs b/tests/ui/structs-enums/newtype-struct-with-dtor.rs
index f73b492dfcf..19672e41c9a 100644
--- a/tests/ui/structs-enums/newtype-struct-with-dtor.rs
+++ b/tests/ui/structs-enums/newtype-struct-with-dtor.rs
@@ -1,7 +1,7 @@
-// run-pass
+//@ run-pass
 #![allow(unused_unsafe)]
 #![allow(unused_variables)]
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 pub struct Fd(u32);
 
diff --git a/tests/ui/structs-enums/newtype-struct-xc-2.rs b/tests/ui/structs-enums/newtype-struct-xc-2.rs
index 40837321be2..e83025346d7 100644
--- a/tests/ui/structs-enums/newtype-struct-xc-2.rs
+++ b/tests/ui/structs-enums/newtype-struct-xc-2.rs
@@ -1,7 +1,7 @@
-// run-pass
-// aux-build:newtype_struct_xc.rs
+//@ run-pass
+//@ aux-build:newtype_struct_xc.rs
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 extern crate newtype_struct_xc;
 use newtype_struct_xc::Au;
diff --git a/tests/ui/structs-enums/newtype-struct-xc.rs b/tests/ui/structs-enums/newtype-struct-xc.rs
index 0c6466d97fc..6f90cfe8e4a 100644
--- a/tests/ui/structs-enums/newtype-struct-xc.rs
+++ b/tests/ui/structs-enums/newtype-struct-xc.rs
@@ -1,7 +1,7 @@
-// run-pass
-// aux-build:newtype_struct_xc.rs
+//@ run-pass
+//@ aux-build:newtype_struct_xc.rs
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 extern crate newtype_struct_xc;
 
diff --git a/tests/ui/structs-enums/nonzero-enum.rs b/tests/ui/structs-enums/nonzero-enum.rs
index 15b571be563..40abcdc78e5 100644
--- a/tests/ui/structs-enums/nonzero-enum.rs
+++ b/tests/ui/structs-enums/nonzero-enum.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 use std::mem::size_of;
 
diff --git a/tests/ui/structs-enums/numeric-fields.rs b/tests/ui/structs-enums/numeric-fields.rs
index 6ff3afc3870..3b610f4aaef 100644
--- a/tests/ui/structs-enums/numeric-fields.rs
+++ b/tests/ui/structs-enums/numeric-fields.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 struct S(u8, u16);
 
 fn main() {
diff --git a/tests/ui/structs-enums/rec-align-u32.rs b/tests/ui/structs-enums/rec-align-u32.rs
index b3c323d2a29..9cd2a988871 100644
--- a/tests/ui/structs-enums/rec-align-u32.rs
+++ b/tests/ui/structs-enums/rec-align-u32.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(unused_unsafe)]
 // Issue #2303
diff --git a/tests/ui/structs-enums/rec-align-u64.rs b/tests/ui/structs-enums/rec-align-u64.rs
index de008bcc01d..e4b02fa0c58 100644
--- a/tests/ui/structs-enums/rec-align-u64.rs
+++ b/tests/ui/structs-enums/rec-align-u64.rs
@@ -1,7 +1,7 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(unused_unsafe)]
-// ignore-wasm32-bare seems unimportant to test
+//@ ignore-wasm32-bare seems unimportant to test
 
 // Issue #2303
 
diff --git a/tests/ui/structs-enums/rec-auto.rs b/tests/ui/structs-enums/rec-auto.rs
index c2ef13ede4c..bf2e37a189b 100644
--- a/tests/ui/structs-enums/rec-auto.rs
+++ b/tests/ui/structs-enums/rec-auto.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 
 
diff --git a/tests/ui/structs-enums/rec-extend.rs b/tests/ui/structs-enums/rec-extend.rs
index 4c91cd1850e..2141523ce9e 100644
--- a/tests/ui/structs-enums/rec-extend.rs
+++ b/tests/ui/structs-enums/rec-extend.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 
 
diff --git a/tests/ui/structs-enums/rec-tup.rs b/tests/ui/structs-enums/rec-tup.rs
index b85d28fdf03..941733056eb 100644
--- a/tests/ui/structs-enums/rec-tup.rs
+++ b/tests/ui/structs-enums/rec-tup.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 
 
diff --git a/tests/ui/structs-enums/rec.rs b/tests/ui/structs-enums/rec.rs
index 82c84ebd6ff..734bd523497 100644
--- a/tests/ui/structs-enums/rec.rs
+++ b/tests/ui/structs-enums/rec.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #[derive(Copy, Clone)]
 struct Rect {x: isize, y: isize, w: isize, h: isize}
diff --git a/tests/ui/structs-enums/record-pat.rs b/tests/ui/structs-enums/record-pat.rs
index 1acaf2a32c2..1959f9bc320 100644
--- a/tests/ui/structs-enums/record-pat.rs
+++ b/tests/ui/structs-enums/record-pat.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 #![allow(non_shorthand_field_patterns)]
 
diff --git a/tests/ui/structs-enums/resource-in-struct.rs b/tests/ui/structs-enums/resource-in-struct.rs
index 267ad6b4a86..0614b6c3622 100644
--- a/tests/ui/structs-enums/resource-in-struct.rs
+++ b/tests/ui/structs-enums/resource-in-struct.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 
 // Ensures that class dtors run if the object is inside an enum
diff --git a/tests/ui/structs-enums/simple-generic-tag.rs b/tests/ui/structs-enums/simple-generic-tag.rs
index dbd2834d468..59521a446f4 100644
--- a/tests/ui/structs-enums/simple-generic-tag.rs
+++ b/tests/ui/structs-enums/simple-generic-tag.rs
@@ -1,10 +1,10 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
 
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 enum clam<T> { a(T), }
 
diff --git a/tests/ui/structs-enums/simple-match-generic-tag.rs b/tests/ui/structs-enums/simple-match-generic-tag.rs
index 762fd49ad24..47a2d1054e0 100644
--- a/tests/ui/structs-enums/simple-match-generic-tag.rs
+++ b/tests/ui/structs-enums/simple-match-generic-tag.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/structs-enums/small-enum-range-edge.rs b/tests/ui/structs-enums/small-enum-range-edge.rs
index 30612947963..6ffd0f101cd 100644
--- a/tests/ui/structs-enums/small-enum-range-edge.rs
+++ b/tests/ui/structs-enums/small-enum-range-edge.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_upper_case_globals)]
 
 // Tests the range assertion wraparound case when reading discriminants.
diff --git a/tests/ui/structs-enums/small-enums-with-fields.rs b/tests/ui/structs-enums/small-enums-with-fields.rs
index 565ec1bd45d..d38fb5165e0 100644
--- a/tests/ui/structs-enums/small-enums-with-fields.rs
+++ b/tests/ui/structs-enums/small-enums-with-fields.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 use std::mem::size_of;
 
 #[derive(PartialEq, Debug)]
diff --git a/tests/ui/structs-enums/struct-aliases-xcrate.rs b/tests/ui/structs-enums/struct-aliases-xcrate.rs
index ffe7b22f809..fc9ce1a1015 100644
--- a/tests/ui/structs-enums/struct-aliases-xcrate.rs
+++ b/tests/ui/structs-enums/struct-aliases-xcrate.rs
@@ -1,8 +1,8 @@
-// run-pass
+//@ run-pass
 #![allow(unused_imports)]
 #![allow(non_shorthand_field_patterns)]
 
-// aux-build:xcrate_struct_aliases.rs
+//@ aux-build:xcrate_struct_aliases.rs
 
 extern crate xcrate_struct_aliases;
 
diff --git a/tests/ui/structs-enums/struct-aliases.rs b/tests/ui/structs-enums/struct-aliases.rs
index b7aeed7bc39..6b5f55a9d16 100644
--- a/tests/ui/structs-enums/struct-aliases.rs
+++ b/tests/ui/structs-enums/struct-aliases.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_shorthand_field_patterns)]
 
 use std::mem;
diff --git a/tests/ui/structs-enums/struct-destructuring-cross-crate.rs b/tests/ui/structs-enums/struct-destructuring-cross-crate.rs
index 19e0a0bbdd2..df740bdb310 100644
--- a/tests/ui/structs-enums/struct-destructuring-cross-crate.rs
+++ b/tests/ui/structs-enums/struct-destructuring-cross-crate.rs
@@ -1,5 +1,5 @@
-// run-pass
-// aux-build:struct_destructuring_cross_crate.rs
+//@ run-pass
+//@ aux-build:struct_destructuring_cross_crate.rs
 
 
 extern crate struct_destructuring_cross_crate;
diff --git a/tests/ui/structs-enums/struct-field-shorthand.rs b/tests/ui/structs-enums/struct-field-shorthand.rs
index ed650c68364..7d78bccc0ae 100644
--- a/tests/ui/structs-enums/struct-field-shorthand.rs
+++ b/tests/ui/structs-enums/struct-field-shorthand.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 struct Foo {
     x: i32,
     y: bool,
diff --git a/tests/ui/structs-enums/struct-like-variant-construct.rs b/tests/ui/structs-enums/struct-like-variant-construct.rs
index 60fc7ce394c..5a49d715b21 100644
--- a/tests/ui/structs-enums/struct-like-variant-construct.rs
+++ b/tests/ui/structs-enums/struct-like-variant-construct.rs
@@ -1,6 +1,6 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 enum Foo {
     Bar {
diff --git a/tests/ui/structs-enums/struct-like-variant-match.rs b/tests/ui/structs-enums/struct-like-variant-match.rs
index ade1a697037..9af0c105394 100644
--- a/tests/ui/structs-enums/struct-like-variant-match.rs
+++ b/tests/ui/structs-enums/struct-like-variant-match.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_shorthand_field_patterns)]
 
 enum Foo {
diff --git a/tests/ui/structs-enums/struct-lit-functional-no-fields.rs b/tests/ui/structs-enums/struct-lit-functional-no-fields.rs
index f19604e951c..0eb716da4f0 100644
--- a/tests/ui/structs-enums/struct-lit-functional-no-fields.rs
+++ b/tests/ui/structs-enums/struct-lit-functional-no-fields.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #[derive(Debug,PartialEq,Clone)]
 struct Foo<T> {
     bar: T,
diff --git a/tests/ui/structs-enums/struct-literal-dtor.rs b/tests/ui/structs-enums/struct-literal-dtor.rs
index 6d1b1dfb9b6..30b1f113938 100644
--- a/tests/ui/structs-enums/struct-literal-dtor.rs
+++ b/tests/ui/structs-enums/struct-literal-dtor.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 
 struct foo {
diff --git a/tests/ui/structs-enums/struct-new-as-field-name.rs b/tests/ui/structs-enums/struct-new-as-field-name.rs
index 641fc3c5867..1f776b40f52 100644
--- a/tests/ui/structs-enums/struct-new-as-field-name.rs
+++ b/tests/ui/structs-enums/struct-new-as-field-name.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 struct Foo {
     new: isize,
diff --git a/tests/ui/structs-enums/struct-order-of-eval-1.rs b/tests/ui/structs-enums/struct-order-of-eval-1.rs
index f3fe9953856..25cdabcc03c 100644
--- a/tests/ui/structs-enums/struct-order-of-eval-1.rs
+++ b/tests/ui/structs-enums/struct-order-of-eval-1.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 struct S { f0: String, f1: isize }
diff --git a/tests/ui/structs-enums/struct-order-of-eval-2.rs b/tests/ui/structs-enums/struct-order-of-eval-2.rs
index a4e0edc97c6..eb425e62d8e 100644
--- a/tests/ui/structs-enums/struct-order-of-eval-2.rs
+++ b/tests/ui/structs-enums/struct-order-of-eval-2.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 struct S {
diff --git a/tests/ui/structs-enums/struct-order-of-eval-3.rs b/tests/ui/structs-enums/struct-order-of-eval-3.rs
index 60887f8d05a..d0ce498ac4f 100644
--- a/tests/ui/structs-enums/struct-order-of-eval-3.rs
+++ b/tests/ui/structs-enums/struct-order-of-eval-3.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // Checks that functional-record-update order-of-eval is as expected
 // even when no Drop-implementations are involved.
 
diff --git a/tests/ui/structs-enums/struct-order-of-eval-4.rs b/tests/ui/structs-enums/struct-order-of-eval-4.rs
index 547df631846..0ad22296ba6 100644
--- a/tests/ui/structs-enums/struct-order-of-eval-4.rs
+++ b/tests/ui/structs-enums/struct-order-of-eval-4.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // Checks that struct-literal expression order-of-eval is as expected
 // even when no Drop-implementations are involved.
 
diff --git a/tests/ui/structs-enums/struct-partial-move-1.rs b/tests/ui/structs-enums/struct-partial-move-1.rs
index c1570159388..9494922b7d7 100644
--- a/tests/ui/structs-enums/struct-partial-move-1.rs
+++ b/tests/ui/structs-enums/struct-partial-move-1.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #[derive(PartialEq, Debug)]
 pub struct Partial<T> { x: T, y: T }
 
diff --git a/tests/ui/structs-enums/struct-partial-move-2.rs b/tests/ui/structs-enums/struct-partial-move-2.rs
index 4315e5c29f3..2c29f528554 100644
--- a/tests/ui/structs-enums/struct-partial-move-2.rs
+++ b/tests/ui/structs-enums/struct-partial-move-2.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #[derive(PartialEq, Debug)]
 pub struct Partial<T> { x: T, y: T }
 
diff --git a/tests/ui/structs-enums/struct-path-associated-type.rs b/tests/ui/structs-enums/struct-path-associated-type.rs
index 2235dfe4b84..158c2ed7dda 100644
--- a/tests/ui/structs-enums/struct-path-associated-type.rs
+++ b/tests/ui/structs-enums/struct-path-associated-type.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 struct S<T, U = u16> {
     a: T,
diff --git a/tests/ui/structs-enums/struct-path-self.rs b/tests/ui/structs-enums/struct-path-self.rs
index e7a59858f57..0906b4f3240 100644
--- a/tests/ui/structs-enums/struct-path-self.rs
+++ b/tests/ui/structs-enums/struct-path-self.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 use std::ops::Add;
 
 struct S<T, U = u16> {
diff --git a/tests/ui/structs-enums/struct-pattern-matching.rs b/tests/ui/structs-enums/struct-pattern-matching.rs
index 89361bf2455..96325fc3c14 100644
--- a/tests/ui/structs-enums/struct-pattern-matching.rs
+++ b/tests/ui/structs-enums/struct-pattern-matching.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_shorthand_field_patterns)]
 
 struct Foo {
diff --git a/tests/ui/structs-enums/struct-variant-field-visibility.rs b/tests/ui/structs-enums/struct-variant-field-visibility.rs
index 7896c829a6e..02d1ceb0513 100644
--- a/tests/ui/structs-enums/struct-variant-field-visibility.rs
+++ b/tests/ui/structs-enums/struct-variant-field-visibility.rs
@@ -1,6 +1,6 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 mod foo {
     pub enum Foo {
diff --git a/tests/ui/structs-enums/struct_variant_xc.rs b/tests/ui/structs-enums/struct_variant_xc.rs
index 9c8d1a69a3e..4723f229185 100644
--- a/tests/ui/structs-enums/struct_variant_xc.rs
+++ b/tests/ui/structs-enums/struct_variant_xc.rs
@@ -1,6 +1,6 @@
-// run-pass
-// aux-build:struct_variant_xc_aux.rs
-// pretty-expanded FIXME #23616
+//@ run-pass
+//@ aux-build:struct_variant_xc_aux.rs
+//@ pretty-expanded FIXME #23616
 
 extern crate struct_variant_xc_aux;
 
diff --git a/tests/ui/structs-enums/struct_variant_xc_match.rs b/tests/ui/structs-enums/struct_variant_xc_match.rs
index 5358d13faa9..b802034ef6d 100644
--- a/tests/ui/structs-enums/struct_variant_xc_match.rs
+++ b/tests/ui/structs-enums/struct_variant_xc_match.rs
@@ -1,5 +1,5 @@
-// run-pass
-// aux-build:struct_variant_xc_aux.rs
+//@ run-pass
+//@ aux-build:struct_variant_xc_aux.rs
 
 extern crate struct_variant_xc_aux;
 
diff --git a/tests/ui/structs-enums/tag-align-dyn-u64.rs b/tests/ui/structs-enums/tag-align-dyn-u64.rs
index 3f7a5e3e511..5e7d918b4fb 100644
--- a/tests/ui/structs-enums/tag-align-dyn-u64.rs
+++ b/tests/ui/structs-enums/tag-align-dyn-u64.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(deprecated)]
 
diff --git a/tests/ui/structs-enums/tag-align-dyn-variants.rs b/tests/ui/structs-enums/tag-align-dyn-variants.rs
index 4d075b04c97..c0574f3354e 100644
--- a/tests/ui/structs-enums/tag-align-dyn-variants.rs
+++ b/tests/ui/structs-enums/tag-align-dyn-variants.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(deprecated)]
 #![allow(non_snake_case)]
diff --git a/tests/ui/structs-enums/tag-align-shape.rs b/tests/ui/structs-enums/tag-align-shape.rs
index ce599582378..6e62250e0d5 100644
--- a/tests/ui/structs-enums/tag-align-shape.rs
+++ b/tests/ui/structs-enums/tag-align-shape.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 
diff --git a/tests/ui/structs-enums/tag-align-u64.rs b/tests/ui/structs-enums/tag-align-u64.rs
index 684b27cd030..8ab9f242822 100644
--- a/tests/ui/structs-enums/tag-align-u64.rs
+++ b/tests/ui/structs-enums/tag-align-u64.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(deprecated)]
 
diff --git a/tests/ui/structs-enums/tag-disr-val-shape.rs b/tests/ui/structs-enums/tag-disr-val-shape.rs
index 51052626c30..996b87c4a3a 100644
--- a/tests/ui/structs-enums/tag-disr-val-shape.rs
+++ b/tests/ui/structs-enums/tag-disr-val-shape.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/structs-enums/tag-exports.rs b/tests/ui/structs-enums/tag-exports.rs
index 1bcb7d35da3..a01b951e675 100644
--- a/tests/ui/structs-enums/tag-exports.rs
+++ b/tests/ui/structs-enums/tag-exports.rs
@@ -1,8 +1,8 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 use alder::*;
 
diff --git a/tests/ui/structs-enums/tag-in-block.rs b/tests/ui/structs-enums/tag-in-block.rs
index 03d4dd9b0ab..944a611c71a 100644
--- a/tests/ui/structs-enums/tag-in-block.rs
+++ b/tests/ui/structs-enums/tag-in-block.rs
@@ -1,10 +1,10 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
 
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 fn foo() {
     fn zed(_z: bar) { }
diff --git a/tests/ui/structs-enums/tag-variant-disr-type-mismatch.rs b/tests/ui/structs-enums/tag-variant-disr-type-mismatch.rs
index 3f59db38310..9205ac81650 100644
--- a/tests/ui/structs-enums/tag-variant-disr-type-mismatch.rs
+++ b/tests/ui/structs-enums/tag-variant-disr-type-mismatch.rs
@@ -1,8 +1,8 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 enum color {
     red = 1,
diff --git a/tests/ui/structs-enums/tag-variant-disr-val.rs b/tests/ui/structs-enums/tag-variant-disr-val.rs
index 297d85c5886..bd34c3a1eb5 100644
--- a/tests/ui/structs-enums/tag-variant-disr-val.rs
+++ b/tests/ui/structs-enums/tag-variant-disr-val.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 
 use color::{red, green, blue, black, white, imaginary, purple, orange};
diff --git a/tests/ui/structs-enums/tag.rs b/tests/ui/structs-enums/tag.rs
index 5fcd64b7cd1..16e6b2341cf 100644
--- a/tests/ui/structs-enums/tag.rs
+++ b/tests/ui/structs-enums/tag.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(unused_parens)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/structs-enums/tuple-struct-construct.rs b/tests/ui/structs-enums/tuple-struct-construct.rs
index dc7cbaffddb..4243bccb4eb 100644
--- a/tests/ui/structs-enums/tuple-struct-construct.rs
+++ b/tests/ui/structs-enums/tuple-struct-construct.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #[allow(dead_code)]
 #[derive(Debug)]
 struct Foo(isize, isize);
diff --git a/tests/ui/structs-enums/tuple-struct-constructor-pointer.rs b/tests/ui/structs-enums/tuple-struct-constructor-pointer.rs
index 23f06516323..18a59841e9f 100644
--- a/tests/ui/structs-enums/tuple-struct-constructor-pointer.rs
+++ b/tests/ui/structs-enums/tuple-struct-constructor-pointer.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #[derive(PartialEq, Debug)]
 struct Foo(isize);
 #[derive(PartialEq, Debug)]
diff --git a/tests/ui/structs-enums/tuple-struct-destructuring.rs b/tests/ui/structs-enums/tuple-struct-destructuring.rs
index dff87ead033..5213052dd7a 100644
--- a/tests/ui/structs-enums/tuple-struct-destructuring.rs
+++ b/tests/ui/structs-enums/tuple-struct-destructuring.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 struct Foo(isize, isize);
 
 pub fn main() {
diff --git a/tests/ui/structs-enums/tuple-struct-matching.rs b/tests/ui/structs-enums/tuple-struct-matching.rs
index 432be1d1f7a..a5436624c65 100644
--- a/tests/ui/structs-enums/tuple-struct-matching.rs
+++ b/tests/ui/structs-enums/tuple-struct-matching.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 struct Foo(isize, isize);
 
 pub fn main() {
diff --git a/tests/ui/structs-enums/tuple-struct-trivial.rs b/tests/ui/structs-enums/tuple-struct-trivial.rs
index c8651fd29de..329f80a462e 100644
--- a/tests/ui/structs-enums/tuple-struct-trivial.rs
+++ b/tests/ui/structs-enums/tuple-struct-trivial.rs
@@ -1,6 +1,6 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 struct Foo(isize, isize, isize);
 
diff --git a/tests/ui/structs-enums/type-sizes.rs b/tests/ui/structs-enums/type-sizes.rs
index 490d6a2f918..92060e3cade 100644
--- a/tests/ui/structs-enums/type-sizes.rs
+++ b/tests/ui/structs-enums/type-sizes.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
diff --git a/tests/ui/structs-enums/uninstantiable-struct.rs b/tests/ui/structs-enums/uninstantiable-struct.rs
index 15f2fc424bb..97bc7d8414e 100644
--- a/tests/ui/structs-enums/uninstantiable-struct.rs
+++ b/tests/ui/structs-enums/uninstantiable-struct.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 pub struct Z(#[allow(dead_code)] &'static Z);
 
 pub fn main() {}
diff --git a/tests/ui/structs-enums/unit-like-struct-drop-run.rs b/tests/ui/structs-enums/unit-like-struct-drop-run.rs
index 1e9c269a4d3..02d14265f3e 100644
--- a/tests/ui/structs-enums/unit-like-struct-drop-run.rs
+++ b/tests/ui/structs-enums/unit-like-struct-drop-run.rs
@@ -1,6 +1,6 @@
-// run-pass
-// needs-unwind
-// ignore-emscripten no threads support
+//@ run-pass
+//@ needs-unwind
+//@ ignore-emscripten no threads support
 
 // Make sure the destructor is run for unit-like structs.
 
diff --git a/tests/ui/structs-enums/unit-like-struct.rs b/tests/ui/structs-enums/unit-like-struct.rs
index 636ec992667..8a2f500676e 100644
--- a/tests/ui/structs-enums/unit-like-struct.rs
+++ b/tests/ui/structs-enums/unit-like-struct.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 struct Foo;
 
 pub fn main() {
diff --git a/tests/ui/structs-enums/variant-structs-trivial.rs b/tests/ui/structs-enums/variant-structs-trivial.rs
index 31fa610a69d..8ca86fa35ee 100644
--- a/tests/ui/structs-enums/variant-structs-trivial.rs
+++ b/tests/ui/structs-enums/variant-structs-trivial.rs
@@ -1,6 +1,6 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 enum Foo {
     Bar { x: isize },