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

97 files changed, 109 insertions, 109 deletions

diff --git a/tests/ui/binding/bind-field-short-with-modifiers.rs b/tests/ui/binding/bind-field-short-with-modifiers.rs
index b271f84e9ce..1edccf0f037 100644
--- a/tests/ui/binding/bind-field-short-with-modifiers.rs
+++ b/tests/ui/binding/bind-field-short-with-modifiers.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(unused_assignments)]
 #![allow(unused_variables)]
 #![allow(non_shorthand_field_patterns)]
diff --git a/tests/ui/binding/borrowed-ptr-pattern-2.rs b/tests/ui/binding/borrowed-ptr-pattern-2.rs
index 40df85b1479..ba80cc49477 100644
--- a/tests/ui/binding/borrowed-ptr-pattern-2.rs
+++ b/tests/ui/binding/borrowed-ptr-pattern-2.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 fn foo(s: &String) -> bool {
     match &**s {
diff --git a/tests/ui/binding/borrowed-ptr-pattern-3.rs b/tests/ui/binding/borrowed-ptr-pattern-3.rs
index f2607eee815..2e3680b76c8 100644
--- a/tests/ui/binding/borrowed-ptr-pattern-3.rs
+++ b/tests/ui/binding/borrowed-ptr-pattern-3.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 fn foo<'r>(s: &'r usize) -> bool {
     match s {
diff --git a/tests/ui/binding/borrowed-ptr-pattern-infallible.rs b/tests/ui/binding/borrowed-ptr-pattern-infallible.rs
index 1bbc03e19ba..d41e9a343a5 100644
--- a/tests/ui/binding/borrowed-ptr-pattern-infallible.rs
+++ b/tests/ui/binding/borrowed-ptr-pattern-infallible.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 
 pub fn main() {
diff --git a/tests/ui/binding/borrowed-ptr-pattern-option.rs b/tests/ui/binding/borrowed-ptr-pattern-option.rs
index 319b8631e8d..33fd282d832 100644
--- a/tests/ui/binding/borrowed-ptr-pattern-option.rs
+++ b/tests/ui/binding/borrowed-ptr-pattern-option.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 fn select<'r>(x: &'r Option<isize>, y: &'r Option<isize>) -> &'r Option<isize> {
     match (x, y) {
diff --git a/tests/ui/binding/borrowed-ptr-pattern.rs b/tests/ui/binding/borrowed-ptr-pattern.rs
index d5f94ab54e3..0cdd2754e13 100644
--- a/tests/ui/binding/borrowed-ptr-pattern.rs
+++ b/tests/ui/binding/borrowed-ptr-pattern.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 fn foo<T:Clone>(x: &T) -> T{
     match x {
diff --git a/tests/ui/binding/empty-types-in-patterns.rs b/tests/ui/binding/empty-types-in-patterns.rs
index 0d0dbcaf40f..48a8c419724 100644
--- a/tests/ui/binding/empty-types-in-patterns.rs
+++ b/tests/ui/binding/empty-types-in-patterns.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(never_type, never_type_fallback)]
 #![feature(exhaustive_patterns)]
diff --git a/tests/ui/binding/exhaustive-bool-match-sanity.rs b/tests/ui/binding/exhaustive-bool-match-sanity.rs
index f83def21060..9bdab3ad02c 100644
--- a/tests/ui/binding/exhaustive-bool-match-sanity.rs
+++ b/tests/ui/binding/exhaustive-bool-match-sanity.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // Issue #33540
 // We previously used to generate a 3-armed boolean `SwitchInt` in the
 // MIR of the function `foo` below. #33583 changed rustc to
diff --git a/tests/ui/binding/expr-match-generic-unique1.rs b/tests/ui/binding/expr-match-generic-unique1.rs
index c5f38d81559..e4c984ec6ed 100644
--- a/tests/ui/binding/expr-match-generic-unique1.rs
+++ b/tests/ui/binding/expr-match-generic-unique1.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 fn test_generic<T: Clone, F>(expected: Box<T>, eq: F) where F: FnOnce(Box<T>, Box<T>) -> bool {
     let actual: Box<T> = match true {
diff --git a/tests/ui/binding/expr-match-generic-unique2.rs b/tests/ui/binding/expr-match-generic-unique2.rs
index 8977ca68efa..51aa22d1f30 100644
--- a/tests/ui/binding/expr-match-generic-unique2.rs
+++ b/tests/ui/binding/expr-match-generic-unique2.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 fn test_generic<T: Clone, F>(expected: T, eq: F) where F: FnOnce(T, T) -> bool {
     let actual: T = match true {
diff --git a/tests/ui/binding/expr-match-generic.rs b/tests/ui/binding/expr-match-generic.rs
index 530fc676f7c..975eec42fd0 100644
--- a/tests/ui/binding/expr-match-generic.rs
+++ b/tests/ui/binding/expr-match-generic.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 
 type compare<T> = extern "Rust" fn(T, T) -> bool;
diff --git a/tests/ui/binding/expr-match-panic-all.rs b/tests/ui/binding/expr-match-panic-all.rs
index ac31b49a1e9..928f4d012b4 100644
--- a/tests/ui/binding/expr-match-panic-all.rs
+++ b/tests/ui/binding/expr-match-panic-all.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 
 
diff --git a/tests/ui/binding/expr-match-panic.rs b/tests/ui/binding/expr-match-panic.rs
index 4b6b6e072c0..b3adc80cb8e 100644
--- a/tests/ui/binding/expr-match-panic.rs
+++ b/tests/ui/binding/expr-match-panic.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 
 fn test_simple() {
diff --git a/tests/ui/binding/expr-match-unique.rs b/tests/ui/binding/expr-match-unique.rs
index eec9e1f8b4a..e22841e76f3 100644
--- a/tests/ui/binding/expr-match-unique.rs
+++ b/tests/ui/binding/expr-match-unique.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // Tests for match as expressions resulting in boxed types
 fn test_box() {
diff --git a/tests/ui/binding/expr-match.rs b/tests/ui/binding/expr-match.rs
index 575b38fbc95..049beaaf51b 100644
--- a/tests/ui/binding/expr-match.rs
+++ b/tests/ui/binding/expr-match.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 
 
diff --git a/tests/ui/binding/fat-arrow-match.rs b/tests/ui/binding/fat-arrow-match.rs
index aaf5be8cf74..d9a75c62096 100644
--- a/tests/ui/binding/fat-arrow-match.rs
+++ b/tests/ui/binding/fat-arrow-match.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/binding/fn-arg-incomplete-pattern-drop-order.rs b/tests/ui/binding/fn-arg-incomplete-pattern-drop-order.rs
index 0450fe8abbd..1c74a6a43b8 100644
--- a/tests/ui/binding/fn-arg-incomplete-pattern-drop-order.rs
+++ b/tests/ui/binding/fn-arg-incomplete-pattern-drop-order.rs
@@ -1,5 +1,5 @@
-// run-pass
-// needs-unwind
+//@ run-pass
+//@ needs-unwind
 // Check that partially moved from function parameters are dropped after the
 // named bindings that move from them.
 
diff --git a/tests/ui/binding/fn-pattern-expected-type-2.rs b/tests/ui/binding/fn-pattern-expected-type-2.rs
index 130ff3d4465..33e4d54f557 100644
--- a/tests/ui/binding/fn-pattern-expected-type-2.rs
+++ b/tests/ui/binding/fn-pattern-expected-type-2.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 pub fn main() {
     let v : &[(isize,isize)] = &[ (1, 2), (3, 4), (5, 6) ];
     for &(x, y) in v {
diff --git a/tests/ui/binding/fn-pattern-expected-type.rs b/tests/ui/binding/fn-pattern-expected-type.rs
index faeb7649636..ca61fa536dc 100644
--- a/tests/ui/binding/fn-pattern-expected-type.rs
+++ b/tests/ui/binding/fn-pattern-expected-type.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 pub fn main() {
     let f = |(x, y): (isize, isize)| {
diff --git a/tests/ui/binding/func-arg-incomplete-pattern.rs b/tests/ui/binding/func-arg-incomplete-pattern.rs
index eb94ee48f92..010310fed8c 100644
--- a/tests/ui/binding/func-arg-incomplete-pattern.rs
+++ b/tests/ui/binding/func-arg-incomplete-pattern.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 // Test that we do not leak when the arg pattern must drop part of the
 // argument (in this case, the `y` field).
diff --git a/tests/ui/binding/func-arg-ref-pattern.rs b/tests/ui/binding/func-arg-ref-pattern.rs
index 2d75c12140b..56634544bc9 100644
--- a/tests/ui/binding/func-arg-ref-pattern.rs
+++ b/tests/ui/binding/func-arg-ref-pattern.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // Test argument patterns where we create refs to the inside of
 // boxes. Make sure that we don't free the box as we match the
diff --git a/tests/ui/binding/func-arg-wild-pattern.rs b/tests/ui/binding/func-arg-wild-pattern.rs
index bcd82c679a5..35cc9463aea 100644
--- a/tests/ui/binding/func-arg-wild-pattern.rs
+++ b/tests/ui/binding/func-arg-wild-pattern.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // Test that we can compile code that uses a `_` in function argument
 // patterns.
 
diff --git a/tests/ui/binding/if-let.rs b/tests/ui/binding/if-let.rs
index 28d57e92c37..495d5ce9495 100644
--- a/tests/ui/binding/if-let.rs
+++ b/tests/ui/binding/if-let.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 pub fn main() {
diff --git a/tests/ui/binding/inconsistent-lifetime-mismatch.rs b/tests/ui/binding/inconsistent-lifetime-mismatch.rs
index 87768c28cf4..b45c72cd9bd 100644
--- a/tests/ui/binding/inconsistent-lifetime-mismatch.rs
+++ b/tests/ui/binding/inconsistent-lifetime-mismatch.rs
@@ -1,6 +1,6 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 fn foo(_: &[&str]) {}
 
diff --git a/tests/ui/binding/inferred-suffix-in-pattern-range.rs b/tests/ui/binding/inferred-suffix-in-pattern-range.rs
index 079cc0a16db..0cffc35f344 100644
--- a/tests/ui/binding/inferred-suffix-in-pattern-range.rs
+++ b/tests/ui/binding/inferred-suffix-in-pattern-range.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 pub fn main() {
     let x = 2;
diff --git a/tests/ui/binding/irrefutable-if-let-without-else.fixed b/tests/ui/binding/irrefutable-if-let-without-else.fixed
index 3d7f4695ca8..0485119522b 100644
--- a/tests/ui/binding/irrefutable-if-let-without-else.fixed
+++ b/tests/ui/binding/irrefutable-if-let-without-else.fixed
@@ -1,4 +1,4 @@
-// run-rustfix
+//@ run-rustfix
 enum Enum {
     Variant(i32),
 }
diff --git a/tests/ui/binding/irrefutable-if-let-without-else.rs b/tests/ui/binding/irrefutable-if-let-without-else.rs
index 5aaf4ace3f8..a970cf1980a 100644
--- a/tests/ui/binding/irrefutable-if-let-without-else.rs
+++ b/tests/ui/binding/irrefutable-if-let-without-else.rs
@@ -1,4 +1,4 @@
-// run-rustfix
+//@ run-rustfix
 enum Enum {
     Variant(i32),
 }
diff --git a/tests/ui/binding/irrefutable-slice-patterns.rs b/tests/ui/binding/irrefutable-slice-patterns.rs
index 048e1e5e9b4..b8b5844e1fa 100644
--- a/tests/ui/binding/irrefutable-slice-patterns.rs
+++ b/tests/ui/binding/irrefutable-slice-patterns.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // Regression test for #47096.
 
diff --git a/tests/ui/binding/issue-53114-borrow-checks.rs b/tests/ui/binding/issue-53114-borrow-checks.rs
index 6ab1f4f47df..032106647e0 100644
--- a/tests/ui/binding/issue-53114-borrow-checks.rs
+++ b/tests/ui/binding/issue-53114-borrow-checks.rs
@@ -1,4 +1,4 @@
-// check-pass
+//@ check-pass
 // Issue #53114: NLL's borrow check had some deviations from the old borrow
 // checker, and both had some deviations from our ideal state. This test
 // captures the behavior of how `_` bindings are handled with respect to how we
diff --git a/tests/ui/binding/let-assignability.rs b/tests/ui/binding/let-assignability.rs
index b85f4a96a6d..dab71253364 100644
--- a/tests/ui/binding/let-assignability.rs
+++ b/tests/ui/binding/let-assignability.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 fn f() {
     let a: Box<_> = Box::new(1);
diff --git a/tests/ui/binding/let-destruct-ref.rs b/tests/ui/binding/let-destruct-ref.rs
index 28d7294ebc8..824ac6f5f02 100644
--- a/tests/ui/binding/let-destruct-ref.rs
+++ b/tests/ui/binding/let-destruct-ref.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 pub fn main() {
     let x = 3_usize;
diff --git a/tests/ui/binding/let-var-hygiene.rs b/tests/ui/binding/let-var-hygiene.rs
index 571207bd7d6..ef080c5ff4f 100644
--- a/tests/ui/binding/let-var-hygiene.rs
+++ b/tests/ui/binding/let-var-hygiene.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // shouldn't affect evaluation of $ex:
 
 macro_rules! bad_macro {
diff --git a/tests/ui/binding/match-arm-statics.rs b/tests/ui/binding/match-arm-statics.rs
index 5f7e357eeb2..21d0aac260d 100644
--- a/tests/ui/binding/match-arm-statics.rs
+++ b/tests/ui/binding/match-arm-statics.rs
@@ -1,6 +1,6 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
-// compile-flags: -g
+//@ compile-flags: -g
 
 #[derive(PartialEq, Eq)]
 struct NewBool(bool);
diff --git a/tests/ui/binding/match-beginning-vert.rs b/tests/ui/binding/match-beginning-vert.rs
index 93c08f0b710..ac07181e063 100644
--- a/tests/ui/binding/match-beginning-vert.rs
+++ b/tests/ui/binding/match-beginning-vert.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![feature(if_let_guard)]
 
diff --git a/tests/ui/binding/match-borrowed_str.rs b/tests/ui/binding/match-borrowed_str.rs
index 22782032ebf..440f2a002de 100644
--- a/tests/ui/binding/match-borrowed_str.rs
+++ b/tests/ui/binding/match-borrowed_str.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 fn f1(ref_string: &str) -> String {
     match ref_string {
diff --git a/tests/ui/binding/match-bot-2.rs b/tests/ui/binding/match-bot-2.rs
index 95b3406f0b5..014247417a6 100644
--- a/tests/ui/binding/match-bot-2.rs
+++ b/tests/ui/binding/match-bot-2.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(unreachable_code)]
 // n.b. This was only ever failing with optimization disabled.
 
diff --git a/tests/ui/binding/match-bot.rs b/tests/ui/binding/match-bot.rs
index 5c4472c7aea..4a5b7f1315f 100644
--- a/tests/ui/binding/match-bot.rs
+++ b/tests/ui/binding/match-bot.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 pub fn main() {
     let i: isize =
diff --git a/tests/ui/binding/match-byte-array-patterns.rs b/tests/ui/binding/match-byte-array-patterns.rs
index f0c988c01c2..f66feb4300b 100644
--- a/tests/ui/binding/match-byte-array-patterns.rs
+++ b/tests/ui/binding/match-byte-array-patterns.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 fn main() {
     let buf = &[0u8; 4];
diff --git a/tests/ui/binding/match-enum-struct-0.rs b/tests/ui/binding/match-enum-struct-0.rs
index e2623ece84c..6885cffadc9 100644
--- a/tests/ui/binding/match-enum-struct-0.rs
+++ b/tests/ui/binding/match-enum-struct-0.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 // regression test for issue #5625
 
diff --git a/tests/ui/binding/match-enum-struct-1.rs b/tests/ui/binding/match-enum-struct-1.rs
index f035432ec99..57801346905 100644
--- a/tests/ui/binding/match-enum-struct-1.rs
+++ b/tests/ui/binding/match-enum-struct-1.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 enum E {
diff --git a/tests/ui/binding/match-implicit-copy-unique.rs b/tests/ui/binding/match-implicit-copy-unique.rs
index 74ffe2ecdb3..ab3b018e759 100644
--- a/tests/ui/binding/match-implicit-copy-unique.rs
+++ b/tests/ui/binding/match-implicit-copy-unique.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_shorthand_field_patterns)]
 
 struct Pair { a: Box<isize>, b: Box<isize> }
diff --git a/tests/ui/binding/match-in-macro.rs b/tests/ui/binding/match-in-macro.rs
index 0840cc4404d..1f4521f568e 100644
--- a/tests/ui/binding/match-in-macro.rs
+++ b/tests/ui/binding/match-in-macro.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 enum Foo {
     B { b1: isize, bb1: isize},
diff --git a/tests/ui/binding/match-join.rs b/tests/ui/binding/match-join.rs
index 60f2a458489..06ac261ec10 100644
--- a/tests/ui/binding/match-join.rs
+++ b/tests/ui/binding/match-join.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(unused_mut)]
 fn foo<T>(y: Option<T>) {
     let mut x: isize;
diff --git a/tests/ui/binding/match-larger-const.rs b/tests/ui/binding/match-larger-const.rs
index 6f9a353207f..4d9e587fdce 100644
--- a/tests/ui/binding/match-larger-const.rs
+++ b/tests/ui/binding/match-larger-const.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #[derive(Eq, PartialEq)]
 pub struct Data([u8; 4]);
 
diff --git a/tests/ui/binding/match-naked-record-expr.rs b/tests/ui/binding/match-naked-record-expr.rs
index c23ff8c9495..c6557cc10d6 100644
--- a/tests/ui/binding/match-naked-record-expr.rs
+++ b/tests/ui/binding/match-naked-record-expr.rs
@@ -1,5 +1,5 @@
-// run-pass
-// pretty-expanded FIXME #23616
+//@ run-pass
+//@ pretty-expanded FIXME #23616
 
 struct X { x: isize }
 
diff --git a/tests/ui/binding/match-naked-record.rs b/tests/ui/binding/match-naked-record.rs
index f7479152ebc..24d7aec00e7 100644
--- a/tests/ui/binding/match-naked-record.rs
+++ b/tests/ui/binding/match-naked-record.rs
@@ -1,6 +1,6 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 struct X { x: isize }
 
diff --git a/tests/ui/binding/match-path.rs b/tests/ui/binding/match-path.rs
index 286214eb8ac..9bcef9914d1 100644
--- a/tests/ui/binding/match-path.rs
+++ b/tests/ui/binding/match-path.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
 
 mod m1 {
     pub enum foo { foo1, foo2, }
diff --git a/tests/ui/binding/match-pattern-bindings.rs b/tests/ui/binding/match-pattern-bindings.rs
index 4ec533677d6..f9cdaacbe3e 100644
--- a/tests/ui/binding/match-pattern-bindings.rs
+++ b/tests/ui/binding/match-pattern-bindings.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 fn main() {
     let value = Some(1);
diff --git a/tests/ui/binding/match-pattern-lit.rs b/tests/ui/binding/match-pattern-lit.rs
index c9c6135e2e6..2c453594905 100644
--- a/tests/ui/binding/match-pattern-lit.rs
+++ b/tests/ui/binding/match-pattern-lit.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 
 fn altlit(f: isize) -> isize {
diff --git a/tests/ui/binding/match-pattern-no-type-params.rs b/tests/ui/binding/match-pattern-no-type-params.rs
index 1fc7ddda023..f4fb3e46e92 100644
--- a/tests/ui/binding/match-pattern-no-type-params.rs
+++ b/tests/ui/binding/match-pattern-no-type-params.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/binding/match-pattern-simple.rs b/tests/ui/binding/match-pattern-simple.rs
index 3f56cd4796d..2e43b702fae 100644
--- a/tests/ui/binding/match-pattern-simple.rs
+++ b/tests/ui/binding/match-pattern-simple.rs
@@ -1,8 +1,8 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 fn altsimple(f: isize) { match f { _x => () } }
 
diff --git a/tests/ui/binding/match-phi.rs b/tests/ui/binding/match-phi.rs
index 92a3f6e0f7f..cfef03adaa4 100644
--- a/tests/ui/binding/match-phi.rs
+++ b/tests/ui/binding/match-phi.rs
@@ -1,7 +1,7 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(unused_assignments)]
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 #![allow(non_camel_case_types)]
 #![allow(unused_variables)]
 
diff --git a/tests/ui/binding/match-pipe-binding.rs b/tests/ui/binding/match-pipe-binding.rs
index 7d4a7c708dd..616de521ed5 100644
--- a/tests/ui/binding/match-pipe-binding.rs
+++ b/tests/ui/binding/match-pipe-binding.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 fn test1() {
     // from issue 6338
diff --git a/tests/ui/binding/match-range-infer.rs b/tests/ui/binding/match-range-infer.rs
index 19d1cb89d4a..aebfa037651 100644
--- a/tests/ui/binding/match-range-infer.rs
+++ b/tests/ui/binding/match-range-infer.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // Test that type inference for range patterns works correctly (is bi-directional).
 
 pub fn main() {
diff --git a/tests/ui/binding/match-range-static.rs b/tests/ui/binding/match-range-static.rs
index f01a3505ee6..478dfb3cf41 100644
--- a/tests/ui/binding/match-range-static.rs
+++ b/tests/ui/binding/match-range-static.rs
@@ -1,5 +1,5 @@
-// run-pass
-// pretty-expanded FIXME #23616
+//@ run-pass
+//@ pretty-expanded FIXME #23616
 #![allow(non_upper_case_globals)]
 
 const s: isize = 1;
diff --git a/tests/ui/binding/match-range.rs b/tests/ui/binding/match-range.rs
index cb7b93e7cc6..a024e5e585a 100644
--- a/tests/ui/binding/match-range.rs
+++ b/tests/ui/binding/match-range.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![feature(exclusive_range_pattern)]
 
 pub fn main() {
diff --git a/tests/ui/binding/match-reassign.rs b/tests/ui/binding/match-reassign.rs
index 19b48579cb4..bf4fb45ed92 100644
--- a/tests/ui/binding/match-reassign.rs
+++ b/tests/ui/binding/match-reassign.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // Regression test for #23698: The reassignment checker only cared
 // about the last assignment in a match arm body
 
diff --git a/tests/ui/binding/match-ref-binding-in-guard-3256.rs b/tests/ui/binding/match-ref-binding-in-guard-3256.rs
index 9075a34d410..52e2745f2d6 100644
--- a/tests/ui/binding/match-ref-binding-in-guard-3256.rs
+++ b/tests/ui/binding/match-ref-binding-in-guard-3256.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 use std::sync::Mutex;
 
diff --git a/tests/ui/binding/match-ref-binding-mut-option.rs b/tests/ui/binding/match-ref-binding-mut-option.rs
index c25639b7213..f500e05c572 100644
--- a/tests/ui/binding/match-ref-binding-mut-option.rs
+++ b/tests/ui/binding/match-ref-binding-mut-option.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 pub fn main() {
     let mut v = Some(22);
diff --git a/tests/ui/binding/match-ref-binding-mut.rs b/tests/ui/binding/match-ref-binding-mut.rs
index d7afd61bc8e..ab481480832 100644
--- a/tests/ui/binding/match-ref-binding-mut.rs
+++ b/tests/ui/binding/match-ref-binding-mut.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_shorthand_field_patterns)]
 
 struct Rec {
diff --git a/tests/ui/binding/match-ref-binding.rs b/tests/ui/binding/match-ref-binding.rs
index ac6a07eabe1..d211c455e16 100644
--- a/tests/ui/binding/match-ref-binding.rs
+++ b/tests/ui/binding/match-ref-binding.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 fn destructure(x: Option<isize>) -> isize {
     match x {
diff --git a/tests/ui/binding/match-ref-unsized.rs b/tests/ui/binding/match-ref-unsized.rs
index 53784ebb9fc..204308dc9ec 100644
--- a/tests/ui/binding/match-ref-unsized.rs
+++ b/tests/ui/binding/match-ref-unsized.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // Binding unsized expressions to ref patterns
 
 pub fn main() {
diff --git a/tests/ui/binding/match-str.rs b/tests/ui/binding/match-str.rs
index 0ee18ea18de..0444f487b11 100644
--- a/tests/ui/binding/match-str.rs
+++ b/tests/ui/binding/match-str.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 // Issue #53
 #![allow(non_camel_case_types)]
diff --git a/tests/ui/binding/match-struct-0.rs b/tests/ui/binding/match-struct-0.rs
index c49f3ed6178..8f7dbbd9a08 100644
--- a/tests/ui/binding/match-struct-0.rs
+++ b/tests/ui/binding/match-struct-0.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 struct Foo{
     f : isize,
diff --git a/tests/ui/binding/match-tag.rs b/tests/ui/binding/match-tag.rs
index 6914a1c6b6d..c2dfbbddde4 100644
--- a/tests/ui/binding/match-tag.rs
+++ b/tests/ui/binding/match-tag.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(unused_mut)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/binding/match-unique-bind.rs b/tests/ui/binding/match-unique-bind.rs
index 507478983f6..02f1945f571 100644
--- a/tests/ui/binding/match-unique-bind.rs
+++ b/tests/ui/binding/match-unique-bind.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![feature(box_patterns)]
 
 pub fn main() {
diff --git a/tests/ui/binding/match-unsized.rs b/tests/ui/binding/match-unsized.rs
index 41937a557ef..95019a6f222 100644
--- a/tests/ui/binding/match-unsized.rs
+++ b/tests/ui/binding/match-unsized.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 fn main() {
     let data: &'static str = "Hello, World!";
     match data {
diff --git a/tests/ui/binding/match-value-binding-in-guard-3291.rs b/tests/ui/binding/match-value-binding-in-guard-3291.rs
index 0d750da79e7..a1f939cadca 100644
--- a/tests/ui/binding/match-value-binding-in-guard-3291.rs
+++ b/tests/ui/binding/match-value-binding-in-guard-3291.rs
@@ -1,5 +1,5 @@
-// run-pass
-// pretty-expanded FIXME #23616
+//@ run-pass
+//@ pretty-expanded FIXME #23616
 
 fn foo(x: Option<Box<isize>>, b: bool) -> isize {
     match x {
diff --git a/tests/ui/binding/match-var-hygiene.rs b/tests/ui/binding/match-var-hygiene.rs
index 43740bbcf1d..b076082a5f4 100644
--- a/tests/ui/binding/match-var-hygiene.rs
+++ b/tests/ui/binding/match-var-hygiene.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // shouldn't affect evaluation of $ex.
 macro_rules! bad_macro { ($ex:expr) => (
     {match 9 {_x => $ex}}
diff --git a/tests/ui/binding/match-vec-alternatives.rs b/tests/ui/binding/match-vec-alternatives.rs
index af95eb95df0..83e3d9bd5da 100644
--- a/tests/ui/binding/match-vec-alternatives.rs
+++ b/tests/ui/binding/match-vec-alternatives.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 fn match_vecs<'a, T>(l1: &'a [T], l2: &'a [T]) -> &'static str {
     match (l1, l2) {
diff --git a/tests/ui/binding/match-vec-rvalue.rs b/tests/ui/binding/match-vec-rvalue.rs
index fead2254c75..f21cc37a35b 100644
--- a/tests/ui/binding/match-vec-rvalue.rs
+++ b/tests/ui/binding/match-vec-rvalue.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // Tests that matching rvalues with drops does not crash.
 
 
diff --git a/tests/ui/binding/match-with-ret-arm.rs b/tests/ui/binding/match-with-ret-arm.rs
index 58a90964121..d5e1a973ad1 100644
--- a/tests/ui/binding/match-with-ret-arm.rs
+++ b/tests/ui/binding/match-with-ret-arm.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 pub fn main() {
     // sometimes we have had trouble finding
     // the right type for f, as we unified
diff --git a/tests/ui/binding/multi-let.rs b/tests/ui/binding/multi-let.rs
index 064d32a7084..7f8671a5a65 100644
--- a/tests/ui/binding/multi-let.rs
+++ b/tests/ui/binding/multi-let.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 pub fn main() {
     let x = 10;
diff --git a/tests/ui/binding/mut-in-ident-patterns.rs b/tests/ui/binding/mut-in-ident-patterns.rs
index 1d1dd660e51..40b7e5b7398 100644
--- a/tests/ui/binding/mut-in-ident-patterns.rs
+++ b/tests/ui/binding/mut-in-ident-patterns.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(unused_assignments)]
 #![allow(non_camel_case_types)]
diff --git a/tests/ui/binding/nested-matchs.rs b/tests/ui/binding/nested-matchs.rs
index 29490fd4888..03e688ec50e 100644
--- a/tests/ui/binding/nested-matchs.rs
+++ b/tests/ui/binding/nested-matchs.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(unused_mut)] // under NLL we get warning about `bar` below
 fn baz() -> ! { panic!(); }
 
diff --git a/tests/ui/binding/nested-pattern.rs b/tests/ui/binding/nested-pattern.rs
index 7d14c9ad9b7..c4b5824fb0a 100644
--- a/tests/ui/binding/nested-pattern.rs
+++ b/tests/ui/binding/nested-pattern.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/binding/nil-pattern.rs b/tests/ui/binding/nil-pattern.rs
index 268af351d08..757d701c15a 100644
--- a/tests/ui/binding/nil-pattern.rs
+++ b/tests/ui/binding/nil-pattern.rs
@@ -1,4 +1,4 @@
-// run-pass
-// pretty-expanded FIXME #23616
+//@ run-pass
+//@ pretty-expanded FIXME #23616
 
 pub fn main() { let x = (); match x { () => { } } }
diff --git a/tests/ui/binding/nullary-or-pattern.rs b/tests/ui/binding/nullary-or-pattern.rs
index 7a3d9d60eda..7cd3b6ac08f 100644
--- a/tests/ui/binding/nullary-or-pattern.rs
+++ b/tests/ui/binding/nullary-or-pattern.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 
 enum blah { a, b, }
diff --git a/tests/ui/binding/optional_comma_in_match_arm.rs b/tests/ui/binding/optional_comma_in_match_arm.rs
index 71e2f07bb6b..16fc72bbac0 100644
--- a/tests/ui/binding/optional_comma_in_match_arm.rs
+++ b/tests/ui/binding/optional_comma_in_match_arm.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(unused_unsafe)]
 #![allow(while_true)]
 
diff --git a/tests/ui/binding/or-pattern.rs b/tests/ui/binding/or-pattern.rs
index 07559e414dc..943b2cae253 100644
--- a/tests/ui/binding/or-pattern.rs
+++ b/tests/ui/binding/or-pattern.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 
 enum blah { a(isize, isize, #[allow(dead_code)] usize), b(isize, isize), c, }
diff --git a/tests/ui/binding/order-drop-with-match.rs b/tests/ui/binding/order-drop-with-match.rs
index f50632ede9f..c12c5e4c627 100644
--- a/tests/ui/binding/order-drop-with-match.rs
+++ b/tests/ui/binding/order-drop-with-match.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 // Test to make sure the destructors run in the right order.
 // Each destructor sets it's tag in the corresponding entry
diff --git a/tests/ui/binding/pat-ranges.rs b/tests/ui/binding/pat-ranges.rs
index 19b3045784f..7d43b8b5cfb 100644
--- a/tests/ui/binding/pat-ranges.rs
+++ b/tests/ui/binding/pat-ranges.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // Parsing of range patterns
 
 #![allow(ellipsis_inclusive_range_patterns)]
diff --git a/tests/ui/binding/pat-tuple-1.rs b/tests/ui/binding/pat-tuple-1.rs
index b09d4a22df0..dc2d0496f42 100644
--- a/tests/ui/binding/pat-tuple-1.rs
+++ b/tests/ui/binding/pat-tuple-1.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 fn tuple() {
     let x = (1, 2, 3);
     match x {
diff --git a/tests/ui/binding/pat-tuple-2.rs b/tests/ui/binding/pat-tuple-2.rs
index 810fd264139..71dc29ada10 100644
--- a/tests/ui/binding/pat-tuple-2.rs
+++ b/tests/ui/binding/pat-tuple-2.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 fn tuple() {
     let x = (1,);
     match x {
diff --git a/tests/ui/binding/pat-tuple-3.rs b/tests/ui/binding/pat-tuple-3.rs
index 9bec898611e..839e3bb3bdd 100644
--- a/tests/ui/binding/pat-tuple-3.rs
+++ b/tests/ui/binding/pat-tuple-3.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 fn tuple() {
     let x = (1, 2, 3);
     let branch = match x {
diff --git a/tests/ui/binding/pat-tuple-4.rs b/tests/ui/binding/pat-tuple-4.rs
index 71a54850268..f1193568520 100644
--- a/tests/ui/binding/pat-tuple-4.rs
+++ b/tests/ui/binding/pat-tuple-4.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 fn tuple() {
     let x = (1, 2, 3);
     match x {
diff --git a/tests/ui/binding/pat-tuple-5.rs b/tests/ui/binding/pat-tuple-5.rs
index c8cdd37dd85..928fc743417 100644
--- a/tests/ui/binding/pat-tuple-5.rs
+++ b/tests/ui/binding/pat-tuple-5.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 fn tuple() {
     struct S;
     struct Z;
diff --git a/tests/ui/binding/pat-tuple-6.rs b/tests/ui/binding/pat-tuple-6.rs
index 877f0e4140e..7c47e836275 100644
--- a/tests/ui/binding/pat-tuple-6.rs
+++ b/tests/ui/binding/pat-tuple-6.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 fn tuple() {
     let x = (1, 2, 3, 4, 5);
     match x {
diff --git a/tests/ui/binding/pat-tuple-7.rs b/tests/ui/binding/pat-tuple-7.rs
index 7835e2c352f..ad2bb7715af 100644
--- a/tests/ui/binding/pat-tuple-7.rs
+++ b/tests/ui/binding/pat-tuple-7.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 fn main() {
     #[allow(unused_parens)]
diff --git a/tests/ui/binding/pattern-bound-var-in-for-each.rs b/tests/ui/binding/pattern-bound-var-in-for-each.rs
index 3f725cddc5b..0932e9d1959 100644
--- a/tests/ui/binding/pattern-bound-var-in-for-each.rs
+++ b/tests/ui/binding/pattern-bound-var-in-for-each.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 // Tests that codegen_path checks whether a
 // pattern-bound var is an upvar (when codegenning
 // the for-each body)
diff --git a/tests/ui/binding/pattern-in-closure.rs b/tests/ui/binding/pattern-in-closure.rs
index 3ac8d57681a..928c179a8b3 100644
--- a/tests/ui/binding/pattern-in-closure.rs
+++ b/tests/ui/binding/pattern-in-closure.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(non_shorthand_field_patterns)]
 
 struct Foo {
diff --git a/tests/ui/binding/range-inclusive-pattern-precedence.rs b/tests/ui/binding/range-inclusive-pattern-precedence.rs
index 858239bb177..378ea00ee69 100644
--- a/tests/ui/binding/range-inclusive-pattern-precedence.rs
+++ b/tests/ui/binding/range-inclusive-pattern-precedence.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![feature(box_patterns)]
 
 const VALUE: usize = 21;
diff --git a/tests/ui/binding/shadow.rs b/tests/ui/binding/shadow.rs
index 2495c8f47e7..d13737cdc13 100644
--- a/tests/ui/binding/shadow.rs
+++ b/tests/ui/binding/shadow.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
diff --git a/tests/ui/binding/simple-generic-match.rs b/tests/ui/binding/simple-generic-match.rs
index acac32b8231..910bab03e1f 100644
--- a/tests/ui/binding/simple-generic-match.rs
+++ b/tests/ui/binding/simple-generic-match.rs
@@ -1,7 +1,7 @@
-// run-pass
+//@ run-pass
 #![allow(non_camel_case_types)]
 
-// pretty-expanded FIXME #23616
+//@ pretty-expanded FIXME #23616
 
 enum clam<T> { a(#[allow(dead_code)] T), }
 
diff --git a/tests/ui/binding/use-uninit-match.rs b/tests/ui/binding/use-uninit-match.rs
index 9250dbf0c43..de55334ffc8 100644
--- a/tests/ui/binding/use-uninit-match.rs
+++ b/tests/ui/binding/use-uninit-match.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
diff --git a/tests/ui/binding/use-uninit-match2.rs b/tests/ui/binding/use-uninit-match2.rs
index 9102730629b..48fe449c5b3 100644
--- a/tests/ui/binding/use-uninit-match2.rs
+++ b/tests/ui/binding/use-uninit-match2.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 #![allow(dead_code)]
 #![allow(unused_mut)]
 #![allow(non_camel_case_types)]
diff --git a/tests/ui/binding/zero_sized_subslice_match.rs b/tests/ui/binding/zero_sized_subslice_match.rs
index 187c2983633..6da9f9593b4 100644
--- a/tests/ui/binding/zero_sized_subslice_match.rs
+++ b/tests/ui/binding/zero_sized_subslice_match.rs
@@ -1,4 +1,4 @@
-// run-pass
+//@ run-pass
 
 fn main() {
     let x = [(), ()];