Auto merge of #63029 - petrochenkov:rpass, r=Centril

Move run-pass tests to ui This is the second attempt at doing https://github.com/rust-lang/rust/pull/53994 (which was previously reverted in https://github.com/rust-lang/rust/pull/54530). The issue with inability to run the test suite in a faster way (https://github.com/rust-lang/rust/issues/54047) that motivated the revert was recently addressed by https://github.com/rust-lang/rust/pull/61755. r? @Centril
author: bors <bors@rust-lang.org> 2019-07-27 19:27:36 +0000
committer: bors <bors@rust-lang.org> 2019-07-27 19:27:36 +0000
commit: c798dffac9dc8c82374db48f5b474690cc6e9686 (patch)
tree: 42d3f81ee0df278440f33b6ac0f6a37dae32fa32
parent: a5e7bb3e2bae3e8d31c10de66e91cdcea42a97df (diff)
parent: f1c8673ae7584e0c1e53c554ba61b7bf831edf90 (diff)
download: rust-c798dffac9dc8c82374db48f5b474690cc6e9686.tar.gz
rust-c798dffac9dc8c82374db48f5b474690cc6e9686.zip
3336 files changed, 1175 insertions, 324 deletions
diff --git a/src/bootstrap/README.md b/src/bootstrap/README.md
index 1e01d68fb3a..3e877fc4e31 100644
--- a/src/bootstrap/README.md
+++ b/src/bootstrap/README.md
@@ -55,11 +55,11 @@ The script accepts commands, flags, and arguments to determine what to do:
   # run all unit tests
   ./x.py test
 
-  # execute the run-pass test suite
-  ./x.py test src/test/run-pass
+  # execute the UI test suite
+  ./x.py test src/test/ui
 
-  # execute only some tests in the run-pass test suite
-  ./x.py test src/test/run-pass --test-args substring-of-test-name
+  # execute only some tests in the UI test suite
+  ./x.py test src/test/ui --test-args substring-of-test-name
 
   # execute tests in the standard library in stage0
   ./x.py test --stage 0 src/libstd
@@ -215,7 +215,7 @@ build/
 
     # Output for all compiletest-based test suites
     test/
-      run-pass/
+      ui/
       compile-fail/
       debuginfo/
       ...
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index ab50bc1db22..5a75497173e 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -371,7 +371,6 @@ impl<'a> Builder<'a> {
             Kind::Test => describe!(
                 test::Tidy,
                 test::Ui,
-                test::RunPass,
                 test::CompileFail,
                 test::RunFail,
                 test::RunPassValgrind,
@@ -382,10 +381,8 @@ impl<'a> Builder<'a> {
                 test::Incremental,
                 test::Debuginfo,
                 test::UiFullDeps,
-                test::RunPassFullDeps,
                 test::Rustdoc,
                 test::Pretty,
-                test::RunPassPretty,
                 test::RunFailPretty,
                 test::RunPassValgrindPretty,
                 test::Crate,
diff --git a/src/bootstrap/builder/tests.rs b/src/bootstrap/builder/tests.rs
index cab7443bf3f..d1542b1fca6 100644
--- a/src/bootstrap/builder/tests.rs
+++ b/src/bootstrap/builder/tests.rs
@@ -629,7 +629,6 @@ fn test_with_no_doc_stage0() {
 fn test_exclude() {
     let mut config = configure(&[], &[]);
     config.exclude = vec![
-        "src/test/run-pass".into(),
         "src/tools/tidy".into(),
     ];
     config.cmd = Subcommand::Test {
@@ -648,11 +647,9 @@ fn test_exclude() {
     let builder = Builder::new(&build);
     builder.run_step_descriptions(&Builder::get_step_descriptions(Kind::Test), &[]);
 
-    // Ensure we have really excluded run-pass & tidy
-    assert!(!builder.cache.contains::<test::RunPass>());
+    // Ensure we have really excluded tidy
     assert!(!builder.cache.contains::<test::Tidy>());
 
     // Ensure other tests are not affected.
-    assert!(builder.cache.contains::<test::RunPassFullDeps>());
     assert!(builder.cache.contains::<test::RustdocUi>());
 }
diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs
index 0e171e92b31..828865f10ff 100644
--- a/src/bootstrap/flags.rs
+++ b/src/bootstrap/flags.rs
@@ -330,7 +330,7 @@ Arguments:
     This subcommand accepts a number of paths to directories to tests that
     should be compiled and run. For example:
 
-        ./x.py test src/test/run-pass
+        ./x.py test src/test/ui
         ./x.py test src/libstd --test-args hash_map
         ./x.py test src/libstd --stage 0 --no-doc
         ./x.py test src/test/ui --bless
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index ea05b30ecef..73d6fe532c8 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -48,10 +48,8 @@ check:
 	$(Q)$(BOOTSTRAP) test $(BOOTSTRAP_ARGS)
 check-aux:
 	$(Q)$(BOOTSTRAP) test \
-		src/test/run-pass/pretty \
 		src/test/run-fail/pretty \
 		src/test/run-pass-valgrind/pretty \
-		src/test/run-pass-fulldeps/pretty \
 		$(AUX_ARGS) \
 		$(BOOTSTRAP_ARGS)
 check-bootstrap:
@@ -75,9 +73,7 @@ check-stage2-T-x86_64-unknown-linux-musl-H-x86_64-unknown-linux-gnu:
 
 TESTS_IN_2 := \
 	src/test/ui \
-	src/test/run-pass \
 	src/test/compile-fail \
-	src/test/run-pass-fulldeps \
 	src/tools/linkchecker
 
 ci-subset-1:
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index b25dc39378a..bf824775ccb 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -547,7 +547,7 @@ impl Step for TestHelpers {
     }
 
     /// Compiles the `rust_test_helpers.c` library which we used in various
-    /// `run-pass` test suites for ABI testing.
+    /// `run-pass` tests for ABI testing.
     fn run(self, builder: &Builder<'_>) {
         if builder.config.dry_run {
             return;
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 7d945e20622..0959734423e 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -820,13 +820,6 @@ default_test_with_compare_mode!(Ui {
     compare_mode: "nll"
 });
 
-default_test_with_compare_mode!(RunPass {
-    path: "src/test/run-pass",
-    mode: "run-pass",
-    suite: "run-pass",
-    compare_mode: "nll"
-});
-
 default_test!(CompileFail {
     path: "src/test/compile-fail",
     mode: "compile-fail",
@@ -881,12 +874,6 @@ host_test!(UiFullDeps {
     suite: "ui-fulldeps"
 });
 
-host_test!(RunPassFullDeps {
-    path: "src/test/run-pass-fulldeps",
-    mode: "run-pass",
-    suite: "run-pass-fulldeps"
-});
-
 host_test!(Rustdoc {
     path: "src/test/rustdoc",
     mode: "rustdoc",
@@ -898,13 +885,6 @@ host_test!(Pretty {
     mode: "pretty",
     suite: "pretty"
 });
-test!(RunPassPretty {
-    path: "src/test/run-pass/pretty",
-    mode: "pretty",
-    suite: "run-pass",
-    default: false,
-    host: true
-});
 test!(RunFailPretty {
     path: "src/test/run-fail/pretty",
     mode: "pretty",
diff --git a/src/ci/docker/asmjs/Dockerfile b/src/ci/docker/asmjs/Dockerfile
index 01d6fce3418..3abaab6b34e 100644
--- a/src/ci/docker/asmjs/Dockerfile
+++ b/src/ci/docker/asmjs/Dockerfile
@@ -32,7 +32,7 @@ ENV TARGETS=asmjs-unknown-emscripten
 ENV RUST_CONFIGURE_ARGS --enable-emscripten --disable-optimize-tests
 
 ENV SCRIPT python2.7 ../x.py test --target $TARGETS \
-  src/test/run-pass \
+  src/test/ui \
   src/test/run-fail \
   src/libstd \
   src/liballoc \
diff --git a/src/ci/docker/test-various/Dockerfile b/src/ci/docker/test-various/Dockerfile
index cfbf2c6b688..6a2600d8756 100644
--- a/src/ci/docker/test-various/Dockerfile
+++ b/src/ci/docker/test-various/Dockerfile
@@ -43,7 +43,6 @@ ENV WASM_TARGETS=wasm32-unknown-unknown
 ENV WASM_SCRIPT python2.7 /checkout/x.py test --target $WASM_TARGETS \
   src/test/run-make \
   src/test/ui \
-  src/test/run-pass \
   src/test/compile-fail \
   src/test/mir-opt \
   src/test/codegen-units \
diff --git a/src/doc/unstable-book/src/language-features/plugin.md b/src/doc/unstable-book/src/language-features/plugin.md
index 0e38e2865d8..f19b39daca3 100644
--- a/src/doc/unstable-book/src/language-features/plugin.md
+++ b/src/doc/unstable-book/src/language-features/plugin.md
@@ -44,7 +44,7 @@ code that manipulates syntax trees at
 compile time.
 
 Let's write a plugin
-[`roman_numerals.rs`](https://github.com/rust-lang/rust/blob/master/src/test/run-pass-fulldeps/auxiliary/roman_numerals.rs)
+[`roman_numerals.rs`](https://github.com/rust-lang/rust/blob/master/src/test/ui-fulldeps/auxiliary/roman_numerals.rs)
 that implements Roman numeral integer literals.
 
 ```rust,ignore
diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs
index 17ea5843881..4a7c6af7ada 100644
--- a/src/libcore/fmt/mod.rs
+++ b/src/libcore/fmt/mod.rs
@@ -2172,5 +2172,5 @@ impl<T: ?Sized + Debug> Debug for UnsafeCell<T> {
     }
 }
 
-// If you expected tests to be here, look instead at the run-pass/ifmt.rs test,
+// If you expected tests to be here, look instead at the ui/ifmt.rs test,
 // it's a lot easier than creating all of the rt::Piece structures here.
diff --git a/src/librustc_ast_borrowck/borrowck/README.md b/src/librustc_ast_borrowck/borrowck/README.md
index 6c47e8784e0..3f2175921d4 100644
--- a/src/librustc_ast_borrowck/borrowck/README.md
+++ b/src/librustc_ast_borrowck/borrowck/README.md
@@ -747,7 +747,7 @@ However, it is not always unsafe to freeze the base pointer. In
 particular, if the referent is frozen, there is no harm in it:
 
 ```rust
-// src/test/run-pass/borrowck-borrow-of-mut-base-ptr-safe.rs
+// src/test/ui/borrowck-borrow-of-mut-base-ptr-safe.rs
 fn foo<'a>(mut t0: &'a mut i32,
            mut t1: &'a mut i32) {
     let p: &i32 = &*t0; // Freezes `*t0`
@@ -763,7 +763,7 @@ already frozen. In particular, we cannot assign to `*t0` through the
 new alias `t2`, as demonstrated in this test case:
 
 ```rust
-// src/test/run-pass/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs
+// src/test/ui/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs
 fn foo(t0: & &mut i32) {
     let t1 = t0;
     let p: &i32 = &**t0;
diff --git a/src/librustc_typeck/check/_match.rs b/src/librustc_typeck/check/_match.rs
index de42a6a35c8..3f0604b84b7 100644
--- a/src/librustc_typeck/check/_match.rs
+++ b/src/librustc_typeck/check/_match.rs
@@ -88,7 +88,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             // For each ampersand peeled off, update the binding mode and push the original
             // type into the adjustments vector.
             //
-            // See the examples in `run-pass/match-defbm*.rs`.
+            // See the examples in `ui/match-defbm*.rs`.
             let mut pat_adjustments = vec![];
             while let ty::Ref(_, inner_ty, inner_mutability) = exp_ty.sty {
                 debug!("inspecting {:?}", exp_ty);
diff --git a/src/librustc_typeck/check/coercion.rs b/src/librustc_typeck/check/coercion.rs
index 7e0ecc72574..4edb6ad8931 100644
--- a/src/librustc_typeck/check/coercion.rs
+++ b/src/librustc_typeck/check/coercion.rs
@@ -13,7 +13,7 @@
 //! useful for freezing mut/const things (that is, when the expected is &T
 //! but you have &const T or &mut T) and also for avoiding the linearity
 //! of mut things (when the expected is &mut T and you have &mut T). See
-//! the various `src/test/run-pass/coerce-reborrow-*.rs` tests for
+//! the various `src/test/ui/coerce-reborrow-*.rs` tests for
 //! examples of where this is useful.
 //!
 //! ## Subtle note
@@ -346,7 +346,7 @@ impl<'f, 'tcx> Coerce<'f, 'tcx> {
             //     too strong. Consider a coercion from `&'a &'x Rc<T>` to
             //     `&'b T`. In this case, `'a` is actually irrelevant.
             //     The pointer we want is `LUB('x, 'b`). If we choose `LUB('a,'b)`
-            //     we get spurious errors (`run-pass/regions-lub-ref-ref-rc.rs`).
+            //     we get spurious errors (`ui/regions-lub-ref-ref-rc.rs`).
             //     (The errors actually show up in borrowck, typically, because
             //     this extra edge causes the region `'a` to be inferred to something
             //     too big, which then results in borrowck errors.)
diff --git a/src/librustc_typeck/check/method/probe.rs b/src/librustc_typeck/check/method/probe.rs
index 41979509a3c..75428efa73c 100644
--- a/src/librustc_typeck/check/method/probe.rs
+++ b/src/librustc_typeck/check/method/probe.rs
@@ -1394,7 +1394,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
     /// probe. This will result in a pending obligation so when more type-info is available we can
     /// make the final decision.
     ///
-    /// Example (`src/test/run-pass/method-two-trait-defer-resolution-1.rs`):
+    /// Example (`src/test/ui/method-two-trait-defer-resolution-1.rs`):
     ///
     /// ```
     /// trait Foo { ... }
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index 21cd4b694ae..36977b878dd 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -312,7 +312,7 @@ impl<'a, 'tcx> Expectation<'tcx> {
     /// It is only the `&[1, 2, 3]` expression as a whole that can be coerced
     /// to the type `&[isize]`. Therefore, we propagate this more limited hint,
     /// which still is useful, because it informs integer literals and the like.
-    /// See the test case `test/run-pass/coerce-expect-unsized.rs` and #20169
+    /// See the test case `test/ui/coerce-expect-unsized.rs` and #20169
     /// for examples of where this comes up,.
     fn rvalue_hint(fcx: &FnCtxt<'a, 'tcx>, ty: Ty<'tcx>) -> Expectation<'tcx> {
         match fcx.tcx.struct_tail_without_normalization(ty).sty {
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs
index 35de4f4008b..764041d2f42 100644
--- a/src/libstd/thread/mod.rs
+++ b/src/libstd/thread/mod.rs
@@ -1742,6 +1742,6 @@ mod tests {
         assert!(thread::current().id() != spawned_id);
     }
 
-    // NOTE: the corresponding test for stderr is in run-pass/thread-stderr, due
+    // NOTE: the corresponding test for stderr is in ui/thread-stderr, due
     // to the test harness apparently interfering with stderr configuration.
 }
diff --git a/src/libsyntax/ext/tt/macro_check.rs b/src/libsyntax/ext/tt/macro_check.rs
index 758d34917cb..5af97199902 100644
--- a/src/libsyntax/ext/tt/macro_check.rs
+++ b/src/libsyntax/ext/tt/macro_check.rs
@@ -238,7 +238,7 @@ fn check_binders(
     match *lhs {
         TokenTree::Token(..) => {}
         // This can only happen when checking a nested macro because this LHS is then in the RHS of
-        // the outer macro. See run-pass/macros/macro-of-higher-order.rs where $y:$fragment in the
+        // the outer macro. See ui/macros/macro-of-higher-order.rs where $y:$fragment in the
         // LHS of the nested macro (and RHS of the outer macro) is parsed as MetaVar(y) Colon
         // MetaVar(fragment) and not as MetaVarDecl(y, fragment).
         TokenTree::MetaVar(span, name) => {
diff --git a/src/libsyntax_pos/hygiene.rs b/src/libsyntax_pos/hygiene.rs
index a96e5ef2323..f83979b9e9b 100644
--- a/src/libsyntax_pos/hygiene.rs
+++ b/src/libsyntax_pos/hygiene.rs
@@ -305,7 +305,7 @@ impl HygieneData {
         // was defined at its invocation (i.e., inside the macros 2.0 definition)
         // so that the macros 2.0 definition remains hygienic.
         //
-        // See the example at `test/run-pass/hygiene/legacy_interaction.rs`.
+        // See the example at `test/ui/hygiene/legacy_interaction.rs`.
         for (expn_id, transparency) in self.marks(ctxt) {
             call_site_ctxt = self.apply_mark_internal(call_site_ctxt, expn_id, transparency);
         }
diff --git a/src/test/run-pass/.gitattributes b/src/test/run-pass/.gitattributes
deleted file mode 100644
index c6a6f23074d..00000000000
--- a/src/test/run-pass/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-lexer-crlf-line-endings-string-literal-doc-comment.rs -text
diff --git a/src/test/run-pass/auxiliary/weak-lang-items.rs b/src/test/run-pass/auxiliary/weak-lang-items.rs
deleted file mode 100644
index 7a698cf76ae..00000000000
--- a/src/test/run-pass/auxiliary/weak-lang-items.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// no-prefer-dynamic
-
-// This aux-file will require the eh_personality function to be codegen'd, but
-// it hasn't been defined just yet. Make sure we don't explode.
-
-#![no_std]
-#![crate_type = "rlib"]
-
-struct A;
-
-impl core::ops::Drop for A {
-    fn drop(&mut self) {}
-}
-
-pub fn foo() {
-    let _a = A;
-    panic!("wut");
-}
-
-mod std {
-    pub use core::{option, fmt};
-}
diff --git a/src/test/run-pass/coherence/auxiliary/coherence_copy_like_lib.rs b/src/test/run-pass/coherence/auxiliary/coherence_copy_like_lib.rs
deleted file mode 100644
index b5b4802c112..00000000000
--- a/src/test/run-pass/coherence/auxiliary/coherence_copy_like_lib.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#![crate_type = "rlib"]
-#![feature(fundamental)]
-
-pub trait MyCopy { }
-impl MyCopy for i32 { }
-
-pub struct MyStruct<T>(T);
-
-#[fundamental]
-pub struct MyFundamentalStruct<T>(T);
diff --git a/src/test/run-pass/coherence/auxiliary/coherence_lib.rs b/src/test/run-pass/coherence/auxiliary/coherence_lib.rs
deleted file mode 100644
index 9a5ec824306..00000000000
--- a/src/test/run-pass/coherence/auxiliary/coherence_lib.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-#![crate_type="lib"]
-
-pub trait Remote {
-    fn foo(&self) { }
-}
-
-pub trait Remote1<T> {
-    fn foo(&self, t: T) { }
-}
-
-pub trait Remote2<T, U> {
-    fn foo(&self, t: T, u: U) { }
-}
-
-pub struct Pair<T,U>(T,U);
diff --git a/src/test/run-pass/consts/auxiliary/const_fn_lib.rs b/src/test/run-pass/consts/auxiliary/const_fn_lib.rs
deleted file mode 100644
index 95440607ae3..00000000000
--- a/src/test/run-pass/consts/auxiliary/const_fn_lib.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-// Crate that exports a const fn. Used for testing cross-crate.
-
-#![crate_type="rlib"]
-
-pub const fn foo() -> usize { 22 }
diff --git a/src/test/run-pass/if-ret.stderr b/src/test/run-pass/if-ret.stderr
deleted file mode 100644
index 7c02f835685..00000000000
--- a/src/test/run-pass/if-ret.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-warning: unreachable block in `if` expression
-  --> $DIR/if-ret.rs:4:24
-   |
-LL | fn foo() { if (return) { } }
-   |                        ^^^
-   |
-   = note: `#[warn(unreachable_code)]` on by default
-
diff --git a/src/test/run-pass/macros/auxiliary/macro_crate_nonterminal.rs b/src/test/run-pass/macros/auxiliary/macro_crate_nonterminal.rs
deleted file mode 100644
index 2e2440462ae..00000000000
--- a/src/test/run-pass/macros/auxiliary/macro_crate_nonterminal.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-pub fn increment(x: usize) -> usize {
-    x + 1
-}
-
-#[macro_export]
-macro_rules! increment {
-    ($x:expr) => ($crate::increment($x))
-}
-
-pub fn check_local() {
-    assert_eq!(increment!(3), 4);
-}
diff --git a/src/test/run-pass/macros/auxiliary/unstable-macros.rs b/src/test/run-pass/macros/auxiliary/unstable-macros.rs
deleted file mode 100644
index b8d580702c9..00000000000
--- a/src/test/run-pass/macros/auxiliary/unstable-macros.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#![feature(staged_api)]
-#![stable(feature = "unit_test", since = "1.0.0")]
-
-#[unstable(feature = "unstable_macros", issue = "0")]
-#[macro_export]
-macro_rules! unstable_macro{ () => () }
diff --git a/src/test/run-pass/macros/macro-use-all-and-none.stderr b/src/test/run-pass/macros/macro-use-all-and-none.stderr
deleted file mode 100644
index ce12a539541..00000000000
--- a/src/test/run-pass/macros/macro-use-all-and-none.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-warning: unused attribute
-  --> $DIR/macro-use-all-and-none.rs:5:1
-   |
-LL | #[macro_use()]
-   | ^^^^^^^^^^^^^^
-   |
-   = note: `#[warn(unused_attributes)]` on by default
-
diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs b/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs
deleted file mode 100644
index b76b4321d62..00000000000
--- a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub fn foo() {}
diff --git a/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute.rs b/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute.rs
deleted file mode 100644
index 02d4851ab2a..00000000000
--- a/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-// run-pass
-#![feature(crate_in_paths)]
-#![allow(dead_code)]
-use crate::m::f;
-use crate as root;
-
-mod m {
-    pub fn f() -> u8 { 1 }
-    pub fn g() -> u8 { 2 }
-    pub fn h() -> u8 { 3 }
-
-    // OK, visibilities are implicitly absolute like imports
-    pub(in crate::m) struct S;
-}
-
-mod n {
-    use crate::m::f;
-    use crate as root;
-    pub fn check() {
-        assert_eq!(f(), 1);
-        assert_eq!(crate::m::g(), 2);
-        assert_eq!(root::m::h(), 3);
-    }
-}
-
-mod p {
-    use {super::f, crate::m::g, self::root::m::h};
-    use crate as root;
-    pub fn check() {
-        assert_eq!(f(), 1);
-        assert_eq!(g(), 2);
-        assert_eq!(h(), 3);
-    }
-}
-
-fn main() {
-    assert_eq!(f(), 1);
-    assert_eq!(crate::m::g(), 2);
-    assert_eq!(root::m::h(), 3);
-    n::check();
-    p::check();
-}
diff --git a/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute.stderr b/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute.stderr
deleted file mode 100644
index 12f799f6e47..00000000000
--- a/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-warning: the feature `crate_in_paths` has been stable since 1.30.0 and no longer requires an attribute to enable
-  --> $DIR/crate-path-absolute.rs:2:12
-   |
-LL | #![feature(crate_in_paths)]
-   |            ^^^^^^^^^^^^^^
-   |
-   = note: `#[warn(stable_features)]` on by default
-
diff --git a/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs b/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs
deleted file mode 100644
index 5fa8d7b2a49..00000000000
--- a/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// run-pass
-#![feature(crate_in_paths)]
-#![feature(crate_visibility_modifier)]
-#![allow(dead_code)]
-mod m {
-    pub struct Z;
-    pub struct S1(crate (::m::Z)); // OK
-    pub struct S2((crate ::m::Z)); // OK
-    pub struct S3(crate ::m::Z); // OK
-    pub struct S4(crate crate::m::Z); // OK
-}
-
-fn main() {
-    crate struct S; // OK (item in statement position)
-}
diff --git a/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.stderr b/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.stderr
deleted file mode 100644
index 23a0e544554..00000000000
--- a/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-warning: the feature `crate_in_paths` has been stable since 1.30.0 and no longer requires an attribute to enable
-  --> $DIR/crate-path-visibility-ambiguity.rs:2:12
-   |
-LL | #![feature(crate_in_paths)]
-   |            ^^^^^^^^^^^^^^
-   |
-   = note: `#[warn(stable_features)]` on by default
-
diff --git a/src/test/run-pass/rfcs/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs b/src/test/run-pass/rfcs/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs
deleted file mode 100644
index 07e70648452..00000000000
--- a/src/test/run-pass/rfcs/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#[derive(Debug, PartialEq)]
-pub struct S;
-
-#[derive(Debug)]
-pub struct Z;
-
-pub trait Tr<'a> {}
diff --git a/src/test/run-pass/rfcs/rfc-2126-extern-absolute-paths/basic.rs b/src/test/run-pass/rfcs/rfc-2126-extern-absolute-paths/basic.rs
deleted file mode 100644
index 566b3581046..00000000000
--- a/src/test/run-pass/rfcs/rfc-2126-extern-absolute-paths/basic.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// run-pass
-#![allow(dead_code)]
-// aux-build:xcrate.rs
-// compile-flags:--extern xcrate
-// edition:2018
-
-#![allow(unused_imports)]
-
-use xcrate::Z;
-
-fn f() {
-    use xcrate;
-    use xcrate as ycrate;
-    let s = xcrate::S;
-    assert_eq!(format!("{:?}", s), "S");
-    let z = ycrate::Z;
-    assert_eq!(format!("{:?}", z), "Z");
-}
-
-fn main() {
-    let s = ::xcrate::S;
-    assert_eq!(format!("{:?}", s), "S");
-    let z = Z;
-    assert_eq!(format!("{:?}", z), "Z");
-}
diff --git a/src/test/run-pass/rfcs/rfc-2126-extern-absolute-paths/test.rs b/src/test/run-pass/rfcs/rfc-2126-extern-absolute-paths/test.rs
deleted file mode 100644
index 7ed82e32a0a..00000000000
--- a/src/test/run-pass/rfcs/rfc-2126-extern-absolute-paths/test.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// run-pass
-// Check that `#[test]` works with extern-absolute-paths enabled.
-//
-// Regression test for #47075.
-
-// edition:2018
-// compile-flags: --test
-
-#[test]
-fn test() {}
diff --git a/src/test/run-pass/rfcs/rfc-2126-extern-absolute-paths/whitelisted.rs b/src/test/run-pass/rfcs/rfc-2126-extern-absolute-paths/whitelisted.rs
deleted file mode 100644
index 251406e7604..00000000000
--- a/src/test/run-pass/rfcs/rfc-2126-extern-absolute-paths/whitelisted.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// run-pass
-// edition:2018
-
-// Tests that `core` and `std` are always available.
-use core::iter;
-use std::io;
-// FIXME(eddyb) Add a `meta` crate to the distribution.
-// use meta;
-
-fn main() {
-    for _ in iter::once(()) {
-        io::stdout();
-    }
-}
diff --git a/src/test/run-pass/traits/auxiliary/trait_safety_lib.rs b/src/test/run-pass/traits/auxiliary/trait_safety_lib.rs
deleted file mode 100644
index 6fc432ed455..00000000000
--- a/src/test/run-pass/traits/auxiliary/trait_safety_lib.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Simple smoke test that unsafe traits can be compiled etc.
-
-pub unsafe trait Foo {
-    fn foo(&self) -> isize;
-}
-
-unsafe impl Foo for isize {
-    fn foo(&self) -> isize { *self }
-}
diff --git a/src/test/run-pass-fulldeps/ast_stmt_expr_attr.rs b/src/test/ui-fulldeps/ast_stmt_expr_attr.rs
index 49e137549c0..c90fe001432 100644
--- a/src/test/run-pass-fulldeps/ast_stmt_expr_attr.rs
+++ b/src/test/ui-fulldeps/ast_stmt_expr_attr.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 // ignore-cross-compile
 
diff --git a/src/test/run-pass-fulldeps/auxiliary/issue-13560-1.rs b/src/test/ui-fulldeps/auxiliary/issue-13560-1.rs
index c3a2ae679bf..c3a2ae679bf 100644
--- a/src/test/run-pass-fulldeps/auxiliary/issue-13560-1.rs
+++ b/src/test/ui-fulldeps/auxiliary/issue-13560-1.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/issue-13560-2.rs b/src/test/ui-fulldeps/auxiliary/issue-13560-2.rs
index 39c261e1162..39c261e1162 100644
--- a/src/test/run-pass-fulldeps/auxiliary/issue-13560-2.rs
+++ b/src/test/ui-fulldeps/auxiliary/issue-13560-2.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/issue-13560-3.rs b/src/test/ui-fulldeps/auxiliary/issue-13560-3.rs
index e991bcc1a02..e991bcc1a02 100644
--- a/src/test/run-pass-fulldeps/auxiliary/issue-13560-3.rs
+++ b/src/test/ui-fulldeps/auxiliary/issue-13560-3.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/issue-16822.rs b/src/test/ui-fulldeps/auxiliary/issue-16822.rs
index 9042dd39117..9042dd39117 100644
--- a/src/test/run-pass-fulldeps/auxiliary/issue-16822.rs
+++ b/src/test/ui-fulldeps/auxiliary/issue-16822.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/issue-18502.rs b/src/test/ui-fulldeps/auxiliary/issue-18502.rs
index 4d4230607aa..4d4230607aa 100644
--- a/src/test/run-pass-fulldeps/auxiliary/issue-18502.rs
+++ b/src/test/ui-fulldeps/auxiliary/issue-18502.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/issue-24106.rs b/src/test/ui-fulldeps/auxiliary/issue-24106.rs
index 2c6a6034806..2c6a6034806 100644
--- a/src/test/run-pass-fulldeps/auxiliary/issue-24106.rs
+++ b/src/test/ui-fulldeps/auxiliary/issue-24106.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/issue-40001-plugin.rs b/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs
index ad42ee1d1ec..ad42ee1d1ec 100644
--- a/src/test/run-pass-fulldeps/auxiliary/issue-40001-plugin.rs
+++ b/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/linkage-visibility.rs b/src/test/ui-fulldeps/auxiliary/linkage-visibility.rs
index 8917693d45e..8917693d45e 100644
--- a/src/test/run-pass-fulldeps/auxiliary/linkage-visibility.rs
+++ b/src/test/ui-fulldeps/auxiliary/linkage-visibility.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/lint-for-crate.rs b/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs
index 2826ae75bee..2826ae75bee 100644
--- a/src/test/run-pass-fulldeps/auxiliary/lint-for-crate.rs
+++ b/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/llvm-pass-plugin.rs b/src/test/ui-fulldeps/auxiliary/llvm-pass-plugin.rs
index 1832fee4347..1832fee4347 100644
--- a/src/test/run-pass-fulldeps/auxiliary/llvm-pass-plugin.rs
+++ b/src/test/ui-fulldeps/auxiliary/llvm-pass-plugin.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-lib.rs b/src/test/ui-fulldeps/auxiliary/lto-syntax-extension-lib.rs
index 954a1e554da..954a1e554da 100644
--- a/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-lib.rs
+++ b/src/test/ui-fulldeps/auxiliary/lto-syntax-extension-lib.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-plugin.rs b/src/test/ui-fulldeps/auxiliary/lto-syntax-extension-plugin.rs
index 6e446241d55..6e446241d55 100644
--- a/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-plugin.rs
+++ b/src/test/ui-fulldeps/auxiliary/lto-syntax-extension-plugin.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/macro-crate-test.rs b/src/test/ui-fulldeps/auxiliary/macro-crate-test.rs
index d9b2740e476..d9b2740e476 100644
--- a/src/test/run-pass-fulldeps/auxiliary/macro-crate-test.rs
+++ b/src/test/ui-fulldeps/auxiliary/macro-crate-test.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/outlive-expansion-phase.rs b/src/test/ui-fulldeps/auxiliary/outlive-expansion-phase.rs
index c22605afd0c..c22605afd0c 100644
--- a/src/test/run-pass-fulldeps/auxiliary/outlive-expansion-phase.rs
+++ b/src/test/ui-fulldeps/auxiliary/outlive-expansion-phase.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/plugin-args.rs b/src/test/ui-fulldeps/auxiliary/plugin-args.rs
index 36cee82893a..36cee82893a 100644
--- a/src/test/run-pass-fulldeps/auxiliary/plugin-args.rs
+++ b/src/test/ui-fulldeps/auxiliary/plugin-args.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/roman-numerals.rs b/src/test/ui-fulldeps/auxiliary/roman-numerals.rs
index 07302b6e68b..07302b6e68b 100644
--- a/src/test/run-pass-fulldeps/auxiliary/roman-numerals.rs
+++ b/src/test/ui-fulldeps/auxiliary/roman-numerals.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/syntax-extension-with-dll-deps-1.rs b/src/test/ui-fulldeps/auxiliary/syntax-extension-with-dll-deps-1.rs
index 8b00fb81cd2..8b00fb81cd2 100644
--- a/src/test/run-pass-fulldeps/auxiliary/syntax-extension-with-dll-deps-1.rs
+++ b/src/test/ui-fulldeps/auxiliary/syntax-extension-with-dll-deps-1.rs
diff --git a/src/test/run-pass-fulldeps/compiler-calls.rs b/src/test/ui-fulldeps/compiler-calls.rs
index b4731bbaeb5..ea24f5809d5 100644
--- a/src/test/run-pass-fulldeps/compiler-calls.rs
+++ b/src/test/ui-fulldeps/compiler-calls.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that the Callbacks interface to the compiler works.
 
 // ignore-cross-compile
diff --git a/src/test/run-pass-fulldeps/create-dir-all-bare.rs b/src/test/ui-fulldeps/create-dir-all-bare.rs
index da4cde447eb..4554680ec24 100644
--- a/src/test/run-pass-fulldeps/create-dir-all-bare.rs
+++ b/src/test/ui-fulldeps/create-dir-all-bare.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::env;
 use std::fs;
 use std::path::PathBuf;
diff --git a/src/test/run-pass-fulldeps/derive-no-std-not-supported.rs b/src/test/ui-fulldeps/derive-no-std-not-supported.rs
index 0111043994e..d09b1922a7b 100644
--- a/src/test/run-pass-fulldeps/derive-no-std-not-supported.rs
+++ b/src/test/ui-fulldeps/derive-no-std-not-supported.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![feature(rustc_private)]
 #![no_std]
diff --git a/src/test/run-pass-fulldeps/deriving-encodable-decodable-box.rs b/src/test/ui-fulldeps/deriving-encodable-decodable-box.rs
index 4c00c97edf3..877fb57a251 100644
--- a/src/test/run-pass-fulldeps/deriving-encodable-decodable-box.rs
+++ b/src/test/ui-fulldeps/deriving-encodable-decodable-box.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass-fulldeps/deriving-encodable-decodable-cell-refcell.rs b/src/test/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs
index 63e9d738179..a35b681641a 100644
--- a/src/test/run-pass-fulldeps/deriving-encodable-decodable-cell-refcell.rs
+++ b/src/test/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 // This briefly tests the capability of `Cell` and `RefCell` to implement the
 // `Encodable` and `Decodable` traits via `#[derive(Encodable, Decodable)]`
diff --git a/src/test/run-pass-fulldeps/deriving-global.rs b/src/test/ui-fulldeps/deriving-global.rs
index 5283cab7bde..b59d55ff213 100644
--- a/src/test/run-pass-fulldeps/deriving-global.rs
+++ b/src/test/ui-fulldeps/deriving-global.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(rustc_private)]
 
 extern crate serialize;
diff --git a/src/test/run-pass-fulldeps/deriving-hygiene.rs b/src/test/ui-fulldeps/deriving-hygiene.rs
index 6fd99931bf6..0d7439ef872 100644
--- a/src/test/run-pass-fulldeps/deriving-hygiene.rs
+++ b/src/test/ui-fulldeps/deriving-hygiene.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_upper_case_globals)]
 #![feature(rustc_private)]
 extern crate serialize;
diff --git a/src/test/run-pass-fulldeps/dropck_tarena_sound_drop.rs b/src/test/ui-fulldeps/dropck_tarena_sound_drop.rs
index 27eb70160ba..cf188d9efa3 100644
--- a/src/test/run-pass-fulldeps/dropck_tarena_sound_drop.rs
+++ b/src/test/ui-fulldeps/dropck_tarena_sound_drop.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unknown_lints)]
 // Check that an arena (TypedArena) can carry elements whose drop
 // methods might access borrowed data, as long as the borrowed data
diff --git a/src/test/run-pass-fulldeps/empty-struct-braces-derive.rs b/src/test/ui-fulldeps/empty-struct-braces-derive.rs
index d80bbca95df..68b407423aa 100644
--- a/src/test/run-pass-fulldeps/empty-struct-braces-derive.rs
+++ b/src/test/ui-fulldeps/empty-struct-braces-derive.rs
@@ -1,3 +1,4 @@
+// run-pass
 // `#[derive(Trait)]` works for empty structs/variants with braces or parens.
 
 #![feature(rustc_private)]
diff --git a/src/test/run-pass-fulldeps/extern-mod-syntax.rs b/src/test/ui-fulldeps/extern-mod-syntax.rs
index 12373acc365..258ab0dbe95 100644
--- a/src/test/run-pass-fulldeps/extern-mod-syntax.rs
+++ b/src/test/ui-fulldeps/extern-mod-syntax.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 #![feature(rustc_private)]
 
diff --git a/src/test/run-pass-fulldeps/issue-11881.rs b/src/test/ui-fulldeps/issue-11881.rs
index b44be1e90c5..c8893e62941 100644
--- a/src/test/run-pass-fulldeps/issue-11881.rs
+++ b/src/test/ui-fulldeps/issue-11881.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(dead_code)]
 #![allow(unused_imports)]
diff --git a/src/test/run-pass-fulldeps/issue-13560.rs b/src/test/ui-fulldeps/issue-13560.rs
index de2ecbdc988..5f7d647e230 100644
--- a/src/test/run-pass-fulldeps/issue-13560.rs
+++ b/src/test/ui-fulldeps/issue-13560.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:issue-13560-1.rs
 // aux-build:issue-13560-2.rs
 // aux-build:issue-13560-3.rs
diff --git a/src/test/run-pass-fulldeps/issue-14021.rs b/src/test/ui-fulldeps/issue-14021.rs
index b7ba842e001..49fa4492fa1 100644
--- a/src/test/run-pass-fulldeps/issue-14021.rs
+++ b/src/test/ui-fulldeps/issue-14021.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_mut)]
 #![allow(unused_imports)]
 #![feature(rustc_private)]
diff --git a/src/test/run-pass-fulldeps/issue-15149.rs b/src/test/ui-fulldeps/issue-15149.rs
index 2a62fabf53d..c80628aabc8 100644
--- a/src/test/run-pass-fulldeps/issue-15149.rs
+++ b/src/test/ui-fulldeps/issue-15149.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 // no-prefer-dynamic
 // ignore-cross-compile
diff --git a/src/test/run-pass-fulldeps/issue-15778-pass.rs b/src/test/ui-fulldeps/issue-15778-pass.rs
index 35152e7f4ba..b93630d56b0 100644
--- a/src/test/run-pass-fulldeps/issue-15778-pass.rs
+++ b/src/test/ui-fulldeps/issue-15778-pass.rs
@@ -1,10 +1,11 @@
-// aux-build:lint-for-crate.rs
+// run-pass
+// aux-build:lint-for-crate-rpass.rs
 // ignore-stage1
 // compile-flags: -D crate-not-okay
 
 #![feature(plugin, custom_attribute, custom_inner_attributes, rustc_attrs)]
 
-#![plugin(lint_for_crate)]
+#![plugin(lint_for_crate_rpass)]
 #![rustc_crate_okay]
 #![rustc_crate_blue]
 #![rustc_crate_red]
diff --git a/src/test/run-pass-fulldeps/issue-15924.rs b/src/test/ui-fulldeps/issue-15924.rs
index 9d807533f42..ec33de12ebb 100644
--- a/src/test/run-pass-fulldeps/issue-15924.rs
+++ b/src/test/ui-fulldeps/issue-15924.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 #![allow(unused_must_use)]
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass-fulldeps/issue-16822.rs b/src/test/ui-fulldeps/issue-16822.rs
index bcc10d16412..c611c33affd 100644
--- a/src/test/run-pass-fulldeps/issue-16822.rs
+++ b/src/test/ui-fulldeps/issue-16822.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:issue-16822.rs
 
 extern crate issue_16822 as lib;
diff --git a/src/test/run-pass-fulldeps/issue-18502.rs b/src/test/ui-fulldeps/issue-18502.rs
index a6e1fc84932..2082ae7a991 100644
--- a/src/test/run-pass-fulldeps/issue-18502.rs
+++ b/src/test/ui-fulldeps/issue-18502.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:issue-18502.rs
 
 extern crate issue_18502 as fmt;
diff --git a/src/test/run-pass-fulldeps/issue-24106.rs b/src/test/ui-fulldeps/issue-24106.rs
index e8e85ff3377..45f0bd5b679 100644
--- a/src/test/run-pass-fulldeps/issue-24106.rs
+++ b/src/test/ui-fulldeps/issue-24106.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:issue-24106.rs
 
 extern crate issue_24106;
diff --git a/src/test/run-pass-fulldeps/issue-24972.rs b/src/test/ui-fulldeps/issue-24972.rs
index ef4efb6218d..0d354aac137 100644
--- a/src/test/run-pass-fulldeps/issue-24972.rs
+++ b/src/test/ui-fulldeps/issue-24972.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![feature(rustc_private)]
 
diff --git a/src/test/run-pass-fulldeps/issue-2804.rs b/src/test/ui-fulldeps/issue-2804.rs
index d10f72791a2..a5345bbcd14 100644
--- a/src/test/run-pass-fulldeps/issue-2804.rs
+++ b/src/test/ui-fulldeps/issue-2804.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 #![feature(rustc_private)]
diff --git a/src/test/run-pass-fulldeps/issue-40001.rs b/src/test/ui-fulldeps/issue-40001.rs
index 1e546e14423..65e188ed1b6 100644
--- a/src/test/run-pass-fulldeps/issue-40001.rs
+++ b/src/test/ui-fulldeps/issue-40001.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:issue-40001-plugin.rs
 // ignore-stage1
 
diff --git a/src/test/run-pass-fulldeps/issue-4016.rs b/src/test/ui-fulldeps/issue-4016.rs
index 3de7a7cd936..fb84acbe645 100644
--- a/src/test/run-pass-fulldeps/issue-4016.rs
+++ b/src/test/ui-fulldeps/issue-4016.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 #![feature(rustc_private)]
diff --git a/src/test/run-pass-fulldeps/issue-4036.rs b/src/test/ui-fulldeps/issue-4036.rs
index 0cbd8adf977..9c9d3914268 100644
--- a/src/test/run-pass-fulldeps/issue-4036.rs
+++ b/src/test/ui-fulldeps/issue-4036.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Issue #4036: Test for an issue that arose around fixing up type inference
 // byproducts in vtable records.
 
diff --git a/src/test/run-pass-fulldeps/linkage-visibility.rs b/src/test/ui-fulldeps/linkage-visibility.rs
index 5315a219d6d..ae46fbc4e8a 100644
--- a/src/test/run-pass-fulldeps/linkage-visibility.rs
+++ b/src/test/ui-fulldeps/linkage-visibility.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:linkage-visibility.rs
 // ignore-android: FIXME(#10356)
 // ignore-windows: std::dynamic_lib does not work on Windows well
diff --git a/src/test/run-pass-fulldeps/llvm-pass-plugin.rs b/src/test/ui-fulldeps/llvm-pass-plugin.rs
index 411631104a4..a9b53fa8c74 100644
--- a/src/test/run-pass-fulldeps/llvm-pass-plugin.rs
+++ b/src/test/ui-fulldeps/llvm-pass-plugin.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:llvm-pass-plugin.rs
 // ignore-stage1
 
diff --git a/src/test/run-pass-fulldeps/lto-syntax-extension.rs b/src/test/ui-fulldeps/lto-syntax-extension.rs
index 05ce9e0a8df..135861dd772 100644
--- a/src/test/run-pass-fulldeps/lto-syntax-extension.rs
+++ b/src/test/ui-fulldeps/lto-syntax-extension.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:lto-syntax-extension-lib.rs
 // aux-build:lto-syntax-extension-plugin.rs
 // compile-flags:-C lto
diff --git a/src/test/run-pass-fulldeps/macro-crate-multi-decorator.rs b/src/test/ui-fulldeps/macro-crate-multi-decorator.rs
index 573bfca3168..e396cf01615 100644
--- a/src/test/run-pass-fulldeps/macro-crate-multi-decorator.rs
+++ b/src/test/ui-fulldeps/macro-crate-multi-decorator.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(plugin_as_library)]
 #![allow(dead_code)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass-fulldeps/mod_dir_path_canonicalized.rs b/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs
index a0dca9b1da4..8631bcca6d2 100644
--- a/src/test/run-pass-fulldeps/mod_dir_path_canonicalized.rs
+++ b/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Testing that a libsyntax can parse modules with canonicalized base path
 // ignore-cross-compile
 
diff --git a/src/test/run-pass-fulldeps/mod_dir_simple/compiletest-ignore-dir b/src/test/ui-fulldeps/mod_dir_simple/compiletest-ignore-dir
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/run-pass-fulldeps/mod_dir_simple/compiletest-ignore-dir
+++ b/src/test/ui-fulldeps/mod_dir_simple/compiletest-ignore-dir
diff --git a/src/test/run-pass-fulldeps/mod_dir_simple/test.rs b/src/test/ui-fulldeps/mod_dir_simple/test.rs
index a5e27a3a43c..35e26093a2d 100644
--- a/src/test/run-pass-fulldeps/mod_dir_simple/test.rs
+++ b/src/test/ui-fulldeps/mod_dir_simple/test.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub fn foo() -> isize { 10 }
diff --git a/src/test/run-pass-fulldeps/myriad-closures.rs b/src/test/ui-fulldeps/myriad-closures.rs
index a6d3530f139..310351f50cb 100644
--- a/src/test/run-pass-fulldeps/myriad-closures.rs
+++ b/src/test/ui-fulldeps/myriad-closures.rs
@@ -1,3 +1,4 @@
+// run-pass
 // This test case tests whether we can handle code bases that contain a high
 // number of closures, something that needs special handling in the MingGW
 // toolchain.
diff --git a/src/test/run-pass-fulldeps/newtype_index.rs b/src/test/ui-fulldeps/newtype_index.rs
index 1192a44a6ee..336b584768f 100644
--- a/src/test/run-pass-fulldeps/newtype_index.rs
+++ b/src/test/ui-fulldeps/newtype_index.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(rustc_private)]
 
 extern crate rustc_data_structures;
diff --git a/src/test/run-pass-fulldeps/outlive-expansion-phase.rs b/src/test/ui-fulldeps/outlive-expansion-phase.rs
index 86aed2511ce..752f1da7377 100644
--- a/src/test/run-pass-fulldeps/outlive-expansion-phase.rs
+++ b/src/test/ui-fulldeps/outlive-expansion-phase.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:outlive-expansion-phase.rs
 // ignore-stage1
 
diff --git a/src/test/run-pass-fulldeps/plugin-args-1.rs b/src/test/ui-fulldeps/plugin-args-1.rs
index 1bdf004e305..d6437146775 100644
--- a/src/test/run-pass-fulldeps/plugin-args-1.rs
+++ b/src/test/ui-fulldeps/plugin-args-1.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:plugin-args.rs
 // ignore-stage1
 
diff --git a/src/test/run-pass-fulldeps/plugin-args-2.rs b/src/test/ui-fulldeps/plugin-args-2.rs
index 83091df0582..949f8440379 100644
--- a/src/test/run-pass-fulldeps/plugin-args-2.rs
+++ b/src/test/ui-fulldeps/plugin-args-2.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:plugin-args.rs
 // ignore-stage1
 
diff --git a/src/test/run-pass-fulldeps/plugin-args-3.rs b/src/test/ui-fulldeps/plugin-args-3.rs
index 9cd9bee5a0f..efdbcd0bf0d 100644
--- a/src/test/run-pass-fulldeps/plugin-args-3.rs
+++ b/src/test/ui-fulldeps/plugin-args-3.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:plugin-args.rs
 // ignore-stage1
 
diff --git a/src/test/run-pass-fulldeps/pprust-expr-roundtrip.rs b/src/test/ui-fulldeps/pprust-expr-roundtrip.rs
index 5716e6d45a0..09f58521e5d 100644
--- a/src/test/run-pass-fulldeps/pprust-expr-roundtrip.rs
+++ b/src/test/ui-fulldeps/pprust-expr-roundtrip.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cross-compile
 
 // The general idea of this test is to enumerate all "interesting" expressions and check that
diff --git a/src/test/run-pass-fulldeps/regions-mock-tcx.rs b/src/test/ui-fulldeps/regions-mock-tcx.rs
index 8e4e6d1c058..524c94a8555 100644
--- a/src/test/run-pass-fulldeps/regions-mock-tcx.rs
+++ b/src/test/ui-fulldeps/regions-mock-tcx.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_imports)]
 
diff --git a/src/test/run-pass-fulldeps/rename-directory.rs b/src/test/ui-fulldeps/rename-directory.rs
index 1f2545ddcf2..8fc340cb918 100644
--- a/src/test/run-pass-fulldeps/rename-directory.rs
+++ b/src/test/ui-fulldeps/rename-directory.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(unused_imports)]
 // This test can't be a unit test in std,
diff --git a/src/test/run-pass-fulldeps/roman-numerals-macro.rs b/src/test/ui-fulldeps/roman-numerals-macro.rs
index 49c12e426fe..5c4ba3158db 100644
--- a/src/test/run-pass-fulldeps/roman-numerals-macro.rs
+++ b/src/test/ui-fulldeps/roman-numerals-macro.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:roman-numerals.rs
 // ignore-stage1
 
diff --git a/src/test/run-pass-fulldeps/rustc_encodable_hygiene.rs b/src/test/ui-fulldeps/rustc_encodable_hygiene.rs
index ae232c602cb..42a6153465c 100644
--- a/src/test/run-pass-fulldeps/rustc_encodable_hygiene.rs
+++ b/src/test/ui-fulldeps/rustc_encodable_hygiene.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(rustc_private)]
 
 #[allow(dead_code)]
diff --git a/src/test/run-pass-fulldeps/stdio-from.rs b/src/test/ui-fulldeps/stdio-from.rs
index 70e53936b70..fef9f27fcdf 100644
--- a/src/test/run-pass-fulldeps/stdio-from.rs
+++ b/src/test/ui-fulldeps/stdio-from.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cross-compile
 
 use std::env;
diff --git a/src/test/run-pass-fulldeps/switch-stdout.rs b/src/test/ui-fulldeps/switch-stdout.rs
index 6b16f955902..e105637c3da 100644
--- a/src/test/run-pass-fulldeps/switch-stdout.rs
+++ b/src/test/ui-fulldeps/switch-stdout.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::env;
 use std::fs::File;
 use std::io::{Read, Write};
diff --git a/src/test/run-pass-fulldeps/undef_mask.rs b/src/test/ui-fulldeps/undef_mask.rs
index cf6e6f72316..0caccad6229 100644
--- a/src/test/run-pass-fulldeps/undef_mask.rs
+++ b/src/test/ui-fulldeps/undef_mask.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cross-compile
 // ignore-stage1
 
diff --git a/src/test/ui/.gitattributes b/src/test/ui/.gitattributes
index 825f664bf9f..b62ade73aa9 100644
--- a/src/test/ui/.gitattributes
+++ b/src/test/ui/.gitattributes
@@ -1 +1,2 @@
-trailing-carriage-return-in-string.rs -text
\ No newline at end of file
+lexer-crlf-line-endings-string-literal-doc-comment.rs -text
+trailing-carriage-return-in-string.rs -text
diff --git a/src/test/run-pass/abi-sysv64-arg-passing.rs b/src/test/ui/abi-sysv64-arg-passing.rs
index fdf0573b5e3..d40006eb9b6 100644
--- a/src/test/run-pass/abi-sysv64-arg-passing.rs
+++ b/src/test/ui/abi-sysv64-arg-passing.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Checks if the "sysv64" calling convention behaves the same as the
 // "C" calling convention on platforms where both should be the same
 
diff --git a/src/test/run-pass/abi-sysv64-register-usage.rs b/src/test/ui/abi-sysv64-register-usage.rs
index a0d6e968252..0c7e2d906b7 100644
--- a/src/test/run-pass/abi-sysv64-register-usage.rs
+++ b/src/test/ui/abi-sysv64-register-usage.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Checks if the correct registers are being used to pass arguments
 // when the sysv64 ABI is specified.
 
diff --git a/src/test/run-pass/abi/issues/issue-62350-sysv-neg-reg-counts.rs b/src/test/ui/abi/issues/issue-62350-sysv-neg-reg-counts.rs
index df819306e4a..df819306e4a 100644
--- a/src/test/run-pass/abi/issues/issue-62350-sysv-neg-reg-counts.rs
+++ b/src/test/ui/abi/issues/issue-62350-sysv-neg-reg-counts.rs
diff --git a/src/test/run-pass/abort-on-c-abi.rs b/src/test/ui/abort-on-c-abi.rs
index 110f3eee1ef..cd7dd1b6a45 100644
--- a/src/test/run-pass/abort-on-c-abi.rs
+++ b/src/test/ui/abort-on-c-abi.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 // Since we mark some ABIs as "nounwind" to LLVM, we must make sure that
 // we never unwind through them.
diff --git a/src/test/run-pass/alias-uninit-value.rs b/src/test/ui/alias-uninit-value.rs
index c0fd09cbd40..932c93245e6 100644
--- a/src/test/run-pass/alias-uninit-value.rs
+++ b/src/test/ui/alias-uninit-value.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/align-with-extern-c-fn.rs b/src/test/ui/align-with-extern-c-fn.rs
index dca633de3ce..09abe4fbf7e 100644
--- a/src/test/run-pass/align-with-extern-c-fn.rs
+++ b/src/test/ui/align-with-extern-c-fn.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 #![allow(unused_variables)]
 
diff --git a/src/test/run-pass/alignment-gep-tup-like-1.rs b/src/test/ui/alignment-gep-tup-like-1.rs
index 7e6ee60e519..c51c56b0899 100644
--- a/src/test/run-pass/alignment-gep-tup-like-1.rs
+++ b/src/test/ui/alignment-gep-tup-like-1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/alloca-from-derived-tydesc.rs b/src/test/ui/alloca-from-derived-tydesc.rs
index 55f65806ab0..c7f7fbad435 100644
--- a/src/test/run-pass/alloca-from-derived-tydesc.rs
+++ b/src/test/ui/alloca-from-derived-tydesc.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/allocator-alloc-one.rs b/src/test/ui/allocator-alloc-one.rs
index 90114261723..312d5f13b1a 100644
--- a/src/test/run-pass/allocator-alloc-one.rs
+++ b/src/test/ui/allocator-alloc-one.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 
 #![feature(allocator_api, nonnull)]
diff --git a/src/test/run-pass/allocator/auxiliary/custom-as-global.rs b/src/test/ui/allocator/auxiliary/custom-as-global.rs
index a5e96e77501..a5e96e77501 100644
--- a/src/test/run-pass/allocator/auxiliary/custom-as-global.rs
+++ b/src/test/ui/allocator/auxiliary/custom-as-global.rs
diff --git a/src/test/run-pass/allocator/auxiliary/custom.rs b/src/test/ui/allocator/auxiliary/custom.rs
index b0ec9ab0929..b0ec9ab0929 100644
--- a/src/test/run-pass/allocator/auxiliary/custom.rs
+++ b/src/test/ui/allocator/auxiliary/custom.rs
diff --git a/src/test/run-pass/allocator/auxiliary/helper.rs b/src/test/ui/allocator/auxiliary/helper.rs
index 7f6770c226a..7f6770c226a 100644
--- a/src/test/run-pass/allocator/auxiliary/helper.rs
+++ b/src/test/ui/allocator/auxiliary/helper.rs
diff --git a/src/test/run-pass/allocator/custom-in-block.rs b/src/test/ui/allocator/custom-in-block.rs
index 12813a1fc8b..12813a1fc8b 100644
--- a/src/test/run-pass/allocator/custom-in-block.rs
+++ b/src/test/ui/allocator/custom-in-block.rs
diff --git a/src/test/run-pass/allocator/custom-in-submodule.rs b/src/test/ui/allocator/custom-in-submodule.rs
index ea341b1ac14..ea341b1ac14 100644
--- a/src/test/run-pass/allocator/custom-in-submodule.rs
+++ b/src/test/ui/allocator/custom-in-submodule.rs
diff --git a/src/test/run-pass/allocator/custom.rs b/src/test/ui/allocator/custom.rs
index 71f72ae46c2..71f72ae46c2 100644
--- a/src/test/run-pass/allocator/custom.rs
+++ b/src/test/ui/allocator/custom.rs
diff --git a/src/test/run-pass/allocator/xcrate-use.rs b/src/test/ui/allocator/xcrate-use.rs
index 039c70e77be..039c70e77be 100644
--- a/src/test/run-pass/allocator/xcrate-use.rs
+++ b/src/test/ui/allocator/xcrate-use.rs
diff --git a/src/test/run-pass/allocator/xcrate-use2.rs b/src/test/ui/allocator/xcrate-use2.rs
index d8478fb5eaa..d8478fb5eaa 100644
--- a/src/test/run-pass/allocator/xcrate-use2.rs
+++ b/src/test/ui/allocator/xcrate-use2.rs
diff --git a/src/test/run-pass/anon-extern-mod.rs b/src/test/ui/anon-extern-mod.rs
index 6d7e3f3cd5c..37a67876c91 100644
--- a/src/test/run-pass/anon-extern-mod.rs
+++ b/src/test/ui/anon-extern-mod.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 // ignore-wasm32-bare no libc to test ffi with
 
diff --git a/src/test/run-pass/argument-passing.rs b/src/test/ui/argument-passing.rs
index ea18ffe0155..74759a4a6bd 100644
--- a/src/test/run-pass/argument-passing.rs
+++ b/src/test/ui/argument-passing.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 struct X {
     x: isize
 }
diff --git a/src/test/run-pass/array-slice-vec/arr_cycle.rs b/src/test/ui/array-slice-vec/arr_cycle.rs
index c262b5a1ff0..c262b5a1ff0 100644
--- a/src/test/run-pass/array-slice-vec/arr_cycle.rs
+++ b/src/test/ui/array-slice-vec/arr_cycle.rs
diff --git a/src/test/run-pass/array-slice-vec/array_const_index-1.rs b/src/test/ui/array-slice-vec/array_const_index-1.rs
index 8ee225f5cdf..8ee225f5cdf 100644
--- a/src/test/run-pass/array-slice-vec/array_const_index-1.rs
+++ b/src/test/ui/array-slice-vec/array_const_index-1.rs
diff --git a/src/test/run-pass/array-slice-vec/box-of-array-of-drop-1.rs b/src/test/ui/array-slice-vec/box-of-array-of-drop-1.rs
index d4858932815..d4858932815 100644
--- a/src/test/run-pass/array-slice-vec/box-of-array-of-drop-1.rs
+++ b/src/test/ui/array-slice-vec/box-of-array-of-drop-1.rs
diff --git a/src/test/run-pass/array-slice-vec/box-of-array-of-drop-2.rs b/src/test/ui/array-slice-vec/box-of-array-of-drop-2.rs
index e8a5b00a55b..e8a5b00a55b 100644
--- a/src/test/run-pass/array-slice-vec/box-of-array-of-drop-2.rs
+++ b/src/test/ui/array-slice-vec/box-of-array-of-drop-2.rs
diff --git a/src/test/run-pass/array-slice-vec/cast-in-array-size.rs b/src/test/ui/array-slice-vec/cast-in-array-size.rs
index b112dcaef3e..b112dcaef3e 100644
--- a/src/test/run-pass/array-slice-vec/cast-in-array-size.rs
+++ b/src/test/ui/array-slice-vec/cast-in-array-size.rs
diff --git a/src/test/run-pass/array-slice-vec/check-static-mut-slices.rs b/src/test/ui/array-slice-vec/check-static-mut-slices.rs
index b89c634036e..b89c634036e 100644
--- a/src/test/run-pass/array-slice-vec/check-static-mut-slices.rs
+++ b/src/test/ui/array-slice-vec/check-static-mut-slices.rs
diff --git a/src/test/run-pass/array-slice-vec/check-static-slice.rs b/src/test/ui/array-slice-vec/check-static-slice.rs
index 1c607d13426..1c607d13426 100644
--- a/src/test/run-pass/array-slice-vec/check-static-slice.rs
+++ b/src/test/ui/array-slice-vec/check-static-slice.rs
diff --git a/src/test/run-pass/array-slice-vec/copy-out-of-array-1.rs b/src/test/ui/array-slice-vec/copy-out-of-array-1.rs
index e64985ae3f6..e64985ae3f6 100644
--- a/src/test/run-pass/array-slice-vec/copy-out-of-array-1.rs
+++ b/src/test/ui/array-slice-vec/copy-out-of-array-1.rs
diff --git a/src/test/run-pass/array-slice-vec/destructure-array-1.rs b/src/test/ui/array-slice-vec/destructure-array-1.rs
index 74d893ee5b2..74d893ee5b2 100644
--- a/src/test/run-pass/array-slice-vec/destructure-array-1.rs
+++ b/src/test/ui/array-slice-vec/destructure-array-1.rs
diff --git a/src/test/run-pass/array-slice-vec/empty-mutable-vec.rs b/src/test/ui/array-slice-vec/empty-mutable-vec.rs
index 91ab280b9c7..91ab280b9c7 100644
--- a/src/test/run-pass/array-slice-vec/empty-mutable-vec.rs
+++ b/src/test/ui/array-slice-vec/empty-mutable-vec.rs
diff --git a/src/test/run-pass/array-slice-vec/estr-slice.rs b/src/test/ui/array-slice-vec/estr-slice.rs
index cd2c1722065..cd2c1722065 100644
--- a/src/test/run-pass/array-slice-vec/estr-slice.rs
+++ b/src/test/ui/array-slice-vec/estr-slice.rs
diff --git a/src/test/run-pass/array-slice-vec/evec-slice.rs b/src/test/ui/array-slice-vec/evec-slice.rs
index 4bdf2dbdd6e..4bdf2dbdd6e 100644
--- a/src/test/run-pass/array-slice-vec/evec-slice.rs
+++ b/src/test/ui/array-slice-vec/evec-slice.rs
diff --git a/src/test/run-pass/array-slice-vec/fixed_length_copy.rs b/src/test/ui/array-slice-vec/fixed_length_copy.rs
index f73173e8484..f73173e8484 100644
--- a/src/test/run-pass/array-slice-vec/fixed_length_copy.rs
+++ b/src/test/ui/array-slice-vec/fixed_length_copy.rs
diff --git a/src/test/run-pass/array-slice-vec/huge-largest-array.rs b/src/test/ui/array-slice-vec/huge-largest-array.rs
index 9e78162c813..9e78162c813 100644
--- a/src/test/run-pass/array-slice-vec/huge-largest-array.rs
+++ b/src/test/ui/array-slice-vec/huge-largest-array.rs
diff --git a/src/test/run-pass/array-slice-vec/ivec-pass-by-value.rs b/src/test/ui/array-slice-vec/ivec-pass-by-value.rs
index e22aef96330..e22aef96330 100644
--- a/src/test/run-pass/array-slice-vec/ivec-pass-by-value.rs
+++ b/src/test/ui/array-slice-vec/ivec-pass-by-value.rs
diff --git a/src/test/run-pass/array-slice-vec/mutability-inherits-through-fixed-length-vec.rs b/src/test/ui/array-slice-vec/mutability-inherits-through-fixed-length-vec.rs
index 7afb9d8461f..7afb9d8461f 100644
--- a/src/test/run-pass/array-slice-vec/mutability-inherits-through-fixed-length-vec.rs
+++ b/src/test/ui/array-slice-vec/mutability-inherits-through-fixed-length-vec.rs
diff --git a/src/test/run-pass/array-slice-vec/mutable-alias-vec.rs b/src/test/ui/array-slice-vec/mutable-alias-vec.rs
index 98dd46824fa..98dd46824fa 100644
--- a/src/test/run-pass/array-slice-vec/mutable-alias-vec.rs
+++ b/src/test/ui/array-slice-vec/mutable-alias-vec.rs
diff --git a/src/test/run-pass/array-slice-vec/nested-vec-1.rs b/src/test/ui/array-slice-vec/nested-vec-1.rs
index 02a3ccf46f2..02a3ccf46f2 100644
--- a/src/test/run-pass/array-slice-vec/nested-vec-1.rs
+++ b/src/test/ui/array-slice-vec/nested-vec-1.rs
diff --git a/src/test/run-pass/array-slice-vec/nested-vec-2.rs b/src/test/ui/array-slice-vec/nested-vec-2.rs
index d4a704d767e..d4a704d767e 100644
--- a/src/test/run-pass/array-slice-vec/nested-vec-2.rs
+++ b/src/test/ui/array-slice-vec/nested-vec-2.rs
diff --git a/src/test/run-pass/array-slice-vec/nested-vec-3.rs b/src/test/ui/array-slice-vec/nested-vec-3.rs
index 52b892dbcdf..52b892dbcdf 100644
--- a/src/test/run-pass/array-slice-vec/nested-vec-3.rs
+++ b/src/test/ui/array-slice-vec/nested-vec-3.rs
diff --git a/src/test/run-pass/array-slice-vec/new-style-fixed-length-vec.rs b/src/test/ui/array-slice-vec/new-style-fixed-length-vec.rs
index 454f94be876..454f94be876 100644
--- a/src/test/run-pass/array-slice-vec/new-style-fixed-length-vec.rs
+++ b/src/test/ui/array-slice-vec/new-style-fixed-length-vec.rs
diff --git a/src/test/run-pass/array-slice-vec/rcvr-borrowed-to-slice.rs b/src/test/ui/array-slice-vec/rcvr-borrowed-to-slice.rs
index 17cf7e335b9..17cf7e335b9 100644
--- a/src/test/run-pass/array-slice-vec/rcvr-borrowed-to-slice.rs
+++ b/src/test/ui/array-slice-vec/rcvr-borrowed-to-slice.rs
diff --git a/src/test/run-pass/array-slice-vec/repeated-vector-syntax.rs b/src/test/ui/array-slice-vec/repeated-vector-syntax.rs
index 4458eb06dd5..4458eb06dd5 100644
--- a/src/test/run-pass/array-slice-vec/repeated-vector-syntax.rs
+++ b/src/test/ui/array-slice-vec/repeated-vector-syntax.rs
diff --git a/src/test/run-pass/array-slice-vec/show-boxed-slice.rs b/src/test/ui/array-slice-vec/show-boxed-slice.rs
index dfa4c720bb0..dfa4c720bb0 100644
--- a/src/test/run-pass/array-slice-vec/show-boxed-slice.rs
+++ b/src/test/ui/array-slice-vec/show-boxed-slice.rs
diff --git a/src/test/run-pass/array-slice-vec/slice-2.rs b/src/test/ui/array-slice-vec/slice-2.rs
index 01733f48234..01733f48234 100644
--- a/src/test/run-pass/array-slice-vec/slice-2.rs
+++ b/src/test/ui/array-slice-vec/slice-2.rs
diff --git a/src/test/run-pass/array-slice-vec/slice-of-zero-size-elements.rs b/src/test/ui/array-slice-vec/slice-of-zero-size-elements.rs
index 83b08a3db4c..83b08a3db4c 100644
--- a/src/test/run-pass/array-slice-vec/slice-of-zero-size-elements.rs
+++ b/src/test/ui/array-slice-vec/slice-of-zero-size-elements.rs
diff --git a/src/test/run-pass/array-slice-vec/slice-panic-1.rs b/src/test/ui/array-slice-vec/slice-panic-1.rs
index 8b27d055e2b..8b27d055e2b 100644
--- a/src/test/run-pass/array-slice-vec/slice-panic-1.rs
+++ b/src/test/ui/array-slice-vec/slice-panic-1.rs
diff --git a/src/test/run-pass/array-slice-vec/slice-panic-2.rs b/src/test/ui/array-slice-vec/slice-panic-2.rs
index 2ee564cadb3..2ee564cadb3 100644
--- a/src/test/run-pass/array-slice-vec/slice-panic-2.rs
+++ b/src/test/ui/array-slice-vec/slice-panic-2.rs
diff --git a/src/test/run-pass/array-slice-vec/slice.rs b/src/test/ui/array-slice-vec/slice.rs
index 14e1ddf52eb..14e1ddf52eb 100644
--- a/src/test/run-pass/array-slice-vec/slice.rs
+++ b/src/test/ui/array-slice-vec/slice.rs
diff --git a/src/test/run-pass/array-slice-vec/slice_binary_search.rs b/src/test/ui/array-slice-vec/slice_binary_search.rs
index 12236960179..12236960179 100644
--- a/src/test/run-pass/array-slice-vec/slice_binary_search.rs
+++ b/src/test/ui/array-slice-vec/slice_binary_search.rs
diff --git a/src/test/run-pass/array-slice-vec/variance-vec-covariant.rs b/src/test/ui/array-slice-vec/variance-vec-covariant.rs
index d7e64132f89..d7e64132f89 100644
--- a/src/test/run-pass/array-slice-vec/variance-vec-covariant.rs
+++ b/src/test/ui/array-slice-vec/variance-vec-covariant.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-concat.rs b/src/test/ui/array-slice-vec/vec-concat.rs
index 1f493679b79..1f493679b79 100644
--- a/src/test/run-pass/array-slice-vec/vec-concat.rs
+++ b/src/test/ui/array-slice-vec/vec-concat.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-dst.rs b/src/test/ui/array-slice-vec/vec-dst.rs
index e741201652b..e741201652b 100644
--- a/src/test/run-pass/array-slice-vec/vec-dst.rs
+++ b/src/test/ui/array-slice-vec/vec-dst.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-fixed-length.rs b/src/test/ui/array-slice-vec/vec-fixed-length.rs
index 5db02ee066b..5db02ee066b 100644
--- a/src/test/run-pass/array-slice-vec/vec-fixed-length.rs
+++ b/src/test/ui/array-slice-vec/vec-fixed-length.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-growth.rs b/src/test/ui/array-slice-vec/vec-growth.rs
index b09f08bb85a..b09f08bb85a 100644
--- a/src/test/run-pass/array-slice-vec/vec-growth.rs
+++ b/src/test/ui/array-slice-vec/vec-growth.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-late-init.rs b/src/test/ui/array-slice-vec/vec-late-init.rs
index 5dee3608256..5dee3608256 100644
--- a/src/test/run-pass/array-slice-vec/vec-late-init.rs
+++ b/src/test/ui/array-slice-vec/vec-late-init.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-macro-no-std.rs b/src/test/ui/array-slice-vec/vec-macro-no-std.rs
index 443895f7c48..443895f7c48 100644
--- a/src/test/run-pass/array-slice-vec/vec-macro-no-std.rs
+++ b/src/test/ui/array-slice-vec/vec-macro-no-std.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-macro-repeat.rs b/src/test/ui/array-slice-vec/vec-macro-repeat.rs
index 7be8dadbe17..7be8dadbe17 100644
--- a/src/test/run-pass/array-slice-vec/vec-macro-repeat.rs
+++ b/src/test/ui/array-slice-vec/vec-macro-repeat.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-macro-rvalue-scope.rs b/src/test/ui/array-slice-vec/vec-macro-rvalue-scope.rs
index bde01037181..bde01037181 100644
--- a/src/test/run-pass/array-slice-vec/vec-macro-rvalue-scope.rs
+++ b/src/test/ui/array-slice-vec/vec-macro-rvalue-scope.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-macro-with-brackets.rs b/src/test/ui/array-slice-vec/vec-macro-with-brackets.rs
index 6c95bd50007..6c95bd50007 100644
--- a/src/test/run-pass/array-slice-vec/vec-macro-with-brackets.rs
+++ b/src/test/ui/array-slice-vec/vec-macro-with-brackets.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-macro-with-trailing-comma.rs b/src/test/ui/array-slice-vec/vec-macro-with-trailing-comma.rs
index f7a51f9c456..f7a51f9c456 100644
--- a/src/test/run-pass/array-slice-vec/vec-macro-with-trailing-comma.rs
+++ b/src/test/ui/array-slice-vec/vec-macro-with-trailing-comma.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-matching-autoslice.rs b/src/test/ui/array-slice-vec/vec-matching-autoslice.rs
index 8179edf420c..8179edf420c 100644
--- a/src/test/run-pass/array-slice-vec/vec-matching-autoslice.rs
+++ b/src/test/ui/array-slice-vec/vec-matching-autoslice.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-matching-fixed.rs b/src/test/ui/array-slice-vec/vec-matching-fixed.rs
index 5253bc1b214..5253bc1b214 100644
--- a/src/test/run-pass/array-slice-vec/vec-matching-fixed.rs
+++ b/src/test/ui/array-slice-vec/vec-matching-fixed.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-matching-fold.rs b/src/test/ui/array-slice-vec/vec-matching-fold.rs
index 2b19c49c427..2b19c49c427 100644
--- a/src/test/run-pass/array-slice-vec/vec-matching-fold.rs
+++ b/src/test/ui/array-slice-vec/vec-matching-fold.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-matching-legal-tail-element-borrow.rs b/src/test/ui/array-slice-vec/vec-matching-legal-tail-element-borrow.rs
index bce03b3375e..bce03b3375e 100644
--- a/src/test/run-pass/array-slice-vec/vec-matching-legal-tail-element-borrow.rs
+++ b/src/test/ui/array-slice-vec/vec-matching-legal-tail-element-borrow.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-matching.rs b/src/test/ui/array-slice-vec/vec-matching.rs
index a37c25160fa..a37c25160fa 100644
--- a/src/test/run-pass/array-slice-vec/vec-matching.rs
+++ b/src/test/ui/array-slice-vec/vec-matching.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-push.rs b/src/test/ui/array-slice-vec/vec-push.rs
index 466ab3fab1c..466ab3fab1c 100644
--- a/src/test/run-pass/array-slice-vec/vec-push.rs
+++ b/src/test/ui/array-slice-vec/vec-push.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-repeat-with-cast.rs b/src/test/ui/array-slice-vec/vec-repeat-with-cast.rs
index 3e0e18873ab..3e0e18873ab 100644
--- a/src/test/run-pass/array-slice-vec/vec-repeat-with-cast.rs
+++ b/src/test/ui/array-slice-vec/vec-repeat-with-cast.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-slice-drop.rs b/src/test/ui/array-slice-vec/vec-slice-drop.rs
index 3a9ea86af34..3a9ea86af34 100644
--- a/src/test/run-pass/array-slice-vec/vec-slice-drop.rs
+++ b/src/test/ui/array-slice-vec/vec-slice-drop.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-slice.rs b/src/test/ui/array-slice-vec/vec-slice.rs
index 1f090ddd9c9..1f090ddd9c9 100644
--- a/src/test/run-pass/array-slice-vec/vec-slice.rs
+++ b/src/test/ui/array-slice-vec/vec-slice.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-tail-matching.rs b/src/test/ui/array-slice-vec/vec-tail-matching.rs
index 84d246dff82..84d246dff82 100644
--- a/src/test/run-pass/array-slice-vec/vec-tail-matching.rs
+++ b/src/test/ui/array-slice-vec/vec-tail-matching.rs
diff --git a/src/test/run-pass/array-slice-vec/vec-to_str.rs b/src/test/ui/array-slice-vec/vec-to_str.rs
index a11cfc8e9b5..a11cfc8e9b5 100644
--- a/src/test/run-pass/array-slice-vec/vec-to_str.rs
+++ b/src/test/ui/array-slice-vec/vec-to_str.rs
diff --git a/src/test/run-pass/array-slice-vec/vec.rs b/src/test/ui/array-slice-vec/vec.rs
index e76c1ab440e..e76c1ab440e 100644
--- a/src/test/run-pass/array-slice-vec/vec.rs
+++ b/src/test/ui/array-slice-vec/vec.rs
diff --git a/src/test/run-pass/array-slice-vec/vec_cycle.rs b/src/test/ui/array-slice-vec/vec_cycle.rs
index 82bce437282..82bce437282 100644
--- a/src/test/run-pass/array-slice-vec/vec_cycle.rs
+++ b/src/test/ui/array-slice-vec/vec_cycle.rs
diff --git a/src/test/run-pass/array-slice-vec/vec_cycle_wrapped.rs b/src/test/ui/array-slice-vec/vec_cycle_wrapped.rs
index 1a3606d5e8d..1a3606d5e8d 100644
--- a/src/test/run-pass/array-slice-vec/vec_cycle_wrapped.rs
+++ b/src/test/ui/array-slice-vec/vec_cycle_wrapped.rs
diff --git a/src/test/run-pass/array-slice-vec/vector-no-ann-2.rs b/src/test/ui/array-slice-vec/vector-no-ann-2.rs
index dd8f402f3f6..dd8f402f3f6 100644
--- a/src/test/run-pass/array-slice-vec/vector-no-ann-2.rs
+++ b/src/test/ui/array-slice-vec/vector-no-ann-2.rs
diff --git a/src/test/run-pass/artificial-block.rs b/src/test/ui/artificial-block.rs
index dd4d3e57536..2e383e1a7c6 100644
--- a/src/test/run-pass/artificial-block.rs
+++ b/src/test/ui/artificial-block.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn f() -> isize { { return 3; } }
 
 pub fn main() { assert_eq!(f(), 3); }
diff --git a/src/test/run-pass/as-precedence.rs b/src/test/ui/as-precedence.rs
index 34ff96ea6da..a9f6fceb08f 100644
--- a/src/test/run-pass/as-precedence.rs
+++ b/src/test/ui/as-precedence.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn main() {
     assert_eq!(3 as usize * 3, 9);
     assert_eq!(3 as (usize) * 3, 9);
diff --git a/src/test/run-pass/asm-concat-src.rs b/src/test/ui/asm-concat-src.rs
index c629519e8fe..c4160bfeca1 100644
--- a/src/test/run-pass/asm-concat-src.rs
+++ b/src/test/ui/asm-concat-src.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 // ignore-emscripten no asm
 
diff --git a/src/test/run-pass/asm-in-moved.rs b/src/test/ui/asm-in-moved.rs
index 8726db35555..6525d2f53b0 100644
--- a/src/test/run-pass/asm-in-moved.rs
+++ b/src/test/ui/asm-in-moved.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(asm)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/asm-in-out-operand.rs b/src/test/ui/asm-in-out-operand.rs
index 148c5b34855..13d0363a6a0 100644
--- a/src/test/run-pass/asm-in-out-operand.rs
+++ b/src/test/ui/asm-in-out-operand.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(asm)]
 
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
diff --git a/src/test/run-pass/asm-indirect-memory.rs b/src/test/ui/asm-indirect-memory.rs
index 83b773d8604..2e8011af502 100644
--- a/src/test/run-pass/asm-indirect-memory.rs
+++ b/src/test/ui/asm-indirect-memory.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(asm)]
 
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
diff --git a/src/test/run-pass/asm-out-assign.rs b/src/test/ui/asm-out-assign.rs
index 5c46cb92c6b..ed63d1b4d49 100644
--- a/src/test/run-pass/asm-out-assign.rs
+++ b/src/test/ui/asm-out-assign.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(asm)]
 
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
diff --git a/src/test/run-pass/assert-eq-trailing-comma.rs b/src/test/ui/assert-eq-trailing-comma.rs
index 77f3ec90da4..7071f80d7f7 100644
--- a/src/test/run-pass/assert-eq-trailing-comma.rs
+++ b/src/test/ui/assert-eq-trailing-comma.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn main() {
     assert_eq!(1, 1,);
 }
diff --git a/src/test/run-pass/assert-escape.rs b/src/test/ui/assert-escape.rs
index 01342113bde..00e51d42cab 100644
--- a/src/test/run-pass/assert-escape.rs
+++ b/src/test/ui/assert-escape.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn main() {
     assert!(r#"☃\backslash"#.contains("\\"));
 }
diff --git a/src/test/run-pass/assert-ne-trailing-comma.rs b/src/test/ui/assert-ne-trailing-comma.rs
index f931a04a290..03308db9a1f 100644
--- a/src/test/run-pass/assert-ne-trailing-comma.rs
+++ b/src/test/ui/assert-ne-trailing-comma.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn main() {
     assert_ne!(1, 2,);
 }
diff --git a/src/test/run-pass/assign-assign.rs b/src/test/ui/assign-assign.rs
index ea0337676fc..bcf506b398b 100644
--- a/src/test/run-pass/assign-assign.rs
+++ b/src/test/ui/assign-assign.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Issue 483 - Assignment expressions result in nil
 
 fn test_assign() {
diff --git a/src/test/run-pass/assoc-oddities-3.rs b/src/test/ui/assoc-oddities-3.rs
index bd381259675..cd025dc8bee 100644
--- a/src/test/run-pass/assoc-oddities-3.rs
+++ b/src/test/ui/assoc-oddities-3.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn that_odd_parse(c: bool, n: usize) -> u32 {
     let x = 2;
     let a = [1, 2, 3, 4];
diff --git a/src/test/run-pass/associated-consts/associated-const-const-eval.rs b/src/test/ui/associated-consts/associated-const-const-eval.rs
index 5a34bb97ca5..5a34bb97ca5 100644
--- a/src/test/run-pass/associated-consts/associated-const-const-eval.rs
+++ b/src/test/ui/associated-consts/associated-const-const-eval.rs
diff --git a/src/test/run-pass/associated-consts/associated-const-cross-crate-const-eval.rs b/src/test/ui/associated-consts/associated-const-cross-crate-const-eval.rs
index 611639b84be..611639b84be 100644
--- a/src/test/run-pass/associated-consts/associated-const-cross-crate-const-eval.rs
+++ b/src/test/ui/associated-consts/associated-const-cross-crate-const-eval.rs
diff --git a/src/test/run-pass/associated-consts/associated-const-cross-crate-defaults.rs b/src/test/ui/associated-consts/associated-const-cross-crate-defaults.rs
index 92d9cffecdd..92d9cffecdd 100644
--- a/src/test/run-pass/associated-consts/associated-const-cross-crate-defaults.rs
+++ b/src/test/ui/associated-consts/associated-const-cross-crate-defaults.rs
diff --git a/src/test/run-pass/associated-consts/associated-const-cross-crate.rs b/src/test/ui/associated-consts/associated-const-cross-crate.rs
index ecdc112e02d..ecdc112e02d 100644
--- a/src/test/run-pass/associated-consts/associated-const-cross-crate.rs
+++ b/src/test/ui/associated-consts/associated-const-cross-crate.rs
diff --git a/src/test/run-pass/associated-consts/associated-const-in-global-const.rs b/src/test/ui/associated-consts/associated-const-in-global-const.rs
index 18d7a121558..18d7a121558 100644
--- a/src/test/run-pass/associated-consts/associated-const-in-global-const.rs
+++ b/src/test/ui/associated-consts/associated-const-in-global-const.rs
diff --git a/src/test/run-pass/associated-consts/associated-const-inherent-impl.rs b/src/test/ui/associated-consts/associated-const-inherent-impl.rs
index c6d956dffe1..c6d956dffe1 100644
--- a/src/test/run-pass/associated-consts/associated-const-inherent-impl.rs
+++ b/src/test/ui/associated-consts/associated-const-inherent-impl.rs
diff --git a/src/test/run-pass/associated-consts/associated-const-marks-live-code.rs b/src/test/ui/associated-consts/associated-const-marks-live-code.rs
index 68eb4e25d33..68eb4e25d33 100644
--- a/src/test/run-pass/associated-consts/associated-const-marks-live-code.rs
+++ b/src/test/ui/associated-consts/associated-const-marks-live-code.rs
diff --git a/src/test/run-pass/associated-consts/associated-const-match-patterns.rs b/src/test/ui/associated-consts/associated-const-match-patterns.rs
index 62c1cb983d1..62c1cb983d1 100644
--- a/src/test/run-pass/associated-consts/associated-const-match-patterns.rs
+++ b/src/test/ui/associated-consts/associated-const-match-patterns.rs
diff --git a/src/test/run-pass/associated-consts/associated-const-outer-ty-refs.rs b/src/test/ui/associated-consts/associated-const-outer-ty-refs.rs
index f32ca0cccfc..f32ca0cccfc 100644
--- a/src/test/run-pass/associated-consts/associated-const-outer-ty-refs.rs
+++ b/src/test/ui/associated-consts/associated-const-outer-ty-refs.rs
diff --git a/src/test/run-pass/associated-consts/associated-const-overwrite-default.rs b/src/test/ui/associated-consts/associated-const-overwrite-default.rs
index 445135aef2b..445135aef2b 100644
--- a/src/test/run-pass/associated-consts/associated-const-overwrite-default.rs
+++ b/src/test/ui/associated-consts/associated-const-overwrite-default.rs
diff --git a/src/test/run-pass/associated-consts/associated-const-public-impl.rs b/src/test/ui/associated-consts/associated-const-public-impl.rs
index 787bee0ff02..787bee0ff02 100644
--- a/src/test/run-pass/associated-consts/associated-const-public-impl.rs
+++ b/src/test/ui/associated-consts/associated-const-public-impl.rs
diff --git a/src/test/run-pass/associated-consts/associated-const-range-match-patterns.rs b/src/test/ui/associated-consts/associated-const-range-match-patterns.rs
index 5276869a702..5276869a702 100644
--- a/src/test/run-pass/associated-consts/associated-const-range-match-patterns.rs
+++ b/src/test/ui/associated-consts/associated-const-range-match-patterns.rs
diff --git a/src/test/run-pass/associated-consts/associated-const-resolution-order.rs b/src/test/ui/associated-consts/associated-const-resolution-order.rs
index d2ccd30a6e2..d2ccd30a6e2 100644
--- a/src/test/run-pass/associated-consts/associated-const-resolution-order.rs
+++ b/src/test/ui/associated-consts/associated-const-resolution-order.rs
diff --git a/src/test/run-pass/associated-consts/associated-const-self-type.rs b/src/test/ui/associated-consts/associated-const-self-type.rs
index 36e1e4ecce7..36e1e4ecce7 100644
--- a/src/test/run-pass/associated-consts/associated-const-self-type.rs
+++ b/src/test/ui/associated-consts/associated-const-self-type.rs
diff --git a/src/test/run-pass/associated-consts/associated-const-type-parameters.rs b/src/test/ui/associated-consts/associated-const-type-parameters.rs
index 47c3313ec28..47c3313ec28 100644
--- a/src/test/run-pass/associated-consts/associated-const-type-parameters.rs
+++ b/src/test/ui/associated-consts/associated-const-type-parameters.rs
diff --git a/src/test/run-pass/associated-consts/associated-const-ufcs-infer-trait.rs b/src/test/ui/associated-consts/associated-const-ufcs-infer-trait.rs
index ca44c9f45fc..ca44c9f45fc 100644
--- a/src/test/run-pass/associated-consts/associated-const-ufcs-infer-trait.rs
+++ b/src/test/ui/associated-consts/associated-const-ufcs-infer-trait.rs
diff --git a/src/test/run-pass/associated-consts/associated-const-use-default.rs b/src/test/ui/associated-consts/associated-const-use-default.rs
index adf36b1fff2..adf36b1fff2 100644
--- a/src/test/run-pass/associated-consts/associated-const-use-default.rs
+++ b/src/test/ui/associated-consts/associated-const-use-default.rs
diff --git a/src/test/run-pass/associated-consts/associated-const-use-impl-of-same-trait.rs b/src/test/ui/associated-consts/associated-const-use-impl-of-same-trait.rs
index 8f01bae4fcf..8f01bae4fcf 100644
--- a/src/test/run-pass/associated-consts/associated-const-use-impl-of-same-trait.rs
+++ b/src/test/ui/associated-consts/associated-const-use-impl-of-same-trait.rs
diff --git a/src/test/run-pass/associated-consts/associated-const.rs b/src/test/ui/associated-consts/associated-const.rs
index e4b1c29f371..e4b1c29f371 100644
--- a/src/test/run-pass/associated-consts/associated-const.rs
+++ b/src/test/ui/associated-consts/associated-const.rs
diff --git a/src/test/run-pass/associated-consts/auxiliary/associated-const-cc-lib.rs b/src/test/ui/associated-consts/auxiliary/associated-const-cc-lib.rs
index 4fcefe32cbf..4fcefe32cbf 100644
--- a/src/test/run-pass/associated-consts/auxiliary/associated-const-cc-lib.rs
+++ b/src/test/ui/associated-consts/auxiliary/associated-const-cc-lib.rs
diff --git a/src/test/run-pass/associated-consts/auxiliary/empty-struct.rs b/src/test/ui/associated-consts/auxiliary/empty-struct.rs
index 93275e7143e..93275e7143e 100644
--- a/src/test/run-pass/associated-consts/auxiliary/empty-struct.rs
+++ b/src/test/ui/associated-consts/auxiliary/empty-struct.rs
diff --git a/src/test/run-pass/associated-item-long-paths.rs b/src/test/ui/associated-item-long-paths.rs
index f2d151fc54a..aad8c487c5a 100644
--- a/src/test/run-pass/associated-item-long-paths.rs
+++ b/src/test/ui/associated-item-long-paths.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::mem::size_of;
 
 // The main point of this test is to ensure that we can parse and resolve
diff --git a/src/test/run-pass/associated-types/associated-types-basic.rs b/src/test/ui/associated-types/associated-types-basic.rs
index b7f6721ec4f..b7f6721ec4f 100644
--- a/src/test/run-pass/associated-types/associated-types-basic.rs
+++ b/src/test/ui/associated-types/associated-types-basic.rs
diff --git a/src/test/run-pass/associated-types/associated-types-binding-in-trait.rs b/src/test/ui/associated-types/associated-types-binding-in-trait.rs
index 2e42b3a2a44..2e42b3a2a44 100644
--- a/src/test/run-pass/associated-types/associated-types-binding-in-trait.rs
+++ b/src/test/ui/associated-types/associated-types-binding-in-trait.rs
diff --git a/src/test/run-pass/associated-types/associated-types-binding-in-where-clause.rs b/src/test/ui/associated-types/associated-types-binding-in-where-clause.rs
index c54bc3cd623..c54bc3cd623 100644
--- a/src/test/run-pass/associated-types/associated-types-binding-in-where-clause.rs
+++ b/src/test/ui/associated-types/associated-types-binding-in-where-clause.rs
diff --git a/src/test/run-pass/associated-types/associated-types-bound.rs b/src/test/ui/associated-types/associated-types-bound.rs
index 0e9a229a5e5..0e9a229a5e5 100644
--- a/src/test/run-pass/associated-types/associated-types-bound.rs
+++ b/src/test/ui/associated-types/associated-types-bound.rs
diff --git a/src/test/run-pass/associated-types/associated-types-cc.rs b/src/test/ui/associated-types/associated-types-cc.rs
index 13f1d27203a..13f1d27203a 100644
--- a/src/test/run-pass/associated-types/associated-types-cc.rs
+++ b/src/test/ui/associated-types/associated-types-cc.rs
diff --git a/src/test/run-pass/associated-types/associated-types-conditional-dispatch.rs b/src/test/ui/associated-types/associated-types-conditional-dispatch.rs
index 70ee60517ae..70ee60517ae 100644
--- a/src/test/run-pass/associated-types/associated-types-conditional-dispatch.rs
+++ b/src/test/ui/associated-types/associated-types-conditional-dispatch.rs
diff --git a/src/test/run-pass/associated-types/associated-types-constant-type.rs b/src/test/ui/associated-types/associated-types-constant-type.rs
index 1e4c113a5fb..1e4c113a5fb 100644
--- a/src/test/run-pass/associated-types/associated-types-constant-type.rs
+++ b/src/test/ui/associated-types/associated-types-constant-type.rs
diff --git a/src/test/run-pass/associated-types/associated-types-doubleendediterator-object.rs b/src/test/ui/associated-types/associated-types-doubleendediterator-object.rs
index 96ba2ee3b62..96ba2ee3b62 100644
--- a/src/test/run-pass/associated-types/associated-types-doubleendediterator-object.rs
+++ b/src/test/ui/associated-types/associated-types-doubleendediterator-object.rs
diff --git a/src/test/run-pass/associated-types/associated-types-duplicate-binding-in-env-hrtb.rs b/src/test/ui/associated-types/associated-types-duplicate-binding-in-env-hrtb.rs
index 12ca100435a..12ca100435a 100644
--- a/src/test/run-pass/associated-types/associated-types-duplicate-binding-in-env-hrtb.rs
+++ b/src/test/ui/associated-types/associated-types-duplicate-binding-in-env-hrtb.rs
diff --git a/src/test/run-pass/associated-types/associated-types-duplicate-binding-in-env.rs b/src/test/ui/associated-types/associated-types-duplicate-binding-in-env.rs
index 9ffccd3d8ff..9ffccd3d8ff 100644
--- a/src/test/run-pass/associated-types/associated-types-duplicate-binding-in-env.rs
+++ b/src/test/ui/associated-types/associated-types-duplicate-binding-in-env.rs
diff --git a/src/test/run-pass/associated-types/associated-types-enum-field-named.rs b/src/test/ui/associated-types/associated-types-enum-field-named.rs
index 896d67213e9..896d67213e9 100644
--- a/src/test/run-pass/associated-types/associated-types-enum-field-named.rs
+++ b/src/test/ui/associated-types/associated-types-enum-field-named.rs
diff --git a/src/test/run-pass/associated-types/associated-types-enum-field-numbered.rs b/src/test/ui/associated-types/associated-types-enum-field-numbered.rs
index 77ced3c0781..77ced3c0781 100644
--- a/src/test/run-pass/associated-types/associated-types-enum-field-numbered.rs
+++ b/src/test/ui/associated-types/associated-types-enum-field-numbered.rs
diff --git a/src/test/run-pass/associated-types/associated-types-eq-obj.rs b/src/test/ui/associated-types/associated-types-eq-obj.rs
index c202c376c5f..c202c376c5f 100644
--- a/src/test/run-pass/associated-types/associated-types-eq-obj.rs
+++ b/src/test/ui/associated-types/associated-types-eq-obj.rs
diff --git a/src/test/run-pass/associated-types/associated-types-from-supertrait.rs b/src/test/ui/associated-types/associated-types-from-supertrait.rs
index c040790188d..8f40b94c099 100644
--- a/src/test/run-pass/associated-types/associated-types-from-supertrait.rs
+++ b/src/test/ui/associated-types/associated-types-from-supertrait.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 trait Foo: Iterator<Item = i32> {}
 trait Bar: Foo {}
 
diff --git a/src/test/run-pass/associated-types/associated-types-impl-redirect.rs b/src/test/ui/associated-types/associated-types-impl-redirect.rs
index 8fa20cdf4b7..8fa20cdf4b7 100644
--- a/src/test/run-pass/associated-types/associated-types-impl-redirect.rs
+++ b/src/test/ui/associated-types/associated-types-impl-redirect.rs
diff --git a/src/test/run-pass/associated-types/associated-types-in-bound-type-arg.rs b/src/test/ui/associated-types/associated-types-in-bound-type-arg.rs
index 88bb5fe0afe..88bb5fe0afe 100644
--- a/src/test/run-pass/associated-types/associated-types-in-bound-type-arg.rs
+++ b/src/test/ui/associated-types/associated-types-in-bound-type-arg.rs
diff --git a/src/test/run-pass/associated-types/associated-types-in-default-method.rs b/src/test/ui/associated-types/associated-types-in-default-method.rs
index 80ffbf585fb..80ffbf585fb 100644
--- a/src/test/run-pass/associated-types/associated-types-in-default-method.rs
+++ b/src/test/ui/associated-types/associated-types-in-default-method.rs
diff --git a/src/test/run-pass/associated-types/associated-types-in-fn.rs b/src/test/ui/associated-types/associated-types-in-fn.rs
index 9c588a528fe..9c588a528fe 100644
--- a/src/test/run-pass/associated-types/associated-types-in-fn.rs
+++ b/src/test/ui/associated-types/associated-types-in-fn.rs
diff --git a/src/test/run-pass/associated-types/associated-types-in-impl-generics.rs b/src/test/ui/associated-types/associated-types-in-impl-generics.rs
index 0ddd99cbfa8..0ddd99cbfa8 100644
--- a/src/test/run-pass/associated-types/associated-types-in-impl-generics.rs
+++ b/src/test/ui/associated-types/associated-types-in-impl-generics.rs
diff --git a/src/test/run-pass/associated-types/associated-types-in-inherent-method.rs b/src/test/ui/associated-types/associated-types-in-inherent-method.rs
index 1f29e966851..1f29e966851 100644
--- a/src/test/run-pass/associated-types/associated-types-in-inherent-method.rs
+++ b/src/test/ui/associated-types/associated-types-in-inherent-method.rs
diff --git a/src/test/run-pass/associated-types/associated-types-issue-20220.rs b/src/test/ui/associated-types/associated-types-issue-20220.rs
index 19fa7a6085a..19fa7a6085a 100644
--- a/src/test/run-pass/associated-types/associated-types-issue-20220.rs
+++ b/src/test/ui/associated-types/associated-types-issue-20220.rs
diff --git a/src/test/run-pass/associated-types/associated-types-issue-20371.rs b/src/test/ui/associated-types/associated-types-issue-20371.rs
index ae8a8767d27..ae8a8767d27 100644
--- a/src/test/run-pass/associated-types/associated-types-issue-20371.rs
+++ b/src/test/ui/associated-types/associated-types-issue-20371.rs
diff --git a/src/test/run-pass/associated-types/associated-types-issue-21212.rs b/src/test/ui/associated-types/associated-types-issue-21212.rs
index ce27eac4d0e..ce27eac4d0e 100644
--- a/src/test/run-pass/associated-types/associated-types-issue-21212.rs
+++ b/src/test/ui/associated-types/associated-types-issue-21212.rs
diff --git a/src/test/run-pass/associated-types/associated-types-iterator-binding.rs b/src/test/ui/associated-types/associated-types-iterator-binding.rs
index 7c5528c986e..7c5528c986e 100644
--- a/src/test/run-pass/associated-types/associated-types-iterator-binding.rs
+++ b/src/test/ui/associated-types/associated-types-iterator-binding.rs
diff --git a/src/test/run-pass/associated-types/associated-types-method.rs b/src/test/ui/associated-types/associated-types-method.rs
index 64132cfeed7..64132cfeed7 100644
--- a/src/test/run-pass/associated-types/associated-types-method.rs
+++ b/src/test/ui/associated-types/associated-types-method.rs
diff --git a/src/test/run-pass/associated-types/associated-types-nested-projections.rs b/src/test/ui/associated-types/associated-types-nested-projections.rs
index 76ba7496250..76ba7496250 100644
--- a/src/test/run-pass/associated-types/associated-types-nested-projections.rs
+++ b/src/test/ui/associated-types/associated-types-nested-projections.rs
diff --git a/src/test/run-pass/associated-types/associated-types-normalize-in-bounds-binding.rs b/src/test/ui/associated-types/associated-types-normalize-in-bounds-binding.rs
index 7c54efb83c2..7c54efb83c2 100644
--- a/src/test/run-pass/associated-types/associated-types-normalize-in-bounds-binding.rs
+++ b/src/test/ui/associated-types/associated-types-normalize-in-bounds-binding.rs
diff --git a/src/test/run-pass/associated-types/associated-types-normalize-in-bounds-ufcs.rs b/src/test/ui/associated-types/associated-types-normalize-in-bounds-ufcs.rs
index e09aa3663c6..e09aa3663c6 100644
--- a/src/test/run-pass/associated-types/associated-types-normalize-in-bounds-ufcs.rs
+++ b/src/test/ui/associated-types/associated-types-normalize-in-bounds-ufcs.rs
diff --git a/src/test/run-pass/associated-types/associated-types-normalize-in-bounds.rs b/src/test/ui/associated-types/associated-types-normalize-in-bounds.rs
index dcfae0f37e1..dcfae0f37e1 100644
--- a/src/test/run-pass/associated-types/associated-types-normalize-in-bounds.rs
+++ b/src/test/ui/associated-types/associated-types-normalize-in-bounds.rs
diff --git a/src/test/run-pass/associated-types/associated-types-normalize-unifield-struct.rs b/src/test/ui/associated-types/associated-types-normalize-unifield-struct.rs
index a04525dcd46..a04525dcd46 100644
--- a/src/test/run-pass/associated-types/associated-types-normalize-unifield-struct.rs
+++ b/src/test/ui/associated-types/associated-types-normalize-unifield-struct.rs
diff --git a/src/test/run-pass/associated-types/associated-types-project-from-type-param-via-bound-in-where.rs b/src/test/ui/associated-types/associated-types-project-from-type-param-via-bound-in-where.rs
index fc1dba97dfd..fc1dba97dfd 100644
--- a/src/test/run-pass/associated-types/associated-types-project-from-type-param-via-bound-in-where.rs
+++ b/src/test/ui/associated-types/associated-types-project-from-type-param-via-bound-in-where.rs
diff --git a/src/test/run-pass/associated-types/associated-types-projection-bound-in-supertraits.rs b/src/test/ui/associated-types/associated-types-projection-bound-in-supertraits.rs
index 107e6b4ce0c..107e6b4ce0c 100644
--- a/src/test/run-pass/associated-types/associated-types-projection-bound-in-supertraits.rs
+++ b/src/test/ui/associated-types/associated-types-projection-bound-in-supertraits.rs
diff --git a/src/test/run-pass/associated-types/associated-types-projection-from-known-type-in-impl.rs b/src/test/ui/associated-types/associated-types-projection-from-known-type-in-impl.rs
index a59c327be21..a59c327be21 100644
--- a/src/test/run-pass/associated-types/associated-types-projection-from-known-type-in-impl.rs
+++ b/src/test/ui/associated-types/associated-types-projection-from-known-type-in-impl.rs
diff --git a/src/test/run-pass/associated-types/associated-types-projection-in-object-type.rs b/src/test/ui/associated-types/associated-types-projection-in-object-type.rs
index eec95a141f5..eec95a141f5 100644
--- a/src/test/run-pass/associated-types/associated-types-projection-in-object-type.rs
+++ b/src/test/ui/associated-types/associated-types-projection-in-object-type.rs
diff --git a/src/test/run-pass/associated-types/associated-types-projection-in-supertrait.rs b/src/test/ui/associated-types/associated-types-projection-in-supertrait.rs
index ead405fcf01..ead405fcf01 100644
--- a/src/test/run-pass/associated-types/associated-types-projection-in-supertrait.rs
+++ b/src/test/ui/associated-types/associated-types-projection-in-supertrait.rs
diff --git a/src/test/run-pass/associated-types/associated-types-projection-in-where-clause.rs b/src/test/ui/associated-types/associated-types-projection-in-where-clause.rs
index e9a26e53c3c..e9a26e53c3c 100644
--- a/src/test/run-pass/associated-types/associated-types-projection-in-where-clause.rs
+++ b/src/test/ui/associated-types/associated-types-projection-in-where-clause.rs
diff --git a/src/test/run-pass/associated-types/associated-types-projection-to-unrelated-trait.rs b/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait.rs
index 5f06a829600..5f06a829600 100644
--- a/src/test/run-pass/associated-types/associated-types-projection-to-unrelated-trait.rs
+++ b/src/test/ui/associated-types/associated-types-projection-to-unrelated-trait.rs
diff --git a/src/test/run-pass/associated-types/associated-types-qualified-path-with-trait-with-type-parameters.rs b/src/test/ui/associated-types/associated-types-qualified-path-with-trait-with-type-parameters.rs
index 3c830d37060..3c830d37060 100644
--- a/src/test/run-pass/associated-types/associated-types-qualified-path-with-trait-with-type-parameters.rs
+++ b/src/test/ui/associated-types/associated-types-qualified-path-with-trait-with-type-parameters.rs
diff --git a/src/test/run-pass/associated-types/associated-types-ref-from-struct.rs b/src/test/ui/associated-types/associated-types-ref-from-struct.rs
index 3ccba289e4b..3ccba289e4b 100644
--- a/src/test/run-pass/associated-types/associated-types-ref-from-struct.rs
+++ b/src/test/ui/associated-types/associated-types-ref-from-struct.rs
diff --git a/src/test/run-pass/associated-types/associated-types-ref-in-struct-literal.rs b/src/test/ui/associated-types/associated-types-ref-in-struct-literal.rs
index 4a490ed0387..4a490ed0387 100644
--- a/src/test/run-pass/associated-types/associated-types-ref-in-struct-literal.rs
+++ b/src/test/ui/associated-types/associated-types-ref-in-struct-literal.rs
diff --git a/src/test/run-pass/associated-types/associated-types-region-erasure-issue-20582.rs b/src/test/ui/associated-types/associated-types-region-erasure-issue-20582.rs
index b722506dbbf..b722506dbbf 100644
--- a/src/test/run-pass/associated-types/associated-types-region-erasure-issue-20582.rs
+++ b/src/test/ui/associated-types/associated-types-region-erasure-issue-20582.rs
diff --git a/src/test/run-pass/associated-types/associated-types-resolve-lifetime.rs b/src/test/ui/associated-types/associated-types-resolve-lifetime.rs
index 52f2324d72a..52f2324d72a 100644
--- a/src/test/run-pass/associated-types/associated-types-resolve-lifetime.rs
+++ b/src/test/ui/associated-types/associated-types-resolve-lifetime.rs
diff --git a/src/test/run-pass/associated-types/associated-types-return.rs b/src/test/ui/associated-types/associated-types-return.rs
index 997a48b0379..997a48b0379 100644
--- a/src/test/run-pass/associated-types/associated-types-return.rs
+++ b/src/test/ui/associated-types/associated-types-return.rs
diff --git a/src/test/run-pass/associated-types/associated-types-simple.rs b/src/test/ui/associated-types/associated-types-simple.rs
index 2e2dfd80726..2e2dfd80726 100644
--- a/src/test/run-pass/associated-types/associated-types-simple.rs
+++ b/src/test/ui/associated-types/associated-types-simple.rs
diff --git a/src/test/run-pass/associated-types/associated-types-stream.rs b/src/test/ui/associated-types/associated-types-stream.rs
index 96954528aaa..96954528aaa 100644
--- a/src/test/run-pass/associated-types/associated-types-stream.rs
+++ b/src/test/ui/associated-types/associated-types-stream.rs
diff --git a/src/test/run-pass/associated-types/associated-types-struct-field-named.rs b/src/test/ui/associated-types/associated-types-struct-field-named.rs
index c400bf943e1..c400bf943e1 100644
--- a/src/test/run-pass/associated-types/associated-types-struct-field-named.rs
+++ b/src/test/ui/associated-types/associated-types-struct-field-named.rs
diff --git a/src/test/run-pass/associated-types/associated-types-struct-field-numbered.rs b/src/test/ui/associated-types/associated-types-struct-field-numbered.rs
index fa59060629d..fa59060629d 100644
--- a/src/test/run-pass/associated-types/associated-types-struct-field-numbered.rs
+++ b/src/test/ui/associated-types/associated-types-struct-field-numbered.rs
diff --git a/src/test/run-pass/associated-types/associated-types-sugar-path.rs b/src/test/ui/associated-types/associated-types-sugar-path.rs
index 66f7672aa43..66f7672aa43 100644
--- a/src/test/run-pass/associated-types/associated-types-sugar-path.rs
+++ b/src/test/ui/associated-types/associated-types-sugar-path.rs
diff --git a/src/test/run-pass/associated-types/associated-types-where-clause-impl-ambiguity.rs b/src/test/ui/associated-types/associated-types-where-clause-impl-ambiguity.rs
index f2a4c6e42a9..f2a4c6e42a9 100644
--- a/src/test/run-pass/associated-types/associated-types-where-clause-impl-ambiguity.rs
+++ b/src/test/ui/associated-types/associated-types-where-clause-impl-ambiguity.rs
diff --git a/src/test/run-pass/associated-types/auxiliary/associated-types-cc-lib.rs b/src/test/ui/associated-types/auxiliary/associated-types-cc-lib.rs
index b6785358706..b6785358706 100644
--- a/src/test/run-pass/associated-types/auxiliary/associated-types-cc-lib.rs
+++ b/src/test/ui/associated-types/auxiliary/associated-types-cc-lib.rs
diff --git a/src/test/run-pass/atomic-access-bool.rs b/src/test/ui/atomic-access-bool.rs
index 8522493232f..e9d48bb3b43 100644
--- a/src/test/run-pass/atomic-access-bool.rs
+++ b/src/test/ui/atomic-access-bool.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 #![feature(atomic_access)]
 use std::sync::atomic::AtomicBool;
diff --git a/src/test/run-pass/atomic-alignment.rs b/src/test/ui/atomic-alignment.rs
index ec1dbf42e4a..5bda90d2eab 100644
--- a/src/test/run-pass/atomic-alignment.rs
+++ b/src/test/ui/atomic-alignment.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(cfg_target_has_atomic)]
 #![feature(integer_atomics)]
 
diff --git a/src/test/run-pass/atomic-compare_exchange.rs b/src/test/ui/atomic-compare_exchange.rs
index 77da820e07c..9b327eef3c8 100644
--- a/src/test/run-pass/atomic-compare_exchange.rs
+++ b/src/test/ui/atomic-compare_exchange.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 
 #![feature(extended_compare_and_swap)]
diff --git a/src/test/run-pass/atomic-print.rs b/src/test/ui/atomic-print.rs
index ee76ef9b25f..ef3453da689 100644
--- a/src/test/run-pass/atomic-print.rs
+++ b/src/test/ui/atomic-print.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(deprecated)]
 // ignore-cloudabi no process support
diff --git a/src/test/run-pass/attr-main-2.rs b/src/test/ui/attr-main-2.rs
index e0bf6ecc8f1..3a51f83ba3b 100644
--- a/src/test/run-pass/attr-main-2.rs
+++ b/src/test/ui/attr-main-2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(main)]
 
 pub fn main() {
diff --git a/src/test/run-pass/attr-main.rs b/src/test/ui/attr-main.rs
index 645baf32e04..9c4caaa4a42 100644
--- a/src/test/run-pass/attr-main.rs
+++ b/src/test/ui/attr-main.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(main)]
diff --git a/src/test/run-pass/attr-shebang.rs b/src/test/ui/attr-shebang.rs
index 73f10410828..cce31c9bb7b 100644
--- a/src/test/run-pass/attr-shebang.rs
+++ b/src/test/ui/attr-shebang.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 #![feature(rust1)]
 pub fn main() { }
diff --git a/src/test/run-pass/attr-start.rs b/src/test/ui/attr-start.rs
index 29f86c9b59e..6777631484b 100644
--- a/src/test/run-pass/attr-start.rs
+++ b/src/test/ui/attr-start.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(start)]
diff --git a/src/test/run-pass/attr.rs b/src/test/ui/attr.rs
index 645baf32e04..9c4caaa4a42 100644
--- a/src/test/run-pass/attr.rs
+++ b/src/test/ui/attr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(main)]
diff --git a/src/test/run-pass/augmented-assignments-feature-gate-cross.rs b/src/test/ui/augmented-assignments-feature-gate-cross.rs
index 566d4522808..84988feb6f5 100644
--- a/src/test/run-pass/augmented-assignments-feature-gate-cross.rs
+++ b/src/test/ui/augmented-assignments-feature-gate-cross.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:augmented_assignments.rs
 
 extern crate augmented_assignments;
diff --git a/src/test/run-pass/augmented-assignments-feature-gate.rs b/src/test/ui/augmented-assignments-feature-gate.rs
index 7809ac8ea96..8e686796fee 100644
--- a/src/test/run-pass/augmented-assignments-feature-gate.rs
+++ b/src/test/ui/augmented-assignments-feature-gate.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::ops::AddAssign;
 
 struct Int(i32);
diff --git a/src/test/run-pass/augmented-assignments.rs b/src/test/ui/augmented-assignments-rpass.rs
index c26d0ffce44..fb383cc57a6 100644
--- a/src/test/run-pass/augmented-assignments.rs
+++ b/src/test/ui/augmented-assignments-rpass.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 #![deny(unused_assignments)]
 
diff --git a/src/test/run-pass/auto-instantiate.rs b/src/test/ui/auto-instantiate.rs
index ac21409e92c..a58b178287f 100644
--- a/src/test/run-pass/auto-instantiate.rs
+++ b/src/test/ui/auto-instantiate.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #[derive(Debug)]
 struct Pair<T, U> { a: T, b: U }
diff --git a/src/test/run-pass/auto-is-contextual.rs b/src/test/ui/auto-is-contextual.rs
index 3405cc712d7..a2ddd5374c0 100644
--- a/src/test/run-pass/auto-is-contextual.rs
+++ b/src/test/ui/auto-is-contextual.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(path_statements)]
 #![allow(dead_code)]
 macro_rules! auto {
diff --git a/src/test/run-pass/autobind.rs b/src/test/ui/autobind.rs
index bb38b7afdf6..70606a2a200 100644
--- a/src/test/run-pass/autobind.rs
+++ b/src/test/ui/autobind.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn f<T>(x: Vec<T>) -> T { return x.into_iter().next().unwrap(); }
 
 fn g<F>(act: F) -> isize where F: FnOnce(Vec<isize>) -> isize { return act(vec![1, 2, 3]); }
diff --git a/src/test/run-pass/autoref-autoderef/auto-ref-bounded-ty-param.rs b/src/test/ui/autoref-autoderef/auto-ref-bounded-ty-param.rs
index 2482e1878f5..2482e1878f5 100644
--- a/src/test/run-pass/autoref-autoderef/auto-ref-bounded-ty-param.rs
+++ b/src/test/ui/autoref-autoderef/auto-ref-bounded-ty-param.rs
diff --git a/src/test/run-pass/autoref-autoderef/auto-ref-sliceable.rs b/src/test/ui/autoref-autoderef/auto-ref-sliceable.rs
index e5f79d78051..e5f79d78051 100644
--- a/src/test/run-pass/autoref-autoderef/auto-ref-sliceable.rs
+++ b/src/test/ui/autoref-autoderef/auto-ref-sliceable.rs
diff --git a/src/test/run-pass/autoref-autoderef/auto-ref.rs b/src/test/ui/autoref-autoderef/auto-ref.rs
index b77f9c34213..b77f9c34213 100644
--- a/src/test/run-pass/autoref-autoderef/auto-ref.rs
+++ b/src/test/ui/autoref-autoderef/auto-ref.rs
diff --git a/src/test/run-pass/autoref-autoderef/autoderef-and-borrow-method-receiver.rs b/src/test/ui/autoref-autoderef/autoderef-and-borrow-method-receiver.rs
index 874f4228277..874f4228277 100644
--- a/src/test/run-pass/autoref-autoderef/autoderef-and-borrow-method-receiver.rs
+++ b/src/test/ui/autoref-autoderef/autoderef-and-borrow-method-receiver.rs
diff --git a/src/test/run-pass/autoref-autoderef/autoderef-method-on-trait.rs b/src/test/ui/autoref-autoderef/autoderef-method-on-trait.rs
index fadb0784e75..fadb0784e75 100644
--- a/src/test/run-pass/autoref-autoderef/autoderef-method-on-trait.rs
+++ b/src/test/ui/autoref-autoderef/autoderef-method-on-trait.rs
diff --git a/src/test/run-pass/autoref-autoderef/autoderef-method-priority.rs b/src/test/ui/autoref-autoderef/autoderef-method-priority.rs
index a218f85eba2..a218f85eba2 100644
--- a/src/test/run-pass/autoref-autoderef/autoderef-method-priority.rs
+++ b/src/test/ui/autoref-autoderef/autoderef-method-priority.rs
diff --git a/src/test/run-pass/autoref-autoderef/autoderef-method-twice-but-not-thrice.rs b/src/test/ui/autoref-autoderef/autoderef-method-twice-but-not-thrice.rs
index 9fda3b2c099..9fda3b2c099 100644
--- a/src/test/run-pass/autoref-autoderef/autoderef-method-twice-but-not-thrice.rs
+++ b/src/test/ui/autoref-autoderef/autoderef-method-twice-but-not-thrice.rs
diff --git a/src/test/run-pass/autoref-autoderef/autoderef-method-twice.rs b/src/test/ui/autoref-autoderef/autoderef-method-twice.rs
index f53dc8d1032..f53dc8d1032 100644
--- a/src/test/run-pass/autoref-autoderef/autoderef-method-twice.rs
+++ b/src/test/ui/autoref-autoderef/autoderef-method-twice.rs
diff --git a/src/test/run-pass/autoref-autoderef/autoderef-method.rs b/src/test/ui/autoref-autoderef/autoderef-method.rs
index 262050fa47b..262050fa47b 100644
--- a/src/test/run-pass/autoref-autoderef/autoderef-method.rs
+++ b/src/test/ui/autoref-autoderef/autoderef-method.rs
diff --git a/src/test/run-pass/autoref-autoderef/autoderef-privacy.rs b/src/test/ui/autoref-autoderef/autoderef-privacy.rs
index 841be930b77..841be930b77 100644
--- a/src/test/run-pass/autoref-autoderef/autoderef-privacy.rs
+++ b/src/test/ui/autoref-autoderef/autoderef-privacy.rs
diff --git a/src/test/run-pass/autoref-autoderef/autoref-intermediate-types-issue-3585.rs b/src/test/ui/autoref-autoderef/autoref-intermediate-types-issue-3585.rs
index 70ef7ce87ed..70ef7ce87ed 100644
--- a/src/test/run-pass/autoref-autoderef/autoref-intermediate-types-issue-3585.rs
+++ b/src/test/ui/autoref-autoderef/autoref-intermediate-types-issue-3585.rs
diff --git a/src/test/run-pass/auxiliary/anon-extern-mod-cross-crate-1.rs b/src/test/ui/auxiliary/anon-extern-mod-cross-crate-1.rs
index 948b5e688eb..948b5e688eb 100644
--- a/src/test/run-pass/auxiliary/anon-extern-mod-cross-crate-1.rs
+++ b/src/test/ui/auxiliary/anon-extern-mod-cross-crate-1.rs
diff --git a/src/test/run-pass/auxiliary/augmented_assignments.rs b/src/test/ui/auxiliary/augmented_assignments.rs
index d0d3f57459a..d0d3f57459a 100644
--- a/src/test/run-pass/auxiliary/augmented_assignments.rs
+++ b/src/test/ui/auxiliary/augmented_assignments.rs
diff --git a/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo.rs b/src/test/ui/auxiliary/blind-item-mixed-crate-use-item-foo.rs
index cf769f31bf7..cf769f31bf7 100644
--- a/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo.rs
+++ b/src/test/ui/auxiliary/blind-item-mixed-crate-use-item-foo.rs
diff --git a/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo2.rs b/src/test/ui/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
index 81c16ede909..81c16ede909 100644
--- a/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
+++ b/src/test/ui/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
diff --git a/src/test/run-pass/auxiliary/check_static_recursion_foreign_helper.rs b/src/test/ui/auxiliary/check_static_recursion_foreign_helper.rs
index 5330b7a92a3..5330b7a92a3 100644
--- a/src/test/run-pass/auxiliary/check_static_recursion_foreign_helper.rs
+++ b/src/test/ui/auxiliary/check_static_recursion_foreign_helper.rs
diff --git a/src/test/run-pass/auxiliary/cond_plugin.rs b/src/test/ui/auxiliary/cond_plugin.rs
index 1f97b556a07..1f97b556a07 100644
--- a/src/test/run-pass/auxiliary/cond_plugin.rs
+++ b/src/test/ui/auxiliary/cond_plugin.rs
diff --git a/src/test/run-pass/auxiliary/crate-method-reexport-grrrrrrr2.rs b/src/test/ui/auxiliary/crate-method-reexport-grrrrrrr2.rs
index d08504005a5..d08504005a5 100644
--- a/src/test/run-pass/auxiliary/crate-method-reexport-grrrrrrr2.rs
+++ b/src/test/ui/auxiliary/crate-method-reexport-grrrrrrr2.rs
diff --git a/src/test/run-pass/auxiliary/debuginfo-lto-aux.rs b/src/test/ui/auxiliary/debuginfo-lto-aux.rs
index dd471154b4f..dd471154b4f 100644
--- a/src/test/run-pass/auxiliary/debuginfo-lto-aux.rs
+++ b/src/test/ui/auxiliary/debuginfo-lto-aux.rs
diff --git a/src/test/run-pass/auxiliary/edition-kw-macro-2015.rs b/src/test/ui/auxiliary/edition-kw-macro-2015.rs
index 553ba69303a..553ba69303a 100644
--- a/src/test/run-pass/auxiliary/edition-kw-macro-2015.rs
+++ b/src/test/ui/auxiliary/edition-kw-macro-2015.rs
diff --git a/src/test/run-pass/auxiliary/edition-kw-macro-2018.rs b/src/test/ui/auxiliary/edition-kw-macro-2018.rs
index f1f4ee28093..f1f4ee28093 100644
--- a/src/test/run-pass/auxiliary/edition-kw-macro-2018.rs
+++ b/src/test/ui/auxiliary/edition-kw-macro-2018.rs
diff --git a/src/test/run-pass/auxiliary/foreign_lib.rs b/src/test/ui/auxiliary/foreign_lib.rs
index de6b0e2118a..de6b0e2118a 100644
--- a/src/test/run-pass/auxiliary/foreign_lib.rs
+++ b/src/test/ui/auxiliary/foreign_lib.rs
diff --git a/src/test/run-pass/auxiliary/hello_macro.rs b/src/test/ui/auxiliary/hello_macro.rs
index f2e9e0eaa8c..f2e9e0eaa8c 100644
--- a/src/test/run-pass/auxiliary/hello_macro.rs
+++ b/src/test/ui/auxiliary/hello_macro.rs
diff --git a/src/test/run-pass/auxiliary/impl_privacy_xc_1.rs b/src/test/ui/auxiliary/impl_privacy_xc_1.rs
index 367b8ec8b88..367b8ec8b88 100644
--- a/src/test/run-pass/auxiliary/impl_privacy_xc_1.rs
+++ b/src/test/ui/auxiliary/impl_privacy_xc_1.rs
diff --git a/src/test/run-pass/auxiliary/impl_privacy_xc_2.rs b/src/test/ui/auxiliary/impl_privacy_xc_2.rs
index 5f9c2268167..5f9c2268167 100644
--- a/src/test/run-pass/auxiliary/impl_privacy_xc_2.rs
+++ b/src/test/ui/auxiliary/impl_privacy_xc_2.rs
diff --git a/src/test/run-pass/auxiliary/inline_dtor.rs b/src/test/ui/auxiliary/inline_dtor.rs
index 5eee89fdc57..5eee89fdc57 100644
--- a/src/test/run-pass/auxiliary/inline_dtor.rs
+++ b/src/test/ui/auxiliary/inline_dtor.rs
diff --git a/src/test/run-pass/auxiliary/inner_static.rs b/src/test/ui/auxiliary/inner_static.rs
index 42dcd379d41..42dcd379d41 100644
--- a/src/test/run-pass/auxiliary/inner_static.rs
+++ b/src/test/ui/auxiliary/inner_static.rs
diff --git a/src/test/run-pass/auxiliary/kinds_in_metadata.rs b/src/test/ui/auxiliary/kinds_in_metadata.rs
index 2a2106ff70a..2a2106ff70a 100644
--- a/src/test/run-pass/auxiliary/kinds_in_metadata.rs
+++ b/src/test/ui/auxiliary/kinds_in_metadata.rs
diff --git a/src/test/run-pass/auxiliary/link-cfg-works-transitive-dylib.rs b/src/test/ui/auxiliary/link-cfg-works-transitive-dylib.rs
index fa4f33bcef6..fa4f33bcef6 100644
--- a/src/test/run-pass/auxiliary/link-cfg-works-transitive-dylib.rs
+++ b/src/test/ui/auxiliary/link-cfg-works-transitive-dylib.rs
diff --git a/src/test/run-pass/auxiliary/link-cfg-works-transitive-rlib.rs b/src/test/ui/auxiliary/link-cfg-works-transitive-rlib.rs
index b365ed91732..b365ed91732 100644
--- a/src/test/run-pass/auxiliary/link-cfg-works-transitive-rlib.rs
+++ b/src/test/ui/auxiliary/link-cfg-works-transitive-rlib.rs
diff --git a/src/test/run-pass/auxiliary/linkage1.rs b/src/test/ui/auxiliary/linkage1.rs
index e87ce5e4d31..e87ce5e4d31 100644
--- a/src/test/run-pass/auxiliary/linkage1.rs
+++ b/src/test/ui/auxiliary/linkage1.rs
diff --git a/src/test/run-pass/auxiliary/llvm_pr32379.rs b/src/test/ui/auxiliary/llvm_pr32379.rs
index 8e429767095..8e429767095 100644
--- a/src/test/run-pass/auxiliary/llvm_pr32379.rs
+++ b/src/test/ui/auxiliary/llvm_pr32379.rs
diff --git a/src/test/run-pass/auxiliary/msvc-data-only-lib.rs b/src/test/ui/auxiliary/msvc-data-only-lib.rs
index ccaa6d8edcf..ccaa6d8edcf 100644
--- a/src/test/run-pass/auxiliary/msvc-data-only-lib.rs
+++ b/src/test/ui/auxiliary/msvc-data-only-lib.rs
diff --git a/src/test/run-pass/auxiliary/nested_item.rs b/src/test/ui/auxiliary/nested_item.rs
index 9db9d19d6f6..9db9d19d6f6 100644
--- a/src/test/run-pass/auxiliary/nested_item.rs
+++ b/src/test/ui/auxiliary/nested_item.rs
diff --git a/src/test/run-pass/auxiliary/proc_macro_def.rs b/src/test/ui/auxiliary/proc_macro_def.rs
index dfc5a42d19c..dfc5a42d19c 100644
--- a/src/test/run-pass/auxiliary/proc_macro_def.rs
+++ b/src/test/ui/auxiliary/proc_macro_def.rs
diff --git a/src/test/run-pass/auxiliary/reachable-unnameable-items.rs b/src/test/ui/auxiliary/reachable-unnameable-items.rs
index 20f110b1a8c..20f110b1a8c 100644
--- a/src/test/run-pass/auxiliary/reachable-unnameable-items.rs
+++ b/src/test/ui/auxiliary/reachable-unnameable-items.rs
diff --git a/src/test/run-pass/auxiliary/reexport-should-still-link.rs b/src/test/ui/auxiliary/reexport-should-still-link.rs
index 237ea8dfcf3..237ea8dfcf3 100644
--- a/src/test/run-pass/auxiliary/reexport-should-still-link.rs
+++ b/src/test/ui/auxiliary/reexport-should-still-link.rs
diff --git a/src/test/run-pass/auxiliary/rmeta-rlib.rs b/src/test/ui/auxiliary/rmeta-rlib-rpass.rs
index f5e8c3d2a5c..f5e8c3d2a5c 100644
--- a/src/test/run-pass/auxiliary/rmeta-rlib.rs
+++ b/src/test/ui/auxiliary/rmeta-rlib-rpass.rs
diff --git a/src/test/run-pass/auxiliary/rmeta-rmeta.rs b/src/test/ui/auxiliary/rmeta-rmeta.rs
index 4a6d055a81f..4a6d055a81f 100644
--- a/src/test/run-pass/auxiliary/rmeta-rmeta.rs
+++ b/src/test/ui/auxiliary/rmeta-rmeta.rs
diff --git a/src/test/run-pass/auxiliary/svh-a-base.rs b/src/test/ui/auxiliary/svh-a-base.rs
index 36b41fc818f..36b41fc818f 100644
--- a/src/test/run-pass/auxiliary/svh-a-base.rs
+++ b/src/test/ui/auxiliary/svh-a-base.rs
diff --git a/src/test/run-pass/auxiliary/svh-b.rs b/src/test/ui/auxiliary/svh-b.rs
index 57029f70888..57029f70888 100644
--- a/src/test/run-pass/auxiliary/svh-b.rs
+++ b/src/test/ui/auxiliary/svh-b.rs
diff --git a/src/test/run-pass/auxiliary/trait_superkinds_in_metadata.rs b/src/test/ui/auxiliary/trait_superkinds_in_metadata.rs
index acfd1e13e93..acfd1e13e93 100644
--- a/src/test/run-pass/auxiliary/trait_superkinds_in_metadata.rs
+++ b/src/test/ui/auxiliary/trait_superkinds_in_metadata.rs
diff --git a/src/test/run-pass/auxiliary/typeid-intrinsic-aux1.rs b/src/test/ui/auxiliary/typeid-intrinsic-aux1.rs
index 281c079682f..281c079682f 100644
--- a/src/test/run-pass/auxiliary/typeid-intrinsic-aux1.rs
+++ b/src/test/ui/auxiliary/typeid-intrinsic-aux1.rs
diff --git a/src/test/run-pass/auxiliary/typeid-intrinsic-aux2.rs b/src/test/ui/auxiliary/typeid-intrinsic-aux2.rs
index 281c079682f..281c079682f 100644
--- a/src/test/run-pass/auxiliary/typeid-intrinsic-aux2.rs
+++ b/src/test/ui/auxiliary/typeid-intrinsic-aux2.rs
diff --git a/src/test/run-pass/auxiliary/using-target-feature-unstable.rs b/src/test/ui/auxiliary/using-target-feature-unstable.rs
index 78645c284f1..78645c284f1 100644
--- a/src/test/run-pass/auxiliary/using-target-feature-unstable.rs
+++ b/src/test/ui/auxiliary/using-target-feature-unstable.rs
diff --git a/src/test/run-pass/backtrace-debuginfo-aux.rs b/src/test/ui/backtrace-debuginfo-aux.rs
index 781d6eba5ed..1411bcf89e8 100644
--- a/src/test/run-pass/backtrace-debuginfo-aux.rs
+++ b/src/test/ui/backtrace-debuginfo-aux.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-test: not a test, used by backtrace-debuginfo.rs to test file!()
 
 #[inline(never)]
diff --git a/src/test/run-pass/backtrace-debuginfo.rs b/src/test/ui/backtrace-debuginfo.rs
index a2a934513d2..8668ec82bfd 100644
--- a/src/test/run-pass/backtrace-debuginfo.rs
+++ b/src/test/ui/backtrace-debuginfo.rs
@@ -1,3 +1,4 @@
+// run-pass
 // We disable tail merging here because it can't preserve debuginfo and thus
 // potentially breaks the backtraces. Also, subtle changes can decide whether
 // tail merging succeeds, so the test might work today but fail tomorrow due to a
diff --git a/src/test/run-pass/backtrace.rs b/src/test/ui/backtrace.rs
index 93e8c9f1729..82519332d64 100644
--- a/src/test/run-pass/backtrace.rs
+++ b/src/test/ui/backtrace.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-android FIXME #17520
 // ignore-cloudabi spawning processes is not supported
 // ignore-emscripten spawning processes is not supported
diff --git a/src/test/run-pass/bare-fn-implements-fn-mut.rs b/src/test/ui/bare-fn-implements-fn-mut.rs
index c06fc702ca7..dfead48893e 100644
--- a/src/test/run-pass/bare-fn-implements-fn-mut.rs
+++ b/src/test/ui/bare-fn-implements-fn-mut.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::ops::FnMut;
 
 fn call_f<F:FnMut()>(mut f: F) {
diff --git a/src/test/run-pass/bare-static-string.rs b/src/test/ui/bare-static-string.rs
index 8d4782226d5..d336dc7c6a0 100644
--- a/src/test/run-pass/bare-static-string.rs
+++ b/src/test/ui/bare-static-string.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let x: &'static str = "foo";
     println!("{}", x);
diff --git a/src/test/run-pass/bench/issue-32062.rs b/src/test/ui/bench/issue-32062.rs
index dc45061da5b..dc45061da5b 100644
--- a/src/test/run-pass/bench/issue-32062.rs
+++ b/src/test/ui/bench/issue-32062.rs
diff --git a/src/test/run-pass/big-literals.rs b/src/test/ui/big-literals.rs
index 9b1fa2123f9..131de5439b7 100644
--- a/src/test/run-pass/big-literals.rs
+++ b/src/test/ui/big-literals.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Catch mistakes in the overflowing literals lint.
 #![deny(overflowing_literals)]
 
diff --git a/src/test/run-pass/binary-minus-without-space.rs b/src/test/ui/binary-minus-without-space.rs
index 60d00e7cf54..2fbd5300dd1 100644
--- a/src/test/run-pass/binary-minus-without-space.rs
+++ b/src/test/ui/binary-minus-without-space.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Check that issue #954 stays fixed
 
 
diff --git a/src/test/run-pass/bind-by-move.rs b/src/test/ui/bind-by-move.rs
index 82db89468d1..f0a9ebdd08c 100644
--- a/src/test/run-pass/bind-by-move.rs
+++ b/src/test/ui/bind-by-move.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::sync::Arc;
 fn dispose(_x: Arc<bool>) { }
 
diff --git a/src/test/run-pass/binding/bind-field-short-with-modifiers.rs b/src/test/ui/binding/bind-field-short-with-modifiers.rs
index b271f84e9ce..b271f84e9ce 100644
--- a/src/test/run-pass/binding/bind-field-short-with-modifiers.rs
+++ b/src/test/ui/binding/bind-field-short-with-modifiers.rs
diff --git a/src/test/run-pass/binding/borrowed-ptr-pattern-2.rs b/src/test/ui/binding/borrowed-ptr-pattern-2.rs
index 40df85b1479..40df85b1479 100644
--- a/src/test/run-pass/binding/borrowed-ptr-pattern-2.rs
+++ b/src/test/ui/binding/borrowed-ptr-pattern-2.rs
diff --git a/src/test/run-pass/binding/borrowed-ptr-pattern-3.rs b/src/test/ui/binding/borrowed-ptr-pattern-3.rs
index f2607eee815..f2607eee815 100644
--- a/src/test/run-pass/binding/borrowed-ptr-pattern-3.rs
+++ b/src/test/ui/binding/borrowed-ptr-pattern-3.rs
diff --git a/src/test/run-pass/binding/borrowed-ptr-pattern-infallible.rs b/src/test/ui/binding/borrowed-ptr-pattern-infallible.rs
index 1bbc03e19ba..1bbc03e19ba 100644
--- a/src/test/run-pass/binding/borrowed-ptr-pattern-infallible.rs
+++ b/src/test/ui/binding/borrowed-ptr-pattern-infallible.rs
diff --git a/src/test/run-pass/binding/borrowed-ptr-pattern-option.rs b/src/test/ui/binding/borrowed-ptr-pattern-option.rs
index 319b8631e8d..319b8631e8d 100644
--- a/src/test/run-pass/binding/borrowed-ptr-pattern-option.rs
+++ b/src/test/ui/binding/borrowed-ptr-pattern-option.rs
diff --git a/src/test/run-pass/binding/borrowed-ptr-pattern.rs b/src/test/ui/binding/borrowed-ptr-pattern.rs
index d5f94ab54e3..d5f94ab54e3 100644
--- a/src/test/run-pass/binding/borrowed-ptr-pattern.rs
+++ b/src/test/ui/binding/borrowed-ptr-pattern.rs
diff --git a/src/test/run-pass/binding/empty-types-in-patterns.rs b/src/test/ui/binding/empty-types-in-patterns.rs
index 2b8b1b29df8..2b8b1b29df8 100644
--- a/src/test/run-pass/binding/empty-types-in-patterns.rs
+++ b/src/test/ui/binding/empty-types-in-patterns.rs
diff --git a/src/test/run-pass/binding/exhaustive-bool-match-sanity.rs b/src/test/ui/binding/exhaustive-bool-match-sanity.rs
index f83def21060..f83def21060 100644
--- a/src/test/run-pass/binding/exhaustive-bool-match-sanity.rs
+++ b/src/test/ui/binding/exhaustive-bool-match-sanity.rs
diff --git a/src/test/run-pass/binding/expr-match-generic-unique1.rs b/src/test/ui/binding/expr-match-generic-unique1.rs
index 5a5f75eea36..5a5f75eea36 100644
--- a/src/test/run-pass/binding/expr-match-generic-unique1.rs
+++ b/src/test/ui/binding/expr-match-generic-unique1.rs
diff --git a/src/test/run-pass/binding/expr-match-generic-unique2.rs b/src/test/ui/binding/expr-match-generic-unique2.rs
index 1d236135cdb..1d236135cdb 100644
--- a/src/test/run-pass/binding/expr-match-generic-unique2.rs
+++ b/src/test/ui/binding/expr-match-generic-unique2.rs
diff --git a/src/test/run-pass/binding/expr-match-generic.rs b/src/test/ui/binding/expr-match-generic.rs
index 530fc676f7c..530fc676f7c 100644
--- a/src/test/run-pass/binding/expr-match-generic.rs
+++ b/src/test/ui/binding/expr-match-generic.rs
diff --git a/src/test/run-pass/binding/expr-match-panic-all.rs b/src/test/ui/binding/expr-match-panic-all.rs
index ac31b49a1e9..ac31b49a1e9 100644
--- a/src/test/run-pass/binding/expr-match-panic-all.rs
+++ b/src/test/ui/binding/expr-match-panic-all.rs
diff --git a/src/test/run-pass/binding/expr-match-panic.rs b/src/test/ui/binding/expr-match-panic.rs
index 4b6b6e072c0..4b6b6e072c0 100644
--- a/src/test/run-pass/binding/expr-match-panic.rs
+++ b/src/test/ui/binding/expr-match-panic.rs
diff --git a/src/test/run-pass/binding/expr-match-unique.rs b/src/test/ui/binding/expr-match-unique.rs
index a999541207d..a999541207d 100644
--- a/src/test/run-pass/binding/expr-match-unique.rs
+++ b/src/test/ui/binding/expr-match-unique.rs
diff --git a/src/test/run-pass/binding/expr-match.rs b/src/test/ui/binding/expr-match.rs
index 575b38fbc95..575b38fbc95 100644
--- a/src/test/run-pass/binding/expr-match.rs
+++ b/src/test/ui/binding/expr-match.rs
diff --git a/src/test/run-pass/binding/fat-arrow-match.rs b/src/test/ui/binding/fat-arrow-match.rs
index aaf5be8cf74..aaf5be8cf74 100644
--- a/src/test/run-pass/binding/fat-arrow-match.rs
+++ b/src/test/ui/binding/fat-arrow-match.rs
diff --git a/src/test/run-pass/binding/fn-arg-incomplete-pattern-drop-order.rs b/src/test/ui/binding/fn-arg-incomplete-pattern-drop-order.rs
index 4d5a6fbba28..ea4a9e5afa5 100644
--- a/src/test/run-pass/binding/fn-arg-incomplete-pattern-drop-order.rs
+++ b/src/test/ui/binding/fn-arg-incomplete-pattern-drop-order.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Check that partially moved from function parameters are dropped after the
 // named bindings that move from them.
 
diff --git a/src/test/run-pass/binding/fn-pattern-expected-type-2.rs b/src/test/ui/binding/fn-pattern-expected-type-2.rs
index 130ff3d4465..130ff3d4465 100644
--- a/src/test/run-pass/binding/fn-pattern-expected-type-2.rs
+++ b/src/test/ui/binding/fn-pattern-expected-type-2.rs
diff --git a/src/test/run-pass/binding/fn-pattern-expected-type.rs b/src/test/ui/binding/fn-pattern-expected-type.rs
index faeb7649636..faeb7649636 100644
--- a/src/test/run-pass/binding/fn-pattern-expected-type.rs
+++ b/src/test/ui/binding/fn-pattern-expected-type.rs
diff --git a/src/test/run-pass/binding/func-arg-incomplete-pattern.rs b/src/test/ui/binding/func-arg-incomplete-pattern.rs
index 98dd51811de..98dd51811de 100644
--- a/src/test/run-pass/binding/func-arg-incomplete-pattern.rs
+++ b/src/test/ui/binding/func-arg-incomplete-pattern.rs
diff --git a/src/test/run-pass/binding/func-arg-ref-pattern.rs b/src/test/ui/binding/func-arg-ref-pattern.rs
index ebb7a6afa9b..ebb7a6afa9b 100644
--- a/src/test/run-pass/binding/func-arg-ref-pattern.rs
+++ b/src/test/ui/binding/func-arg-ref-pattern.rs
diff --git a/src/test/run-pass/binding/func-arg-wild-pattern.rs b/src/test/ui/binding/func-arg-wild-pattern.rs
index bcd82c679a5..bcd82c679a5 100644
--- a/src/test/run-pass/binding/func-arg-wild-pattern.rs
+++ b/src/test/ui/binding/func-arg-wild-pattern.rs
diff --git a/src/test/run-pass/binding/if-let.rs b/src/test/ui/binding/if-let.rs
index 3ea8d402a3e..3ea8d402a3e 100644
--- a/src/test/run-pass/binding/if-let.rs
+++ b/src/test/ui/binding/if-let.rs
diff --git a/src/test/run-pass/binding/inconsistent-lifetime-mismatch.rs b/src/test/ui/binding/inconsistent-lifetime-mismatch.rs
index 87768c28cf4..87768c28cf4 100644
--- a/src/test/run-pass/binding/inconsistent-lifetime-mismatch.rs
+++ b/src/test/ui/binding/inconsistent-lifetime-mismatch.rs
diff --git a/src/test/run-pass/binding/inferred-suffix-in-pattern-range.rs b/src/test/ui/binding/inferred-suffix-in-pattern-range.rs
index 079cc0a16db..079cc0a16db 100644
--- a/src/test/run-pass/binding/inferred-suffix-in-pattern-range.rs
+++ b/src/test/ui/binding/inferred-suffix-in-pattern-range.rs
diff --git a/src/test/run-pass/binding/irrefutable-slice-patterns.rs b/src/test/ui/binding/irrefutable-slice-patterns.rs
index 733e6b7b57f..733e6b7b57f 100644
--- a/src/test/run-pass/binding/irrefutable-slice-patterns.rs
+++ b/src/test/ui/binding/irrefutable-slice-patterns.rs
diff --git a/src/test/run-pass/binding/let-assignability.rs b/src/test/ui/binding/let-assignability.rs
index 5bb375d285d..5bb375d285d 100644
--- a/src/test/run-pass/binding/let-assignability.rs
+++ b/src/test/ui/binding/let-assignability.rs
diff --git a/src/test/run-pass/binding/let-destruct-ref.rs b/src/test/ui/binding/let-destruct-ref.rs
index 28d7294ebc8..28d7294ebc8 100644
--- a/src/test/run-pass/binding/let-destruct-ref.rs
+++ b/src/test/ui/binding/let-destruct-ref.rs
diff --git a/src/test/run-pass/binding/let-var-hygiene.rs b/src/test/ui/binding/let-var-hygiene.rs
index 571207bd7d6..571207bd7d6 100644
--- a/src/test/run-pass/binding/let-var-hygiene.rs
+++ b/src/test/ui/binding/let-var-hygiene.rs
diff --git a/src/test/run-pass/binding/match-arm-statics.rs b/src/test/ui/binding/match-arm-statics.rs
index 5f7e357eeb2..5f7e357eeb2 100644
--- a/src/test/run-pass/binding/match-arm-statics.rs
+++ b/src/test/ui/binding/match-arm-statics.rs
diff --git a/src/test/run-pass/binding/match-beginning-vert.rs b/src/test/ui/binding/match-beginning-vert.rs
index 79267400b28..79267400b28 100644
--- a/src/test/run-pass/binding/match-beginning-vert.rs
+++ b/src/test/ui/binding/match-beginning-vert.rs
diff --git a/src/test/run-pass/binding/match-borrowed_str.rs b/src/test/ui/binding/match-borrowed_str.rs
index 22782032ebf..22782032ebf 100644
--- a/src/test/run-pass/binding/match-borrowed_str.rs
+++ b/src/test/ui/binding/match-borrowed_str.rs
diff --git a/src/test/run-pass/binding/match-bot-2.rs b/src/test/ui/binding/match-bot-2.rs
index 95b3406f0b5..95b3406f0b5 100644
--- a/src/test/run-pass/binding/match-bot-2.rs
+++ b/src/test/ui/binding/match-bot-2.rs
diff --git a/src/test/run-pass/binding/match-bot.rs b/src/test/ui/binding/match-bot.rs
index 5c4472c7aea..5c4472c7aea 100644
--- a/src/test/run-pass/binding/match-bot.rs
+++ b/src/test/ui/binding/match-bot.rs
diff --git a/src/test/run-pass/binding/match-byte-array-patterns.rs b/src/test/ui/binding/match-byte-array-patterns.rs
index e87745705da..e87745705da 100644
--- a/src/test/run-pass/binding/match-byte-array-patterns.rs
+++ b/src/test/ui/binding/match-byte-array-patterns.rs
diff --git a/src/test/run-pass/binding/match-enum-struct-0.rs b/src/test/ui/binding/match-enum-struct-0.rs
index e2623ece84c..e2623ece84c 100644
--- a/src/test/run-pass/binding/match-enum-struct-0.rs
+++ b/src/test/ui/binding/match-enum-struct-0.rs
diff --git a/src/test/run-pass/binding/match-enum-struct-1.rs b/src/test/ui/binding/match-enum-struct-1.rs
index f035432ec99..f035432ec99 100644
--- a/src/test/run-pass/binding/match-enum-struct-1.rs
+++ b/src/test/ui/binding/match-enum-struct-1.rs
diff --git a/src/test/run-pass/binding/match-implicit-copy-unique.rs b/src/test/ui/binding/match-implicit-copy-unique.rs
index a7e8109b46c..a7e8109b46c 100644
--- a/src/test/run-pass/binding/match-implicit-copy-unique.rs
+++ b/src/test/ui/binding/match-implicit-copy-unique.rs
diff --git a/src/test/run-pass/binding/match-in-macro.rs b/src/test/ui/binding/match-in-macro.rs
index 0840cc4404d..0840cc4404d 100644
--- a/src/test/run-pass/binding/match-in-macro.rs
+++ b/src/test/ui/binding/match-in-macro.rs
diff --git a/src/test/run-pass/binding/match-join.rs b/src/test/ui/binding/match-join.rs
index 60f2a458489..60f2a458489 100644
--- a/src/test/run-pass/binding/match-join.rs
+++ b/src/test/ui/binding/match-join.rs
diff --git a/src/test/run-pass/binding/match-larger-const.rs b/src/test/ui/binding/match-larger-const.rs
index 6f9a353207f..6f9a353207f 100644
--- a/src/test/run-pass/binding/match-larger-const.rs
+++ b/src/test/ui/binding/match-larger-const.rs
diff --git a/src/test/run-pass/binding/match-naked-record-expr.rs b/src/test/ui/binding/match-naked-record-expr.rs
index c23ff8c9495..c23ff8c9495 100644
--- a/src/test/run-pass/binding/match-naked-record-expr.rs
+++ b/src/test/ui/binding/match-naked-record-expr.rs
diff --git a/src/test/run-pass/binding/match-naked-record.rs b/src/test/ui/binding/match-naked-record.rs
index f7479152ebc..f7479152ebc 100644
--- a/src/test/run-pass/binding/match-naked-record.rs
+++ b/src/test/ui/binding/match-naked-record.rs
diff --git a/src/test/run-pass/binding/match-path.rs b/src/test/ui/binding/match-path.rs
index 286214eb8ac..286214eb8ac 100644
--- a/src/test/run-pass/binding/match-path.rs
+++ b/src/test/ui/binding/match-path.rs
diff --git a/src/test/run-pass/binding/match-pattern-bindings.rs b/src/test/ui/binding/match-pattern-bindings.rs
index 4ec533677d6..4ec533677d6 100644
--- a/src/test/run-pass/binding/match-pattern-bindings.rs
+++ b/src/test/ui/binding/match-pattern-bindings.rs
diff --git a/src/test/run-pass/binding/match-pattern-lit.rs b/src/test/ui/binding/match-pattern-lit.rs
index c9c6135e2e6..c9c6135e2e6 100644
--- a/src/test/run-pass/binding/match-pattern-lit.rs
+++ b/src/test/ui/binding/match-pattern-lit.rs
diff --git a/src/test/run-pass/binding/match-pattern-no-type-params.rs b/src/test/ui/binding/match-pattern-no-type-params.rs
index 1fc7ddda023..1fc7ddda023 100644
--- a/src/test/run-pass/binding/match-pattern-no-type-params.rs
+++ b/src/test/ui/binding/match-pattern-no-type-params.rs
diff --git a/src/test/run-pass/binding/match-pattern-simple.rs b/src/test/ui/binding/match-pattern-simple.rs
index 3f56cd4796d..3f56cd4796d 100644
--- a/src/test/run-pass/binding/match-pattern-simple.rs
+++ b/src/test/ui/binding/match-pattern-simple.rs
diff --git a/src/test/run-pass/binding/match-phi.rs b/src/test/ui/binding/match-phi.rs
index 92a3f6e0f7f..92a3f6e0f7f 100644
--- a/src/test/run-pass/binding/match-phi.rs
+++ b/src/test/ui/binding/match-phi.rs
diff --git a/src/test/run-pass/binding/match-pipe-binding.rs b/src/test/ui/binding/match-pipe-binding.rs
index 7d4a7c708dd..7d4a7c708dd 100644
--- a/src/test/run-pass/binding/match-pipe-binding.rs
+++ b/src/test/ui/binding/match-pipe-binding.rs
diff --git a/src/test/run-pass/binding/match-range-infer.rs b/src/test/ui/binding/match-range-infer.rs
index 19d1cb89d4a..19d1cb89d4a 100644
--- a/src/test/run-pass/binding/match-range-infer.rs
+++ b/src/test/ui/binding/match-range-infer.rs
diff --git a/src/test/run-pass/binding/match-range-static.rs b/src/test/ui/binding/match-range-static.rs
index f01a3505ee6..f01a3505ee6 100644
--- a/src/test/run-pass/binding/match-range-static.rs
+++ b/src/test/ui/binding/match-range-static.rs
diff --git a/src/test/run-pass/binding/match-range.rs b/src/test/ui/binding/match-range.rs
index 1dca84dfd45..1dca84dfd45 100644
--- a/src/test/run-pass/binding/match-range.rs
+++ b/src/test/ui/binding/match-range.rs
diff --git a/src/test/run-pass/binding/match-reassign.rs b/src/test/ui/binding/match-reassign.rs
index 19b48579cb4..19b48579cb4 100644
--- a/src/test/run-pass/binding/match-reassign.rs
+++ b/src/test/ui/binding/match-reassign.rs
diff --git a/src/test/run-pass/binding/match-ref-binding-in-guard-3256.rs b/src/test/ui/binding/match-ref-binding-in-guard-3256.rs
index 9075a34d410..9075a34d410 100644
--- a/src/test/run-pass/binding/match-ref-binding-in-guard-3256.rs
+++ b/src/test/ui/binding/match-ref-binding-in-guard-3256.rs
diff --git a/src/test/run-pass/binding/match-ref-binding-mut-option.rs b/src/test/ui/binding/match-ref-binding-mut-option.rs
index c25639b7213..c25639b7213 100644
--- a/src/test/run-pass/binding/match-ref-binding-mut-option.rs
+++ b/src/test/ui/binding/match-ref-binding-mut-option.rs
diff --git a/src/test/run-pass/binding/match-ref-binding-mut.rs b/src/test/ui/binding/match-ref-binding-mut.rs
index d7afd61bc8e..d7afd61bc8e 100644
--- a/src/test/run-pass/binding/match-ref-binding-mut.rs
+++ b/src/test/ui/binding/match-ref-binding-mut.rs
diff --git a/src/test/run-pass/binding/match-ref-binding.rs b/src/test/ui/binding/match-ref-binding.rs
index ac6a07eabe1..ac6a07eabe1 100644
--- a/src/test/run-pass/binding/match-ref-binding.rs
+++ b/src/test/ui/binding/match-ref-binding.rs
diff --git a/src/test/run-pass/binding/match-ref-unsized.rs b/src/test/ui/binding/match-ref-unsized.rs
index 53784ebb9fc..53784ebb9fc 100644
--- a/src/test/run-pass/binding/match-ref-unsized.rs
+++ b/src/test/ui/binding/match-ref-unsized.rs
diff --git a/src/test/run-pass/binding/match-str.rs b/src/test/ui/binding/match-str.rs
index 0ee18ea18de..0ee18ea18de 100644
--- a/src/test/run-pass/binding/match-str.rs
+++ b/src/test/ui/binding/match-str.rs
diff --git a/src/test/run-pass/binding/match-struct-0.rs b/src/test/ui/binding/match-struct-0.rs
index c49f3ed6178..c49f3ed6178 100644
--- a/src/test/run-pass/binding/match-struct-0.rs
+++ b/src/test/ui/binding/match-struct-0.rs
diff --git a/src/test/run-pass/binding/match-tag.rs b/src/test/ui/binding/match-tag.rs
index eceb6467784..eceb6467784 100644
--- a/src/test/run-pass/binding/match-tag.rs
+++ b/src/test/ui/binding/match-tag.rs
diff --git a/src/test/run-pass/binding/match-unique-bind.rs b/src/test/ui/binding/match-unique-bind.rs
index f5361b118be..f5361b118be 100644
--- a/src/test/run-pass/binding/match-unique-bind.rs
+++ b/src/test/ui/binding/match-unique-bind.rs
diff --git a/src/test/run-pass/binding/match-unsized.rs b/src/test/ui/binding/match-unsized.rs
index 41937a557ef..41937a557ef 100644
--- a/src/test/run-pass/binding/match-unsized.rs
+++ b/src/test/ui/binding/match-unsized.rs
diff --git a/src/test/run-pass/binding/match-value-binding-in-guard-3291.rs b/src/test/ui/binding/match-value-binding-in-guard-3291.rs
index 4b209b20a18..4b209b20a18 100644
--- a/src/test/run-pass/binding/match-value-binding-in-guard-3291.rs
+++ b/src/test/ui/binding/match-value-binding-in-guard-3291.rs
diff --git a/src/test/run-pass/binding/match-var-hygiene.rs b/src/test/ui/binding/match-var-hygiene.rs
index 43740bbcf1d..43740bbcf1d 100644
--- a/src/test/run-pass/binding/match-var-hygiene.rs
+++ b/src/test/ui/binding/match-var-hygiene.rs
diff --git a/src/test/run-pass/binding/match-vec-alternatives.rs b/src/test/ui/binding/match-vec-alternatives.rs
index 9b06a86a7b9..9b06a86a7b9 100644
--- a/src/test/run-pass/binding/match-vec-alternatives.rs
+++ b/src/test/ui/binding/match-vec-alternatives.rs
diff --git a/src/test/run-pass/binding/match-vec-rvalue.rs b/src/test/ui/binding/match-vec-rvalue.rs
index fead2254c75..fead2254c75 100644
--- a/src/test/run-pass/binding/match-vec-rvalue.rs
+++ b/src/test/ui/binding/match-vec-rvalue.rs
diff --git a/src/test/run-pass/binding/match-with-ret-arm.rs b/src/test/ui/binding/match-with-ret-arm.rs
index 58a90964121..58a90964121 100644
--- a/src/test/run-pass/binding/match-with-ret-arm.rs
+++ b/src/test/ui/binding/match-with-ret-arm.rs
diff --git a/src/test/run-pass/binding/multi-let.rs b/src/test/ui/binding/multi-let.rs
index 064d32a7084..064d32a7084 100644
--- a/src/test/run-pass/binding/multi-let.rs
+++ b/src/test/ui/binding/multi-let.rs
diff --git a/src/test/run-pass/binding/mut-in-ident-patterns.rs b/src/test/ui/binding/mut-in-ident-patterns.rs
index 1d1dd660e51..1d1dd660e51 100644
--- a/src/test/run-pass/binding/mut-in-ident-patterns.rs
+++ b/src/test/ui/binding/mut-in-ident-patterns.rs
diff --git a/src/test/run-pass/binding/nested-exhaustive-match.rs b/src/test/ui/binding/nested-exhaustive-match.rs
index 8b2294f8432..8b2294f8432 100644
--- a/src/test/run-pass/binding/nested-exhaustive-match.rs
+++ b/src/test/ui/binding/nested-exhaustive-match.rs
diff --git a/src/test/run-pass/binding/nested-matchs.rs b/src/test/ui/binding/nested-matchs.rs
index 29490fd4888..29490fd4888 100644
--- a/src/test/run-pass/binding/nested-matchs.rs
+++ b/src/test/ui/binding/nested-matchs.rs
diff --git a/src/test/run-pass/binding/nested-pattern.rs b/src/test/ui/binding/nested-pattern.rs
index 7d14c9ad9b7..7d14c9ad9b7 100644
--- a/src/test/run-pass/binding/nested-pattern.rs
+++ b/src/test/ui/binding/nested-pattern.rs
diff --git a/src/test/run-pass/binding/nil-pattern.rs b/src/test/ui/binding/nil-pattern.rs
index 268af351d08..268af351d08 100644
--- a/src/test/run-pass/binding/nil-pattern.rs
+++ b/src/test/ui/binding/nil-pattern.rs
diff --git a/src/test/run-pass/binding/nullary-or-pattern.rs b/src/test/ui/binding/nullary-or-pattern.rs
index 7a3d9d60eda..7a3d9d60eda 100644
--- a/src/test/run-pass/binding/nullary-or-pattern.rs
+++ b/src/test/ui/binding/nullary-or-pattern.rs
diff --git a/src/test/run-pass/binding/optional_comma_in_match_arm.rs b/src/test/ui/binding/optional_comma_in_match_arm.rs
index fc268bf2a45..fc268bf2a45 100644
--- a/src/test/run-pass/binding/optional_comma_in_match_arm.rs
+++ b/src/test/ui/binding/optional_comma_in_match_arm.rs
diff --git a/src/test/run-pass/binding/or-pattern.rs b/src/test/ui/binding/or-pattern.rs
index 2ab44a96c3a..2ab44a96c3a 100644
--- a/src/test/run-pass/binding/or-pattern.rs
+++ b/src/test/ui/binding/or-pattern.rs
diff --git a/src/test/run-pass/binding/order-drop-with-match.rs b/src/test/ui/binding/order-drop-with-match.rs
index f50632ede9f..f50632ede9f 100644
--- a/src/test/run-pass/binding/order-drop-with-match.rs
+++ b/src/test/ui/binding/order-drop-with-match.rs
diff --git a/src/test/run-pass/binding/pat-ranges.rs b/src/test/ui/binding/pat-ranges.rs
index 19b3045784f..19b3045784f 100644
--- a/src/test/run-pass/binding/pat-ranges.rs
+++ b/src/test/ui/binding/pat-ranges.rs
diff --git a/src/test/run-pass/binding/pat-tuple-1.rs b/src/test/ui/binding/pat-tuple-1.rs
index b09d4a22df0..b09d4a22df0 100644
--- a/src/test/run-pass/binding/pat-tuple-1.rs
+++ b/src/test/ui/binding/pat-tuple-1.rs
diff --git a/src/test/run-pass/binding/pat-tuple-2.rs b/src/test/ui/binding/pat-tuple-2.rs
index 810fd264139..810fd264139 100644
--- a/src/test/run-pass/binding/pat-tuple-2.rs
+++ b/src/test/ui/binding/pat-tuple-2.rs
diff --git a/src/test/run-pass/binding/pat-tuple-3.rs b/src/test/ui/binding/pat-tuple-3.rs
index 9bec898611e..9bec898611e 100644
--- a/src/test/run-pass/binding/pat-tuple-3.rs
+++ b/src/test/ui/binding/pat-tuple-3.rs
diff --git a/src/test/run-pass/binding/pat-tuple-4.rs b/src/test/ui/binding/pat-tuple-4.rs
index 71a54850268..71a54850268 100644
--- a/src/test/run-pass/binding/pat-tuple-4.rs
+++ b/src/test/ui/binding/pat-tuple-4.rs
diff --git a/src/test/run-pass/binding/pat-tuple-5.rs b/src/test/ui/binding/pat-tuple-5.rs
index c8cdd37dd85..c8cdd37dd85 100644
--- a/src/test/run-pass/binding/pat-tuple-5.rs
+++ b/src/test/ui/binding/pat-tuple-5.rs
diff --git a/src/test/run-pass/binding/pat-tuple-6.rs b/src/test/ui/binding/pat-tuple-6.rs
index 877f0e4140e..877f0e4140e 100644
--- a/src/test/run-pass/binding/pat-tuple-6.rs
+++ b/src/test/ui/binding/pat-tuple-6.rs
diff --git a/src/test/run-pass/binding/pat-tuple-7.rs b/src/test/ui/binding/pat-tuple-7.rs
index 7835e2c352f..7835e2c352f 100644
--- a/src/test/run-pass/binding/pat-tuple-7.rs
+++ b/src/test/ui/binding/pat-tuple-7.rs
diff --git a/src/test/run-pass/binding/pattern-bound-var-in-for-each.rs b/src/test/ui/binding/pattern-bound-var-in-for-each.rs
index 3f725cddc5b..3f725cddc5b 100644
--- a/src/test/run-pass/binding/pattern-bound-var-in-for-each.rs
+++ b/src/test/ui/binding/pattern-bound-var-in-for-each.rs
diff --git a/src/test/run-pass/binding/pattern-in-closure.rs b/src/test/ui/binding/pattern-in-closure.rs
index 3ac8d57681a..3ac8d57681a 100644
--- a/src/test/run-pass/binding/pattern-in-closure.rs
+++ b/src/test/ui/binding/pattern-in-closure.rs
diff --git a/src/test/run-pass/binding/range-inclusive-pattern-precedence.rs b/src/test/ui/binding/range-inclusive-pattern-precedence.rs
index 858239bb177..858239bb177 100644
--- a/src/test/run-pass/binding/range-inclusive-pattern-precedence.rs
+++ b/src/test/ui/binding/range-inclusive-pattern-precedence.rs
diff --git a/src/test/run-pass/binding/simple-generic-match.rs b/src/test/ui/binding/simple-generic-match.rs
index 50cfe19fef4..50cfe19fef4 100644
--- a/src/test/run-pass/binding/simple-generic-match.rs
+++ b/src/test/ui/binding/simple-generic-match.rs
diff --git a/src/test/run-pass/binding/use-uninit-match.rs b/src/test/ui/binding/use-uninit-match.rs
index 9250dbf0c43..9250dbf0c43 100644
--- a/src/test/run-pass/binding/use-uninit-match.rs
+++ b/src/test/ui/binding/use-uninit-match.rs
diff --git a/src/test/run-pass/binding/use-uninit-match2.rs b/src/test/ui/binding/use-uninit-match2.rs
index 9102730629b..9102730629b 100644
--- a/src/test/run-pass/binding/use-uninit-match2.rs
+++ b/src/test/ui/binding/use-uninit-match2.rs
diff --git a/src/test/run-pass/binding/zero_sized_subslice_match.rs b/src/test/ui/binding/zero_sized_subslice_match.rs
index 51e1c024bff..51e1c024bff 100644
--- a/src/test/run-pass/binding/zero_sized_subslice_match.rs
+++ b/src/test/ui/binding/zero_sized_subslice_match.rs
diff --git a/src/test/run-pass/binops-issue-22743.rs b/src/test/ui/binops-issue-22743.rs
index 4e95597b671..393ba0a56cb 100644
--- a/src/test/run-pass/binops-issue-22743.rs
+++ b/src/test/ui/binops-issue-22743.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::ops::Mul;
 
 #[derive(Copy, Clone)]
diff --git a/src/test/run-pass/binops.rs b/src/test/ui/binops.rs
index b24f8b723fd..a7abf6087b3 100644
--- a/src/test/run-pass/binops.rs
+++ b/src/test/ui/binops.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 // Binop corner cases
 
diff --git a/src/test/run-pass/bitwise.rs b/src/test/ui/bitwise.rs
index 309ccae1487..f79ff3c6efb 100644
--- a/src/test/run-pass/bitwise.rs
+++ b/src/test/ui/bitwise.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #[cfg(any(target_pointer_width = "32"))]
 fn target() {
     assert_eq!(-1000isize as usize >> 3_usize, 536870787_usize);
diff --git a/src/test/run-pass/blind-item-local-shadow.rs b/src/test/ui/blind-item-local-shadow.rs
index d88374a351a..942aeb6fdf4 100644
--- a/src/test/run-pass/blind-item-local-shadow.rs
+++ b/src/test/ui/blind-item-local-shadow.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_imports)]
 mod bar {
diff --git a/src/test/run-pass/blind-item-mixed-crate-use-item.rs b/src/test/ui/blind-item-mixed-crate-use-item.rs
index 00d171f6e4d..36d8ab151e4 100644
--- a/src/test/run-pass/blind-item-mixed-crate-use-item.rs
+++ b/src/test/ui/blind-item-mixed-crate-use-item.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:blind-item-mixed-crate-use-item-foo.rs
 // aux-build:blind-item-mixed-crate-use-item-foo2.rs
 
diff --git a/src/test/run-pass/blind-item-mixed-use-item.rs b/src/test/ui/blind-item-mixed-use-item.rs
index e6008206ba8..4a39054967b 100644
--- a/src/test/run-pass/blind-item-mixed-use-item.rs
+++ b/src/test/ui/blind-item-mixed-use-item.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 mod m {
diff --git a/src/test/run-pass/block-arg-call-as.rs b/src/test/ui/block-arg-call-as.rs
index 7157cfecf32..87cf3a487bf 100644
--- a/src/test/run-pass/block-arg-call-as.rs
+++ b/src/test/ui/block-arg-call-as.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_snake_case)]
 
 fn asBlock<F>(f: F) -> usize where F: FnOnce() -> usize {
diff --git a/src/test/run-pass/block-arg.rs b/src/test/ui/block-arg.rs
index 8d5840ae9e7..bd1385e5c33 100644
--- a/src/test/run-pass/block-arg.rs
+++ b/src/test/ui/block-arg.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Check usage and precedence of block arguments in expressions:
 pub fn main() {
     let v = vec![-1.0f64, 0.0, 1.0, 2.0, 3.0];
diff --git a/src/test/run-pass/block-explicit-types.rs b/src/test/ui/block-explicit-types.rs
index 449a4967580..860fcc8df21 100644
--- a/src/test/run-pass/block-explicit-types.rs
+++ b/src/test/ui/block-explicit-types.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     fn as_buf<T, F>(s: String, f: F) -> T where F: FnOnce(String) -> T { f(s) }
     as_buf("foo".to_string(), |foo: String| -> () { println!("{}", foo) });
diff --git a/src/test/run-pass/block-expr-precedence.rs b/src/test/ui/block-expr-precedence.rs
index 2be0ac4c44f..d31eecda9bb 100644
--- a/src/test/run-pass/block-expr-precedence.rs
+++ b/src/test/ui/block-expr-precedence.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(unused_parens)]
 // This test has some extra semis in it that the pretty-printer won't
diff --git a/src/test/run-pass/block-fn-coerce.rs b/src/test/ui/block-fn-coerce.rs
index 0fbc1f5178d..fc5f51d46b2 100644
--- a/src/test/run-pass/block-fn-coerce.rs
+++ b/src/test/ui/block-fn-coerce.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn force<F>(f: F) -> isize where F: FnOnce() -> isize { return f(); }
 
 pub fn main() {
diff --git a/src/test/run-pass/block-iter-1.rs b/src/test/ui/block-iter-1.rs
index 8b3fc95f5a1..caf0266cff1 100644
--- a/src/test/run-pass/block-iter-1.rs
+++ b/src/test/ui/block-iter-1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn iter_vec<T, F>(v: Vec<T> , mut f: F) where F: FnMut(&T) { for x in &v { f(x); } }
 
 pub fn main() {
diff --git a/src/test/run-pass/block-iter-2.rs b/src/test/ui/block-iter-2.rs
index 0176f6d26d9..e90c1ee815a 100644
--- a/src/test/run-pass/block-iter-2.rs
+++ b/src/test/ui/block-iter-2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn iter_vec<T, F>(v: Vec<T>, mut f: F) where F: FnMut(&T) { for x in &v { f(x); } }
 
 pub fn main() {
diff --git a/src/test/run-pass/bool-not.rs b/src/test/ui/bool-not.rs
index 34865a36762..84713d6818a 100644
--- a/src/test/run-pass/bool-not.rs
+++ b/src/test/ui/bool-not.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     if !false { assert!((true)); } else { assert!((false)); }
     if !true { assert!((false)); } else { assert!((true)); }
diff --git a/src/test/run-pass/bool.rs b/src/test/ui/bool.rs
index e6322746f20..92f36c8fd25 100644
--- a/src/test/run-pass/bool.rs
+++ b/src/test/ui/bool.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Basic boolean tests
 
 
diff --git a/src/test/run-pass/borrow-by-val-method-receiver.rs b/src/test/ui/borrow-by-val-method-receiver.rs
index 5907f8238af..465bef1614d 100644
--- a/src/test/run-pass/borrow-by-val-method-receiver.rs
+++ b/src/test/ui/borrow-by-val-method-receiver.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 trait Foo {
     fn foo(self);
 }
diff --git a/src/test/run-pass/borrowck/borrowck-assign-to-subfield.rs b/src/test/ui/borrowck/borrowck-assign-to-subfield.rs
index 050d702b625..050d702b625 100644
--- a/src/test/run-pass/borrowck/borrowck-assign-to-subfield.rs
+++ b/src/test/ui/borrowck/borrowck-assign-to-subfield.rs
diff --git a/src/test/run-pass/borrowck/borrowck-assignment-to-static-mut.rs b/src/test/ui/borrowck/borrowck-assignment-to-static-mut.rs
index 72bf43da95e..72bf43da95e 100644
--- a/src/test/run-pass/borrowck/borrowck-assignment-to-static-mut.rs
+++ b/src/test/ui/borrowck/borrowck-assignment-to-static-mut.rs
diff --git a/src/test/run-pass/borrowck/borrowck-binding-mutbl.rs b/src/test/ui/borrowck/borrowck-binding-mutbl.rs
index c2d2e02ec15..c2d2e02ec15 100644
--- a/src/test/run-pass/borrowck/borrowck-binding-mutbl.rs
+++ b/src/test/ui/borrowck/borrowck-binding-mutbl.rs
diff --git a/src/test/run-pass/borrowck/borrowck-borrow-from-expr-block.rs b/src/test/ui/borrowck/borrowck-borrow-from-expr-block.rs
index 15c6e8bf210..15c6e8bf210 100644
--- a/src/test/run-pass/borrowck/borrowck-borrow-from-expr-block.rs
+++ b/src/test/ui/borrowck/borrowck-borrow-from-expr-block.rs
diff --git a/src/test/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs b/src/test/ui/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs
index 2839a9195a0..2839a9195a0 100644
--- a/src/test/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs
+++ b/src/test/ui/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs
diff --git a/src/test/run-pass/borrowck/borrowck-closures-two-imm.rs b/src/test/ui/borrowck/borrowck-closures-two-imm.rs
index ab135194a09..ab135194a09 100644
--- a/src/test/run-pass/borrowck/borrowck-closures-two-imm.rs
+++ b/src/test/ui/borrowck/borrowck-closures-two-imm.rs
diff --git a/src/test/run-pass/borrowck/borrowck-field-sensitivity.rs b/src/test/ui/borrowck/borrowck-field-sensitivity-rpass.rs
index cb1ba90de89..cb1ba90de89 100644
--- a/src/test/run-pass/borrowck/borrowck-field-sensitivity.rs
+++ b/src/test/ui/borrowck/borrowck-field-sensitivity-rpass.rs
diff --git a/src/test/run-pass/borrowck/borrowck-fixed-length-vecs.rs b/src/test/ui/borrowck/borrowck-fixed-length-vecs.rs
index 126323d8d24..126323d8d24 100644
--- a/src/test/run-pass/borrowck/borrowck-fixed-length-vecs.rs
+++ b/src/test/ui/borrowck/borrowck-fixed-length-vecs.rs
diff --git a/src/test/run-pass/borrowck/borrowck-freeze-frozen-mut.rs b/src/test/ui/borrowck/borrowck-freeze-frozen-mut.rs
index 199931d6d1e..199931d6d1e 100644
--- a/src/test/run-pass/borrowck/borrowck-freeze-frozen-mut.rs
+++ b/src/test/ui/borrowck/borrowck-freeze-frozen-mut.rs
diff --git a/src/test/run-pass/borrowck/borrowck-lend-args.rs b/src/test/ui/borrowck/borrowck-lend-args.rs
index d0ef2dcdd28..d0ef2dcdd28 100644
--- a/src/test/run-pass/borrowck/borrowck-lend-args.rs
+++ b/src/test/ui/borrowck/borrowck-lend-args.rs
diff --git a/src/test/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs b/src/test/ui/borrowck/borrowck-macro-interaction-issue-6304.rs
index 628e49f574c..628e49f574c 100644
--- a/src/test/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs
+++ b/src/test/ui/borrowck/borrowck-macro-interaction-issue-6304.rs
diff --git a/src/test/run-pass/borrowck/borrowck-move-by-capture-ok.rs b/src/test/ui/borrowck/borrowck-move-by-capture-ok.rs
index 98e4b881893..98e4b881893 100644
--- a/src/test/run-pass/borrowck/borrowck-move-by-capture-ok.rs
+++ b/src/test/ui/borrowck/borrowck-move-by-capture-ok.rs
diff --git a/src/test/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs b/src/test/ui/borrowck/borrowck-multiple-borrows-interior-boxes.rs
index 96d2663500e..96d2663500e 100644
--- a/src/test/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs
+++ b/src/test/ui/borrowck/borrowck-multiple-borrows-interior-boxes.rs
diff --git a/src/test/run-pass/borrowck/borrowck-mut-uniq.rs b/src/test/ui/borrowck/borrowck-mut-uniq.rs
index 80b3484e0fb..80b3484e0fb 100644
--- a/src/test/run-pass/borrowck/borrowck-mut-uniq.rs
+++ b/src/test/ui/borrowck/borrowck-mut-uniq.rs
diff --git a/src/test/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs b/src/test/ui/borrowck/borrowck-mut-vec-as-imm-slice.rs
index d2b0c01545e..d2b0c01545e 100644
--- a/src/test/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs
+++ b/src/test/ui/borrowck/borrowck-mut-vec-as-imm-slice.rs
diff --git a/src/test/run-pass/borrowck/borrowck-pat-enum.rs b/src/test/ui/borrowck/borrowck-pat-enum.rs
index 7f9c5544d0b..7f9c5544d0b 100644
--- a/src/test/run-pass/borrowck/borrowck-pat-enum.rs
+++ b/src/test/ui/borrowck/borrowck-pat-enum.rs
diff --git a/src/test/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs b/src/test/ui/borrowck/borrowck-pat-reassign-no-binding.rs
index 1362fd8ce4c..1362fd8ce4c 100644
--- a/src/test/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs
+++ b/src/test/ui/borrowck/borrowck-pat-reassign-no-binding.rs
diff --git a/src/test/run-pass/borrowck/borrowck-rvalues-mutable.rs b/src/test/ui/borrowck/borrowck-rvalues-mutable.rs
index c4695c942e1..c4695c942e1 100644
--- a/src/test/run-pass/borrowck/borrowck-rvalues-mutable.rs
+++ b/src/test/ui/borrowck/borrowck-rvalues-mutable.rs
diff --git a/src/test/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs b/src/test/ui/borrowck/borrowck-scope-of-deref-issue-4666.rs
index e89332ae31a..e89332ae31a 100644
--- a/src/test/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs
+++ b/src/test/ui/borrowck/borrowck-scope-of-deref-issue-4666.rs
diff --git a/src/test/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs b/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-rpass.rs
index 7675147c8ec..7675147c8ec 100644
--- a/src/test/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs
+++ b/src/test/ui/borrowck/borrowck-slice-pattern-element-loan-rpass.rs
diff --git a/src/test/run-pass/borrowck/borrowck-static-item-in-fn.rs b/src/test/ui/borrowck/borrowck-static-item-in-fn.rs
index 5f4379325a5..5f4379325a5 100644
--- a/src/test/run-pass/borrowck/borrowck-static-item-in-fn.rs
+++ b/src/test/ui/borrowck/borrowck-static-item-in-fn.rs
diff --git a/src/test/run-pass/borrowck/borrowck-trait-lifetime.rs b/src/test/ui/borrowck/borrowck-trait-lifetime.rs
index 8a6dfe76d60..8a6dfe76d60 100644
--- a/src/test/run-pass/borrowck/borrowck-trait-lifetime.rs
+++ b/src/test/ui/borrowck/borrowck-trait-lifetime.rs
diff --git a/src/test/run-pass/borrowck/borrowck-uniq-via-ref.rs b/src/test/ui/borrowck/borrowck-uniq-via-ref.rs
index bdf7cc57a53..bdf7cc57a53 100644
--- a/src/test/run-pass/borrowck/borrowck-uniq-via-ref.rs
+++ b/src/test/ui/borrowck/borrowck-uniq-via-ref.rs
diff --git a/src/test/run-pass/borrowck/borrowck-univariant-enum.rs b/src/test/ui/borrowck/borrowck-univariant-enum.rs
index c78e9475233..c78e9475233 100644
--- a/src/test/run-pass/borrowck/borrowck-univariant-enum.rs
+++ b/src/test/ui/borrowck/borrowck-univariant-enum.rs
diff --git a/src/test/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs b/src/test/ui/borrowck/borrowck-unsafe-static-mutable-borrows.rs
index adc7dfd541f..adc7dfd541f 100644
--- a/src/test/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs
+++ b/src/test/ui/borrowck/borrowck-unsafe-static-mutable-borrows.rs
diff --git a/src/test/run-pass/borrowck/borrowck-unused-mut-locals.rs b/src/test/ui/borrowck/borrowck-unused-mut-locals.rs
index fd0e346e2b4..fd0e346e2b4 100644
--- a/src/test/run-pass/borrowck/borrowck-unused-mut-locals.rs
+++ b/src/test/ui/borrowck/borrowck-unused-mut-locals.rs
diff --git a/src/test/run-pass/borrowck/borrowck-use-mut-borrow.rs b/src/test/ui/borrowck/borrowck-use-mut-borrow-rpass.rs
index bcd1d3ccd8a..bcd1d3ccd8a 100644
--- a/src/test/run-pass/borrowck/borrowck-use-mut-borrow.rs
+++ b/src/test/ui/borrowck/borrowck-use-mut-borrow-rpass.rs
diff --git a/src/test/run-pass/borrowck/issue-62007-assign-box.rs b/src/test/ui/borrowck/issue-62007-assign-box.rs
index f6fbea821b5..f6fbea821b5 100644
--- a/src/test/run-pass/borrowck/issue-62007-assign-box.rs
+++ b/src/test/ui/borrowck/issue-62007-assign-box.rs
diff --git a/src/test/run-pass/borrowck/issue-62007-assign-field.rs b/src/test/ui/borrowck/issue-62007-assign-field.rs
index 5b21c083816..5b21c083816 100644
--- a/src/test/run-pass/borrowck/issue-62007-assign-field.rs
+++ b/src/test/ui/borrowck/issue-62007-assign-field.rs
diff --git a/src/test/run-pass/borrowck/two-phase-baseline.rs b/src/test/ui/borrowck/two-phase-baseline.rs
index 994dc823dfc..994dc823dfc 100644
--- a/src/test/run-pass/borrowck/two-phase-baseline.rs
+++ b/src/test/ui/borrowck/two-phase-baseline.rs
diff --git a/src/test/run-pass/borrowck/two-phase-bin-ops.rs b/src/test/ui/borrowck/two-phase-bin-ops.rs
index 1242ae307d3..1242ae307d3 100644
--- a/src/test/run-pass/borrowck/two-phase-bin-ops.rs
+++ b/src/test/ui/borrowck/two-phase-bin-ops.rs
diff --git a/src/test/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs b/src/test/ui/borrowck/two-phase-control-flow-split-before-activation.rs
index 0b20e1945e6..0b20e1945e6 100644
--- a/src/test/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs
+++ b/src/test/ui/borrowck/two-phase-control-flow-split-before-activation.rs
diff --git a/src/test/run-pass/box-new.rs b/src/test/ui/box-new.rs
index 2d177bcf927..be1a40cf779 100644
--- a/src/test/run-pass/box-new.rs
+++ b/src/test/ui/box-new.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 fn main() {
diff --git a/src/test/run-pass/bug-7183-generics.rs b/src/test/ui/bug-7183-generics.rs
index 72cfe1973a8..f53a1736127 100644
--- a/src/test/run-pass/bug-7183-generics.rs
+++ b/src/test/ui/bug-7183-generics.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 trait Speak : Sized {
     fn say(&self, s:&str) -> String;
     fn hi(&self) -> String { hello(self) }
diff --git a/src/test/run-pass/bug-7295.rs b/src/test/ui/bug-7295.rs
index b6dea6c82dc..156ff2ee82f 100644
--- a/src/test/run-pass/bug-7295.rs
+++ b/src/test/ui/bug-7295.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 pub trait Foo<T> {
diff --git a/src/test/run-pass/builtin-clone-unwind.rs b/src/test/ui/builtin-clone-unwind.rs
index fa278082912..339bcfa1060 100644
--- a/src/test/run-pass/builtin-clone-unwind.rs
+++ b/src/test/ui/builtin-clone-unwind.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 #![allow(unused_imports)]
 // ignore-wasm32-bare compiled with panic=abort by default
diff --git a/src/test/run-pass/builtin-clone.rs b/src/test/ui/builtin-clone.rs
index 2a9b98a6e33..0874d5bc390 100644
--- a/src/test/run-pass/builtin-clone.rs
+++ b/src/test/ui/builtin-clone.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that `Clone` is correctly implemented for builtin types.
 // Also test that cloning an array or a tuple is done right, i.e.
 // each component is cloned.
diff --git a/src/test/run-pass/builtin-superkinds-capabilities-transitive.rs b/src/test/ui/builtin-superkinds-capabilities-transitive.rs
index 8ff70036ed2..1f997d37122 100644
--- a/src/test/run-pass/builtin-superkinds-capabilities-transitive.rs
+++ b/src/test/ui/builtin-superkinds-capabilities-transitive.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests "transitivity" of super-builtin-kinds on traits. Here, if
 // we have a Foo, we know we have a Bar, and if we have a Bar, we
 // know we have a Send. So if we have a Foo we should know we have
diff --git a/src/test/run-pass/builtin-superkinds-capabilities-xc.rs b/src/test/ui/builtin-superkinds-capabilities-xc.rs
index 7af41cbf50b..8416bb3a377 100644
--- a/src/test/run-pass/builtin-superkinds-capabilities-xc.rs
+++ b/src/test/ui/builtin-superkinds-capabilities-xc.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:trait_superkinds_in_metadata.rs
 
 // Tests "capabilities" granted by traits with super-builtin-kinds,
diff --git a/src/test/run-pass/builtin-superkinds-capabilities.rs b/src/test/ui/builtin-superkinds-capabilities.rs
index 2a2917b69b0..e936f921a82 100644
--- a/src/test/run-pass/builtin-superkinds-capabilities.rs
+++ b/src/test/ui/builtin-superkinds-capabilities.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests "capabilities" granted by traits that inherit from super-
 // builtin-kinds, e.g., if a trait requires Send to implement, then
 // at usage site of that trait, we know we have the Send capability.
diff --git a/src/test/run-pass/builtin-superkinds-in-metadata.rs b/src/test/ui/builtin-superkinds-in-metadata.rs
index f585d9cc4f8..117014b44ee 100644
--- a/src/test/run-pass/builtin-superkinds-in-metadata.rs
+++ b/src/test/ui/builtin-superkinds-in-metadata.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 
 // aux-build:trait_superkinds_in_metadata.rs
diff --git a/src/test/run-pass/builtin-superkinds-phantom-typaram.rs b/src/test/ui/builtin-superkinds-phantom-typaram.rs
index 3899ecf6f3f..9b80664b04e 100644
--- a/src/test/run-pass/builtin-superkinds-phantom-typaram.rs
+++ b/src/test/ui/builtin-superkinds-phantom-typaram.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Tests that even when a type parameter doesn't implement a required
 // super-builtin-kind of a trait, if the type parameter is never used,
diff --git a/src/test/run-pass/builtin-superkinds-simple.rs b/src/test/ui/builtin-superkinds-simple.rs
index 670b8ed0e9b..8d247715784 100644
--- a/src/test/run-pass/builtin-superkinds-simple.rs
+++ b/src/test/ui/builtin-superkinds-simple.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Simple test case of implementing a trait with super-builtin-kinds.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/builtin-superkinds-typaram.rs b/src/test/ui/builtin-superkinds-typaram.rs
index c3a456318bc..f999dfff786 100644
--- a/src/test/run-pass/builtin-superkinds-typaram.rs
+++ b/src/test/ui/builtin-superkinds-typaram.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests correct implementation of traits with super-builtin-kinds
 // using a bounded type parameter.
 
diff --git a/src/test/run-pass/byte-literals.rs b/src/test/ui/byte-literals.rs
index 259ac08fd97..2649c2eac33 100644
--- a/src/test/run-pass/byte-literals.rs
+++ b/src/test/ui/byte-literals.rs
@@ -1,3 +1,4 @@
+// run-pass
 //
 
 
diff --git a/src/test/run-pass/c-stack-as-value.rs b/src/test/ui/c-stack-as-value.rs
index 3b997295c12..7595b76fb3f 100644
--- a/src/test/run-pass/c-stack-as-value.rs
+++ b/src/test/ui/c-stack-as-value.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 // ignore-wasm32-bare no libc to test ffi with
 
diff --git a/src/test/run-pass/c-stack-returning-int64.rs b/src/test/ui/c-stack-returning-int64.rs
index ec162b40bf8..388d280b831 100644
--- a/src/test/run-pass/c-stack-returning-int64.rs
+++ b/src/test/ui/c-stack-returning-int64.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare no libc to test with
 // ignore-sgx no libc
 
diff --git a/src/test/run-pass/cabi-int-widening.rs b/src/test/ui/cabi-int-widening.rs
index f6524c6a3d9..240eaebf3d6 100644
--- a/src/test/run-pass/cabi-int-widening.rs
+++ b/src/test/ui/cabi-int-widening.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare no libc to test ffi with
 
 #[link(name = "rust_test_helpers", kind = "static")]
diff --git a/src/test/run-pass/can-copy-pod.rs b/src/test/ui/can-copy-pod.rs
index bc10d236b36..e6c57ca3f71 100644
--- a/src/test/run-pass/can-copy-pod.rs
+++ b/src/test/ui/can-copy-pod.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 /* Any copyright is dedicated to the Public Domain.
diff --git a/src/test/run-pass/cancel-clean-via-immediate-rvalue-ref.rs b/src/test/ui/cancel-clean-via-immediate-rvalue-ref.rs
index f27803677cc..781d5c14abe 100644
--- a/src/test/run-pass/cancel-clean-via-immediate-rvalue-ref.rs
+++ b/src/test/ui/cancel-clean-via-immediate-rvalue-ref.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/cast-does-fallback.rs b/src/test/ui/cast-does-fallback.rs
index 6adf90fc0e6..770f7a31c76 100644
--- a/src/test/run-pass/cast-does-fallback.rs
+++ b/src/test/ui/cast-does-fallback.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     // Test that these type check correctly.
     (&42u8 >> 4) as usize;
diff --git a/src/test/run-pass/cast-region-to-uint.rs b/src/test/ui/cast-region-to-uint.rs
index ef2f6f1c492..33ec2d27610 100644
--- a/src/test/run-pass/cast-region-to-uint.rs
+++ b/src/test/ui/cast-region-to-uint.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let x: isize = 3;
     println!("&x={:x}", (&x as *const isize as usize));
diff --git a/src/test/run-pass/cast-rfc0401-vtable-kinds.rs b/src/test/ui/cast-rfc0401-vtable-kinds.rs
index a27dd9eef52..249481467e6 100644
--- a/src/test/run-pass/cast-rfc0401-vtable-kinds.rs
+++ b/src/test/ui/cast-rfc0401-vtable-kinds.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Check that you can cast between different pointers to trait objects
 // whose vtable have the same kind (both lengths, or both trait pointers).
 
diff --git a/src/test/run-pass/cast-rfc0401.rs b/src/test/ui/cast-rfc0401.rs
index 017b63c7374..996fa013fed 100644
--- a/src/test/run-pass/cast-rfc0401.rs
+++ b/src/test/ui/cast-rfc0401.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 use std::vec;
diff --git a/src/test/run-pass/cast-to-infer-ty.rs b/src/test/ui/cast-to-infer-ty.rs
index e29860cbfbf..053ebb621a7 100644
--- a/src/test/run-pass/cast-to-infer-ty.rs
+++ b/src/test/ui/cast-to-infer-ty.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Check that we allow a cast to `_` so long as the target type can be
 // inferred elsewhere.
 
diff --git a/src/test/run-pass/cast.rs b/src/test/ui/cast.rs
index c7977f461df..218275c4d99 100644
--- a/src/test/run-pass/cast.rs
+++ b/src/test/ui/cast.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_assignments)]
 #![allow(unused_variables)]
 
diff --git a/src/test/run-pass/catch-unwind-bang.rs b/src/test/ui/catch-unwind-bang.rs
index 6c6f5a4fcfd..f181991713b 100644
--- a/src/test/run-pass/catch-unwind-bang.rs
+++ b/src/test/ui/catch-unwind-bang.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare compiled with panic=abort by default
 
 fn worker() -> ! {
diff --git a/src/test/run-pass/cell-does-not-clone.rs b/src/test/ui/cell-does-not-clone.rs
index 7ba6419d8a3..587447b54b7 100644
--- a/src/test/run-pass/cell-does-not-clone.rs
+++ b/src/test/ui/cell-does-not-clone.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 use std::cell::Cell;
diff --git a/src/test/run-pass/cfg/auxiliary/cfg_inner_static.rs b/src/test/ui/cfg/auxiliary/cfg_inner_static.rs
index 6a619a4e768..6a619a4e768 100644
--- a/src/test/run-pass/cfg/auxiliary/cfg_inner_static.rs
+++ b/src/test/ui/cfg/auxiliary/cfg_inner_static.rs
diff --git a/src/test/run-pass/cfg/auxiliary/crate-attributes-using-cfg_attr.rs b/src/test/ui/cfg/auxiliary/crate-attributes-using-cfg_attr.rs
index 1e0f5d79c0b..1e0f5d79c0b 100644
--- a/src/test/run-pass/cfg/auxiliary/crate-attributes-using-cfg_attr.rs
+++ b/src/test/ui/cfg/auxiliary/crate-attributes-using-cfg_attr.rs
diff --git a/src/test/run-pass/cfg/cfg-attr-cfg.rs b/src/test/ui/cfg/cfg-attr-cfg.rs
index 61794e0bfa9..61794e0bfa9 100644
--- a/src/test/run-pass/cfg/cfg-attr-cfg.rs
+++ b/src/test/ui/cfg/cfg-attr-cfg.rs
diff --git a/src/test/run-pass/cfg/cfg-attr-crate.rs b/src/test/ui/cfg/cfg-attr-crate.rs
index 1d70f2f84f2..1d70f2f84f2 100644
--- a/src/test/run-pass/cfg/cfg-attr-crate.rs
+++ b/src/test/ui/cfg/cfg-attr-crate.rs
diff --git a/src/test/run-pass/cfg/cfg-family.rs b/src/test/ui/cfg/cfg-family.rs
index 9fb7c766921..9fb7c766921 100644
--- a/src/test/run-pass/cfg/cfg-family.rs
+++ b/src/test/ui/cfg/cfg-family.rs
diff --git a/src/test/run-pass/cfg/cfg-in-crate-1.rs b/src/test/ui/cfg/cfg-in-crate-1.rs
index e84300aa331..e84300aa331 100644
--- a/src/test/run-pass/cfg/cfg-in-crate-1.rs
+++ b/src/test/ui/cfg/cfg-in-crate-1.rs
diff --git a/src/test/run-pass/cfg/cfg-macros-foo.rs b/src/test/ui/cfg/cfg-macros-foo.rs
index 8b112c7961b..8b112c7961b 100644
--- a/src/test/run-pass/cfg/cfg-macros-foo.rs
+++ b/src/test/ui/cfg/cfg-macros-foo.rs
diff --git a/src/test/run-pass/cfg/cfg-macros-notfoo.rs b/src/test/ui/cfg/cfg-macros-notfoo.rs
index 292d97821cd..292d97821cd 100644
--- a/src/test/run-pass/cfg/cfg-macros-notfoo.rs
+++ b/src/test/ui/cfg/cfg-macros-notfoo.rs
diff --git a/src/test/run-pass/cfg/cfg-match-arm.rs b/src/test/ui/cfg/cfg-match-arm.rs
index 071008f9eb6..071008f9eb6 100644
--- a/src/test/run-pass/cfg/cfg-match-arm.rs
+++ b/src/test/ui/cfg/cfg-match-arm.rs
diff --git a/src/test/run-pass/cfg/cfg-target-family.rs b/src/test/ui/cfg/cfg-target-family.rs
index ecf802f7281..ecf802f7281 100644
--- a/src/test/run-pass/cfg/cfg-target-family.rs
+++ b/src/test/ui/cfg/cfg-target-family.rs
diff --git a/src/test/run-pass/cfg/cfg-target-vendor.rs b/src/test/ui/cfg/cfg-target-vendor.rs
index 7824585162e..7824585162e 100644
--- a/src/test/run-pass/cfg/cfg-target-vendor.rs
+++ b/src/test/ui/cfg/cfg-target-vendor.rs
diff --git a/src/test/run-pass/cfg/cfg_attr.rs b/src/test/ui/cfg/cfg_attr.rs
index c959e68acf9..c959e68acf9 100644
--- a/src/test/run-pass/cfg/cfg_attr.rs
+++ b/src/test/ui/cfg/cfg_attr.rs
diff --git a/src/test/run-pass/cfg/cfg_inner_static.rs b/src/test/ui/cfg/cfg_inner_static.rs
index 45dbbcc1084..45dbbcc1084 100644
--- a/src/test/run-pass/cfg/cfg_inner_static.rs
+++ b/src/test/ui/cfg/cfg_inner_static.rs
diff --git a/src/test/run-pass/cfg/cfg_stmt_expr.rs b/src/test/ui/cfg/cfg_stmt_expr.rs
index e466ad69f72..e466ad69f72 100644
--- a/src/test/run-pass/cfg/cfg_stmt_expr.rs
+++ b/src/test/ui/cfg/cfg_stmt_expr.rs
diff --git a/src/test/run-pass/cfg/cfgs-on-items.rs b/src/test/ui/cfg/cfgs-on-items.rs
index 9f2fc49423e..9f2fc49423e 100644
--- a/src/test/run-pass/cfg/cfgs-on-items.rs
+++ b/src/test/ui/cfg/cfgs-on-items.rs
diff --git a/src/test/run-pass/cfg/conditional-compile-arch.rs b/src/test/ui/cfg/conditional-compile-arch.rs
index ea3affee406..ea3affee406 100644
--- a/src/test/run-pass/cfg/conditional-compile-arch.rs
+++ b/src/test/ui/cfg/conditional-compile-arch.rs
diff --git a/src/test/run-pass/cfg/conditional-compile.rs b/src/test/ui/cfg/conditional-compile.rs
index de5bd5f07dd..de5bd5f07dd 100644
--- a/src/test/run-pass/cfg/conditional-compile.rs
+++ b/src/test/ui/cfg/conditional-compile.rs
diff --git a/src/test/run-pass/cfg/crate-attributes-using-cfg_attr.rs b/src/test/ui/cfg/crate-attributes-using-cfg_attr.rs
index 43b266b778f..43b266b778f 100644
--- a/src/test/run-pass/cfg/crate-attributes-using-cfg_attr.rs
+++ b/src/test/ui/cfg/crate-attributes-using-cfg_attr.rs
diff --git a/src/test/run-pass/chalkify/builtin-copy-clone.rs b/src/test/ui/chalkify/builtin-copy-clone.rs
index 4f69714bc74..d403514b553 100644
--- a/src/test/run-pass/chalkify/builtin-copy-clone.rs
+++ b/src/test/ui/chalkify/builtin-copy-clone.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Z chalk
 
 // Test that `Clone` is correctly implemented for builtin types.
diff --git a/src/test/run-pass/chalkify/inherent_impl.rs b/src/test/ui/chalkify/inherent_impl.rs
index fbe30f11544..44e120c1eeb 100644
--- a/src/test/run-pass/chalkify/inherent_impl.rs
+++ b/src/test/ui/chalkify/inherent_impl.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Z chalk
 
 trait Foo { }
diff --git a/src/test/run-pass/chalkify/projection.rs b/src/test/ui/chalkify/projection.rs
index a598f68d3f9..d6a8dd7a4a2 100644
--- a/src/test/run-pass/chalkify/projection.rs
+++ b/src/test/ui/chalkify/projection.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Z chalk
 
 trait Foo { }
diff --git a/src/test/run-pass/chalkify/super_trait.rs b/src/test/ui/chalkify/super_trait.rs
index 441d61ef248..eeff9fd9b80 100644
--- a/src/test/run-pass/chalkify/super_trait.rs
+++ b/src/test/ui/chalkify/super_trait.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Z chalk
 
 trait Foo { }
diff --git a/src/test/run-pass/chalkify/trait_implied_bound.rs b/src/test/ui/chalkify/trait_implied_bound.rs
index f82453792ff..8a2e1cf5990 100644
--- a/src/test/run-pass/chalkify/trait_implied_bound.rs
+++ b/src/test/ui/chalkify/trait_implied_bound.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Z chalk
 
 trait Foo { }
diff --git a/src/test/run-pass/chalkify/type_implied_bound.rs b/src/test/ui/chalkify/type_implied_bound.rs
index 94d976d3242..8673f5319bd 100644
--- a/src/test/run-pass/chalkify/type_implied_bound.rs
+++ b/src/test/ui/chalkify/type_implied_bound.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Z chalk
 
 trait Eq { }
diff --git a/src/test/run-pass/char.rs b/src/test/ui/char.rs
index 1616d666c1b..cfb7a37af01 100644
--- a/src/test/run-pass/char.rs
+++ b/src/test/ui/char.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let c: char = 'x';
     let d: char = 'x';
diff --git a/src/test/run-pass/char_unicode.rs b/src/test/ui/char_unicode.rs
index 90ec26e80bb..93e5300e36f 100644
--- a/src/test/run-pass/char_unicode.rs
+++ b/src/test/ui/char_unicode.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(unicode_version)]
 
 /// Tests access to the internal Unicode Version type and value.
diff --git a/src/test/run-pass/check-static-recursion-foreign.rs b/src/test/ui/check-static-recursion-foreign.rs
index 361f8a1d340..8ca0af8e47a 100644
--- a/src/test/run-pass/check-static-recursion-foreign.rs
+++ b/src/test/ui/check-static-recursion-foreign.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Static recursion check shouldn't fail when given a foreign item (#18279)
 
diff --git a/src/test/run-pass/check_const-feature-gated.rs b/src/test/ui/check_const-feature-gated.rs
index 1c816d5d7c3..f4faab1abc2 100644
--- a/src/test/run-pass/check_const-feature-gated.rs
+++ b/src/test/ui/check_const-feature-gated.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 const ARR: [usize; 1] = [2];
 
 fn main() {
diff --git a/src/test/run-pass/child-outlives-parent.rs b/src/test/ui/child-outlives-parent.rs
index 80e3c81af52..e3a39a44bb8 100644
--- a/src/test/run-pass/child-outlives-parent.rs
+++ b/src/test/ui/child-outlives-parent.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Reported as issue #126, child leaks the string.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/cleanup-arm-conditional.rs b/src/test/ui/cleanup-arm-conditional.rs
index b8b10990520..915842f3e85 100644
--- a/src/test/run-pass/cleanup-arm-conditional.rs
+++ b/src/test/ui/cleanup-arm-conditional.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 #![allow(unused_imports)]
 // Test that cleanup scope for temporaries created in a match
diff --git a/src/test/run-pass/cleanup-rvalue-during-if-and-while.rs b/src/test/ui/cleanup-rvalue-during-if-and-while.rs
index 370c95c6668..6fecb4e76da 100644
--- a/src/test/run-pass/cleanup-rvalue-during-if-and-while.rs
+++ b/src/test/ui/cleanup-rvalue-during-if-and-while.rs
@@ -1,3 +1,4 @@
+// run-pass
 // This test verifies that temporaries created for `while`'s and `if`
 // conditions are dropped after the condition is evaluated.
 
diff --git a/src/test/run-pass/cleanup-rvalue-for-scope.rs b/src/test/ui/cleanup-rvalue-for-scope.rs
index 488c6e580d1..b6582c01fba 100644
--- a/src/test/run-pass/cleanup-rvalue-for-scope.rs
+++ b/src/test/ui/cleanup-rvalue-for-scope.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_snake_case)]
 #![allow(dead_code)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/cleanup-rvalue-scopes.rs b/src/test/ui/cleanup-rvalue-scopes.rs
index 331c93f442e..f51f13abf79 100644
--- a/src/test/run-pass/cleanup-rvalue-scopes.rs
+++ b/src/test/ui/cleanup-rvalue-scopes.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_snake_case)]
 #![allow(unused_variables)]
 // Test that destructors for rvalue temporaries run either at end of
diff --git a/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs b/src/test/ui/cleanup-rvalue-temp-during-incomplete-alloc.rs
index 7b4d66e7571..62f8b81385a 100644
--- a/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs
+++ b/src/test/ui/cleanup-rvalue-temp-during-incomplete-alloc.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(dead_code)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/cleanup-shortcircuit.rs b/src/test/ui/cleanup-shortcircuit.rs
index 6e67a276d4f..19d774079ab 100644
--- a/src/test/run-pass/cleanup-shortcircuit.rs
+++ b/src/test/ui/cleanup-shortcircuit.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that cleanups for the RHS of shortcircuiting operators work.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/clone-with-exterior.rs b/src/test/ui/clone-with-exterior.rs
index 1d3b54aa5eb..1ef29719267 100644
--- a/src/test/run-pass/clone-with-exterior.rs
+++ b/src/test/ui/clone-with-exterior.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 // ignore-emscripten no threads support
 
diff --git a/src/test/run-pass/close-over-big-then-small-data.rs b/src/test/ui/close-over-big-then-small-data.rs
index 0eead0194ef..40e5f500df4 100644
--- a/src/test/run-pass/close-over-big-then-small-data.rs
+++ b/src/test/ui/close-over-big-then-small-data.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // If we use GEPi rather than GEP_tup_like when
 // storing closure data (as we used to do), the u64 would
diff --git a/src/test/run-pass/cmp-default.rs b/src/test/ui/cmp-default.rs
index 3be0eb4c5d5..bb5c39f5cde 100644
--- a/src/test/run-pass/cmp-default.rs
+++ b/src/test/ui/cmp-default.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::cmp::Ordering;
 
 // Test default methods in PartialOrd and PartialEq
diff --git a/src/test/run-pass/codegen-object-shim.rs b/src/test/ui/codegen-object-shim.rs
index 26f53a9c182..9a85a50ebd9 100644
--- a/src/test/run-pass/codegen-object-shim.rs
+++ b/src/test/ui/codegen-object-shim.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn main() {
     assert_eq!((ToString::to_string as fn(&(dyn ToString+'static)) -> String)(&"foo"),
         String::from("foo"));
diff --git a/src/test/run-pass/coerce/coerce-expect-unsized.rs b/src/test/ui/coerce/coerce-expect-unsized.rs
index b44aa6ab377..b44aa6ab377 100644
--- a/src/test/run-pass/coerce/coerce-expect-unsized.rs
+++ b/src/test/ui/coerce/coerce-expect-unsized.rs
diff --git a/src/test/run-pass/coerce/coerce-overloaded-autoderef.rs b/src/test/ui/coerce/coerce-overloaded-autoderef.rs
index 3fe18103ef8..3fe18103ef8 100644
--- a/src/test/run-pass/coerce/coerce-overloaded-autoderef.rs
+++ b/src/test/ui/coerce/coerce-overloaded-autoderef.rs
diff --git a/src/test/run-pass/coerce/coerce-reborrow-imm-ptr-arg.rs b/src/test/ui/coerce/coerce-reborrow-imm-ptr-arg.rs
index f033e1b5d2b..f033e1b5d2b 100644
--- a/src/test/run-pass/coerce/coerce-reborrow-imm-ptr-arg.rs
+++ b/src/test/ui/coerce/coerce-reborrow-imm-ptr-arg.rs
diff --git a/src/test/run-pass/coerce/coerce-reborrow-imm-ptr-rcvr.rs b/src/test/ui/coerce/coerce-reborrow-imm-ptr-rcvr.rs
index 64a365229cb..64a365229cb 100644
--- a/src/test/run-pass/coerce/coerce-reborrow-imm-ptr-rcvr.rs
+++ b/src/test/ui/coerce/coerce-reborrow-imm-ptr-rcvr.rs
diff --git a/src/test/run-pass/coerce/coerce-reborrow-imm-vec-arg.rs b/src/test/ui/coerce/coerce-reborrow-imm-vec-arg.rs
index c2aaae1c73e..c2aaae1c73e 100644
--- a/src/test/run-pass/coerce/coerce-reborrow-imm-vec-arg.rs
+++ b/src/test/ui/coerce/coerce-reborrow-imm-vec-arg.rs
diff --git a/src/test/run-pass/coerce/coerce-reborrow-imm-vec-rcvr.rs b/src/test/ui/coerce/coerce-reborrow-imm-vec-rcvr.rs
index 9a5652acf87..9a5652acf87 100644
--- a/src/test/run-pass/coerce/coerce-reborrow-imm-vec-rcvr.rs
+++ b/src/test/ui/coerce/coerce-reborrow-imm-vec-rcvr.rs
diff --git a/src/test/run-pass/coerce/coerce-reborrow-mut-ptr-arg.rs b/src/test/ui/coerce/coerce-reborrow-mut-ptr-arg.rs
index 76cd6793b3c..76cd6793b3c 100644
--- a/src/test/run-pass/coerce/coerce-reborrow-mut-ptr-arg.rs
+++ b/src/test/ui/coerce/coerce-reborrow-mut-ptr-arg.rs
diff --git a/src/test/run-pass/coerce/coerce-reborrow-mut-ptr-rcvr.rs b/src/test/ui/coerce/coerce-reborrow-mut-ptr-rcvr.rs
index e6e7c3a51aa..e6e7c3a51aa 100644
--- a/src/test/run-pass/coerce/coerce-reborrow-mut-ptr-rcvr.rs
+++ b/src/test/ui/coerce/coerce-reborrow-mut-ptr-rcvr.rs
diff --git a/src/test/run-pass/coerce/coerce-reborrow-mut-vec-arg.rs b/src/test/ui/coerce/coerce-reborrow-mut-vec-arg.rs
index 2635754f14d..2635754f14d 100644
--- a/src/test/run-pass/coerce/coerce-reborrow-mut-vec-arg.rs
+++ b/src/test/ui/coerce/coerce-reborrow-mut-vec-arg.rs
diff --git a/src/test/run-pass/coerce/coerce-reborrow-mut-vec-rcvr.rs b/src/test/ui/coerce/coerce-reborrow-mut-vec-rcvr.rs
index c03336ea37a..c03336ea37a 100644
--- a/src/test/run-pass/coerce/coerce-reborrow-mut-vec-rcvr.rs
+++ b/src/test/ui/coerce/coerce-reborrow-mut-vec-rcvr.rs
diff --git a/src/test/run-pass/coerce/coerce-unify-return.rs b/src/test/ui/coerce/coerce-unify-return.rs
index 95a7ee8fe0f..95a7ee8fe0f 100644
--- a/src/test/run-pass/coerce/coerce-unify-return.rs
+++ b/src/test/ui/coerce/coerce-unify-return.rs
diff --git a/src/test/run-pass/coerce/coerce-unify.rs b/src/test/ui/coerce/coerce-unify.rs
index f1818f9bb5a..f1818f9bb5a 100644
--- a/src/test/run-pass/coerce/coerce-unify.rs
+++ b/src/test/ui/coerce/coerce-unify.rs
diff --git a/src/test/run-pass/coerce/coerce-unsize-subtype.rs b/src/test/ui/coerce/coerce-unsize-subtype.rs
index 45b53300c5b..45b53300c5b 100644
--- a/src/test/run-pass/coerce/coerce-unsize-subtype.rs
+++ b/src/test/ui/coerce/coerce-unsize-subtype.rs
diff --git a/src/test/run-pass/coherence/auxiliary/re_rebalance_coherence_lib.rs b/src/test/ui/coherence/auxiliary/re_rebalance_coherence_lib-rpass.rs
index 9a191bad8b0..9a191bad8b0 100644
--- a/src/test/run-pass/coherence/auxiliary/re_rebalance_coherence_lib.rs
+++ b/src/test/ui/coherence/auxiliary/re_rebalance_coherence_lib-rpass.rs
diff --git a/src/test/run-pass/coherence/coherence-bigint-int.rs b/src/test/ui/coherence/coherence-bigint-int.rs
index 0c9abdc15e6..0c9abdc15e6 100644
--- a/src/test/run-pass/coherence/coherence-bigint-int.rs
+++ b/src/test/ui/coherence/coherence-bigint-int.rs
diff --git a/src/test/run-pass/coherence/coherence-bigint-vecint.rs b/src/test/ui/coherence/coherence-bigint-vecint.rs
index 38e0be0aa9a..38e0be0aa9a 100644
--- a/src/test/run-pass/coherence/coherence-bigint-vecint.rs
+++ b/src/test/ui/coherence/coherence-bigint-vecint.rs
diff --git a/src/test/run-pass/coherence/coherence-blanket.rs b/src/test/ui/coherence/coherence-blanket.rs
index 5d310cc2c6a..5d310cc2c6a 100644
--- a/src/test/run-pass/coherence/coherence-blanket.rs
+++ b/src/test/ui/coherence/coherence-blanket.rs
diff --git a/src/test/run-pass/coherence/coherence-covered-type-parameter.rs b/src/test/ui/coherence/coherence-covered-type-parameter.rs
index 1cf039f0831..1cf039f0831 100644
--- a/src/test/run-pass/coherence/coherence-covered-type-parameter.rs
+++ b/src/test/ui/coherence/coherence-covered-type-parameter.rs
diff --git a/src/test/run-pass/coherence/coherence-impl-in-fn.rs b/src/test/ui/coherence/coherence-impl-in-fn.rs
index 09e2c1e5a4e..09e2c1e5a4e 100644
--- a/src/test/run-pass/coherence/coherence-impl-in-fn.rs
+++ b/src/test/ui/coherence/coherence-impl-in-fn.rs
diff --git a/src/test/run-pass/coherence/coherence-iterator-vec-any-elem.rs b/src/test/ui/coherence/coherence-iterator-vec-any-elem.rs
index 051cc280b2d..051cc280b2d 100644
--- a/src/test/run-pass/coherence/coherence-iterator-vec-any-elem.rs
+++ b/src/test/ui/coherence/coherence-iterator-vec-any-elem.rs
diff --git a/src/test/run-pass/coherence/coherence-iterator-vec.rs b/src/test/ui/coherence/coherence-iterator-vec.rs
index df6e808f7de..df6e808f7de 100644
--- a/src/test/run-pass/coherence/coherence-iterator-vec.rs
+++ b/src/test/ui/coherence/coherence-iterator-vec.rs
diff --git a/src/test/run-pass/coherence/coherence-multidispatch-tuple.rs b/src/test/ui/coherence/coherence-multidispatch-tuple.rs
index 6a816664c48..6a816664c48 100644
--- a/src/test/run-pass/coherence/coherence-multidispatch-tuple.rs
+++ b/src/test/ui/coherence/coherence-multidispatch-tuple.rs
diff --git a/src/test/run-pass/coherence/coherence-negative-impls-safe.rs b/src/test/ui/coherence/coherence-negative-impls-safe-rpass.rs
index 98b04489ac4..98b04489ac4 100644
--- a/src/test/run-pass/coherence/coherence-negative-impls-safe.rs
+++ b/src/test/ui/coherence/coherence-negative-impls-safe-rpass.rs
diff --git a/src/test/run-pass/coherence/coherence-rfc447-constrained.rs b/src/test/ui/coherence/coherence-rfc447-constrained.rs
index 4da54d386fd..4da54d386fd 100644
--- a/src/test/run-pass/coherence/coherence-rfc447-constrained.rs
+++ b/src/test/ui/coherence/coherence-rfc447-constrained.rs
diff --git a/src/test/run-pass/coherence/coherence-where-clause.rs b/src/test/ui/coherence/coherence-where-clause.rs
index 28397420385..28397420385 100644
--- a/src/test/run-pass/coherence/coherence-where-clause.rs
+++ b/src/test/ui/coherence/coherence-where-clause.rs
diff --git a/src/test/run-pass/coherence/coherence_copy_like.rs b/src/test/ui/coherence/coherence_copy_like.rs
index 653f76264c1..653f76264c1 100644
--- a/src/test/run-pass/coherence/coherence_copy_like.rs
+++ b/src/test/ui/coherence/coherence_copy_like.rs
diff --git a/src/test/run-pass/coherence/re-rebalance-coherence-default-generic-associated-type.rs b/src/test/ui/coherence/re-rebalance-coherence-default-generic-associated-type.rs
index 4168b7a6146..3df6114f62a 100644
--- a/src/test/run-pass/coherence/re-rebalance-coherence-default-generic-associated-type.rs
+++ b/src/test/ui/coherence/re-rebalance-coherence-default-generic-associated-type.rs
@@ -1,12 +1,12 @@
 // run-pass
-// aux-build:re_rebalance_coherence_lib.rs
+// aux-build:re_rebalance_coherence_lib-rpass.rs
 
 #![allow(dead_code)]
 #![feature(re_rebalance_coherence)]
 // check that a generic type with a default value from an associated type can be used without
 // specifying the value, and without invoking coherence errors.
 
-extern crate re_rebalance_coherence_lib as lib;
+extern crate re_rebalance_coherence_lib_rpass as lib;
 use lib::*;
 
 struct MyString {}
diff --git a/src/test/run-pass/coherence/re-rebalance-coherence.rs b/src/test/ui/coherence/re-rebalance-coherence-rpass.rs
index bacd3b89fad..bacd3b89fad 100644
--- a/src/test/run-pass/coherence/re-rebalance-coherence.rs
+++ b/src/test/ui/coherence/re-rebalance-coherence-rpass.rs
diff --git a/src/test/run-pass/collections-const-new.rs b/src/test/ui/collections-const-new.rs
index 37ee1a41c0b..e01b0dfa14d 100644
--- a/src/test/run-pass/collections-const-new.rs
+++ b/src/test/ui/collections-const-new.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Test several functions can be used for constants
 // 1. Vec::new()
diff --git a/src/test/run-pass/command-exec.rs b/src/test/ui/command-exec.rs
index aa5a3a37705..568be67abe3 100644
--- a/src/test/run-pass/command-exec.rs
+++ b/src/test/ui/command-exec.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 // ignore-windows - this is a unix-specific test
 // ignore-pretty issue #37199
diff --git a/src/test/run-pass/command-pre-exec.rs b/src/test/ui/command-pre-exec.rs
index 5c3cc31de58..c0fc554183a 100644
--- a/src/test/run-pass/command-pre-exec.rs
+++ b/src/test/ui/command-pre-exec.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 // ignore-windows - this is a unix-specific test
 // ignore-cloudabi no processes
diff --git a/src/test/run-pass/command-uid-gid.rs b/src/test/ui/command-uid-gid.rs
index 5f4b3941d90..f867106c35d 100644
--- a/src/test/run-pass/command-uid-gid.rs
+++ b/src/test/ui/command-uid-gid.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-android
 // ignore-cloudabi
 // ignore-emscripten
diff --git a/src/test/run-pass/complex.rs b/src/test/ui/complex.rs
index 4c2bb6859dd..9b11ca67e47 100644
--- a/src/test/run-pass/complex.rs
+++ b/src/test/ui/complex.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unconditional_recursion)]
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
diff --git a/src/test/run-pass/concat.rs b/src/test/ui/concat-rpass.rs
index e89763745be..0c30a39d6a2 100644
--- a/src/test/run-pass/concat.rs
+++ b/src/test/ui/concat-rpass.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     assert_eq!(format!(concat!("foo", "bar", "{}"), "baz"), "foobarbaz".to_string());
     assert_eq!(format!(concat!()), "".to_string());
diff --git a/src/test/run-pass/consts/assoc-const.rs b/src/test/ui/consts/assoc-const.rs
index b70479d255b..b70479d255b 100644
--- a/src/test/run-pass/consts/assoc-const.rs
+++ b/src/test/ui/consts/assoc-const.rs
diff --git a/src/test/run-pass/consts/auxiliary/anon-extern-mod-cross-crate-1.rs b/src/test/ui/consts/auxiliary/anon-extern-mod-cross-crate-1.rs
index 948b5e688eb..948b5e688eb 100644
--- a/src/test/run-pass/consts/auxiliary/anon-extern-mod-cross-crate-1.rs
+++ b/src/test/ui/consts/auxiliary/anon-extern-mod-cross-crate-1.rs
diff --git a/src/test/run-pass/consts/auxiliary/cci_borrow_lib.rs b/src/test/ui/consts/auxiliary/cci_borrow_lib.rs
index 7c57a1c6678..7c57a1c6678 100644
--- a/src/test/run-pass/consts/auxiliary/cci_borrow_lib.rs
+++ b/src/test/ui/consts/auxiliary/cci_borrow_lib.rs
diff --git a/src/test/run-pass/consts/auxiliary/cci_const.rs b/src/test/ui/consts/auxiliary/cci_const.rs
index af6a5ad8ed3..af6a5ad8ed3 100644
--- a/src/test/run-pass/consts/auxiliary/cci_const.rs
+++ b/src/test/ui/consts/auxiliary/cci_const.rs
diff --git a/src/test/run-pass/consts/auxiliary/cci_const_block.rs b/src/test/ui/consts/auxiliary/cci_const_block.rs
index ad618aab830..ad618aab830 100644
--- a/src/test/run-pass/consts/auxiliary/cci_const_block.rs
+++ b/src/test/ui/consts/auxiliary/cci_const_block.rs
diff --git a/src/test/run-pass/consts/bswap-const.rs b/src/test/ui/consts/bswap-const.rs
index 3145c21acc9..3145c21acc9 100644
--- a/src/test/run-pass/consts/bswap-const.rs
+++ b/src/test/ui/consts/bswap-const.rs
diff --git a/src/test/run-pass/consts/chained-constants-stackoverflow.rs b/src/test/ui/consts/chained-constants-stackoverflow.rs
index a171567c5d2..a171567c5d2 100644
--- a/src/test/run-pass/consts/chained-constants-stackoverflow.rs
+++ b/src/test/ui/consts/chained-constants-stackoverflow.rs
diff --git a/src/test/run-pass/consts/const-adt-align-mismatch.rs b/src/test/ui/consts/const-adt-align-mismatch.rs
index bd51bc9f215..bd51bc9f215 100644
--- a/src/test/run-pass/consts/const-adt-align-mismatch.rs
+++ b/src/test/ui/consts/const-adt-align-mismatch.rs
diff --git a/src/test/run-pass/consts/const-autoderef.rs b/src/test/ui/consts/const-autoderef.rs
index 1c836318d32..1c836318d32 100644
--- a/src/test/run-pass/consts/const-autoderef.rs
+++ b/src/test/ui/consts/const-autoderef.rs
diff --git a/src/test/run-pass/consts/const-big-enum.rs b/src/test/ui/consts/const-big-enum.rs
index 2f21e8a6ddd..2f21e8a6ddd 100644
--- a/src/test/run-pass/consts/const-big-enum.rs
+++ b/src/test/ui/consts/const-big-enum.rs
diff --git a/src/test/run-pass/consts/const-binops.rs b/src/test/ui/consts/const-binops.rs
index d038dfeb419..d038dfeb419 100644
--- a/src/test/run-pass/consts/const-binops.rs
+++ b/src/test/ui/consts/const-binops.rs
diff --git a/src/test/run-pass/consts/const-bitshift-rhs-inference.rs b/src/test/ui/consts/const-bitshift-rhs-inference.rs
index cf21c296cf3..cf21c296cf3 100644
--- a/src/test/run-pass/consts/const-bitshift-rhs-inference.rs
+++ b/src/test/ui/consts/const-bitshift-rhs-inference.rs
diff --git a/src/test/run-pass/consts/const-block-cross-crate-fn.rs b/src/test/ui/consts/const-block-cross-crate-fn.rs
index 0ac3830d230..0ac3830d230 100644
--- a/src/test/run-pass/consts/const-block-cross-crate-fn.rs
+++ b/src/test/ui/consts/const-block-cross-crate-fn.rs
diff --git a/src/test/run-pass/consts/const-block-item-macro-codegen.rs b/src/test/ui/consts/const-block-item-macro-codegen.rs
index 7ad883686ae..7ad883686ae 100644
--- a/src/test/run-pass/consts/const-block-item-macro-codegen.rs
+++ b/src/test/ui/consts/const-block-item-macro-codegen.rs
diff --git a/src/test/run-pass/consts/const-block-item.rs b/src/test/ui/consts/const-block-item.rs
index cf0d4441d4a..cf0d4441d4a 100644
--- a/src/test/run-pass/consts/const-block-item.rs
+++ b/src/test/ui/consts/const-block-item.rs
diff --git a/src/test/run-pass/consts/const-block-non-item-statement-3.rs b/src/test/ui/consts/const-block-non-item-statement-3.rs
index 10a4c31f24e..10a4c31f24e 100644
--- a/src/test/run-pass/consts/const-block-non-item-statement-3.rs
+++ b/src/test/ui/consts/const-block-non-item-statement-3.rs
diff --git a/src/test/run-pass/consts/const-block-non-item-statement.rs b/src/test/ui/consts/const-block-non-item-statement-rpass.rs
index a1b9b586ad0..a1b9b586ad0 100644
--- a/src/test/run-pass/consts/const-block-non-item-statement.rs
+++ b/src/test/ui/consts/const-block-non-item-statement-rpass.rs
diff --git a/src/test/run-pass/consts/const-block.rs b/src/test/ui/consts/const-block.rs
index 7172a34c8cf..7172a34c8cf 100644
--- a/src/test/run-pass/consts/const-block.rs
+++ b/src/test/ui/consts/const-block.rs
diff --git a/src/test/run-pass/consts/const-bound.rs b/src/test/ui/consts/const-bound.rs
index 735056a0ab0..735056a0ab0 100644
--- a/src/test/run-pass/consts/const-bound.rs
+++ b/src/test/ui/consts/const-bound.rs
diff --git a/src/test/run-pass/consts/const-byte-str-cast.rs b/src/test/ui/consts/const-byte-str-cast.rs
index 65d626c297f..65d626c297f 100644
--- a/src/test/run-pass/consts/const-byte-str-cast.rs
+++ b/src/test/ui/consts/const-byte-str-cast.rs
diff --git a/src/test/run-pass/consts/const-cast-ptr-int.rs b/src/test/ui/consts/const-cast-ptr-int.rs
index 987d9616e91..987d9616e91 100644
--- a/src/test/run-pass/consts/const-cast-ptr-int.rs
+++ b/src/test/ui/consts/const-cast-ptr-int.rs
diff --git a/src/test/run-pass/consts/const-cast.rs b/src/test/ui/consts/const-cast.rs
index 0d8609e334a..0d8609e334a 100644
--- a/src/test/run-pass/consts/const-cast.rs
+++ b/src/test/ui/consts/const-cast.rs
diff --git a/src/test/run-pass/consts/const-const.rs b/src/test/ui/consts/const-const.rs
index 85e4a72e86d..85e4a72e86d 100644
--- a/src/test/run-pass/consts/const-const.rs
+++ b/src/test/ui/consts/const-const.rs
diff --git a/src/test/run-pass/consts/const-contents.rs b/src/test/ui/consts/const-contents.rs
index 7ba3d435650..7ba3d435650 100644
--- a/src/test/run-pass/consts/const-contents.rs
+++ b/src/test/ui/consts/const-contents.rs
diff --git a/src/test/run-pass/consts/const-cross-crate-const.rs b/src/test/ui/consts/const-cross-crate-const.rs
index 92020417ff5..92020417ff5 100644
--- a/src/test/run-pass/consts/const-cross-crate-const.rs
+++ b/src/test/ui/consts/const-cross-crate-const.rs
diff --git a/src/test/run-pass/consts/const-cross-crate-extern.rs b/src/test/ui/consts/const-cross-crate-extern.rs
index 3c61afd5bec..3c61afd5bec 100644
--- a/src/test/run-pass/consts/const-cross-crate-extern.rs
+++ b/src/test/ui/consts/const-cross-crate-extern.rs
diff --git a/src/test/run-pass/consts/const-deref.rs b/src/test/ui/consts/const-deref.rs
index 6060d8e510e..6060d8e510e 100644
--- a/src/test/run-pass/consts/const-deref.rs
+++ b/src/test/ui/consts/const-deref.rs
diff --git a/src/test/run-pass/consts/const-endianess.rs b/src/test/ui/consts/const-endianess.rs
index 936f31954d3..936f31954d3 100644
--- a/src/test/run-pass/consts/const-endianess.rs
+++ b/src/test/ui/consts/const-endianess.rs
diff --git a/src/test/run-pass/consts/const-enum-byref-self.rs b/src/test/ui/consts/const-enum-byref-self.rs
index b7e14bfb765..b7e14bfb765 100644
--- a/src/test/run-pass/consts/const-enum-byref-self.rs
+++ b/src/test/ui/consts/const-enum-byref-self.rs
diff --git a/src/test/run-pass/consts/const-enum-byref.rs b/src/test/ui/consts/const-enum-byref.rs
index badf5294654..badf5294654 100644
--- a/src/test/run-pass/consts/const-enum-byref.rs
+++ b/src/test/ui/consts/const-enum-byref.rs
diff --git a/src/test/run-pass/consts/const-enum-cast.rs b/src/test/ui/consts/const-enum-cast.rs
index a3255c2f601..a3255c2f601 100644
--- a/src/test/run-pass/consts/const-enum-cast.rs
+++ b/src/test/ui/consts/const-enum-cast.rs
diff --git a/src/test/run-pass/consts/const-enum-ptr.rs b/src/test/ui/consts/const-enum-ptr.rs
index 84f4eb8406d..84f4eb8406d 100644
--- a/src/test/run-pass/consts/const-enum-ptr.rs
+++ b/src/test/ui/consts/const-enum-ptr.rs
diff --git a/src/test/run-pass/consts/const-enum-struct.rs b/src/test/ui/consts/const-enum-struct.rs
index ee88c936188..ee88c936188 100644
--- a/src/test/run-pass/consts/const-enum-struct.rs
+++ b/src/test/ui/consts/const-enum-struct.rs
diff --git a/src/test/run-pass/consts/const-enum-struct2.rs b/src/test/ui/consts/const-enum-struct2.rs
index 6dfe63d5d00..6dfe63d5d00 100644
--- a/src/test/run-pass/consts/const-enum-struct2.rs
+++ b/src/test/ui/consts/const-enum-struct2.rs
diff --git a/src/test/run-pass/consts/const-enum-structlike.rs b/src/test/ui/consts/const-enum-structlike.rs
index 0ea79aebce6..0ea79aebce6 100644
--- a/src/test/run-pass/consts/const-enum-structlike.rs
+++ b/src/test/ui/consts/const-enum-structlike.rs
diff --git a/src/test/run-pass/consts/const-enum-tuple.rs b/src/test/ui/consts/const-enum-tuple.rs
index e0363166b02..e0363166b02 100644
--- a/src/test/run-pass/consts/const-enum-tuple.rs
+++ b/src/test/ui/consts/const-enum-tuple.rs
diff --git a/src/test/run-pass/consts/const-enum-tuple2.rs b/src/test/ui/consts/const-enum-tuple2.rs
index ef378b5995d..ef378b5995d 100644
--- a/src/test/run-pass/consts/const-enum-tuple2.rs
+++ b/src/test/ui/consts/const-enum-tuple2.rs
diff --git a/src/test/run-pass/consts/const-enum-tuplestruct.rs b/src/test/ui/consts/const-enum-tuplestruct.rs
index f93945c6a68..f93945c6a68 100644
--- a/src/test/run-pass/consts/const-enum-tuplestruct.rs
+++ b/src/test/ui/consts/const-enum-tuplestruct.rs
diff --git a/src/test/run-pass/consts/const-enum-tuplestruct2.rs b/src/test/ui/consts/const-enum-tuplestruct2.rs
index b8aa9a3152f..b8aa9a3152f 100644
--- a/src/test/run-pass/consts/const-enum-tuplestruct2.rs
+++ b/src/test/ui/consts/const-enum-tuplestruct2.rs
diff --git a/src/test/run-pass/consts/const-enum-vec-index.rs b/src/test/ui/consts/const-enum-vec-index.rs
index 3f155340ab5..3f155340ab5 100644
--- a/src/test/run-pass/consts/const-enum-vec-index.rs
+++ b/src/test/ui/consts/const-enum-vec-index.rs
diff --git a/src/test/run-pass/consts/const-enum-vec-ptr.rs b/src/test/ui/consts/const-enum-vec-ptr.rs
index 43ffe6570dc..43ffe6570dc 100644
--- a/src/test/run-pass/consts/const-enum-vec-ptr.rs
+++ b/src/test/ui/consts/const-enum-vec-ptr.rs
diff --git a/src/test/run-pass/consts/const-enum-vector.rs b/src/test/ui/consts/const-enum-vector.rs
index ee3739f9723..ee3739f9723 100644
--- a/src/test/run-pass/consts/const-enum-vector.rs
+++ b/src/test/ui/consts/const-enum-vector.rs
diff --git a/src/test/run-pass/consts/const-err.rs b/src/test/ui/consts/const-err-rpass.rs
index 9851f1c58be..9851f1c58be 100644
--- a/src/test/run-pass/consts/const-err.rs
+++ b/src/test/ui/consts/const-err-rpass.rs
diff --git a/src/test/run-pass/consts/const-expr-in-fixed-length-vec.rs b/src/test/ui/consts/const-expr-in-fixed-length-vec.rs
index a9960b4552b..a9960b4552b 100644
--- a/src/test/run-pass/consts/const-expr-in-fixed-length-vec.rs
+++ b/src/test/ui/consts/const-expr-in-fixed-length-vec.rs
diff --git a/src/test/run-pass/consts/const-expr-in-vec-repeat.rs b/src/test/ui/consts/const-expr-in-vec-repeat.rs
index 4eaef25059b..4eaef25059b 100644
--- a/src/test/run-pass/consts/const-expr-in-vec-repeat.rs
+++ b/src/test/ui/consts/const-expr-in-vec-repeat.rs
diff --git a/src/test/run-pass/consts/const-extern-function.rs b/src/test/ui/consts/const-extern-function.rs
index cfcf99b867a..cfcf99b867a 100644
--- a/src/test/run-pass/consts/const-extern-function.rs
+++ b/src/test/ui/consts/const-extern-function.rs
diff --git a/src/test/run-pass/consts/const-fields-and-indexing.rs b/src/test/ui/consts/const-fields-and-indexing.rs
index bb13bebf4e2..bb13bebf4e2 100644
--- a/src/test/run-pass/consts/const-fields-and-indexing.rs
+++ b/src/test/ui/consts/const-fields-and-indexing.rs
diff --git a/src/test/run-pass/consts/const-fn-const-eval.rs b/src/test/ui/consts/const-fn-const-eval.rs
index d4da990812e..d4da990812e 100644
--- a/src/test/run-pass/consts/const-fn-const-eval.rs
+++ b/src/test/ui/consts/const-fn-const-eval.rs
diff --git a/src/test/run-pass/consts/const-fn-feature-flags.rs b/src/test/ui/consts/const-fn-feature-flags.rs
index 30e7e102b86..30e7e102b86 100644
--- a/src/test/run-pass/consts/const-fn-feature-flags.rs
+++ b/src/test/ui/consts/const-fn-feature-flags.rs
diff --git a/src/test/run-pass/consts/const-fn-method.rs b/src/test/ui/consts/const-fn-method.rs
index 002646db92a..002646db92a 100644
--- a/src/test/run-pass/consts/const-fn-method.rs
+++ b/src/test/ui/consts/const-fn-method.rs
diff --git a/src/test/run-pass/consts/const-fn-nested.rs b/src/test/ui/consts/const-fn-nested.rs
index ef5598bf9e7..ef5598bf9e7 100644
--- a/src/test/run-pass/consts/const-fn-nested.rs
+++ b/src/test/ui/consts/const-fn-nested.rs
diff --git a/src/test/run-pass/consts/const-fn-stability-calls.rs b/src/test/ui/consts/const-fn-stability-calls.rs
index 13867904895..13867904895 100644
--- a/src/test/run-pass/consts/const-fn-stability-calls.rs
+++ b/src/test/ui/consts/const-fn-stability-calls.rs
diff --git a/src/test/run-pass/consts/const-fn-type-name.rs b/src/test/ui/consts/const-fn-type-name.rs
index 2bb1aeecf37..2bb1aeecf37 100644
--- a/src/test/run-pass/consts/const-fn-type-name.rs
+++ b/src/test/ui/consts/const-fn-type-name.rs
diff --git a/src/test/run-pass/consts/const-fn-val.rs b/src/test/ui/consts/const-fn-val.rs
index e5bf4757e3a..e5bf4757e3a 100644
--- a/src/test/run-pass/consts/const-fn-val.rs
+++ b/src/test/ui/consts/const-fn-val.rs
diff --git a/src/test/run-pass/consts/const-fn.rs b/src/test/ui/consts/const-fn.rs
index 7b924aa46aa..7b924aa46aa 100644
--- a/src/test/run-pass/consts/const-fn.rs
+++ b/src/test/ui/consts/const-fn.rs
diff --git a/src/test/run-pass/consts/const-index-feature-gate.rs b/src/test/ui/consts/const-index-feature-gate.rs
index 3537a1790cc..3537a1790cc 100644
--- a/src/test/run-pass/consts/const-index-feature-gate.rs
+++ b/src/test/ui/consts/const-index-feature-gate.rs
diff --git a/src/test/run-pass/consts/const-int-conversion.rs b/src/test/ui/consts/const-int-conversion-rpass.rs
index 1d3123d216e..d52dbbae1e7 100644
--- a/src/test/run-pass/consts/const-int-conversion.rs
+++ b/src/test/ui/consts/const-int-conversion-rpass.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(const_int_conversion)]
 
 const REVERSE: u32 = 0x12345678_u32.reverse_bits();
diff --git a/src/test/run-pass/consts/const-int-overflowing.rs b/src/test/ui/consts/const-int-overflowing-rpass.rs
index 9597393df72..b619c7908aa 100644
--- a/src/test/run-pass/consts/const-int-overflowing.rs
+++ b/src/test/ui/consts/const-int-overflowing-rpass.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 const ADD_A: (u32, bool) = 5u32.overflowing_add(2);
 const ADD_B: (u32, bool) = u32::max_value().overflowing_add(1);
 
diff --git a/src/test/run-pass/consts/const-int-rotate.rs b/src/test/ui/consts/const-int-rotate-rpass.rs
index 16946eadd63..14f34f76cea 100644
--- a/src/test/run-pass/consts/const-int-rotate.rs
+++ b/src/test/ui/consts/const-int-rotate-rpass.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 const LEFT: u32 = 0x10000b3u32.rotate_left(8);
 const RIGHT: u32 = 0xb301u32.rotate_right(8);
 
diff --git a/src/test/run-pass/consts/const-int-saturating-arith.rs b/src/test/ui/consts/const-int-saturating-arith.rs
index dae4c7216b2..394d6c17f5a 100644
--- a/src/test/run-pass/consts/const-int-saturating-arith.rs
+++ b/src/test/ui/consts/const-int-saturating-arith.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-emscripten no i128 support
 #![feature(const_saturating_int_methods)]
 
diff --git a/src/test/run-pass/consts/const-int-sign.rs b/src/test/ui/consts/const-int-sign-rpass.rs
index fcd3ef4ea02..05726cb2286 100644
--- a/src/test/run-pass/consts/const-int-sign.rs
+++ b/src/test/ui/consts/const-int-sign-rpass.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(const_int_sign)]
 
 const NEGATIVE_A: bool = (-10i32).is_negative();
diff --git a/src/test/run-pass/consts/const-int-wrapping.rs b/src/test/ui/consts/const-int-wrapping-rpass.rs
index db86c25194f..73147d7912d 100644
--- a/src/test/run-pass/consts/const-int-wrapping.rs
+++ b/src/test/ui/consts/const-int-wrapping-rpass.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 const ADD_A: u32 = 200u32.wrapping_add(55);
 const ADD_B: u32 = 200u32.wrapping_add(u32::max_value());
 
diff --git a/src/test/run-pass/consts/const-meth-pattern.rs b/src/test/ui/consts/const-meth-pattern.rs
index 1544d760a13..1544d760a13 100644
--- a/src/test/run-pass/consts/const-meth-pattern.rs
+++ b/src/test/ui/consts/const-meth-pattern.rs
diff --git a/src/test/run-pass/consts/const-needs_drop.rs b/src/test/ui/consts/const-needs_drop.rs
index 871300defaf..58e80116442 100644
--- a/src/test/run-pass/consts/const-needs_drop.rs
+++ b/src/test/ui/consts/const-needs_drop.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::mem;
 
 struct Trivial(u8, f32);
diff --git a/src/test/run-pass/consts/const-negation.rs b/src/test/ui/consts/const-negation.rs
index 1c8e27ae617..1c8e27ae617 100644
--- a/src/test/run-pass/consts/const-negation.rs
+++ b/src/test/ui/consts/const-negation.rs
diff --git a/src/test/run-pass/consts/const-negative.rs b/src/test/ui/consts/const-negative.rs
index 1cb56093628..1cb56093628 100644
--- a/src/test/run-pass/consts/const-negative.rs
+++ b/src/test/ui/consts/const-negative.rs
diff --git a/src/test/run-pass/consts/const-nullary-enum.rs b/src/test/ui/consts/const-nullary-enum.rs
index b6574dce6ca..b6574dce6ca 100644
--- a/src/test/run-pass/consts/const-nullary-enum.rs
+++ b/src/test/ui/consts/const-nullary-enum.rs
diff --git a/src/test/run-pass/consts/const-nullary-univariant-enum.rs b/src/test/ui/consts/const-nullary-univariant-enum.rs
index 51349ad3195..51349ad3195 100644
--- a/src/test/run-pass/consts/const-nullary-univariant-enum.rs
+++ b/src/test/ui/consts/const-nullary-univariant-enum.rs
diff --git a/src/test/run-pass/consts/const-pattern-variant.rs b/src/test/ui/consts/const-pattern-variant.rs
index 80f749ed72d..80f749ed72d 100644
--- a/src/test/run-pass/consts/const-pattern-variant.rs
+++ b/src/test/ui/consts/const-pattern-variant.rs
diff --git a/src/test/run-pass/consts/const-ptr-nonnull.rs b/src/test/ui/consts/const-ptr-nonnull-rpass.rs
index 67d52ad0824..67d52ad0824 100644
--- a/src/test/run-pass/consts/const-ptr-nonnull.rs
+++ b/src/test/ui/consts/const-ptr-nonnull-rpass.rs
diff --git a/src/test/run-pass/consts/const-ptr-unique.rs b/src/test/ui/consts/const-ptr-unique-rpass.rs
index e8735e1a32c..e8735e1a32c 100644
--- a/src/test/run-pass/consts/const-ptr-unique.rs
+++ b/src/test/ui/consts/const-ptr-unique-rpass.rs
diff --git a/src/test/run-pass/consts/const-rec-and-tup.rs b/src/test/ui/consts/const-rec-and-tup.rs
index 0bddaf75de8..0bddaf75de8 100644
--- a/src/test/run-pass/consts/const-rec-and-tup.rs
+++ b/src/test/ui/consts/const-rec-and-tup.rs
diff --git a/src/test/run-pass/consts/const-region-ptrs-noncopy.rs b/src/test/ui/consts/const-region-ptrs-noncopy.rs
index 10b9ce896a6..10b9ce896a6 100644
--- a/src/test/run-pass/consts/const-region-ptrs-noncopy.rs
+++ b/src/test/ui/consts/const-region-ptrs-noncopy.rs
diff --git a/src/test/run-pass/consts/const-region-ptrs.rs b/src/test/ui/consts/const-region-ptrs.rs
index 9b94a2b1121..9b94a2b1121 100644
--- a/src/test/run-pass/consts/const-region-ptrs.rs
+++ b/src/test/ui/consts/const-region-ptrs.rs
diff --git a/src/test/run-pass/consts/const-repeated-values.rs b/src/test/ui/consts/const-repeated-values.rs
index 27efb5ba2a2..27efb5ba2a2 100644
--- a/src/test/run-pass/consts/const-repeated-values.rs
+++ b/src/test/ui/consts/const-repeated-values.rs
diff --git a/src/test/run-pass/consts/const-size_of-align_of.rs b/src/test/ui/consts/const-size_of-align_of.rs
index 0c63dc84a37..0c63dc84a37 100644
--- a/src/test/run-pass/consts/const-size_of-align_of.rs
+++ b/src/test/ui/consts/const-size_of-align_of.rs
diff --git a/src/test/run-pass/consts/const-str-ptr.rs b/src/test/ui/consts/const-str-ptr.rs
index 56fd9d9f55f..56fd9d9f55f 100644
--- a/src/test/run-pass/consts/const-str-ptr.rs
+++ b/src/test/ui/consts/const-str-ptr.rs
diff --git a/src/test/run-pass/consts/const-struct-offsets.rs b/src/test/ui/consts/const-struct-offsets.rs
index 26a00832079..26a00832079 100644
--- a/src/test/run-pass/consts/const-struct-offsets.rs
+++ b/src/test/ui/consts/const-struct-offsets.rs
diff --git a/src/test/run-pass/consts/const-struct.rs b/src/test/ui/consts/const-struct.rs
index db397a891d6..db397a891d6 100644
--- a/src/test/run-pass/consts/const-struct.rs
+++ b/src/test/ui/consts/const-struct.rs
diff --git a/src/test/run-pass/consts/const-trait-to-trait.rs b/src/test/ui/consts/const-trait-to-trait.rs
index 12a2999d79d..12a2999d79d 100644
--- a/src/test/run-pass/consts/const-trait-to-trait.rs
+++ b/src/test/ui/consts/const-trait-to-trait.rs
diff --git a/src/test/run-pass/consts/const-tuple-struct.rs b/src/test/ui/consts/const-tuple-struct.rs
index 0144afaaceb..0144afaaceb 100644
--- a/src/test/run-pass/consts/const-tuple-struct.rs
+++ b/src/test/ui/consts/const-tuple-struct.rs
diff --git a/src/test/run-pass/consts/const-typeid-of.rs b/src/test/ui/consts/const-typeid-of-rpass.rs
index 225acb60ac4..225acb60ac4 100644
--- a/src/test/run-pass/consts/const-typeid-of.rs
+++ b/src/test/ui/consts/const-typeid-of-rpass.rs
diff --git a/src/test/run-pass/consts/const-unit-struct.rs b/src/test/ui/consts/const-unit-struct.rs
index 1c9e0e8d3c9..1c9e0e8d3c9 100644
--- a/src/test/run-pass/consts/const-unit-struct.rs
+++ b/src/test/ui/consts/const-unit-struct.rs
diff --git a/src/test/run-pass/consts/const-unsafe-fn.rs b/src/test/ui/consts/const-unsafe-fn.rs
index 72ce73f745f..72ce73f745f 100644
--- a/src/test/run-pass/consts/const-unsafe-fn.rs
+++ b/src/test/ui/consts/const-unsafe-fn.rs
diff --git a/src/test/run-pass/consts/const-vec-of-fns.rs b/src/test/ui/consts/const-vec-of-fns.rs
index 6d90b066b74..6d90b066b74 100644
--- a/src/test/run-pass/consts/const-vec-of-fns.rs
+++ b/src/test/ui/consts/const-vec-of-fns.rs
diff --git a/src/test/run-pass/consts/const-vec-syntax.rs b/src/test/ui/consts/const-vec-syntax.rs
index 61246e44eba..61246e44eba 100644
--- a/src/test/run-pass/consts/const-vec-syntax.rs
+++ b/src/test/ui/consts/const-vec-syntax.rs
diff --git a/src/test/run-pass/consts/const-vecs-and-slices.rs b/src/test/ui/consts/const-vecs-and-slices.rs
index 1cdc33b7a34..1cdc33b7a34 100644
--- a/src/test/run-pass/consts/const-vecs-and-slices.rs
+++ b/src/test/ui/consts/const-vecs-and-slices.rs
diff --git a/src/test/run-pass/consts/const.rs b/src/test/ui/consts/const.rs
index 71fbadfa828..71fbadfa828 100644
--- a/src/test/run-pass/consts/const.rs
+++ b/src/test/ui/consts/const.rs
diff --git a/src/test/run-pass/consts/consts-in-patterns.rs b/src/test/ui/consts/consts-in-patterns.rs
index ac6c5a51506..ac6c5a51506 100644
--- a/src/test/run-pass/consts/consts-in-patterns.rs
+++ b/src/test/ui/consts/consts-in-patterns.rs
diff --git a/src/test/run-pass/consts/deref_in_pattern.rs b/src/test/ui/consts/deref_in_pattern.rs
index cc47b5b49c0..cc47b5b49c0 100644
--- a/src/test/run-pass/consts/deref_in_pattern.rs
+++ b/src/test/ui/consts/deref_in_pattern.rs
diff --git a/src/test/run-pass/consts/ice-48279.rs b/src/test/ui/consts/ice-48279.rs
index d1d90df240c..d1d90df240c 100644
--- a/src/test/run-pass/consts/ice-48279.rs
+++ b/src/test/ui/consts/ice-48279.rs
diff --git a/src/test/run-pass/consts/issue-37550.rs b/src/test/ui/consts/issue-37550.rs
index 04865830df2..04865830df2 100644
--- a/src/test/run-pass/consts/issue-37550.rs
+++ b/src/test/ui/consts/issue-37550.rs
diff --git a/src/test/run-pass/consts/issue-broken-mir.rs b/src/test/ui/consts/issue-broken-mir.rs
index 36f0ff92104..36f0ff92104 100644
--- a/src/test/run-pass/consts/issue-broken-mir.rs
+++ b/src/test/ui/consts/issue-broken-mir.rs
diff --git a/src/test/run-pass/consts/locals-in-const-fn.rs b/src/test/ui/consts/locals-in-const-fn.rs
index 95d50171a84..95d50171a84 100644
--- a/src/test/run-pass/consts/locals-in-const-fn.rs
+++ b/src/test/ui/consts/locals-in-const-fn.rs
diff --git a/src/test/run-pass/consts/match-const-fn-structs.rs b/src/test/ui/consts/match-const-fn-structs.rs
index 5a68048c477..5a68048c477 100644
--- a/src/test/run-pass/consts/match-const-fn-structs.rs
+++ b/src/test/ui/consts/match-const-fn-structs.rs
diff --git a/src/test/run-pass/consts/mozjs-error.rs b/src/test/ui/consts/mozjs-error.rs
index 7edcadbf2cb..7edcadbf2cb 100644
--- a/src/test/run-pass/consts/mozjs-error.rs
+++ b/src/test/ui/consts/mozjs-error.rs
diff --git a/src/test/run-pass/consts/non-scalar-cast.rs b/src/test/ui/consts/non-scalar-cast.rs
index 671366c90ec..671366c90ec 100644
--- a/src/test/run-pass/consts/non-scalar-cast.rs
+++ b/src/test/ui/consts/non-scalar-cast.rs
diff --git a/src/test/run-pass/consts/promotion.rs b/src/test/ui/consts/promotion.rs
index 3c5401e4212..3c5401e4212 100644
--- a/src/test/run-pass/consts/promotion.rs
+++ b/src/test/ui/consts/promotion.rs
diff --git a/src/test/run-pass/consts/references.rs b/src/test/ui/consts/references.rs
index d0af47a8ea8..d0af47a8ea8 100644
--- a/src/test/run-pass/consts/references.rs
+++ b/src/test/ui/consts/references.rs
diff --git a/src/test/run-pass/consts/repeat_match.rs b/src/test/ui/consts/repeat_match.rs
index 20983184a47..20983184a47 100644
--- a/src/test/run-pass/consts/repeat_match.rs
+++ b/src/test/ui/consts/repeat_match.rs
diff --git a/src/test/run-pass/consts/return-in-const-fn.rs b/src/test/ui/consts/return-in-const-fn.rs
index 077a33c081b..077a33c081b 100644
--- a/src/test/run-pass/consts/return-in-const-fn.rs
+++ b/src/test/ui/consts/return-in-const-fn.rs
diff --git a/src/test/run-pass/consts/signed_enum_discr.rs b/src/test/ui/consts/signed_enum_discr.rs
index 2e4395ccf22..2e4395ccf22 100644
--- a/src/test/run-pass/consts/signed_enum_discr.rs
+++ b/src/test/ui/consts/signed_enum_discr.rs
diff --git a/src/test/run-pass/consts/transmute-const.rs b/src/test/ui/consts/transmute-const.rs
index e24f89cdffd..e24f89cdffd 100644
--- a/src/test/run-pass/consts/transmute-const.rs
+++ b/src/test/ui/consts/transmute-const.rs
diff --git a/src/test/run-pass/consts/tuple-struct-constructors.rs b/src/test/ui/consts/tuple-struct-constructors.rs
index 1655f0eb850..1655f0eb850 100644
--- a/src/test/run-pass/consts/tuple-struct-constructors.rs
+++ b/src/test/ui/consts/tuple-struct-constructors.rs
diff --git a/src/test/run-pass/core-run-destroy.rs b/src/test/ui/core-run-destroy.rs
index 625e5179381..225b2ca8f4d 100644
--- a/src/test/run-pass/core-run-destroy.rs
+++ b/src/test/ui/core-run-destroy.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(stable_features)]
 #![allow(deprecated)]
diff --git a/src/test/run-pass/crate-leading-sep.rs b/src/test/ui/crate-leading-sep.rs
index 26d4df433aa..ca5905fab41 100644
--- a/src/test/run-pass/crate-leading-sep.rs
+++ b/src/test/ui/crate-leading-sep.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 fn main() {
diff --git a/src/test/run-pass/crate-method-reexport-grrrrrrr.rs b/src/test/ui/crate-method-reexport-grrrrrrr.rs
index 0d243e14b94..eefcf7738ad 100644
--- a/src/test/run-pass/crate-method-reexport-grrrrrrr.rs
+++ b/src/test/ui/crate-method-reexport-grrrrrrr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/crate-name-attr-used.rs b/src/test/ui/crate-name-attr-used.rs
index 666f80e5662..ad53a53143e 100644
--- a/src/test/run-pass/crate-name-attr-used.rs
+++ b/src/test/ui/crate-name-attr-used.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags:--crate-name crate_name_attr_used -F unused-attributes
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/cross-crate/anon-extern-mod-cross-crate-2.rs b/src/test/ui/cross-crate/anon-extern-mod-cross-crate-2.rs
index 77168be5374..77168be5374 100644
--- a/src/test/run-pass/cross-crate/anon-extern-mod-cross-crate-2.rs
+++ b/src/test/ui/cross-crate/anon-extern-mod-cross-crate-2.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/anon-extern-mod-cross-crate-1.rs b/src/test/ui/cross-crate/auxiliary/anon-extern-mod-cross-crate-1.rs
index 948b5e688eb..948b5e688eb 100644
--- a/src/test/run-pass/cross-crate/auxiliary/anon-extern-mod-cross-crate-1.rs
+++ b/src/test/ui/cross-crate/auxiliary/anon-extern-mod-cross-crate-1.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/anon_trait_static_method_lib.rs b/src/test/ui/cross-crate/auxiliary/anon_trait_static_method_lib.rs
index dceec7e3ec1..dceec7e3ec1 100644
--- a/src/test/run-pass/cross-crate/auxiliary/anon_trait_static_method_lib.rs
+++ b/src/test/ui/cross-crate/auxiliary/anon_trait_static_method_lib.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/cci_borrow_lib.rs b/src/test/ui/cross-crate/auxiliary/cci_borrow_lib.rs
index 7c57a1c6678..7c57a1c6678 100644
--- a/src/test/run-pass/cross-crate/auxiliary/cci_borrow_lib.rs
+++ b/src/test/ui/cross-crate/auxiliary/cci_borrow_lib.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/cci_capture_clause.rs b/src/test/ui/cross-crate/auxiliary/cci_capture_clause.rs
index 4cd001ecc9e..4cd001ecc9e 100644
--- a/src/test/run-pass/cross-crate/auxiliary/cci_capture_clause.rs
+++ b/src/test/ui/cross-crate/auxiliary/cci_capture_clause.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/cci_const.rs b/src/test/ui/cross-crate/auxiliary/cci_const.rs
index af6a5ad8ed3..af6a5ad8ed3 100644
--- a/src/test/run-pass/cross-crate/auxiliary/cci_const.rs
+++ b/src/test/ui/cross-crate/auxiliary/cci_const.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/cci_impl_lib.rs b/src/test/ui/cross-crate/auxiliary/cci_impl_lib.rs
index 0db0037b203..0db0037b203 100644
--- a/src/test/run-pass/cross-crate/auxiliary/cci_impl_lib.rs
+++ b/src/test/ui/cross-crate/auxiliary/cci_impl_lib.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/cci_iter_lib.rs b/src/test/ui/cross-crate/auxiliary/cci_iter_lib.rs
index 60c36bc7d05..60c36bc7d05 100644
--- a/src/test/run-pass/cross-crate/auxiliary/cci_iter_lib.rs
+++ b/src/test/ui/cross-crate/auxiliary/cci_iter_lib.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/cci_nested_lib.rs b/src/test/ui/cross-crate/auxiliary/cci_nested_lib.rs
index 379ed076611..379ed076611 100644
--- a/src/test/run-pass/cross-crate/auxiliary/cci_nested_lib.rs
+++ b/src/test/ui/cross-crate/auxiliary/cci_nested_lib.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/cci_no_inline_lib.rs b/src/test/ui/cross-crate/auxiliary/cci_no_inline_lib.rs
index 177dba2178f..177dba2178f 100644
--- a/src/test/run-pass/cross-crate/auxiliary/cci_no_inline_lib.rs
+++ b/src/test/ui/cross-crate/auxiliary/cci_no_inline_lib.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/moves_based_on_type_lib.rs b/src/test/ui/cross-crate/auxiliary/moves_based_on_type_lib.rs
index 7e7e3b86024..7e7e3b86024 100644
--- a/src/test/run-pass/cross-crate/auxiliary/moves_based_on_type_lib.rs
+++ b/src/test/ui/cross-crate/auxiliary/moves_based_on_type_lib.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/newtype_struct_xc.rs b/src/test/ui/cross-crate/auxiliary/newtype_struct_xc.rs
index 9d1e0742e3c..9d1e0742e3c 100644
--- a/src/test/run-pass/cross-crate/auxiliary/newtype_struct_xc.rs
+++ b/src/test/ui/cross-crate/auxiliary/newtype_struct_xc.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/pub_static_array.rs b/src/test/ui/cross-crate/auxiliary/pub_static_array.rs
index 49cb76921ad..49cb76921ad 100644
--- a/src/test/run-pass/cross-crate/auxiliary/pub_static_array.rs
+++ b/src/test/ui/cross-crate/auxiliary/pub_static_array.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/reexported_static_methods.rs b/src/test/ui/cross-crate/auxiliary/reexported_static_methods.rs
index cc961625f32..cc961625f32 100644
--- a/src/test/run-pass/cross-crate/auxiliary/reexported_static_methods.rs
+++ b/src/test/ui/cross-crate/auxiliary/reexported_static_methods.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/xcrate-trait-lifetime-param.rs b/src/test/ui/cross-crate/auxiliary/xcrate-trait-lifetime-param.rs
index 7c1175f7a88..7c1175f7a88 100644
--- a/src/test/run-pass/cross-crate/auxiliary/xcrate-trait-lifetime-param.rs
+++ b/src/test/ui/cross-crate/auxiliary/xcrate-trait-lifetime-param.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/xcrate_address_insignificant.rs b/src/test/ui/cross-crate/auxiliary/xcrate_address_insignificant.rs
index e79e334b53f..e79e334b53f 100644
--- a/src/test/run-pass/cross-crate/auxiliary/xcrate_address_insignificant.rs
+++ b/src/test/ui/cross-crate/auxiliary/xcrate_address_insignificant.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/xcrate_associated_type_defaults.rs b/src/test/ui/cross-crate/auxiliary/xcrate_associated_type_defaults.rs
index d8a55dd34bc..d8a55dd34bc 100644
--- a/src/test/run-pass/cross-crate/auxiliary/xcrate_associated_type_defaults.rs
+++ b/src/test/ui/cross-crate/auxiliary/xcrate_associated_type_defaults.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/xcrate_generic_fn_nested_return.rs b/src/test/ui/cross-crate/auxiliary/xcrate_generic_fn_nested_return.rs
index 2ab23b4d7e4..2ab23b4d7e4 100644
--- a/src/test/run-pass/cross-crate/auxiliary/xcrate_generic_fn_nested_return.rs
+++ b/src/test/ui/cross-crate/auxiliary/xcrate_generic_fn_nested_return.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/xcrate_static_addresses.rs b/src/test/ui/cross-crate/auxiliary/xcrate_static_addresses.rs
index e18d34799ef..e18d34799ef 100644
--- a/src/test/run-pass/cross-crate/auxiliary/xcrate_static_addresses.rs
+++ b/src/test/ui/cross-crate/auxiliary/xcrate_static_addresses.rs
diff --git a/src/test/run-pass/cross-crate/auxiliary/xcrate_unit_struct.rs b/src/test/ui/cross-crate/auxiliary/xcrate_unit_struct.rs
index 69ed498e7e1..69ed498e7e1 100644
--- a/src/test/run-pass/cross-crate/auxiliary/xcrate_unit_struct.rs
+++ b/src/test/ui/cross-crate/auxiliary/xcrate_unit_struct.rs
diff --git a/src/test/run-pass/cross-crate/cci_borrow.rs b/src/test/ui/cross-crate/cci_borrow.rs
index 605a166ffa3..605a166ffa3 100644
--- a/src/test/run-pass/cross-crate/cci_borrow.rs
+++ b/src/test/ui/cross-crate/cci_borrow.rs
diff --git a/src/test/run-pass/cross-crate/cci_capture_clause.rs b/src/test/ui/cross-crate/cci_capture_clause.rs
index ea699b5f5ac..ea699b5f5ac 100644
--- a/src/test/run-pass/cross-crate/cci_capture_clause.rs
+++ b/src/test/ui/cross-crate/cci_capture_clause.rs
diff --git a/src/test/run-pass/cross-crate/cci_impl_exe.rs b/src/test/ui/cross-crate/cci_impl_exe.rs
index b11fb23ebc8..b11fb23ebc8 100644
--- a/src/test/run-pass/cross-crate/cci_impl_exe.rs
+++ b/src/test/ui/cross-crate/cci_impl_exe.rs
diff --git a/src/test/run-pass/cross-crate/cci_iter_exe.rs b/src/test/ui/cross-crate/cci_iter_exe.rs
index 8b58d90fe4e..8b58d90fe4e 100644
--- a/src/test/run-pass/cross-crate/cci_iter_exe.rs
+++ b/src/test/ui/cross-crate/cci_iter_exe.rs
diff --git a/src/test/run-pass/cross-crate/cci_nested_exe.rs b/src/test/ui/cross-crate/cci_nested_exe.rs
index 1c001a2a372..1c001a2a372 100644
--- a/src/test/run-pass/cross-crate/cci_nested_exe.rs
+++ b/src/test/ui/cross-crate/cci_nested_exe.rs
diff --git a/src/test/run-pass/cross-crate/cci_no_inline_exe.rs b/src/test/ui/cross-crate/cci_no_inline_exe.rs
index ffc701678d3..ffc701678d3 100644
--- a/src/test/run-pass/cross-crate/cci_no_inline_exe.rs
+++ b/src/test/ui/cross-crate/cci_no_inline_exe.rs
diff --git a/src/test/run-pass/cross-crate/cross-crate-const-pat.rs b/src/test/ui/cross-crate/cross-crate-const-pat.rs
index e8fa8485ab2..e8fa8485ab2 100644
--- a/src/test/run-pass/cross-crate/cross-crate-const-pat.rs
+++ b/src/test/ui/cross-crate/cross-crate-const-pat.rs
diff --git a/src/test/run-pass/cross-crate/cross-crate-newtype-struct-pat.rs b/src/test/ui/cross-crate/cross-crate-newtype-struct-pat.rs
index eabffc16170..eabffc16170 100644
--- a/src/test/run-pass/cross-crate/cross-crate-newtype-struct-pat.rs
+++ b/src/test/ui/cross-crate/cross-crate-newtype-struct-pat.rs
diff --git a/src/test/run-pass/cross-crate/moves-based-on-type-cross-crate.rs b/src/test/ui/cross-crate/moves-based-on-type-cross-crate.rs
index 3881e335220..3881e335220 100644
--- a/src/test/run-pass/cross-crate/moves-based-on-type-cross-crate.rs
+++ b/src/test/ui/cross-crate/moves-based-on-type-cross-crate.rs
diff --git a/src/test/run-pass/cross-crate/reexported-static-methods-cross-crate.rs b/src/test/ui/cross-crate/reexported-static-methods-cross-crate.rs
index 8c70a1ce477..8c70a1ce477 100644
--- a/src/test/run-pass/cross-crate/reexported-static-methods-cross-crate.rs
+++ b/src/test/ui/cross-crate/reexported-static-methods-cross-crate.rs
diff --git a/src/test/run-pass/cross-crate/static-array-across-crate.rs b/src/test/ui/cross-crate/static-array-across-crate.rs
index 0b84e0e6a3f..0b84e0e6a3f 100644
--- a/src/test/run-pass/cross-crate/static-array-across-crate.rs
+++ b/src/test/ui/cross-crate/static-array-across-crate.rs
diff --git a/src/test/run-pass/cross-crate/xcrate-address-insignificant.rs b/src/test/ui/cross-crate/xcrate-address-insignificant.rs
index 33c70650603..33c70650603 100644
--- a/src/test/run-pass/cross-crate/xcrate-address-insignificant.rs
+++ b/src/test/ui/cross-crate/xcrate-address-insignificant.rs
diff --git a/src/test/run-pass/cross-crate/xcrate-associated-type-defaults.rs b/src/test/ui/cross-crate/xcrate-associated-type-defaults.rs
index 0f3e077d1de..0f3e077d1de 100644
--- a/src/test/run-pass/cross-crate/xcrate-associated-type-defaults.rs
+++ b/src/test/ui/cross-crate/xcrate-associated-type-defaults.rs
diff --git a/src/test/run-pass/cross-crate/xcrate-static-addresses.rs b/src/test/ui/cross-crate/xcrate-static-addresses.rs
index 3c33976568e..3c33976568e 100644
--- a/src/test/run-pass/cross-crate/xcrate-static-addresses.rs
+++ b/src/test/ui/cross-crate/xcrate-static-addresses.rs
diff --git a/src/test/run-pass/cross-crate/xcrate-trait-lifetime-param.rs b/src/test/ui/cross-crate/xcrate-trait-lifetime-param.rs
index 1fd7eb878d9..1fd7eb878d9 100644
--- a/src/test/run-pass/cross-crate/xcrate-trait-lifetime-param.rs
+++ b/src/test/ui/cross-crate/xcrate-trait-lifetime-param.rs
diff --git a/src/test/run-pass/cross-crate/xcrate-unit-struct.rs b/src/test/ui/cross-crate/xcrate-unit-struct.rs
index 7aa3eb0d6c4..7aa3eb0d6c4 100644
--- a/src/test/run-pass/cross-crate/xcrate-unit-struct.rs
+++ b/src/test/ui/cross-crate/xcrate-unit-struct.rs
diff --git a/src/test/run-pass/cross-crate/xcrate_generic_fn_nested_return.rs b/src/test/ui/cross-crate/xcrate_generic_fn_nested_return.rs
index 4593fec5196..4593fec5196 100644
--- a/src/test/run-pass/cross-crate/xcrate_generic_fn_nested_return.rs
+++ b/src/test/ui/cross-crate/xcrate_generic_fn_nested_return.rs
diff --git a/src/test/run-pass/crt-static-off-works.rs b/src/test/ui/crt-static-off-works.rs
index 64d96709afc..911467ee54e 100644
--- a/src/test/run-pass/crt-static-off-works.rs
+++ b/src/test/ui/crt-static-off-works.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 // compile-flags:-C target-feature=-crt-static -Z unstable-options
 // ignore-musl - requires changing the linker which is hard
diff --git a/src/test/run-pass/crt-static-on-works.rs b/src/test/ui/crt-static-on-works.rs
index 272fcfe3b5b..21407b1b911 100644
--- a/src/test/run-pass/crt-static-on-works.rs
+++ b/src/test/ui/crt-static-on-works.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 // compile-flags:-C target-feature=+crt-static -Z unstable-options
 
diff --git a/src/test/run-pass/cycle-generic-bound.rs b/src/test/ui/cycle-generic-bound.rs
index 56bfa98451f..9241f3789d7 100644
--- a/src/test/run-pass/cycle-generic-bound.rs
+++ b/src/test/ui/cycle-generic-bound.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Regression test for #15477. This test just needs to compile.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/dead-code-alias-in-pat.rs b/src/test/ui/dead-code-alias-in-pat.rs
index 5b6ca26f1ce..69d455f3b60 100644
--- a/src/test/run-pass/dead-code-alias-in-pat.rs
+++ b/src/test/ui/dead-code-alias-in-pat.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![deny(dead_code)]
 
 fn main() {
diff --git a/src/test/run-pass/dead-code-leading-underscore.rs b/src/test/ui/dead-code-leading-underscore.rs
index eff40111ac9..1b6e03ab887 100644
--- a/src/test/run-pass/dead-code-leading-underscore.rs
+++ b/src/test/ui/dead-code-leading-underscore.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![deny(dead_code)]
diff --git a/src/test/run-pass/debuginfo-lto.rs b/src/test/ui/debuginfo-lto.rs
index 680616fee7c..e4beee9e737 100644
--- a/src/test/run-pass/debuginfo-lto.rs
+++ b/src/test/ui/debuginfo-lto.rs
@@ -1,3 +1,4 @@
+// run-pass
 // This test case makes sure that we don't run into LLVM's dreaded
 // "possible ODR violation" assertion when compiling with LTO + Debuginfo.
 // It covers cases that have traditionally been prone to cause this error.
diff --git a/src/test/run-pass/deep.rs b/src/test/ui/deep.rs
index 5c3ecd8c22c..2bb109c0e3f 100644
--- a/src/test/run-pass/deep.rs
+++ b/src/test/ui/deep.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-emscripten apparently blows the stack
 
 fn f(x: isize) -> isize {
diff --git a/src/test/run-pass/default-alloc-error-hook.rs b/src/test/ui/default-alloc-error-hook.rs
index 7d1624320e6..40f61c2b7d5 100644
--- a/src/test/run-pass/default-alloc-error-hook.rs
+++ b/src/test/ui/default-alloc-error-hook.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 // ignore-sgx no processes
diff --git a/src/test/run-pass/default-associated-types.rs b/src/test/ui/default-associated-types.rs
index d7ed943b84e..aae70bffa38 100644
--- a/src/test/run-pass/default-associated-types.rs
+++ b/src/test/ui/default-associated-types.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(associated_type_defaults)]
 
 trait Foo<T: Default + ToString> {
diff --git a/src/test/run-pass/default-method-parsing.rs b/src/test/ui/default-method-parsing.rs
index 7f66605d7c3..9ffb8d94a59 100644
--- a/src/test/run-pass/default-method-parsing.rs
+++ b/src/test/ui/default-method-parsing.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 trait Foo {
diff --git a/src/test/run-pass/default-method-simple.rs b/src/test/ui/default-method-simple.rs
index d046fce9b62..6f7ae6a3e0b 100644
--- a/src/test/run-pass/default-method-simple.rs
+++ b/src/test/ui/default-method-simple.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 trait Foo {
diff --git a/src/test/run-pass/defaults-well-formedness.rs b/src/test/ui/defaults-well-formedness.rs
index cbcdb38fbeb..3275890616b 100644
--- a/src/test/run-pass/defaults-well-formedness.rs
+++ b/src/test/ui/defaults-well-formedness.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 trait Trait<T> {}
 struct Foo<U, V=i32>(U, V) where U: Trait<V>;
diff --git a/src/test/run-pass/deprecation-in-force-unstable.rs b/src/test/ui/deprecation-in-force-unstable.rs
index b3509734ffc..4df9b802d45 100644
--- a/src/test/run-pass/deprecation-in-force-unstable.rs
+++ b/src/test/ui/deprecation-in-force-unstable.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags:-Zforce-unstable-if-unmarked
 
 #[deprecated] // should work even with -Zforce-unstable-if-unmarked
diff --git a/src/test/run-pass/deref-lval.rs b/src/test/ui/deref-lval.rs
index d02adcb0cdc..f57872f80e0 100644
--- a/src/test/run-pass/deref-lval.rs
+++ b/src/test/ui/deref-lval.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(box_syntax)]
 
 use std::cell::Cell;
diff --git a/src/test/run-pass/deref-mut-on-ref.rs b/src/test/ui/deref-mut-on-ref.rs
index 119d943026a..a6df5495a27 100644
--- a/src/test/run-pass/deref-mut-on-ref.rs
+++ b/src/test/ui/deref-mut-on-ref.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that `&mut T` implements `DerefMut<T>`
 
 
diff --git a/src/test/run-pass/deref-on-ref.rs b/src/test/ui/deref-on-ref.rs
index 651ccd5be85..973e61c9d59 100644
--- a/src/test/run-pass/deref-on-ref.rs
+++ b/src/test/ui/deref-on-ref.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that `&T` and `&mut T` implement `Deref<T>`
 
 
diff --git a/src/test/run-pass/deref-rc.rs b/src/test/ui/deref-rc.rs
index ae17608fc56..9b4c63b1925 100644
--- a/src/test/run-pass/deref-rc.rs
+++ b/src/test/ui/deref-rc.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::rc::Rc;
 
 fn main() {
diff --git a/src/test/run-pass/deref.rs b/src/test/ui/deref.rs
index 08b047f54d9..cad4ede06a5 100644
--- a/src/test/run-pass/deref.rs
+++ b/src/test/ui/deref.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/deriving/auxiliary/derive-no-std.rs b/src/test/ui/deriving/auxiliary/derive-no-std.rs
index 3893dc1be07..3893dc1be07 100644
--- a/src/test/run-pass/deriving/auxiliary/derive-no-std.rs
+++ b/src/test/ui/deriving/auxiliary/derive-no-std.rs
diff --git a/src/test/run-pass/deriving/derive-no-std.rs b/src/test/ui/deriving/derive-no-std.rs
index 74c73b99cb9..74c73b99cb9 100644
--- a/src/test/run-pass/deriving/derive-no-std.rs
+++ b/src/test/ui/deriving/derive-no-std.rs
diff --git a/src/test/run-pass/deriving/derive-partialord-correctness.rs b/src/test/ui/deriving/derive-partialord-correctness.rs
index 36763eda169..36763eda169 100644
--- a/src/test/run-pass/deriving/derive-partialord-correctness.rs
+++ b/src/test/ui/deriving/derive-partialord-correctness.rs
diff --git a/src/test/run-pass/deriving/deriving-associated-types.rs b/src/test/ui/deriving/deriving-associated-types.rs
index 4b1cbe80c50..4b1cbe80c50 100644
--- a/src/test/run-pass/deriving/deriving-associated-types.rs
+++ b/src/test/ui/deriving/deriving-associated-types.rs
diff --git a/src/test/run-pass/deriving/deriving-bounds.rs b/src/test/ui/deriving/deriving-bounds.rs
index f0b921d0e7c..f0b921d0e7c 100644
--- a/src/test/run-pass/deriving/deriving-bounds.rs
+++ b/src/test/ui/deriving/deriving-bounds.rs
diff --git a/src/test/run-pass/deriving/deriving-clone-array.rs b/src/test/ui/deriving/deriving-clone-array.rs
index 4569749df42..4569749df42 100644
--- a/src/test/run-pass/deriving/deriving-clone-array.rs
+++ b/src/test/ui/deriving/deriving-clone-array.rs
diff --git a/src/test/run-pass/deriving/deriving-clone-enum.rs b/src/test/ui/deriving/deriving-clone-enum.rs
index 09e74974072..09e74974072 100644
--- a/src/test/run-pass/deriving/deriving-clone-enum.rs
+++ b/src/test/ui/deriving/deriving-clone-enum.rs
diff --git a/src/test/run-pass/deriving/deriving-clone-generic-enum.rs b/src/test/ui/deriving/deriving-clone-generic-enum.rs
index a344d7fc43a..a344d7fc43a 100644
--- a/src/test/run-pass/deriving/deriving-clone-generic-enum.rs
+++ b/src/test/ui/deriving/deriving-clone-generic-enum.rs
diff --git a/src/test/run-pass/deriving/deriving-clone-generic-struct.rs b/src/test/ui/deriving/deriving-clone-generic-struct.rs
index f6e105555fd..f6e105555fd 100644
--- a/src/test/run-pass/deriving/deriving-clone-generic-struct.rs
+++ b/src/test/ui/deriving/deriving-clone-generic-struct.rs
diff --git a/src/test/run-pass/deriving/deriving-clone-generic-tuple-struct.rs b/src/test/ui/deriving/deriving-clone-generic-tuple-struct.rs
index 8b9840de172..8b9840de172 100644
--- a/src/test/run-pass/deriving/deriving-clone-generic-tuple-struct.rs
+++ b/src/test/ui/deriving/deriving-clone-generic-tuple-struct.rs
diff --git a/src/test/run-pass/deriving/deriving-clone-struct.rs b/src/test/ui/deriving/deriving-clone-struct.rs
index 7b0a1d20260..7b0a1d20260 100644
--- a/src/test/run-pass/deriving/deriving-clone-struct.rs
+++ b/src/test/ui/deriving/deriving-clone-struct.rs
diff --git a/src/test/run-pass/deriving/deriving-clone-tuple-struct.rs b/src/test/ui/deriving/deriving-clone-tuple-struct.rs
index 166f1be55e0..166f1be55e0 100644
--- a/src/test/run-pass/deriving/deriving-clone-tuple-struct.rs
+++ b/src/test/ui/deriving/deriving-clone-tuple-struct.rs
diff --git a/src/test/run-pass/deriving/deriving-cmp-generic-enum.rs b/src/test/ui/deriving/deriving-cmp-generic-enum.rs
index 88da4bd066c..88da4bd066c 100644
--- a/src/test/run-pass/deriving/deriving-cmp-generic-enum.rs
+++ b/src/test/ui/deriving/deriving-cmp-generic-enum.rs
diff --git a/src/test/run-pass/deriving/deriving-cmp-generic-struct-enum.rs b/src/test/ui/deriving/deriving-cmp-generic-struct-enum.rs
index eeaf2ff7efa..eeaf2ff7efa 100644
--- a/src/test/run-pass/deriving/deriving-cmp-generic-struct-enum.rs
+++ b/src/test/ui/deriving/deriving-cmp-generic-struct-enum.rs
diff --git a/src/test/run-pass/deriving/deriving-cmp-generic-struct.rs b/src/test/ui/deriving/deriving-cmp-generic-struct.rs
index 538caf439c7..538caf439c7 100644
--- a/src/test/run-pass/deriving/deriving-cmp-generic-struct.rs
+++ b/src/test/ui/deriving/deriving-cmp-generic-struct.rs
diff --git a/src/test/run-pass/deriving/deriving-cmp-generic-tuple-struct.rs b/src/test/ui/deriving/deriving-cmp-generic-tuple-struct.rs
index 79f58d4565c..79f58d4565c 100644
--- a/src/test/run-pass/deriving/deriving-cmp-generic-tuple-struct.rs
+++ b/src/test/ui/deriving/deriving-cmp-generic-tuple-struct.rs
diff --git a/src/test/run-pass/deriving/deriving-cmp-shortcircuit.rs b/src/test/ui/deriving/deriving-cmp-shortcircuit.rs
index 140373e9526..140373e9526 100644
--- a/src/test/run-pass/deriving/deriving-cmp-shortcircuit.rs
+++ b/src/test/ui/deriving/deriving-cmp-shortcircuit.rs
diff --git a/src/test/run-pass/deriving/deriving-copyclone.rs b/src/test/ui/deriving/deriving-copyclone.rs
index 78d74a11ffc..78d74a11ffc 100644
--- a/src/test/run-pass/deriving/deriving-copyclone.rs
+++ b/src/test/ui/deriving/deriving-copyclone.rs
diff --git a/src/test/run-pass/deriving/deriving-default-box.rs b/src/test/ui/deriving/deriving-default-box.rs
index 237dbfaa056..237dbfaa056 100644
--- a/src/test/run-pass/deriving/deriving-default-box.rs
+++ b/src/test/ui/deriving/deriving-default-box.rs
diff --git a/src/test/run-pass/deriving/deriving-enum-single-variant.rs b/src/test/ui/deriving/deriving-enum-single-variant.rs
index 1c5979c0747..1c5979c0747 100644
--- a/src/test/run-pass/deriving/deriving-enum-single-variant.rs
+++ b/src/test/ui/deriving/deriving-enum-single-variant.rs
diff --git a/src/test/run-pass/deriving/deriving-eq-ord-boxed-slice.rs b/src/test/ui/deriving/deriving-eq-ord-boxed-slice.rs
index 5b4b0983623..5b4b0983623 100644
--- a/src/test/run-pass/deriving/deriving-eq-ord-boxed-slice.rs
+++ b/src/test/ui/deriving/deriving-eq-ord-boxed-slice.rs
diff --git a/src/test/run-pass/deriving/deriving-hash.rs b/src/test/ui/deriving/deriving-hash.rs
index 68c68c235ef..68c68c235ef 100644
--- a/src/test/run-pass/deriving/deriving-hash.rs
+++ b/src/test/ui/deriving/deriving-hash.rs
diff --git a/src/test/run-pass/deriving/deriving-in-fn.rs b/src/test/ui/deriving/deriving-in-fn.rs
index 8931e94a4f8..8931e94a4f8 100644
--- a/src/test/run-pass/deriving/deriving-in-fn.rs
+++ b/src/test/ui/deriving/deriving-in-fn.rs
diff --git a/src/test/run-pass/deriving/deriving-in-macro.rs b/src/test/ui/deriving/deriving-in-macro.rs
index 46e8e37838d..46e8e37838d 100644
--- a/src/test/run-pass/deriving/deriving-in-macro.rs
+++ b/src/test/ui/deriving/deriving-in-macro.rs
diff --git a/src/test/run-pass/deriving/deriving-meta-multiple.rs b/src/test/ui/deriving/deriving-meta-multiple.rs
index ad255be8dab..ad255be8dab 100644
--- a/src/test/run-pass/deriving/deriving-meta-multiple.rs
+++ b/src/test/ui/deriving/deriving-meta-multiple.rs
diff --git a/src/test/run-pass/deriving/deriving-meta.rs b/src/test/ui/deriving/deriving-meta.rs
index f2ff4f53557..f2ff4f53557 100644
--- a/src/test/run-pass/deriving/deriving-meta.rs
+++ b/src/test/ui/deriving/deriving-meta.rs
diff --git a/src/test/run-pass/deriving/deriving-self-lifetime-totalord-totaleq.rs b/src/test/ui/deriving/deriving-self-lifetime-totalord-totaleq.rs
index e01b5a26fc7..e01b5a26fc7 100644
--- a/src/test/run-pass/deriving/deriving-self-lifetime-totalord-totaleq.rs
+++ b/src/test/ui/deriving/deriving-self-lifetime-totalord-totaleq.rs
diff --git a/src/test/run-pass/deriving/deriving-show-2.rs b/src/test/ui/deriving/deriving-show-2.rs
index 13d124ed4c3..13d124ed4c3 100644
--- a/src/test/run-pass/deriving/deriving-show-2.rs
+++ b/src/test/ui/deriving/deriving-show-2.rs
diff --git a/src/test/run-pass/deriving/deriving-show.rs b/src/test/ui/deriving/deriving-show.rs
index eb3a8948fc8..eb3a8948fc8 100644
--- a/src/test/run-pass/deriving/deriving-show.rs
+++ b/src/test/ui/deriving/deriving-show.rs
diff --git a/src/test/run-pass/deriving/deriving-via-extension-c-enum.rs b/src/test/ui/deriving/deriving-via-extension-c-enum.rs
index 7fa1a69d7e0..7fa1a69d7e0 100644
--- a/src/test/run-pass/deriving/deriving-via-extension-c-enum.rs
+++ b/src/test/ui/deriving/deriving-via-extension-c-enum.rs
diff --git a/src/test/run-pass/deriving/deriving-via-extension-enum.rs b/src/test/ui/deriving/deriving-via-extension-enum.rs
index 6b58fd96622..6b58fd96622 100644
--- a/src/test/run-pass/deriving/deriving-via-extension-enum.rs
+++ b/src/test/ui/deriving/deriving-via-extension-enum.rs
diff --git a/src/test/run-pass/deriving/deriving-via-extension-hash-enum.rs b/src/test/ui/deriving/deriving-via-extension-hash-enum.rs
index 2d1ca05f4fc..2d1ca05f4fc 100644
--- a/src/test/run-pass/deriving/deriving-via-extension-hash-enum.rs
+++ b/src/test/ui/deriving/deriving-via-extension-hash-enum.rs
diff --git a/src/test/run-pass/deriving/deriving-via-extension-hash-struct.rs b/src/test/ui/deriving/deriving-via-extension-hash-struct.rs
index c4037dc2714..c4037dc2714 100644
--- a/src/test/run-pass/deriving/deriving-via-extension-hash-struct.rs
+++ b/src/test/ui/deriving/deriving-via-extension-hash-struct.rs
diff --git a/src/test/run-pass/deriving/deriving-via-extension-struct-empty.rs b/src/test/ui/deriving/deriving-via-extension-struct-empty.rs
index 9fb250e8470..9fb250e8470 100644
--- a/src/test/run-pass/deriving/deriving-via-extension-struct-empty.rs
+++ b/src/test/ui/deriving/deriving-via-extension-struct-empty.rs
diff --git a/src/test/run-pass/deriving/deriving-via-extension-struct-like-enum-variant.rs b/src/test/ui/deriving/deriving-via-extension-struct-like-enum-variant.rs
index b6e6f136c75..b6e6f136c75 100644
--- a/src/test/run-pass/deriving/deriving-via-extension-struct-like-enum-variant.rs
+++ b/src/test/ui/deriving/deriving-via-extension-struct-like-enum-variant.rs
diff --git a/src/test/run-pass/deriving/deriving-via-extension-struct-tuple.rs b/src/test/ui/deriving/deriving-via-extension-struct-tuple.rs
index e84906c96bb..e84906c96bb 100644
--- a/src/test/run-pass/deriving/deriving-via-extension-struct-tuple.rs
+++ b/src/test/ui/deriving/deriving-via-extension-struct-tuple.rs
diff --git a/src/test/run-pass/deriving/deriving-via-extension-struct.rs b/src/test/ui/deriving/deriving-via-extension-struct.rs
index f4d8b16a02f..f4d8b16a02f 100644
--- a/src/test/run-pass/deriving/deriving-via-extension-struct.rs
+++ b/src/test/ui/deriving/deriving-via-extension-struct.rs
diff --git a/src/test/run-pass/deriving/deriving-via-extension-type-params.rs b/src/test/ui/deriving/deriving-via-extension-type-params.rs
index a5dec8ee1ab..a5dec8ee1ab 100644
--- a/src/test/run-pass/deriving/deriving-via-extension-type-params.rs
+++ b/src/test/ui/deriving/deriving-via-extension-type-params.rs
diff --git a/src/test/run-pass/deriving/deriving-with-repr-packed.rs b/src/test/ui/deriving/deriving-with-repr-packed.rs
index 8ce444be13f..8ce444be13f 100644
--- a/src/test/run-pass/deriving/deriving-with-repr-packed.rs
+++ b/src/test/ui/deriving/deriving-with-repr-packed.rs
diff --git a/src/test/run-pass/dispatch_from_dyn_zst.rs b/src/test/ui/dispatch_from_dyn_zst.rs
index a2181336e00..764f58ce9e8 100644
--- a/src/test/run-pass/dispatch_from_dyn_zst.rs
+++ b/src/test/ui/dispatch_from_dyn_zst.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(unsize, dispatch_from_dyn, never_type)]
 
 #![allow(dead_code)]
diff --git a/src/test/run-pass/diverging-fallback-control-flow.rs b/src/test/ui/diverging-fallback-control-flow.rs
index c88ab42d5a8..0f0f787b407 100644
--- a/src/test/run-pass/diverging-fallback-control-flow.rs
+++ b/src/test/ui/diverging-fallback-control-flow.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_assignments)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/diverging-fallback-method-chain.rs b/src/test/ui/diverging-fallback-method-chain.rs
index df1a64e3ae6..ba9f05c64e4 100644
--- a/src/test/run-pass/diverging-fallback-method-chain.rs
+++ b/src/test/ui/diverging-fallback-method-chain.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 // Test a regression found when building compiler. The `produce()`
 // error type `T` winds up getting unified with result of `x.parse()`;
diff --git a/src/test/run-pass/diverging-fallback-option.rs b/src/test/ui/diverging-fallback-option.rs
index af517178150..46bdfc96dbe 100644
--- a/src/test/run-pass/diverging-fallback-option.rs
+++ b/src/test/ui/diverging-fallback-option.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(warnings)]
 
 // Here the type of `c` is `Option<?T>`, where `?T` is unconstrained.
diff --git a/src/test/run-pass/double-ref.rs b/src/test/ui/double-ref.rs
index 16c98da9456..e68b8683376 100644
--- a/src/test/run-pass/double-ref.rs
+++ b/src/test/ui/double-ref.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/drop/auxiliary/dropck_eyepatch_extern_crate.rs b/src/test/ui/drop/auxiliary/dropck_eyepatch_extern_crate.rs
index 270d5de7ac8..270d5de7ac8 100644
--- a/src/test/run-pass/drop/auxiliary/dropck_eyepatch_extern_crate.rs
+++ b/src/test/ui/drop/auxiliary/dropck_eyepatch_extern_crate.rs
diff --git a/src/test/run-pass/drop/drop-on-empty-block-exit.rs b/src/test/ui/drop/drop-on-empty-block-exit.rs
index 1747bf029aa..1747bf029aa 100644
--- a/src/test/run-pass/drop/drop-on-empty-block-exit.rs
+++ b/src/test/ui/drop/drop-on-empty-block-exit.rs
diff --git a/src/test/run-pass/drop/drop-on-ret.rs b/src/test/ui/drop/drop-on-ret.rs
index 290e274f305..290e274f305 100644
--- a/src/test/run-pass/drop/drop-on-ret.rs
+++ b/src/test/ui/drop/drop-on-ret.rs
diff --git a/src/test/run-pass/drop/drop-struct-as-object.rs b/src/test/ui/drop/drop-struct-as-object.rs
index 1bc3b4c157c..1bc3b4c157c 100644
--- a/src/test/run-pass/drop/drop-struct-as-object.rs
+++ b/src/test/ui/drop/drop-struct-as-object.rs
diff --git a/src/test/run-pass/drop/drop-trait-enum.rs b/src/test/ui/drop/drop-trait-enum.rs
index aec46575f97..aec46575f97 100644
--- a/src/test/run-pass/drop/drop-trait-enum.rs
+++ b/src/test/ui/drop/drop-trait-enum.rs
diff --git a/src/test/run-pass/drop/drop-trait-generic.rs b/src/test/ui/drop/drop-trait-generic.rs
index cdefb680c75..cdefb680c75 100644
--- a/src/test/run-pass/drop/drop-trait-generic.rs
+++ b/src/test/ui/drop/drop-trait-generic.rs
diff --git a/src/test/run-pass/drop/drop-trait.rs b/src/test/ui/drop/drop-trait.rs
index d93f7718091..d93f7718091 100644
--- a/src/test/run-pass/drop/drop-trait.rs
+++ b/src/test/ui/drop/drop-trait.rs
diff --git a/src/test/run-pass/drop/drop-uninhabited-enum.rs b/src/test/ui/drop/drop-uninhabited-enum.rs
index b3566f68533..b3566f68533 100644
--- a/src/test/run-pass/drop/drop-uninhabited-enum.rs
+++ b/src/test/ui/drop/drop-uninhabited-enum.rs
diff --git a/src/test/run-pass/drop/drop-with-type-ascription-1.rs b/src/test/ui/drop/drop-with-type-ascription-1.rs
index e5a1a48df56..e5a1a48df56 100644
--- a/src/test/run-pass/drop/drop-with-type-ascription-1.rs
+++ b/src/test/ui/drop/drop-with-type-ascription-1.rs
diff --git a/src/test/run-pass/drop/drop-with-type-ascription-2.rs b/src/test/ui/drop/drop-with-type-ascription-2.rs
index fb70ad48e88..fb70ad48e88 100644
--- a/src/test/run-pass/drop/drop-with-type-ascription-2.rs
+++ b/src/test/ui/drop/drop-with-type-ascription-2.rs
diff --git a/src/test/run-pass/drop/dropck-eyepatch-extern-crate.rs b/src/test/ui/drop/dropck-eyepatch-extern-crate.rs
index fecfd5edffb..fecfd5edffb 100644
--- a/src/test/run-pass/drop/dropck-eyepatch-extern-crate.rs
+++ b/src/test/ui/drop/dropck-eyepatch-extern-crate.rs
diff --git a/src/test/run-pass/drop/dropck-eyepatch-reorder.rs b/src/test/ui/drop/dropck-eyepatch-reorder.rs
index b4605878a54..b4605878a54 100644
--- a/src/test/run-pass/drop/dropck-eyepatch-reorder.rs
+++ b/src/test/ui/drop/dropck-eyepatch-reorder.rs
diff --git a/src/test/run-pass/drop/dropck-eyepatch.rs b/src/test/ui/drop/dropck-eyepatch.rs
index 9255391e412..9255391e412 100644
--- a/src/test/run-pass/drop/dropck-eyepatch.rs
+++ b/src/test/ui/drop/dropck-eyepatch.rs
diff --git a/src/test/run-pass/drop/dropck_legal_cycles.rs b/src/test/ui/drop/dropck_legal_cycles.rs
index a4f4c2666ac..a4f4c2666ac 100644
--- a/src/test/run-pass/drop/dropck_legal_cycles.rs
+++ b/src/test/ui/drop/dropck_legal_cycles.rs
diff --git a/src/test/run-pass/drop/dynamic-drop-async.rs b/src/test/ui/drop/dynamic-drop-async.rs
index 9226145d935..9226145d935 100644
--- a/src/test/run-pass/drop/dynamic-drop-async.rs
+++ b/src/test/ui/drop/dynamic-drop-async.rs
diff --git a/src/test/run-pass/drop/dynamic-drop.rs b/src/test/ui/drop/dynamic-drop.rs
index eb1a3f3a9f9..eb1a3f3a9f9 100644
--- a/src/test/run-pass/drop/dynamic-drop.rs
+++ b/src/test/ui/drop/dynamic-drop.rs
diff --git a/src/test/run-pass/drop/no-drop-flag-size.rs b/src/test/ui/drop/no-drop-flag-size.rs
index 103e70ef6ee..103e70ef6ee 100644
--- a/src/test/run-pass/drop/no-drop-flag-size.rs
+++ b/src/test/ui/drop/no-drop-flag-size.rs
diff --git a/src/test/run-pass/drop/nondrop-cycle.rs b/src/test/ui/drop/nondrop-cycle.rs
index 29070f917e4..29070f917e4 100644
--- a/src/test/run-pass/drop/nondrop-cycle.rs
+++ b/src/test/ui/drop/nondrop-cycle.rs
diff --git a/src/test/run-pass/dupe-first-attr.rc b/src/test/ui/dupe-first-attr.rc
index 8b7025b7be7..8b7025b7be7 100644
--- a/src/test/run-pass/dupe-first-attr.rc
+++ b/src/test/ui/dupe-first-attr.rc
diff --git a/src/test/run-pass/duplicated-external-mods.rs b/src/test/ui/duplicated-external-mods.rs
index f2c1e1f6540..05a279a3014 100644
--- a/src/test/run-pass/duplicated-external-mods.rs
+++ b/src/test/ui/duplicated-external-mods.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:anon-extern-mod-cross-crate-1.rs
 // aux-build:anon-extern-mod-cross-crate-1.rs
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/dynamically-sized-types/dst-coerce-custom.rs b/src/test/ui/dynamically-sized-types/dst-coerce-custom.rs
index 24d83eb5343..24d83eb5343 100644
--- a/src/test/run-pass/dynamically-sized-types/dst-coerce-custom.rs
+++ b/src/test/ui/dynamically-sized-types/dst-coerce-custom.rs
diff --git a/src/test/run-pass/dynamically-sized-types/dst-coerce-rc.rs b/src/test/ui/dynamically-sized-types/dst-coerce-rc.rs
index 683fa6850fd..683fa6850fd 100644
--- a/src/test/run-pass/dynamically-sized-types/dst-coerce-rc.rs
+++ b/src/test/ui/dynamically-sized-types/dst-coerce-rc.rs
diff --git a/src/test/run-pass/dynamically-sized-types/dst-coercions.rs b/src/test/ui/dynamically-sized-types/dst-coercions.rs
index 66688e93fb8..66688e93fb8 100644
--- a/src/test/run-pass/dynamically-sized-types/dst-coercions.rs
+++ b/src/test/ui/dynamically-sized-types/dst-coercions.rs
diff --git a/src/test/run-pass/dynamically-sized-types/dst-deref-mut.rs b/src/test/ui/dynamically-sized-types/dst-deref-mut.rs
index 1d62f42bd4a..1d62f42bd4a 100644
--- a/src/test/run-pass/dynamically-sized-types/dst-deref-mut.rs
+++ b/src/test/ui/dynamically-sized-types/dst-deref-mut.rs
diff --git a/src/test/run-pass/dynamically-sized-types/dst-deref.rs b/src/test/ui/dynamically-sized-types/dst-deref.rs
index 0a350bac14a..0a350bac14a 100644
--- a/src/test/run-pass/dynamically-sized-types/dst-deref.rs
+++ b/src/test/ui/dynamically-sized-types/dst-deref.rs
diff --git a/src/test/run-pass/dynamically-sized-types/dst-field-align.rs b/src/test/ui/dynamically-sized-types/dst-field-align.rs
index 6c338e99912..6c338e99912 100644
--- a/src/test/run-pass/dynamically-sized-types/dst-field-align.rs
+++ b/src/test/ui/dynamically-sized-types/dst-field-align.rs
diff --git a/src/test/run-pass/dynamically-sized-types/dst-index.rs b/src/test/ui/dynamically-sized-types/dst-index.rs
index 980d99a6d6c..980d99a6d6c 100644
--- a/src/test/run-pass/dynamically-sized-types/dst-index.rs
+++ b/src/test/ui/dynamically-sized-types/dst-index.rs
diff --git a/src/test/run-pass/dynamically-sized-types/dst-irrefutable-bind.rs b/src/test/ui/dynamically-sized-types/dst-irrefutable-bind.rs
index 0a6c49111fe..0a6c49111fe 100644
--- a/src/test/run-pass/dynamically-sized-types/dst-irrefutable-bind.rs
+++ b/src/test/ui/dynamically-sized-types/dst-irrefutable-bind.rs
diff --git a/src/test/run-pass/dynamically-sized-types/dst-raw.rs b/src/test/ui/dynamically-sized-types/dst-raw.rs
index 0893b02e74e..0893b02e74e 100644
--- a/src/test/run-pass/dynamically-sized-types/dst-raw.rs
+++ b/src/test/ui/dynamically-sized-types/dst-raw.rs
diff --git a/src/test/run-pass/dynamically-sized-types/dst-struct-sole.rs b/src/test/ui/dynamically-sized-types/dst-struct-sole.rs
index 6ca07fcf8da..6ca07fcf8da 100644
--- a/src/test/run-pass/dynamically-sized-types/dst-struct-sole.rs
+++ b/src/test/ui/dynamically-sized-types/dst-struct-sole.rs
diff --git a/src/test/run-pass/dynamically-sized-types/dst-struct.rs b/src/test/ui/dynamically-sized-types/dst-struct.rs
index 25ec07b88a6..25ec07b88a6 100644
--- a/src/test/run-pass/dynamically-sized-types/dst-struct.rs
+++ b/src/test/ui/dynamically-sized-types/dst-struct.rs
diff --git a/src/test/run-pass/dynamically-sized-types/dst-trait-tuple.rs b/src/test/ui/dynamically-sized-types/dst-trait-tuple.rs
index 70bcc3de07d..70bcc3de07d 100644
--- a/src/test/run-pass/dynamically-sized-types/dst-trait-tuple.rs
+++ b/src/test/ui/dynamically-sized-types/dst-trait-tuple.rs
diff --git a/src/test/run-pass/dynamically-sized-types/dst-trait.rs b/src/test/ui/dynamically-sized-types/dst-trait.rs
index ec6bc72192d..ec6bc72192d 100644
--- a/src/test/run-pass/dynamically-sized-types/dst-trait.rs
+++ b/src/test/ui/dynamically-sized-types/dst-trait.rs
diff --git a/src/test/run-pass/dynamically-sized-types/dst-tuple-sole.rs b/src/test/ui/dynamically-sized-types/dst-tuple-sole.rs
index 606689da0c2..606689da0c2 100644
--- a/src/test/run-pass/dynamically-sized-types/dst-tuple-sole.rs
+++ b/src/test/ui/dynamically-sized-types/dst-tuple-sole.rs
diff --git a/src/test/run-pass/dynamically-sized-types/dst-tuple.rs b/src/test/ui/dynamically-sized-types/dst-tuple.rs
index f70a45a1b35..f70a45a1b35 100644
--- a/src/test/run-pass/dynamically-sized-types/dst-tuple.rs
+++ b/src/test/ui/dynamically-sized-types/dst-tuple.rs
diff --git a/src/test/run-pass/early-ret-binop-add.rs b/src/test/ui/early-ret-binop-add.rs
index 158468c572c..2b5df52a51c 100644
--- a/src/test/run-pass/early-ret-binop-add.rs
+++ b/src/test/ui/early-ret-binop-add.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unreachable_code)]
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/early-vtbl-resolution.rs b/src/test/ui/early-vtbl-resolution.rs
index 812771c29b3..f4b69c14095 100644
--- a/src/test/run-pass/early-vtbl-resolution.rs
+++ b/src/test/ui/early-vtbl-resolution.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/edition-keywords-2015-2015.rs b/src/test/ui/edition-keywords-2015-2015.rs
index 7d25b71422d..943d203b806 100644
--- a/src/test/run-pass/edition-keywords-2015-2015.rs
+++ b/src/test/ui/edition-keywords-2015-2015.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_mut)]
 #![allow(unused_assignments)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/edition-keywords-2015-2018.rs b/src/test/ui/edition-keywords-2015-2018.rs
index 92d474629c1..8c3397c951d 100644
--- a/src/test/run-pass/edition-keywords-2015-2018.rs
+++ b/src/test/ui/edition-keywords-2015-2018.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_mut)]
 #![allow(unused_assignments)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/edition-keywords-2018-2015.rs b/src/test/ui/edition-keywords-2018-2015.rs
index e4ed5ffff98..2cb2dfb18a0 100644
--- a/src/test/run-pass/edition-keywords-2018-2015.rs
+++ b/src/test/ui/edition-keywords-2018-2015.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_assignments)]
 // edition:2018
 // aux-build:edition-kw-macro-2015.rs
diff --git a/src/test/run-pass/edition-keywords-2018-2018.rs b/src/test/ui/edition-keywords-2018-2018.rs
index e3624ac96ed..5043440aa16 100644
--- a/src/test/run-pass/edition-keywords-2018-2018.rs
+++ b/src/test/ui/edition-keywords-2018-2018.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_assignments)]
 // edition:2018
 // aux-build:edition-kw-macro-2018.rs
diff --git a/src/test/run-pass/else-if.rs b/src/test/ui/else-if.rs
index 83a6658895a..77d8d1abfaf 100644
--- a/src/test/run-pass/else-if.rs
+++ b/src/test/ui/else-if.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     if 1 == 2 {
         assert!((false));
diff --git a/src/test/run-pass/empty-allocation-non-null.rs b/src/test/ui/empty-allocation-non-null.rs
index 31117936c76..925bddd5edd 100644
--- a/src/test/run-pass/empty-allocation-non-null.rs
+++ b/src/test/ui/empty-allocation-non-null.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     assert!(Some(Box::new(())).is_some());
 
diff --git a/src/test/run-pass/empty-allocation-rvalue-non-null.rs b/src/test/ui/empty-allocation-rvalue-non-null.rs
index ac597bcb208..2f5a5c4bbc6 100644
--- a/src/test/run-pass/empty-allocation-rvalue-non-null.rs
+++ b/src/test/ui/empty-allocation-rvalue-non-null.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/empty-type-parameter-list.rs b/src/test/ui/empty-type-parameter-list.rs
index 43275090f2d..e168cd03b27 100644
--- a/src/test/run-pass/empty-type-parameter-list.rs
+++ b/src/test/ui/empty-type-parameter-list.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that empty type parameter list (<>) is synonymous with
 // no type parameters at all
 
diff --git a/src/test/run-pass/empty_global_asm.rs b/src/test/ui/empty_global_asm.rs
index 5789985a038..efbe2b2eb67 100644
--- a/src/test/run-pass/empty_global_asm.rs
+++ b/src/test/ui/empty_global_asm.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(global_asm)]
 
 #[cfg(target_arch = "x86")]
diff --git a/src/test/run-pass/env-args-reverse-iterator.rs b/src/test/ui/env-args-reverse-iterator.rs
index d677aa85001..0ffd74f87ab 100644
--- a/src/test/run-pass/env-args-reverse-iterator.rs
+++ b/src/test/ui/env-args-reverse-iterator.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 // ignore-sgx no processes
diff --git a/src/test/run-pass/env-funky-keys.rs b/src/test/ui/env-funky-keys.rs
index 3b236e2b3af..4faceb53266 100644
--- a/src/test/run-pass/env-funky-keys.rs
+++ b/src/test/ui/env-funky-keys.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Ignore this test on Android, because it segfaults there.
 
 // ignore-android
diff --git a/src/test/run-pass/env-home-dir.rs b/src/test/ui/env-home-dir.rs
index 62f45d0a2eb..a75be48fd55 100644
--- a/src/test/run-pass/env-home-dir.rs
+++ b/src/test/ui/env-home-dir.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 #![allow(deprecated)]
 // ignore-cloudabi no environment variables present
diff --git a/src/test/run-pass/env-null-vars.rs b/src/test/ui/env-null-vars.rs
index bdd1d4778cf..10582a8a514 100644
--- a/src/test/run-pass/env-null-vars.rs
+++ b/src/test/ui/env-null-vars.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 
 // ignore-windows
diff --git a/src/test/run-pass/env-vars.rs b/src/test/ui/env-vars.rs
index 6159638745a..2ea906788e8 100644
--- a/src/test/run-pass/env-vars.rs
+++ b/src/test/ui/env-vars.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi no env vars
 // ignore-wasm32-bare no env vars
 
diff --git a/src/test/run-pass/epoch-gate-feature.rs b/src/test/ui/epoch-gate-feature.rs
index 6f0b31518c2..5f7feb5347b 100644
--- a/src/test/run-pass/epoch-gate-feature.rs
+++ b/src/test/ui/epoch-gate-feature.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_variables)]
 // Checks if the correct registers are being used to pass arguments
diff --git a/src/test/run-pass/eq-multidispatch.rs b/src/test/ui/eq-multidispatch.rs
index 1212f5d17db..69d83f496b3 100644
--- a/src/test/run-pass/eq-multidispatch.rs
+++ b/src/test/ui/eq-multidispatch.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #[derive(PartialEq, Debug)]
 struct Bar;
 #[derive(Debug)]
diff --git a/src/test/ui/error-codes/E0661.rs b/src/test/ui/error-codes/E0661.rs
index 8d355a8a021..2440e3a446e 100644
--- a/src/test/ui/error-codes/E0661.rs
+++ b/src/test/ui/error-codes/E0661.rs
@@ -1,3 +1,5 @@
+// ignore-emscripten
+
 #![feature(asm)]
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0661.stderr b/src/test/ui/error-codes/E0661.stderr
index 30a23fd58c5..58f7e7fa0f9 100644
--- a/src/test/ui/error-codes/E0661.stderr
+++ b/src/test/ui/error-codes/E0661.stderr
@@ -1,5 +1,5 @@
 error[E0661]: output operand constraint lacks '=' or '+'
-  --> $DIR/E0661.rs:5:18
+  --> $DIR/E0661.rs:7:18
    |
 LL |     asm!("nop" : "r"(a));
    |                  ^^^
diff --git a/src/test/ui/error-codes/E0662.rs b/src/test/ui/error-codes/E0662.rs
index 7fe528c4745..343ed27f83f 100644
--- a/src/test/ui/error-codes/E0662.rs
+++ b/src/test/ui/error-codes/E0662.rs
@@ -1,3 +1,5 @@
+// ignore-emscripten
+
 #![feature(asm)]
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0662.stderr b/src/test/ui/error-codes/E0662.stderr
index 0d3701aa955..3b2f7632f39 100644
--- a/src/test/ui/error-codes/E0662.stderr
+++ b/src/test/ui/error-codes/E0662.stderr
@@ -1,5 +1,5 @@
 error[E0662]: input operand constraint contains '='
-  --> $DIR/E0662.rs:6:12
+  --> $DIR/E0662.rs:8:12
    |
 LL |          : "=test"("a")
    |            ^^^^^^^
diff --git a/src/test/ui/error-codes/E0663.rs b/src/test/ui/error-codes/E0663.rs
index e5b8156cfb3..cfbb4b37758 100644
--- a/src/test/ui/error-codes/E0663.rs
+++ b/src/test/ui/error-codes/E0663.rs
@@ -1,3 +1,5 @@
+// ignore-emscripten
+
 #![feature(asm)]
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0663.stderr b/src/test/ui/error-codes/E0663.stderr
index 46a079af152..4ac0a85f26d 100644
--- a/src/test/ui/error-codes/E0663.stderr
+++ b/src/test/ui/error-codes/E0663.stderr
@@ -1,5 +1,5 @@
 error[E0663]: input operand constraint contains '+'
-  --> $DIR/E0663.rs:6:12
+  --> $DIR/E0663.rs:8:12
    |
 LL |          : "+test"("a")
    |            ^^^^^^^
diff --git a/src/test/ui/error-codes/E0664.rs b/src/test/ui/error-codes/E0664.rs
index 29ec7ced4fd..fe70c9f96e0 100644
--- a/src/test/ui/error-codes/E0664.rs
+++ b/src/test/ui/error-codes/E0664.rs
@@ -1,3 +1,5 @@
+// ignore-emscripten
+
 #![feature(asm)]
 
 fn main() {
diff --git a/src/test/ui/error-codes/E0664.stderr b/src/test/ui/error-codes/E0664.stderr
index 3a99fce6eed..435e465920b 100644
--- a/src/test/ui/error-codes/E0664.stderr
+++ b/src/test/ui/error-codes/E0664.stderr
@@ -1,5 +1,5 @@
 error[E0664]: clobber should not be surrounded by braces
-  --> $DIR/E0664.rs:7:12
+  --> $DIR/E0664.rs:9:12
    |
 LL |          : "{eax}"
    |            ^^^^^^^
diff --git a/src/test/run-pass/estr-uniq.rs b/src/test/ui/estr-uniq.rs
index 6b2607a997b..1d0a4273953 100644
--- a/src/test/run-pass/estr-uniq.rs
+++ b/src/test/ui/estr-uniq.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_assignments)]
 #![allow(unknown_lints)]
 
diff --git a/src/test/run-pass/exec-env.rs b/src/test/ui/exec-env.rs
index c1b8e082514..230fac10d33 100644
--- a/src/test/run-pass/exec-env.rs
+++ b/src/test/ui/exec-env.rs
@@ -1,3 +1,4 @@
+// run-pass
 // exec-env:TEST_EXEC_ENV=22
 // ignore-cloudabi no env vars
 // ignore-emscripten FIXME: issue #31622
diff --git a/src/test/run-pass/existential_type.rs b/src/test/ui/existential_type.rs
index b36435cf113..c2cf0eeed3d 100644
--- a/src/test/run-pass/existential_type.rs
+++ b/src/test/ui/existential_type.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_assignments)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/explicit-i-suffix.rs b/src/test/ui/explicit-i-suffix.rs
index 119cce3087e..40c7e475104 100644
--- a/src/test/run-pass/explicit-i-suffix.rs
+++ b/src/test/ui/explicit-i-suffix.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/export-glob-imports-target.rs b/src/test/ui/export-glob-imports-target.rs
index 0ac80e65798..4df807ea4c9 100644
--- a/src/test/run-pass/export-glob-imports-target.rs
+++ b/src/test/ui/export-glob-imports-target.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_upper_case_globals)]
 #![allow(dead_code)]
 // Test that a glob-export functions as an import
diff --git a/src/test/run-pass/export-multi.rs b/src/test/ui/export-multi.rs
index bfa2765d254..02bdbe8afff 100644
--- a/src/test/run-pass/export-multi.rs
+++ b/src/test/ui/export-multi.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 use m::f;
diff --git a/src/test/run-pass/export-non-interference2.rs b/src/test/ui/export-non-interference2.rs
index 30d5a0d9c05..6d18b03891a 100644
--- a/src/test/run-pass/export-non-interference2.rs
+++ b/src/test/ui/export-non-interference2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 mod foo {
     pub mod bar {
         pub fn y() { super::super::foo::x(); }
diff --git a/src/test/run-pass/export-non-interference3.rs b/src/test/ui/export-non-interference3.rs
index a11ea3a0455..0d6b6369f94 100644
--- a/src/test/run-pass/export-non-interference3.rs
+++ b/src/test/ui/export-non-interference3.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub mod foo {
     pub fn x() { ::bar::x(); }
 }
diff --git a/src/test/run-pass/expr-block-fn.rs b/src/test/ui/expr-block-fn.rs
index 229e2b02bf0..1cac2cac0ac 100644
--- a/src/test/run-pass/expr-block-fn.rs
+++ b/src/test/ui/expr-block-fn.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn test_fn() {
     fn ten() -> isize { return 10; }
     let rs = ten;
diff --git a/src/test/run-pass/expr-block-generic-unique1.rs b/src/test/ui/expr-block-generic-unique1.rs
index b89f2f9660c..c14191f2ffc 100644
--- a/src/test/run-pass/expr-block-generic-unique1.rs
+++ b/src/test/ui/expr-block-generic-unique1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(box_syntax)]
 
 fn test_generic<T, F>(expected: Box<T>, eq: F) where T: Clone, F: FnOnce(Box<T>, Box<T>) -> bool {
diff --git a/src/test/run-pass/expr-block-generic-unique2.rs b/src/test/ui/expr-block-generic-unique2.rs
index 4c712abcc3f..90ebc02931a 100644
--- a/src/test/run-pass/expr-block-generic-unique2.rs
+++ b/src/test/ui/expr-block-generic-unique2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(box_syntax)]
 
 fn test_generic<T, F>(expected: T, eq: F) where T: Clone, F: FnOnce(T, T) -> bool {
diff --git a/src/test/run-pass/expr-block-generic.rs b/src/test/ui/expr-block-generic.rs
index 5665790a84d..ec93f59722d 100644
--- a/src/test/run-pass/expr-block-generic.rs
+++ b/src/test/ui/expr-block-generic.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn test_generic<T: Clone, F>(expected: T, eq: F) where F: FnOnce(T, T) -> bool {
     let actual: T = { expected.clone() };
     assert!(eq(expected, actual));
diff --git a/src/test/run-pass/expr-block-slot.rs b/src/test/ui/expr-block-slot.rs
index 65d58e00bc9..54bcbb328b0 100644
--- a/src/test/run-pass/expr-block-slot.rs
+++ b/src/test/ui/expr-block-slot.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Regression test for issue #377
 
 
diff --git a/src/test/run-pass/expr-block-unique.rs b/src/test/ui/expr-block-unique.rs
index a5b7bacec23..fe1a7d9f1fb 100644
--- a/src/test/run-pass/expr-block-unique.rs
+++ b/src/test/ui/expr-block-unique.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(box_syntax)]
 
 pub fn main() { let x: Box<_> = { box 100 }; assert_eq!(*x, 100); }
diff --git a/src/test/run-pass/expr-block.rs b/src/test/ui/expr-block.rs
index 222e5cfbcf6..549ccf9774f 100644
--- a/src/test/run-pass/expr-block.rs
+++ b/src/test/ui/expr-block.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 
diff --git a/src/test/run-pass/expr-copy.rs b/src/test/ui/expr-copy.rs
index fdea32f476a..1c6ae03810f 100644
--- a/src/test/run-pass/expr-copy.rs
+++ b/src/test/ui/expr-copy.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn f(arg: &mut A) {
     arg.a = 100;
 }
diff --git a/src/test/run-pass/expr-empty-ret.rs b/src/test/ui/expr-empty-ret.rs
index 6bdf4350a99..ce8ffaf94d0 100644
--- a/src/test/run-pass/expr-empty-ret.rs
+++ b/src/test/ui/expr-empty-ret.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Issue #521
 
diff --git a/src/test/run-pass/expr-fn.rs b/src/test/ui/expr-fn.rs
index 9e0679b959b..af809f563fc 100644
--- a/src/test/run-pass/expr-fn.rs
+++ b/src/test/ui/expr-fn.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn test_int() {
     fn f() -> isize { 10 }
     assert_eq!(f(), 10);
diff --git a/src/test/run-pass/expr-if-generic.rs b/src/test/ui/expr-if-generic.rs
index 3e3600c4528..32ed6d9bee0 100644
--- a/src/test/run-pass/expr-if-generic.rs
+++ b/src/test/ui/expr-if-generic.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn test_generic<T, F>(expected: T, not_expected: T, eq: F) where
     T: Clone,
     F: FnOnce(T, T) -> bool,
diff --git a/src/test/run-pass/expr-if-panic-all.rs b/src/test/ui/expr-if-panic-all.rs
index ea7f36f8a3c..f915a7d9da0 100644
--- a/src/test/run-pass/expr-if-panic-all.rs
+++ b/src/test/ui/expr-if-panic-all.rs
@@ -1,3 +1,4 @@
+// run-pass
 // When all branches of an if expression result in panic, the entire if
 // expression results in panic.
 
diff --git a/src/test/run-pass/expr-if-panic.rs b/src/test/ui/expr-if-panic.rs
index ae92e3b125b..6069cd835e1 100644
--- a/src/test/run-pass/expr-if-panic.rs
+++ b/src/test/ui/expr-if-panic.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn test_if_panic() {
     let x = if false { panic!() } else { 10 };
     assert_eq!(x, 10);
diff --git a/src/test/run-pass/expr-if-unique.rs b/src/test/ui/expr-if-unique.rs
index ef76fb27e9d..509d069d40f 100644
--- a/src/test/run-pass/expr-if-unique.rs
+++ b/src/test/ui/expr-if-unique.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(box_syntax)]
 
 // Tests for if as expressions returning boxed types
diff --git a/src/test/run-pass/expr-if.rs b/src/test/ui/expr-if.rs
index 4b8d363b020..2b8474ff453 100644
--- a/src/test/run-pass/expr-if.rs
+++ b/src/test/ui/expr-if.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests for if as expressions
 
 fn test_if() { let rs: bool = if true { true } else { false }; assert!((rs)); }
diff --git a/src/test/run-pass/expr-scope.rs b/src/test/ui/expr-scope.rs
index 15bb4a2eb0b..9976b6814c0 100644
--- a/src/test/run-pass/expr-scope.rs
+++ b/src/test/ui/expr-scope.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Regression test for issue #762
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/ext-expand-inner-exprs.rs b/src/test/ui/ext-expand-inner-exprs.rs
index a32b3d7f002..5bbdf5ec956 100644
--- a/src/test/run-pass/ext-expand-inner-exprs.rs
+++ b/src/test/ui/ext-expand-inner-exprs.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 static FOO : &'static str = concat!(concat!("hel", "lo"), "world");
 
 pub fn main() {
diff --git a/src/test/run-pass/extend-for-unit.rs b/src/test/ui/extend-for-unit.rs
index 1c1e61239b7..01d743f70bc 100644
--- a/src/test/run-pass/extend-for-unit.rs
+++ b/src/test/ui/extend-for-unit.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let mut x = 0;
     {
diff --git a/src/test/run-pass/exterior.rs b/src/test/ui/exterior.rs
index 01ed7dbac1f..6f2c37926be 100644
--- a/src/test/run-pass/exterior.rs
+++ b/src/test/ui/exterior.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 
diff --git a/src/test/run-pass/extern/auxiliary/extern-crosscrate-source.rs b/src/test/ui/extern/auxiliary/extern-crosscrate-source.rs
index d4568d38e25..d4568d38e25 100644
--- a/src/test/run-pass/extern/auxiliary/extern-crosscrate-source.rs
+++ b/src/test/ui/extern/auxiliary/extern-crosscrate-source.rs
diff --git a/src/test/run-pass/extern/auxiliary/extern-take-value.rs b/src/test/ui/extern/auxiliary/extern-take-value.rs
index 869e794cc8a..869e794cc8a 100644
--- a/src/test/run-pass/extern/auxiliary/extern-take-value.rs
+++ b/src/test/ui/extern/auxiliary/extern-take-value.rs
diff --git a/src/test/run-pass/extern/auxiliary/extern_calling_convention.rs b/src/test/ui/extern/auxiliary/extern_calling_convention.rs
index 968b1a25510..968b1a25510 100644
--- a/src/test/run-pass/extern/auxiliary/extern_calling_convention.rs
+++ b/src/test/ui/extern/auxiliary/extern_calling_convention.rs
diff --git a/src/test/run-pass/extern/auxiliary/extern_mod_ordering_lib.rs b/src/test/ui/extern/auxiliary/extern_mod_ordering_lib.rs
index 7357f59700e..7357f59700e 100644
--- a/src/test/run-pass/extern/auxiliary/extern_mod_ordering_lib.rs
+++ b/src/test/ui/extern/auxiliary/extern_mod_ordering_lib.rs
diff --git a/src/test/run-pass/extern/auxiliary/fat_drop.rs b/src/test/ui/extern/auxiliary/fat_drop.rs
index 768d29876b9..768d29876b9 100644
--- a/src/test/run-pass/extern/auxiliary/fat_drop.rs
+++ b/src/test/ui/extern/auxiliary/fat_drop.rs
diff --git a/src/test/run-pass/extern/extern-1.rs b/src/test/ui/extern/extern-1.rs
index eb9aabc87bc..eb9aabc87bc 100644
--- a/src/test/run-pass/extern/extern-1.rs
+++ b/src/test/ui/extern/extern-1.rs
diff --git a/src/test/run-pass/extern/extern-call-deep.rs b/src/test/ui/extern/extern-call-deep.rs
index 81f884dada9..81f884dada9 100644
--- a/src/test/run-pass/extern/extern-call-deep.rs
+++ b/src/test/ui/extern/extern-call-deep.rs
diff --git a/src/test/run-pass/extern/extern-call-deep2.rs b/src/test/ui/extern/extern-call-deep2.rs
index b31489b1e10..b31489b1e10 100644
--- a/src/test/run-pass/extern/extern-call-deep2.rs
+++ b/src/test/ui/extern/extern-call-deep2.rs
diff --git a/src/test/run-pass/extern/extern-call-direct.rs b/src/test/ui/extern/extern-call-direct.rs
index 72041764215..72041764215 100644
--- a/src/test/run-pass/extern/extern-call-direct.rs
+++ b/src/test/ui/extern/extern-call-direct.rs
diff --git a/src/test/run-pass/extern/extern-call-indirect.rs b/src/test/ui/extern/extern-call-indirect.rs
index 158b54e4b8c..158b54e4b8c 100644
--- a/src/test/run-pass/extern/extern-call-indirect.rs
+++ b/src/test/ui/extern/extern-call-indirect.rs
diff --git a/src/test/run-pass/extern/extern-call-scrub.rs b/src/test/ui/extern/extern-call-scrub.rs
index a7b1065c9e1..a7b1065c9e1 100644
--- a/src/test/run-pass/extern/extern-call-scrub.rs
+++ b/src/test/ui/extern/extern-call-scrub.rs
diff --git a/src/test/run-pass/extern/extern-calling-convention-test.rs b/src/test/ui/extern/extern-calling-convention-test.rs
index 7231a7cde85..7231a7cde85 100644
--- a/src/test/run-pass/extern/extern-calling-convention-test.rs
+++ b/src/test/ui/extern/extern-calling-convention-test.rs
diff --git a/src/test/run-pass/extern/extern-compare-with-return-type.rs b/src/test/ui/extern/extern-compare-with-return-type.rs
index 6c9ed3760f6..6c9ed3760f6 100644
--- a/src/test/run-pass/extern/extern-compare-with-return-type.rs
+++ b/src/test/ui/extern/extern-compare-with-return-type.rs
diff --git a/src/test/run-pass/extern/extern-crosscrate.rs b/src/test/ui/extern/extern-crosscrate.rs
index 123ce20ca26..123ce20ca26 100644
--- a/src/test/run-pass/extern/extern-crosscrate.rs
+++ b/src/test/ui/extern/extern-crosscrate.rs
diff --git a/src/test/run-pass/extern/extern-foreign-crate.rs b/src/test/ui/extern/extern-foreign-crate.rs
index 7f774c44277..7f774c44277 100644
--- a/src/test/run-pass/extern/extern-foreign-crate.rs
+++ b/src/test/ui/extern/extern-foreign-crate.rs
diff --git a/src/test/run-pass/extern/extern-methods.rs b/src/test/ui/extern/extern-methods.rs
index b142ec59e88..b142ec59e88 100644
--- a/src/test/run-pass/extern/extern-methods.rs
+++ b/src/test/ui/extern/extern-methods.rs
diff --git a/src/test/run-pass/extern/extern-mod-abi.rs b/src/test/ui/extern/extern-mod-abi.rs
index c543394cca0..c543394cca0 100644
--- a/src/test/run-pass/extern/extern-mod-abi.rs
+++ b/src/test/ui/extern/extern-mod-abi.rs
diff --git a/src/test/run-pass/extern/extern-mod-ordering-exe.rs b/src/test/ui/extern/extern-mod-ordering-exe.rs
index d7cc4dffb44..d7cc4dffb44 100644
--- a/src/test/run-pass/extern/extern-mod-ordering-exe.rs
+++ b/src/test/ui/extern/extern-mod-ordering-exe.rs
diff --git a/src/test/run-pass/extern/extern-pass-TwoU16s.rs b/src/test/ui/extern/extern-pass-TwoU16s.rs
index 285bce2e19c..285bce2e19c 100644
--- a/src/test/run-pass/extern/extern-pass-TwoU16s.rs
+++ b/src/test/ui/extern/extern-pass-TwoU16s.rs
diff --git a/src/test/run-pass/extern/extern-pass-TwoU32s.rs b/src/test/ui/extern/extern-pass-TwoU32s.rs
index fb18aa8d22f..fb18aa8d22f 100644
--- a/src/test/run-pass/extern/extern-pass-TwoU32s.rs
+++ b/src/test/ui/extern/extern-pass-TwoU32s.rs
diff --git a/src/test/run-pass/extern/extern-pass-TwoU64s.rs b/src/test/ui/extern/extern-pass-TwoU64s.rs
index 419648263aa..419648263aa 100644
--- a/src/test/run-pass/extern/extern-pass-TwoU64s.rs
+++ b/src/test/ui/extern/extern-pass-TwoU64s.rs
diff --git a/src/test/run-pass/extern/extern-pass-TwoU8s.rs b/src/test/ui/extern/extern-pass-TwoU8s.rs
index 53a6a0f29f8..53a6a0f29f8 100644
--- a/src/test/run-pass/extern/extern-pass-TwoU8s.rs
+++ b/src/test/ui/extern/extern-pass-TwoU8s.rs
diff --git a/src/test/run-pass/extern/extern-pass-char.rs b/src/test/ui/extern/extern-pass-char.rs
index 22f841b4552..22f841b4552 100644
--- a/src/test/run-pass/extern/extern-pass-char.rs
+++ b/src/test/ui/extern/extern-pass-char.rs
diff --git a/src/test/run-pass/extern/extern-pass-double.rs b/src/test/ui/extern/extern-pass-double.rs
index dbd0a2dfa48..dbd0a2dfa48 100644
--- a/src/test/run-pass/extern/extern-pass-double.rs
+++ b/src/test/ui/extern/extern-pass-double.rs
diff --git a/src/test/run-pass/extern/extern-pass-empty.rs b/src/test/ui/extern/extern-pass-empty.rs
index 07099a24204..07099a24204 100644
--- a/src/test/run-pass/extern/extern-pass-empty.rs
+++ b/src/test/ui/extern/extern-pass-empty.rs
diff --git a/src/test/run-pass/extern/extern-pass-u32.rs b/src/test/ui/extern/extern-pass-u32.rs
index f2efdb7d366..f2efdb7d366 100644
--- a/src/test/run-pass/extern/extern-pass-u32.rs
+++ b/src/test/ui/extern/extern-pass-u32.rs
diff --git a/src/test/run-pass/extern/extern-pass-u64.rs b/src/test/ui/extern/extern-pass-u64.rs
index 975446d430c..975446d430c 100644
--- a/src/test/run-pass/extern/extern-pass-u64.rs
+++ b/src/test/ui/extern/extern-pass-u64.rs
diff --git a/src/test/run-pass/extern/extern-prelude-core.rs b/src/test/ui/extern/extern-prelude-core.rs
index f0d43404b00..f0d43404b00 100644
--- a/src/test/run-pass/extern/extern-prelude-core.rs
+++ b/src/test/ui/extern/extern-prelude-core.rs
diff --git a/src/test/run-pass/extern/extern-prelude-core.stderr b/src/test/ui/extern/extern-prelude-core.stderr
index f90eb933d3f..f90eb933d3f 100644
--- a/src/test/run-pass/extern/extern-prelude-core.stderr
+++ b/src/test/ui/extern/extern-prelude-core.stderr
diff --git a/src/test/run-pass/extern/extern-prelude-no-speculative.rs b/src/test/ui/extern/extern-prelude-no-speculative.rs
index cc00737ab59..cc00737ab59 100644
--- a/src/test/run-pass/extern/extern-prelude-no-speculative.rs
+++ b/src/test/ui/extern/extern-prelude-no-speculative.rs
diff --git a/src/test/run-pass/extern/extern-prelude-std.rs b/src/test/ui/extern/extern-prelude-std.rs
index 3d28448ee86..3d28448ee86 100644
--- a/src/test/run-pass/extern/extern-prelude-std.rs
+++ b/src/test/ui/extern/extern-prelude-std.rs
diff --git a/src/test/run-pass/extern/extern-prelude-std.stderr b/src/test/ui/extern/extern-prelude-std.stderr
index 73b1dcfd5e1..73b1dcfd5e1 100644
--- a/src/test/run-pass/extern/extern-prelude-std.stderr
+++ b/src/test/ui/extern/extern-prelude-std.stderr
diff --git a/src/test/run-pass/extern/extern-pub.rs b/src/test/ui/extern/extern-pub.rs
index c97e04b0755..c97e04b0755 100644
--- a/src/test/run-pass/extern/extern-pub.rs
+++ b/src/test/ui/extern/extern-pub.rs
diff --git a/src/test/run-pass/extern/extern-return-TwoU16s.rs b/src/test/ui/extern/extern-return-TwoU16s.rs
index dd884ee77fe..dd884ee77fe 100644
--- a/src/test/run-pass/extern/extern-return-TwoU16s.rs
+++ b/src/test/ui/extern/extern-return-TwoU16s.rs
diff --git a/src/test/run-pass/extern/extern-return-TwoU32s.rs b/src/test/ui/extern/extern-return-TwoU32s.rs
index d6aaf5c9eaf..d6aaf5c9eaf 100644
--- a/src/test/run-pass/extern/extern-return-TwoU32s.rs
+++ b/src/test/ui/extern/extern-return-TwoU32s.rs
diff --git a/src/test/run-pass/extern/extern-return-TwoU64s.rs b/src/test/ui/extern/extern-return-TwoU64s.rs
index c5e4ebadc18..c5e4ebadc18 100644
--- a/src/test/run-pass/extern/extern-return-TwoU64s.rs
+++ b/src/test/ui/extern/extern-return-TwoU64s.rs
diff --git a/src/test/run-pass/extern/extern-return-TwoU8s.rs b/src/test/ui/extern/extern-return-TwoU8s.rs
index a7cd21b2073..a7cd21b2073 100644
--- a/src/test/run-pass/extern/extern-return-TwoU8s.rs
+++ b/src/test/ui/extern/extern-return-TwoU8s.rs
diff --git a/src/test/run-pass/extern/extern-rust.rs b/src/test/ui/extern/extern-rust.rs
index 0cb190257be..0cb190257be 100644
--- a/src/test/run-pass/extern/extern-rust.rs
+++ b/src/test/ui/extern/extern-rust.rs
diff --git a/src/test/run-pass/extern/extern-take-value.rs b/src/test/ui/extern/extern-take-value.rs
index c09a774361f..c09a774361f 100644
--- a/src/test/run-pass/extern/extern-take-value.rs
+++ b/src/test/ui/extern/extern-take-value.rs
diff --git a/src/test/run-pass/extern/extern-thiscall.rs b/src/test/ui/extern/extern-thiscall.rs
index e556c0512e9..e556c0512e9 100644
--- a/src/test/run-pass/extern/extern-thiscall.rs
+++ b/src/test/ui/extern/extern-thiscall.rs
diff --git a/src/test/run-pass/extern/extern-types-inherent-impl.rs b/src/test/ui/extern/extern-types-inherent-impl.rs
index fc98f55dc07..fc98f55dc07 100644
--- a/src/test/run-pass/extern/extern-types-inherent-impl.rs
+++ b/src/test/ui/extern/extern-types-inherent-impl.rs
diff --git a/src/test/run-pass/extern/extern-types-manual-sync-send.rs b/src/test/ui/extern/extern-types-manual-sync-send.rs
index ec63e5d40b9..ec63e5d40b9 100644
--- a/src/test/run-pass/extern/extern-types-manual-sync-send.rs
+++ b/src/test/ui/extern/extern-types-manual-sync-send.rs
diff --git a/src/test/run-pass/extern/extern-types-pointer-cast.rs b/src/test/ui/extern/extern-types-pointer-cast.rs
index a4ebd3cf71e..a4ebd3cf71e 100644
--- a/src/test/run-pass/extern/extern-types-pointer-cast.rs
+++ b/src/test/ui/extern/extern-types-pointer-cast.rs
diff --git a/src/test/run-pass/extern/extern-types-size_of_val.rs b/src/test/ui/extern/extern-types-size_of_val.rs
index 1c965609758..1c965609758 100644
--- a/src/test/run-pass/extern/extern-types-size_of_val.rs
+++ b/src/test/ui/extern/extern-types-size_of_val.rs
diff --git a/src/test/run-pass/extern/extern-types-thin-pointer.rs b/src/test/ui/extern/extern-types-thin-pointer.rs
index 83c35f7af78..83c35f7af78 100644
--- a/src/test/run-pass/extern/extern-types-thin-pointer.rs
+++ b/src/test/ui/extern/extern-types-thin-pointer.rs
diff --git a/src/test/run-pass/extern/extern-types-trait-impl.rs b/src/test/ui/extern/extern-types-trait-impl.rs
index 6cce6c723c5..6cce6c723c5 100644
--- a/src/test/run-pass/extern/extern-types-trait-impl.rs
+++ b/src/test/ui/extern/extern-types-trait-impl.rs
diff --git a/src/test/run-pass/extern/extern-vectorcall.rs b/src/test/ui/extern/extern-vectorcall.rs
index 1427a8f55cb..1427a8f55cb 100644
--- a/src/test/run-pass/extern/extern-vectorcall.rs
+++ b/src/test/ui/extern/extern-vectorcall.rs
diff --git a/src/test/run-pass/extern/extern_fat_drop.rs b/src/test/ui/extern/extern_fat_drop.rs
index 1cd12c2cab3..1cd12c2cab3 100644
--- a/src/test/run-pass/extern/extern_fat_drop.rs
+++ b/src/test/ui/extern/extern_fat_drop.rs
diff --git a/src/test/run-pass/extoption_env-not-defined.rs b/src/test/ui/extoption_env-not-defined.rs
index 7a2a2afad5c..4014902ffed 100644
--- a/src/test/run-pass/extoption_env-not-defined.rs
+++ b/src/test/ui/extoption_env-not-defined.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     assert!(option_env!("__HOPEFULLY_DOESNT_EXIST__").is_none());
 }
diff --git a/src/test/run-pass/fact.rs b/src/test/ui/fact.rs
index 0dd68c991ad..c6c2f57e75c 100644
--- a/src/test/run-pass/fact.rs
+++ b/src/test/ui/fact.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn f(x: isize) -> isize {
     // println!("in f:");
 
diff --git a/src/test/run-pass/fat-lto.rs b/src/test/ui/fat-lto.rs
index fb741200d3c..c8d8095a265 100644
--- a/src/test/run-pass/fat-lto.rs
+++ b/src/test/ui/fat-lto.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Clto=fat
 // no-prefer-dynamic
 
diff --git a/src/test/run-pass/fat-ptr-cast.rs b/src/test/ui/fat-ptr-cast-rpass.rs
index 1943abe9e14..5f5e621d762 100644
--- a/src/test/run-pass/fat-ptr-cast.rs
+++ b/src/test/ui/fat-ptr-cast-rpass.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(raw)]
 
 use std::mem;
diff --git a/src/test/run-pass/fds-are-cloexec.rs b/src/test/ui/fds-are-cloexec.rs
index c4091f84af9..2010b5b6680 100644
--- a/src/test/run-pass/fds-are-cloexec.rs
+++ b/src/test/ui/fds-are-cloexec.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-windows
 // ignore-android
 // ignore-cloudabi no processes
diff --git a/src/test/ui/feature-gates/feature-gate-asm.rs b/src/test/ui/feature-gates/feature-gate-asm.rs
index 572d9f26cae..1fce279c9ef 100644
--- a/src/test/ui/feature-gates/feature-gate-asm.rs
+++ b/src/test/ui/feature-gates/feature-gate-asm.rs
@@ -1,3 +1,5 @@
+// ignore-emscripten
+
 fn main() {
     unsafe {
         asm!(""); //~ ERROR inline assembly is not stable enough
diff --git a/src/test/ui/feature-gates/feature-gate-asm.stderr b/src/test/ui/feature-gates/feature-gate-asm.stderr
index ab5cda43bfc..bfa4c87bed5 100644
--- a/src/test/ui/feature-gates/feature-gate-asm.stderr
+++ b/src/test/ui/feature-gates/feature-gate-asm.stderr
@@ -1,5 +1,5 @@
 error[E0658]: use of unstable library feature 'asm': inline assembly is not stable enough for use and is subject to change
-  --> $DIR/feature-gate-asm.rs:3:9
+  --> $DIR/feature-gate-asm.rs:5:9
    |
 LL |         asm!("");
    |         ^^^
diff --git a/src/test/ui/feature-gates/feature-gate-asm2.rs b/src/test/ui/feature-gates/feature-gate-asm2.rs
index 259b0a14e5c..82900eb7e6c 100644
--- a/src/test/ui/feature-gates/feature-gate-asm2.rs
+++ b/src/test/ui/feature-gates/feature-gate-asm2.rs
@@ -1,4 +1,5 @@
 // gate-test-asm
+// ignore-emscripten
 
 fn main() {
     unsafe {
diff --git a/src/test/ui/feature-gates/feature-gate-asm2.stderr b/src/test/ui/feature-gates/feature-gate-asm2.stderr
index 7519cad9a96..e985818f30e 100644
--- a/src/test/ui/feature-gates/feature-gate-asm2.stderr
+++ b/src/test/ui/feature-gates/feature-gate-asm2.stderr
@@ -1,5 +1,5 @@
 error[E0658]: use of unstable library feature 'asm': inline assembly is not stable enough for use and is subject to change
-  --> $DIR/feature-gate-asm2.rs:5:26
+  --> $DIR/feature-gate-asm2.rs:6:26
    |
 LL |         println!("{:?}", asm!(""));
    |                          ^^^
diff --git a/src/test/run-pass/filter-block-view-items.rs b/src/test/ui/filter-block-view-items.rs
index d2b9866504a..e63aa91577b 100644
--- a/src/test/run-pass/filter-block-view-items.rs
+++ b/src/test/ui/filter-block-view-items.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 pub fn main() {
diff --git a/src/test/run-pass/fixup-deref-mut.rs b/src/test/ui/fixup-deref-mut.rs
index a35412fea3f..6b2fd72b895 100644
--- a/src/test/run-pass/fixup-deref-mut.rs
+++ b/src/test/ui/fixup-deref-mut.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/for-loop-while/auto-loop.rs b/src/test/ui/for-loop-while/auto-loop.rs
index f02ac43c734..f02ac43c734 100644
--- a/src/test/run-pass/for-loop-while/auto-loop.rs
+++ b/src/test/ui/for-loop-while/auto-loop.rs
diff --git a/src/test/run-pass/for-loop-while/break-value.rs b/src/test/ui/for-loop-while/break-value.rs
index 9fc49fa8181..9fc49fa8181 100644
--- a/src/test/run-pass/for-loop-while/break-value.rs
+++ b/src/test/ui/for-loop-while/break-value.rs
diff --git a/src/test/run-pass/for-loop-while/break.rs b/src/test/ui/for-loop-while/break.rs
index 427b1b7a063..427b1b7a063 100644
--- a/src/test/run-pass/for-loop-while/break.rs
+++ b/src/test/ui/for-loop-while/break.rs
diff --git a/src/test/run-pass/for-loop-while/for-destruct.rs b/src/test/ui/for-loop-while/for-destruct.rs
index 7ca8d4ded25..7ca8d4ded25 100644
--- a/src/test/run-pass/for-loop-while/for-destruct.rs
+++ b/src/test/ui/for-loop-while/for-destruct.rs
diff --git a/src/test/run-pass/for-loop-while/for-loop-goofiness.rs b/src/test/ui/for-loop-while/for-loop-goofiness.rs
index 872ab168bb2..872ab168bb2 100644
--- a/src/test/run-pass/for-loop-while/for-loop-goofiness.rs
+++ b/src/test/ui/for-loop-while/for-loop-goofiness.rs
diff --git a/src/test/run-pass/for-loop-while/for-loop-has-unit-body.rs b/src/test/ui/for-loop-while/for-loop-has-unit-body.rs
index 38c34d2dc2e..38c34d2dc2e 100644
--- a/src/test/run-pass/for-loop-while/for-loop-has-unit-body.rs
+++ b/src/test/ui/for-loop-while/for-loop-has-unit-body.rs
diff --git a/src/test/run-pass/for-loop-while/for-loop-into-iterator.rs b/src/test/ui/for-loop-while/for-loop-into-iterator.rs
index 199d4ddb299..199d4ddb299 100644
--- a/src/test/run-pass/for-loop-while/for-loop-into-iterator.rs
+++ b/src/test/ui/for-loop-while/for-loop-into-iterator.rs
diff --git a/src/test/run-pass/for-loop-while/for-loop-lifetime-of-unbound-values.rs b/src/test/ui/for-loop-while/for-loop-lifetime-of-unbound-values.rs
index 6a38764a131..6a38764a131 100644
--- a/src/test/run-pass/for-loop-while/for-loop-lifetime-of-unbound-values.rs
+++ b/src/test/ui/for-loop-while/for-loop-lifetime-of-unbound-values.rs
diff --git a/src/test/run-pass/for-loop-while/for-loop-macro.rs b/src/test/ui/for-loop-while/for-loop-macro.rs
index 5abccd2a141..5abccd2a141 100644
--- a/src/test/run-pass/for-loop-while/for-loop-macro.rs
+++ b/src/test/ui/for-loop-while/for-loop-macro.rs
diff --git a/src/test/run-pass/for-loop-while/for-loop-mut-ref-element.rs b/src/test/ui/for-loop-while/for-loop-mut-ref-element.rs
index a3d82ace9e2..a3d82ace9e2 100644
--- a/src/test/run-pass/for-loop-while/for-loop-mut-ref-element.rs
+++ b/src/test/ui/for-loop-while/for-loop-mut-ref-element.rs
diff --git a/src/test/run-pass/for-loop-while/for-loop-no-std.rs b/src/test/ui/for-loop-while/for-loop-no-std.rs
index 65a33c5f16f..65a33c5f16f 100644
--- a/src/test/run-pass/for-loop-while/for-loop-no-std.rs
+++ b/src/test/ui/for-loop-while/for-loop-no-std.rs
diff --git a/src/test/run-pass/for-loop-while/for-loop-panic.rs b/src/test/ui/for-loop-while/for-loop-panic.rs
index ac607d6d731..ac607d6d731 100644
--- a/src/test/run-pass/for-loop-while/for-loop-panic.rs
+++ b/src/test/ui/for-loop-while/for-loop-panic.rs
diff --git a/src/test/run-pass/for-loop-while/for-loop-unconstrained-element-type-i32-fallback.rs b/src/test/ui/for-loop-while/for-loop-unconstrained-element-type-i32-fallback.rs
index a1e9b1ed87d..a1e9b1ed87d 100644
--- a/src/test/run-pass/for-loop-while/for-loop-unconstrained-element-type-i32-fallback.rs
+++ b/src/test/ui/for-loop-while/for-loop-unconstrained-element-type-i32-fallback.rs
diff --git a/src/test/run-pass/for-loop-while/foreach-external-iterators-break.rs b/src/test/ui/for-loop-while/foreach-external-iterators-break.rs
index 7de6a4f8acb..7de6a4f8acb 100644
--- a/src/test/run-pass/for-loop-while/foreach-external-iterators-break.rs
+++ b/src/test/ui/for-loop-while/foreach-external-iterators-break.rs
diff --git a/src/test/run-pass/for-loop-while/foreach-external-iterators-hashmap-break-restart.rs b/src/test/ui/for-loop-while/foreach-external-iterators-hashmap-break-restart.rs
index 5d690807e05..5d690807e05 100644
--- a/src/test/run-pass/for-loop-while/foreach-external-iterators-hashmap-break-restart.rs
+++ b/src/test/ui/for-loop-while/foreach-external-iterators-hashmap-break-restart.rs
diff --git a/src/test/run-pass/for-loop-while/foreach-external-iterators-hashmap.rs b/src/test/ui/for-loop-while/foreach-external-iterators-hashmap.rs
index 9f2ca05cdb6..9f2ca05cdb6 100644
--- a/src/test/run-pass/for-loop-while/foreach-external-iterators-hashmap.rs
+++ b/src/test/ui/for-loop-while/foreach-external-iterators-hashmap.rs
diff --git a/src/test/run-pass/for-loop-while/foreach-external-iterators-loop.rs b/src/test/ui/for-loop-while/foreach-external-iterators-loop.rs
index 78af195bc20..78af195bc20 100644
--- a/src/test/run-pass/for-loop-while/foreach-external-iterators-loop.rs
+++ b/src/test/ui/for-loop-while/foreach-external-iterators-loop.rs
diff --git a/src/test/run-pass/for-loop-while/foreach-external-iterators-nested.rs b/src/test/ui/for-loop-while/foreach-external-iterators-nested.rs
index 8a95f160a1a..8a95f160a1a 100644
--- a/src/test/run-pass/for-loop-while/foreach-external-iterators-nested.rs
+++ b/src/test/ui/for-loop-while/foreach-external-iterators-nested.rs
diff --git a/src/test/run-pass/for-loop-while/foreach-external-iterators.rs b/src/test/ui/for-loop-while/foreach-external-iterators.rs
index 24ecfe9b60d..24ecfe9b60d 100644
--- a/src/test/run-pass/for-loop-while/foreach-external-iterators.rs
+++ b/src/test/ui/for-loop-while/foreach-external-iterators.rs
diff --git a/src/test/run-pass/for-loop-while/foreach-nested.rs b/src/test/ui/for-loop-while/foreach-nested.rs
index bb6edbc0797..bb6edbc0797 100644
--- a/src/test/run-pass/for-loop-while/foreach-nested.rs
+++ b/src/test/ui/for-loop-while/foreach-nested.rs
diff --git a/src/test/run-pass/for-loop-while/foreach-put-structured.rs b/src/test/ui/for-loop-while/foreach-put-structured.rs
index 3a47fcf3415..3a47fcf3415 100644
--- a/src/test/run-pass/for-loop-while/foreach-put-structured.rs
+++ b/src/test/ui/for-loop-while/foreach-put-structured.rs
diff --git a/src/test/run-pass/for-loop-while/foreach-simple-outer-slot.rs b/src/test/ui/for-loop-while/foreach-simple-outer-slot.rs
index a8d42a789ba..a8d42a789ba 100644
--- a/src/test/run-pass/for-loop-while/foreach-simple-outer-slot.rs
+++ b/src/test/ui/for-loop-while/foreach-simple-outer-slot.rs
diff --git a/src/test/run-pass/for-loop-while/label_break_value.rs b/src/test/ui/for-loop-while/label_break_value.rs
index eb5be7742e0..eb5be7742e0 100644
--- a/src/test/run-pass/for-loop-while/label_break_value.rs
+++ b/src/test/ui/for-loop-while/label_break_value.rs
diff --git a/src/test/run-pass/for-loop-while/labeled-break.rs b/src/test/ui/for-loop-while/labeled-break.rs
index 4dacc57574f..4dacc57574f 100644
--- a/src/test/run-pass/for-loop-while/labeled-break.rs
+++ b/src/test/ui/for-loop-while/labeled-break.rs
diff --git a/src/test/run-pass/for-loop-while/linear-for-loop.rs b/src/test/ui/for-loop-while/linear-for-loop.rs
index 3c573db1d77..3c573db1d77 100644
--- a/src/test/run-pass/for-loop-while/linear-for-loop.rs
+++ b/src/test/ui/for-loop-while/linear-for-loop.rs
diff --git a/src/test/run-pass/for-loop-while/liveness-assign-imm-local-after-loop.rs b/src/test/ui/for-loop-while/liveness-assign-imm-local-after-loop.rs
index 11b6971656f..11b6971656f 100644
--- a/src/test/run-pass/for-loop-while/liveness-assign-imm-local-after-loop.rs
+++ b/src/test/ui/for-loop-while/liveness-assign-imm-local-after-loop.rs
diff --git a/src/test/run-pass/for-loop-while/liveness-loop-break.rs b/src/test/ui/for-loop-while/liveness-loop-break.rs
index 60a63bccb10..60a63bccb10 100644
--- a/src/test/run-pass/for-loop-while/liveness-loop-break.rs
+++ b/src/test/ui/for-loop-while/liveness-loop-break.rs
diff --git a/src/test/run-pass/for-loop-while/liveness-move-in-loop.rs b/src/test/ui/for-loop-while/liveness-move-in-loop.rs
index ce73d6335cb..ce73d6335cb 100644
--- a/src/test/run-pass/for-loop-while/liveness-move-in-loop.rs
+++ b/src/test/ui/for-loop-while/liveness-move-in-loop.rs
diff --git a/src/test/run-pass/for-loop-while/loop-break-cont-1.rs b/src/test/ui/for-loop-while/loop-break-cont-1.rs
index f207746f085..f207746f085 100644
--- a/src/test/run-pass/for-loop-while/loop-break-cont-1.rs
+++ b/src/test/ui/for-loop-while/loop-break-cont-1.rs
diff --git a/src/test/run-pass/for-loop-while/loop-break-cont.rs b/src/test/ui/for-loop-while/loop-break-cont.rs
index 92d5a32c62b..92d5a32c62b 100644
--- a/src/test/run-pass/for-loop-while/loop-break-cont.rs
+++ b/src/test/ui/for-loop-while/loop-break-cont.rs
diff --git a/src/test/run-pass/for-loop-while/loop-break-value.rs b/src/test/ui/for-loop-while/loop-break-value.rs
index e1edbbb929e..e1edbbb929e 100644
--- a/src/test/run-pass/for-loop-while/loop-break-value.rs
+++ b/src/test/ui/for-loop-while/loop-break-value.rs
diff --git a/src/test/run-pass/for-loop-while/loop-diverges.rs b/src/test/ui/for-loop-while/loop-diverges.rs
index f657bf9e0b3..f657bf9e0b3 100644
--- a/src/test/run-pass/for-loop-while/loop-diverges.rs
+++ b/src/test/ui/for-loop-while/loop-diverges.rs
diff --git a/src/test/run-pass/for-loop-while/loop-label-shadowing.rs b/src/test/ui/for-loop-while/loop-label-shadowing.rs
index acb53e254bb..acb53e254bb 100644
--- a/src/test/run-pass/for-loop-while/loop-label-shadowing.rs
+++ b/src/test/ui/for-loop-while/loop-label-shadowing.rs
diff --git a/src/test/run-pass/for-loop-while/loop-labeled-break-value.rs b/src/test/ui/for-loop-while/loop-labeled-break-value.rs
index cc8f826983b..cc8f826983b 100644
--- a/src/test/run-pass/for-loop-while/loop-labeled-break-value.rs
+++ b/src/test/ui/for-loop-while/loop-labeled-break-value.rs
diff --git a/src/test/run-pass/for-loop-while/loop-no-reinit-needed-post-bot.rs b/src/test/ui/for-loop-while/loop-no-reinit-needed-post-bot.rs
index 1b5db20129d..1b5db20129d 100644
--- a/src/test/run-pass/for-loop-while/loop-no-reinit-needed-post-bot.rs
+++ b/src/test/ui/for-loop-while/loop-no-reinit-needed-post-bot.rs
diff --git a/src/test/run-pass/for-loop-while/loop-scope.rs b/src/test/ui/for-loop-while/loop-scope.rs
index 73324a3e1bd..73324a3e1bd 100644
--- a/src/test/run-pass/for-loop-while/loop-scope.rs
+++ b/src/test/ui/for-loop-while/loop-scope.rs
diff --git a/src/test/run-pass/for-loop-while/while-cont.rs b/src/test/ui/for-loop-while/while-cont.rs
index a864e8ef70a..a864e8ef70a 100644
--- a/src/test/run-pass/for-loop-while/while-cont.rs
+++ b/src/test/ui/for-loop-while/while-cont.rs
diff --git a/src/test/run-pass/for-loop-while/while-flow-graph.rs b/src/test/ui/for-loop-while/while-flow-graph.rs
index 1748964a7b2..1748964a7b2 100644
--- a/src/test/run-pass/for-loop-while/while-flow-graph.rs
+++ b/src/test/ui/for-loop-while/while-flow-graph.rs
diff --git a/src/test/run-pass/for-loop-while/while-label.rs b/src/test/ui/for-loop-while/while-label.rs
index 5abc41daf94..5abc41daf94 100644
--- a/src/test/run-pass/for-loop-while/while-label.rs
+++ b/src/test/ui/for-loop-while/while-label.rs
diff --git a/src/test/run-pass/for-loop-while/while-let.rs b/src/test/ui/for-loop-while/while-let.rs
index b9d70ff0b9d..b9d70ff0b9d 100644
--- a/src/test/run-pass/for-loop-while/while-let.rs
+++ b/src/test/ui/for-loop-while/while-let.rs
diff --git a/src/test/run-pass/for-loop-while/while-loop-constraints-2.rs b/src/test/ui/for-loop-while/while-loop-constraints-2.rs
index 3c5cdf06cd8..3c5cdf06cd8 100644
--- a/src/test/run-pass/for-loop-while/while-loop-constraints-2.rs
+++ b/src/test/ui/for-loop-while/while-loop-constraints-2.rs
diff --git a/src/test/run-pass/for-loop-while/while-prelude-drop.rs b/src/test/ui/for-loop-while/while-prelude-drop.rs
index 196b9daf6ec..196b9daf6ec 100644
--- a/src/test/run-pass/for-loop-while/while-prelude-drop.rs
+++ b/src/test/ui/for-loop-while/while-prelude-drop.rs
diff --git a/src/test/run-pass/for-loop-while/while-with-break.rs b/src/test/ui/for-loop-while/while-with-break.rs
index a9d52dda544..a9d52dda544 100644
--- a/src/test/run-pass/for-loop-while/while-with-break.rs
+++ b/src/test/ui/for-loop-while/while-with-break.rs
diff --git a/src/test/run-pass/for-loop-while/while.rs b/src/test/ui/for-loop-while/while.rs
index 90f718a3483..90f718a3483 100644
--- a/src/test/run-pass/for-loop-while/while.rs
+++ b/src/test/ui/for-loop-while/while.rs
diff --git a/src/test/run-pass/foreign/auxiliary/fn-abi.rs b/src/test/ui/foreign/auxiliary/fn-abi.rs
index 25c9e1b4ca3..25c9e1b4ca3 100644
--- a/src/test/run-pass/foreign/auxiliary/fn-abi.rs
+++ b/src/test/ui/foreign/auxiliary/fn-abi.rs
diff --git a/src/test/run-pass/foreign/auxiliary/foreign_lib.rs b/src/test/ui/foreign/auxiliary/foreign_lib.rs
index de6b0e2118a..de6b0e2118a 100644
--- a/src/test/run-pass/foreign/auxiliary/foreign_lib.rs
+++ b/src/test/ui/foreign/auxiliary/foreign_lib.rs
diff --git a/src/test/run-pass/foreign/foreign-call-no-runtime.rs b/src/test/ui/foreign/foreign-call-no-runtime.rs
index c6afa07ad05..c6afa07ad05 100644
--- a/src/test/run-pass/foreign/foreign-call-no-runtime.rs
+++ b/src/test/ui/foreign/foreign-call-no-runtime.rs
diff --git a/src/test/run-pass/foreign/foreign-dupe.rs b/src/test/ui/foreign/foreign-dupe.rs
index 3c9f0f583d4..3c9f0f583d4 100644
--- a/src/test/run-pass/foreign/foreign-dupe.rs
+++ b/src/test/ui/foreign/foreign-dupe.rs
diff --git a/src/test/run-pass/foreign/foreign-fn-linkname.rs b/src/test/ui/foreign/foreign-fn-linkname.rs
index 1f048159064..1f048159064 100644
--- a/src/test/run-pass/foreign/foreign-fn-linkname.rs
+++ b/src/test/ui/foreign/foreign-fn-linkname.rs
diff --git a/src/test/run-pass/foreign/foreign-fn-with-byval.rs b/src/test/ui/foreign/foreign-fn-with-byval.rs
index 3a35599aa57..3a35599aa57 100644
--- a/src/test/run-pass/foreign/foreign-fn-with-byval.rs
+++ b/src/test/ui/foreign/foreign-fn-with-byval.rs
diff --git a/src/test/run-pass/foreign/foreign-int-types.rs b/src/test/ui/foreign/foreign-int-types.rs
index 66296574d7d..66296574d7d 100644
--- a/src/test/run-pass/foreign/foreign-int-types.rs
+++ b/src/test/ui/foreign/foreign-int-types.rs
diff --git a/src/test/run-pass/foreign/foreign-mod-src/compiletest-ignore-dir b/src/test/ui/foreign/foreign-mod-src/compiletest-ignore-dir
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/run-pass/foreign/foreign-mod-src/compiletest-ignore-dir
+++ b/src/test/ui/foreign/foreign-mod-src/compiletest-ignore-dir
diff --git a/src/test/run-pass/foreign/foreign-mod-src/inner.rs b/src/test/ui/foreign/foreign-mod-src/inner.rs
index cf484878b07..cf484878b07 100644
--- a/src/test/run-pass/foreign/foreign-mod-src/inner.rs
+++ b/src/test/ui/foreign/foreign-mod-src/inner.rs
diff --git a/src/test/run-pass/foreign/foreign-mod-unused-const.rs b/src/test/ui/foreign/foreign-mod-unused-const.rs
index d9efbe00e52..d9efbe00e52 100644
--- a/src/test/run-pass/foreign/foreign-mod-unused-const.rs
+++ b/src/test/ui/foreign/foreign-mod-unused-const.rs
diff --git a/src/test/run-pass/foreign/foreign-no-abi.rs b/src/test/ui/foreign/foreign-no-abi.rs
index 2f33fb47656..2f33fb47656 100644
--- a/src/test/run-pass/foreign/foreign-no-abi.rs
+++ b/src/test/ui/foreign/foreign-no-abi.rs
diff --git a/src/test/run-pass/foreign/foreign-src/compiletest-ignore-dir b/src/test/ui/foreign/foreign-src/compiletest-ignore-dir
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/run-pass/foreign/foreign-src/compiletest-ignore-dir
+++ b/src/test/ui/foreign/foreign-src/compiletest-ignore-dir
diff --git a/src/test/run-pass/foreign/foreign-src/foreign.rs b/src/test/ui/foreign/foreign-src/foreign.rs
index 47016ad6ce7..47016ad6ce7 100644
--- a/src/test/run-pass/foreign/foreign-src/foreign.rs
+++ b/src/test/ui/foreign/foreign-src/foreign.rs
diff --git a/src/test/run-pass/foreign/foreign-truncated-arguments.rs b/src/test/ui/foreign/foreign-truncated-arguments.rs
index c61c2b587b6..c61c2b587b6 100644
--- a/src/test/run-pass/foreign/foreign-truncated-arguments.rs
+++ b/src/test/ui/foreign/foreign-truncated-arguments.rs
diff --git a/src/test/run-pass/foreign/foreign2.rs b/src/test/ui/foreign/foreign2.rs
index c1ab57776f6..c1ab57776f6 100644
--- a/src/test/run-pass/foreign/foreign2.rs
+++ b/src/test/ui/foreign/foreign2.rs
diff --git a/src/test/run-pass/format-hygiene.rs b/src/test/ui/format-hygiene.rs
index 4a797d19bad..6bf5ae8bead 100644
--- a/src/test/run-pass/format-hygiene.rs
+++ b/src/test/ui/format-hygiene.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_upper_case_globals)]
 pub const arg0: u8 = 1;
 
diff --git a/src/test/run-pass/format-nan.rs b/src/test/ui/format-nan.rs
index dbe2c61c494..e4a134fa2fb 100644
--- a/src/test/run-pass/format-nan.rs
+++ b/src/test/ui/format-nan.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     use std::f64;
     let x = "NaN".to_string();
diff --git a/src/test/run-pass/format-no-std.rs b/src/test/ui/format-no-std.rs
index 32f7a4a07c4..c9b7651bfda 100644
--- a/src/test/run-pass/format-no-std.rs
+++ b/src/test/ui/format-no-std.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-emscripten no no_std executables
 
 #![feature(lang_items, start)]
diff --git a/src/test/run-pass/format-ref-cell.rs b/src/test/ui/format-ref-cell.rs
index 0e7925af78f..afb2f8488b8 100644
--- a/src/test/run-pass/format-ref-cell.rs
+++ b/src/test/ui/format-ref-cell.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::cell::RefCell;
 
 pub fn main() {
diff --git a/src/test/run-pass/fsu-moves-and-copies.rs b/src/test/ui/fsu-moves-and-copies.rs
index f9544ec39a0..c41bcc73fa5 100644
--- a/src/test/run-pass/fsu-moves-and-copies.rs
+++ b/src/test/ui/fsu-moves-and-copies.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(stable_features)]
 // Issue 4691: Ensure that functional-struct-updates operates
diff --git a/src/test/run-pass/fun-call-variants.rs b/src/test/ui/fun-call-variants.rs
index e08878accc3..5b83e2620d8 100644
--- a/src/test/run-pass/fun-call-variants.rs
+++ b/src/test/ui/fun-call-variants.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn ho<F>(f: F) -> isize where F: FnOnce(isize) -> isize { let n: isize = f(3); return n; }
 
 fn direct(x: isize) -> isize { return x + 1; }
diff --git a/src/test/run-pass/fun-indirect-call.rs b/src/test/ui/fun-indirect-call.rs
index 81af4402c11..49da3d83f4a 100644
--- a/src/test/run-pass/fun-indirect-call.rs
+++ b/src/test/ui/fun-indirect-call.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn f() -> isize { return 42; }
 
 pub fn main() {
diff --git a/src/test/run-pass/functions-closures/auxiliary/fn-abi.rs b/src/test/ui/functions-closures/auxiliary/fn-abi.rs
index 25c9e1b4ca3..25c9e1b4ca3 100644
--- a/src/test/run-pass/functions-closures/auxiliary/fn-abi.rs
+++ b/src/test/ui/functions-closures/auxiliary/fn-abi.rs
diff --git a/src/test/run-pass/functions-closures/call-closure-from-overloaded-op.rs b/src/test/ui/functions-closures/call-closure-from-overloaded-op.rs
index 8e1c68fd77d..8e1c68fd77d 100644
--- a/src/test/run-pass/functions-closures/call-closure-from-overloaded-op.rs
+++ b/src/test/ui/functions-closures/call-closure-from-overloaded-op.rs
diff --git a/src/test/run-pass/functions-closures/capture-clauses-boxed-closures.rs b/src/test/ui/functions-closures/capture-clauses-boxed-closures.rs
index bcde504635d..bcde504635d 100644
--- a/src/test/run-pass/functions-closures/capture-clauses-boxed-closures.rs
+++ b/src/test/ui/functions-closures/capture-clauses-boxed-closures.rs
diff --git a/src/test/run-pass/functions-closures/capture-clauses-unboxed-closures.rs b/src/test/ui/functions-closures/capture-clauses-unboxed-closures.rs
index 206b3d7b613..206b3d7b613 100644
--- a/src/test/run-pass/functions-closures/capture-clauses-unboxed-closures.rs
+++ b/src/test/ui/functions-closures/capture-clauses-unboxed-closures.rs
diff --git a/src/test/run-pass/functions-closures/clone-closure.rs b/src/test/ui/functions-closures/clone-closure.rs
index 1e725d8056d..1e725d8056d 100644
--- a/src/test/run-pass/functions-closures/clone-closure.rs
+++ b/src/test/ui/functions-closures/clone-closure.rs
diff --git a/src/test/run-pass/functions-closures/closure-bounds-can-capture-chan.rs b/src/test/ui/functions-closures/closure-bounds-can-capture-chan.rs
index ccb2e201d7d..ccb2e201d7d 100644
--- a/src/test/run-pass/functions-closures/closure-bounds-can-capture-chan.rs
+++ b/src/test/ui/functions-closures/closure-bounds-can-capture-chan.rs
diff --git a/src/test/run-pass/functions-closures/closure-expected-type/README.md b/src/test/ui/functions-closures/closure-expected-type/README.md
index fd493e1ff37..fd493e1ff37 100644
--- a/src/test/run-pass/functions-closures/closure-expected-type/README.md
+++ b/src/test/ui/functions-closures/closure-expected-type/README.md
diff --git a/src/test/run-pass/functions-closures/closure-expected-type/expect-infer-supply-two-infers.rs b/src/test/ui/functions-closures/closure-expected-type/expect-infer-supply-two-infers.rs
index 6d5a9876c37..6d5a9876c37 100644
--- a/src/test/run-pass/functions-closures/closure-expected-type/expect-infer-supply-two-infers.rs
+++ b/src/test/ui/functions-closures/closure-expected-type/expect-infer-supply-two-infers.rs
diff --git a/src/test/run-pass/functions-closures/closure-expected-type/issue-38714.rs b/src/test/ui/functions-closures/closure-expected-type/issue-38714.rs
index e97785b5cac..e97785b5cac 100644
--- a/src/test/run-pass/functions-closures/closure-expected-type/issue-38714.rs
+++ b/src/test/ui/functions-closures/closure-expected-type/issue-38714.rs
diff --git a/src/test/run-pass/functions-closures/closure-expected-type/supply-just-return-type.rs b/src/test/ui/functions-closures/closure-expected-type/supply-just-return-type.rs
index e9964531c3c..e9964531c3c 100644
--- a/src/test/run-pass/functions-closures/closure-expected-type/supply-just-return-type.rs
+++ b/src/test/ui/functions-closures/closure-expected-type/supply-just-return-type.rs
diff --git a/src/test/run-pass/functions-closures/closure-expected-type/supply-nothing.rs b/src/test/ui/functions-closures/closure-expected-type/supply-nothing.rs
index 8665cfc21a7..8665cfc21a7 100644
--- a/src/test/run-pass/functions-closures/closure-expected-type/supply-nothing.rs
+++ b/src/test/ui/functions-closures/closure-expected-type/supply-nothing.rs
diff --git a/src/test/run-pass/functions-closures/closure-immediate.rs b/src/test/ui/functions-closures/closure-immediate.rs
index 428fc6bdef3..428fc6bdef3 100644
--- a/src/test/run-pass/functions-closures/closure-immediate.rs
+++ b/src/test/ui/functions-closures/closure-immediate.rs
diff --git a/src/test/run-pass/functions-closures/closure-inference.rs b/src/test/ui/functions-closures/closure-inference.rs
index 96878445245..96878445245 100644
--- a/src/test/run-pass/functions-closures/closure-inference.rs
+++ b/src/test/ui/functions-closures/closure-inference.rs
diff --git a/src/test/run-pass/functions-closures/closure-inference2.rs b/src/test/ui/functions-closures/closure-inference2.rs
index f2dfa5888aa..f2dfa5888aa 100644
--- a/src/test/run-pass/functions-closures/closure-inference2.rs
+++ b/src/test/ui/functions-closures/closure-inference2.rs
diff --git a/src/test/run-pass/functions-closures/closure-reform.rs b/src/test/ui/functions-closures/closure-reform.rs
index 0bb6159ff4a..0bb6159ff4a 100644
--- a/src/test/run-pass/functions-closures/closure-reform.rs
+++ b/src/test/ui/functions-closures/closure-reform.rs
diff --git a/src/test/run-pass/functions-closures/closure-returning-closure.rs b/src/test/ui/functions-closures/closure-returning-closure.rs
index 17db81687ab..17db81687ab 100644
--- a/src/test/run-pass/functions-closures/closure-returning-closure.rs
+++ b/src/test/ui/functions-closures/closure-returning-closure.rs
diff --git a/src/test/run-pass/functions-closures/closure-to-fn-coercion.rs b/src/test/ui/functions-closures/closure-to-fn-coercion.rs
index 4f43c2bb538..4f43c2bb538 100644
--- a/src/test/run-pass/functions-closures/closure-to-fn-coercion.rs
+++ b/src/test/ui/functions-closures/closure-to-fn-coercion.rs
diff --git a/src/test/run-pass/functions-closures/closure_to_fn_coercion-expected-types.rs b/src/test/ui/functions-closures/closure_to_fn_coercion-expected-types.rs
index e7a9383950f..e7a9383950f 100644
--- a/src/test/run-pass/functions-closures/closure_to_fn_coercion-expected-types.rs
+++ b/src/test/ui/functions-closures/closure_to_fn_coercion-expected-types.rs
diff --git a/src/test/run-pass/functions-closures/copy-closure.rs b/src/test/ui/functions-closures/copy-closure.rs
index 72da02421b7..72da02421b7 100644
--- a/src/test/run-pass/functions-closures/copy-closure.rs
+++ b/src/test/ui/functions-closures/copy-closure.rs
diff --git a/src/test/run-pass/functions-closures/fn-abi.rs b/src/test/ui/functions-closures/fn-abi.rs
index 900af9c1f66..900af9c1f66 100644
--- a/src/test/run-pass/functions-closures/fn-abi.rs
+++ b/src/test/ui/functions-closures/fn-abi.rs
diff --git a/src/test/run-pass/functions-closures/fn-bare-assign.rs b/src/test/ui/functions-closures/fn-bare-assign.rs
index f5dab3c8402..f5dab3c8402 100644
--- a/src/test/run-pass/functions-closures/fn-bare-assign.rs
+++ b/src/test/ui/functions-closures/fn-bare-assign.rs
diff --git a/src/test/run-pass/functions-closures/fn-bare-coerce-to-block.rs b/src/test/ui/functions-closures/fn-bare-coerce-to-block.rs
index 922e016ddc8..922e016ddc8 100644
--- a/src/test/run-pass/functions-closures/fn-bare-coerce-to-block.rs
+++ b/src/test/ui/functions-closures/fn-bare-coerce-to-block.rs
diff --git a/src/test/run-pass/functions-closures/fn-bare-item.rs b/src/test/ui/functions-closures/fn-bare-item.rs
index a6e6495a40a..a6e6495a40a 100644
--- a/src/test/run-pass/functions-closures/fn-bare-item.rs
+++ b/src/test/ui/functions-closures/fn-bare-item.rs
diff --git a/src/test/run-pass/functions-closures/fn-bare-size.rs b/src/test/ui/functions-closures/fn-bare-size.rs
index 2ba56eaaed4..2ba56eaaed4 100644
--- a/src/test/run-pass/functions-closures/fn-bare-size.rs
+++ b/src/test/ui/functions-closures/fn-bare-size.rs
diff --git a/src/test/run-pass/functions-closures/fn-bare-spawn.rs b/src/test/ui/functions-closures/fn-bare-spawn.rs
index 0d46fe22087..0d46fe22087 100644
--- a/src/test/run-pass/functions-closures/fn-bare-spawn.rs
+++ b/src/test/ui/functions-closures/fn-bare-spawn.rs
diff --git a/src/test/run-pass/functions-closures/fn-coerce-field.rs b/src/test/ui/functions-closures/fn-coerce-field.rs
index 38bde7b9e8f..38bde7b9e8f 100644
--- a/src/test/run-pass/functions-closures/fn-coerce-field.rs
+++ b/src/test/ui/functions-closures/fn-coerce-field.rs
diff --git a/src/test/run-pass/functions-closures/fn-item-type-cast.rs b/src/test/ui/functions-closures/fn-item-type-cast.rs
index 4d50ea97b8b..4d50ea97b8b 100644
--- a/src/test/run-pass/functions-closures/fn-item-type-cast.rs
+++ b/src/test/ui/functions-closures/fn-item-type-cast.rs
diff --git a/src/test/run-pass/functions-closures/fn-item-type-coerce.rs b/src/test/ui/functions-closures/fn-item-type-coerce.rs
index 7a096764e45..7a096764e45 100644
--- a/src/test/run-pass/functions-closures/fn-item-type-coerce.rs
+++ b/src/test/ui/functions-closures/fn-item-type-coerce.rs
diff --git a/src/test/run-pass/functions-closures/fn-item-type-zero-sized.rs b/src/test/ui/functions-closures/fn-item-type-zero-sized.rs
index bd9f1ed663d..bd9f1ed663d 100644
--- a/src/test/run-pass/functions-closures/fn-item-type-zero-sized.rs
+++ b/src/test/ui/functions-closures/fn-item-type-zero-sized.rs
diff --git a/src/test/run-pass/functions-closures/fn-lval.rs b/src/test/ui/functions-closures/fn-lval.rs
index 01079eea457..01079eea457 100644
--- a/src/test/run-pass/functions-closures/fn-lval.rs
+++ b/src/test/ui/functions-closures/fn-lval.rs
diff --git a/src/test/run-pass/functions-closures/fn-type-infer.rs b/src/test/ui/functions-closures/fn-type-infer.rs
index fe6567f22b5..fe6567f22b5 100644
--- a/src/test/run-pass/functions-closures/fn-type-infer.rs
+++ b/src/test/ui/functions-closures/fn-type-infer.rs
diff --git a/src/test/run-pass/functions-closures/implied-bounds-closure-arg-outlives.rs b/src/test/ui/functions-closures/implied-bounds-closure-arg-outlives.rs
index 4ac07123d9d..4ac07123d9d 100644
--- a/src/test/run-pass/functions-closures/implied-bounds-closure-arg-outlives.rs
+++ b/src/test/ui/functions-closures/implied-bounds-closure-arg-outlives.rs
diff --git a/src/test/run-pass/functions-closures/nullable-pointer-opt-closures.rs b/src/test/ui/functions-closures/nullable-pointer-opt-closures.rs
index 87dacfba25b..87dacfba25b 100644
--- a/src/test/run-pass/functions-closures/nullable-pointer-opt-closures.rs
+++ b/src/test/ui/functions-closures/nullable-pointer-opt-closures.rs
diff --git a/src/test/run-pass/functions-closures/parallel-codegen-closures.rs b/src/test/ui/functions-closures/parallel-codegen-closures.rs
index 79759daba50..79759daba50 100644
--- a/src/test/run-pass/functions-closures/parallel-codegen-closures.rs
+++ b/src/test/ui/functions-closures/parallel-codegen-closures.rs
diff --git a/src/test/run-pass/functions-closures/return-from-closure.rs b/src/test/ui/functions-closures/return-from-closure.rs
index 656a95f120a..656a95f120a 100644
--- a/src/test/run-pass/functions-closures/return-from-closure.rs
+++ b/src/test/ui/functions-closures/return-from-closure.rs
diff --git a/src/test/run-pass/generator/addassign-yield.rs b/src/test/ui/generator/addassign-yield.rs
index 6a417936384..66f22bf31fc 100644
--- a/src/test/run-pass/generator/addassign-yield.rs
+++ b/src/test/ui/generator/addassign-yield.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Regression test for broken MIR error (#61442)
 // Due to the two possible evaluation orders for
 // a '+=' expression (depending on whether or not the 'AddAssign' trait
diff --git a/src/test/run-pass/generator/auxiliary/xcrate-reachable.rs b/src/test/ui/generator/auxiliary/xcrate-reachable.rs
index 33337f8038f..33337f8038f 100644
--- a/src/test/run-pass/generator/auxiliary/xcrate-reachable.rs
+++ b/src/test/ui/generator/auxiliary/xcrate-reachable.rs
diff --git a/src/test/run-pass/generator/auxiliary/xcrate.rs b/src/test/ui/generator/auxiliary/xcrate.rs
index 613c495832f..613c495832f 100644
--- a/src/test/run-pass/generator/auxiliary/xcrate.rs
+++ b/src/test/ui/generator/auxiliary/xcrate.rs
diff --git a/src/test/run-pass/generator/borrow-in-tail-expr.rs b/src/test/ui/generator/borrow-in-tail-expr.rs
index 540f5e3e1dd..540f5e3e1dd 100644
--- a/src/test/run-pass/generator/borrow-in-tail-expr.rs
+++ b/src/test/ui/generator/borrow-in-tail-expr.rs
diff --git a/src/test/run-pass/generator/conditional-drop.rs b/src/test/ui/generator/conditional-drop.rs
index 907f7a3c06d..907f7a3c06d 100644
--- a/src/test/run-pass/generator/conditional-drop.rs
+++ b/src/test/ui/generator/conditional-drop.rs
diff --git a/src/test/run-pass/generator/control-flow.rs b/src/test/ui/generator/control-flow.rs
index df70e013bd3..df70e013bd3 100644
--- a/src/test/run-pass/generator/control-flow.rs
+++ b/src/test/ui/generator/control-flow.rs
diff --git a/src/test/run-pass/generator/drop-and-replace.rs b/src/test/ui/generator/drop-and-replace.rs
index 042e1276db5..bb33502815b 100644
--- a/src/test/run-pass/generator/drop-and-replace.rs
+++ b/src/test/ui/generator/drop-and-replace.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Regression test for incorrect DropAndReplace behavior introduced in #60840
 // and fixed in #61373. When combined with the optimization implemented in
 // #60187, this produced incorrect code for generators when a saved local was
diff --git a/src/test/run-pass/generator/drop-env.rs b/src/test/ui/generator/drop-env.rs
index ac4e0665628..ac4e0665628 100644
--- a/src/test/run-pass/generator/drop-env.rs
+++ b/src/test/ui/generator/drop-env.rs
diff --git a/src/test/run-pass/generator/issue-44197.rs b/src/test/ui/generator/issue-44197.rs
index 6efaff50c1e..6efaff50c1e 100644
--- a/src/test/run-pass/generator/issue-44197.rs
+++ b/src/test/ui/generator/issue-44197.rs
diff --git a/src/test/run-pass/generator/issue-52398.rs b/src/test/ui/generator/issue-52398.rs
index 54a1912582c..54a1912582c 100644
--- a/src/test/run-pass/generator/issue-52398.rs
+++ b/src/test/ui/generator/issue-52398.rs
diff --git a/src/test/run-pass/generator/issue-57084.rs b/src/test/ui/generator/issue-57084.rs
index 8aaa6a0e427..8aaa6a0e427 100644
--- a/src/test/run-pass/generator/issue-57084.rs
+++ b/src/test/ui/generator/issue-57084.rs
diff --git a/src/test/run-pass/generator/issue-58888.rs b/src/test/ui/generator/issue-58888.rs
index 43b37a9afc2..43b37a9afc2 100644
--- a/src/test/run-pass/generator/issue-58888.rs
+++ b/src/test/ui/generator/issue-58888.rs
diff --git a/src/test/run-pass/generator/iterator-count.rs b/src/test/ui/generator/iterator-count.rs
index ac7e122dd58..ac7e122dd58 100644
--- a/src/test/run-pass/generator/iterator-count.rs
+++ b/src/test/ui/generator/iterator-count.rs
diff --git a/src/test/run-pass/generator/live-upvar-across-yield.rs b/src/test/ui/generator/live-upvar-across-yield.rs
index a1064165b2f..a1064165b2f 100644
--- a/src/test/run-pass/generator/live-upvar-across-yield.rs
+++ b/src/test/ui/generator/live-upvar-across-yield.rs
diff --git a/src/test/run-pass/generator/match-bindings.rs b/src/test/ui/generator/match-bindings.rs
index 560d8e7103c..560d8e7103c 100644
--- a/src/test/run-pass/generator/match-bindings.rs
+++ b/src/test/ui/generator/match-bindings.rs
diff --git a/src/test/run-pass/generator/nested_generators.rs b/src/test/ui/generator/nested_generators.rs
index b56cce1dc44..b56cce1dc44 100644
--- a/src/test/run-pass/generator/nested_generators.rs
+++ b/src/test/ui/generator/nested_generators.rs
diff --git a/src/test/run-pass/generator/non-static-is-unpin.rs b/src/test/ui/generator/non-static-is-unpin.rs
index 96d0a8e2833..96d0a8e2833 100644
--- a/src/test/run-pass/generator/non-static-is-unpin.rs
+++ b/src/test/ui/generator/non-static-is-unpin.rs
diff --git a/src/test/run-pass/generator/overlap-locals.rs b/src/test/ui/generator/overlap-locals.rs
index 704484a480e..101c8714fa8 100644
--- a/src/test/run-pass/generator/overlap-locals.rs
+++ b/src/test/ui/generator/overlap-locals.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(generators)]
 
 fn main() {
diff --git a/src/test/run-pass/generator/panic-drops.rs b/src/test/ui/generator/panic-drops.rs
index 5ac97585f4b..5ac97585f4b 100644
--- a/src/test/run-pass/generator/panic-drops.rs
+++ b/src/test/ui/generator/panic-drops.rs
diff --git a/src/test/run-pass/generator/panic-safe.rs b/src/test/ui/generator/panic-safe.rs
index 5f6778674dc..5f6778674dc 100644
--- a/src/test/run-pass/generator/panic-safe.rs
+++ b/src/test/ui/generator/panic-safe.rs
diff --git a/src/test/run-pass/generator/pin-box-generator.rs b/src/test/ui/generator/pin-box-generator.rs
index c3136f5c0ec..c3136f5c0ec 100644
--- a/src/test/run-pass/generator/pin-box-generator.rs
+++ b/src/test/ui/generator/pin-box-generator.rs
diff --git a/src/test/run-pass/generator/reborrow-mut-upvar.rs b/src/test/ui/generator/reborrow-mut-upvar.rs
index 785e38a7eb8..785e38a7eb8 100644
--- a/src/test/run-pass/generator/reborrow-mut-upvar.rs
+++ b/src/test/ui/generator/reborrow-mut-upvar.rs
diff --git a/src/test/run-pass/generator/resume-after-return.rs b/src/test/ui/generator/resume-after-return.rs
index 71a68ff684a..71a68ff684a 100644
--- a/src/test/run-pass/generator/resume-after-return.rs
+++ b/src/test/ui/generator/resume-after-return.rs
diff --git a/src/test/run-pass/generator/size-moved-locals.rs b/src/test/ui/generator/size-moved-locals.rs
index dbcdfc61ef9..01db971434b 100644
--- a/src/test/run-pass/generator/size-moved-locals.rs
+++ b/src/test/ui/generator/size-moved-locals.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that we don't duplicate storage for a variable that is moved to another
 // binding. This used to happen in the presence of unwind and drop edges (see
 // `complex` below.)
diff --git a/src/test/run-pass/generator/smoke.rs b/src/test/ui/generator/smoke.rs
index 533f2399084..533f2399084 100644
--- a/src/test/run-pass/generator/smoke.rs
+++ b/src/test/ui/generator/smoke.rs
diff --git a/src/test/run-pass/generator/static-generators.rs b/src/test/ui/generator/static-generators.rs
index 965d3c61c22..965d3c61c22 100644
--- a/src/test/run-pass/generator/static-generators.rs
+++ b/src/test/ui/generator/static-generators.rs
diff --git a/src/test/run-pass/generator/too-live-local-in-immovable-gen.rs b/src/test/ui/generator/too-live-local-in-immovable-gen.rs
index f299a8aa72b..f299a8aa72b 100644
--- a/src/test/run-pass/generator/too-live-local-in-immovable-gen.rs
+++ b/src/test/ui/generator/too-live-local-in-immovable-gen.rs
diff --git a/src/test/run-pass/generator/xcrate-reachable.rs b/src/test/ui/generator/xcrate-reachable.rs
index 9483ad7395e..9483ad7395e 100644
--- a/src/test/run-pass/generator/xcrate-reachable.rs
+++ b/src/test/ui/generator/xcrate-reachable.rs
diff --git a/src/test/run-pass/generator/xcrate.rs b/src/test/ui/generator/xcrate.rs
index febf5c3583f..febf5c3583f 100644
--- a/src/test/run-pass/generator/xcrate.rs
+++ b/src/test/ui/generator/xcrate.rs
diff --git a/src/test/run-pass/generator/yield-in-args-rev.rs b/src/test/ui/generator/yield-in-args-rev.rs
index f9ab981121a..f9ab981121a 100644
--- a/src/test/run-pass/generator/yield-in-args-rev.rs
+++ b/src/test/ui/generator/yield-in-args-rev.rs
diff --git a/src/test/run-pass/generator/yield-in-box.rs b/src/test/ui/generator/yield-in-box.rs
index d8475715c7c..d8475715c7c 100644
--- a/src/test/run-pass/generator/yield-in-box.rs
+++ b/src/test/ui/generator/yield-in-box.rs
diff --git a/src/test/run-pass/generator/yield-in-initializer.rs b/src/test/ui/generator/yield-in-initializer.rs
index 8ff35d8ddf1..8ff35d8ddf1 100644
--- a/src/test/run-pass/generator/yield-in-initializer.rs
+++ b/src/test/ui/generator/yield-in-initializer.rs
diff --git a/src/test/run-pass/generator/yield-subtype.rs b/src/test/ui/generator/yield-subtype.rs
index fe88d424dd1..fe88d424dd1 100644
--- a/src/test/run-pass/generator/yield-subtype.rs
+++ b/src/test/ui/generator/yield-subtype.rs
diff --git a/src/test/run-pass/generics/auxiliary/default_type_params_xc.rs b/src/test/ui/generics/auxiliary/default_type_params_xc.rs
index aacbd672ade..aacbd672ade 100644
--- a/src/test/run-pass/generics/auxiliary/default_type_params_xc.rs
+++ b/src/test/ui/generics/auxiliary/default_type_params_xc.rs
diff --git a/src/test/run-pass/generics/generic-alias-unique.rs b/src/test/ui/generics/generic-alias-unique.rs
index 76a184d8d25..76a184d8d25 100644
--- a/src/test/run-pass/generics/generic-alias-unique.rs
+++ b/src/test/ui/generics/generic-alias-unique.rs
diff --git a/src/test/run-pass/generics/generic-default-type-params-cross-crate.rs b/src/test/ui/generics/generic-default-type-params-cross-crate.rs
index 9e5eaa72c15..9e5eaa72c15 100644
--- a/src/test/run-pass/generics/generic-default-type-params-cross-crate.rs
+++ b/src/test/ui/generics/generic-default-type-params-cross-crate.rs
diff --git a/src/test/run-pass/generics/generic-default-type-params.rs b/src/test/ui/generics/generic-default-type-params.rs
index afdd301fde9..afdd301fde9 100644
--- a/src/test/run-pass/generics/generic-default-type-params.rs
+++ b/src/test/ui/generics/generic-default-type-params.rs
diff --git a/src/test/run-pass/generics/generic-derived-type.rs b/src/test/ui/generics/generic-derived-type.rs
index c643496fa7f..c643496fa7f 100644
--- a/src/test/run-pass/generics/generic-derived-type.rs
+++ b/src/test/ui/generics/generic-derived-type.rs
diff --git a/src/test/run-pass/generics/generic-exterior-unique.rs b/src/test/ui/generics/generic-exterior-unique.rs
index 9b3e1ee02a2..9b3e1ee02a2 100644
--- a/src/test/run-pass/generics/generic-exterior-unique.rs
+++ b/src/test/ui/generics/generic-exterior-unique.rs
diff --git a/src/test/run-pass/generics/generic-extern-mangle.rs b/src/test/ui/generics/generic-extern-mangle.rs
index 985a6f39cd7..985a6f39cd7 100644
--- a/src/test/run-pass/generics/generic-extern-mangle.rs
+++ b/src/test/ui/generics/generic-extern-mangle.rs
diff --git a/src/test/run-pass/generics/generic-fn-infer.rs b/src/test/ui/generics/generic-fn-infer.rs
index 9ba4224732b..9ba4224732b 100644
--- a/src/test/run-pass/generics/generic-fn-infer.rs
+++ b/src/test/ui/generics/generic-fn-infer.rs
diff --git a/src/test/run-pass/generics/generic-fn-twice.rs b/src/test/ui/generics/generic-fn-twice.rs
index 2f25fc24ced..2f25fc24ced 100644
--- a/src/test/run-pass/generics/generic-fn-twice.rs
+++ b/src/test/ui/generics/generic-fn-twice.rs
diff --git a/src/test/run-pass/generics/generic-fn-unique.rs b/src/test/ui/generics/generic-fn-unique.rs
index 6cda1c3dc15..6cda1c3dc15 100644
--- a/src/test/run-pass/generics/generic-fn-unique.rs
+++ b/src/test/ui/generics/generic-fn-unique.rs
diff --git a/src/test/run-pass/generics/generic-fn.rs b/src/test/ui/generics/generic-fn.rs
index 8038fabc1ce..8038fabc1ce 100644
--- a/src/test/run-pass/generics/generic-fn.rs
+++ b/src/test/ui/generics/generic-fn.rs
diff --git a/src/test/run-pass/generics/generic-ivec-leak.rs b/src/test/ui/generics/generic-ivec-leak.rs
index a8ea1d5069b..a8ea1d5069b 100644
--- a/src/test/run-pass/generics/generic-ivec-leak.rs
+++ b/src/test/ui/generics/generic-ivec-leak.rs
diff --git a/src/test/run-pass/generics/generic-newtype-struct.rs b/src/test/ui/generics/generic-newtype-struct.rs
index 570c982cc87..570c982cc87 100644
--- a/src/test/run-pass/generics/generic-newtype-struct.rs
+++ b/src/test/ui/generics/generic-newtype-struct.rs
diff --git a/src/test/run-pass/generics/generic-object.rs b/src/test/ui/generics/generic-object.rs
index 870ff980ec6..870ff980ec6 100644
--- a/src/test/run-pass/generics/generic-object.rs
+++ b/src/test/ui/generics/generic-object.rs
diff --git a/src/test/run-pass/generics/generic-recursive-tag.rs b/src/test/ui/generics/generic-recursive-tag.rs
index e1875f0abbe..e1875f0abbe 100644
--- a/src/test/run-pass/generics/generic-recursive-tag.rs
+++ b/src/test/ui/generics/generic-recursive-tag.rs
diff --git a/src/test/run-pass/generics/generic-static-methods.rs b/src/test/ui/generics/generic-static-methods.rs
index b39fa081a65..b39fa081a65 100644
--- a/src/test/run-pass/generics/generic-static-methods.rs
+++ b/src/test/ui/generics/generic-static-methods.rs
diff --git a/src/test/run-pass/generics/generic-tag-corruption.rs b/src/test/ui/generics/generic-tag-corruption.rs
index aa26183a0d4..aa26183a0d4 100644
--- a/src/test/run-pass/generics/generic-tag-corruption.rs
+++ b/src/test/ui/generics/generic-tag-corruption.rs
diff --git a/src/test/run-pass/generics/generic-tag-local.rs b/src/test/ui/generics/generic-tag-local.rs
index cc85e6e0f0a..cc85e6e0f0a 100644
--- a/src/test/run-pass/generics/generic-tag-local.rs
+++ b/src/test/ui/generics/generic-tag-local.rs
diff --git a/src/test/run-pass/generics/generic-tag-match.rs b/src/test/ui/generics/generic-tag-match.rs
index 09ed6a808e6..09ed6a808e6 100644
--- a/src/test/run-pass/generics/generic-tag-match.rs
+++ b/src/test/ui/generics/generic-tag-match.rs
diff --git a/src/test/run-pass/generics/generic-tag-values.rs b/src/test/ui/generics/generic-tag-values.rs
index 230f477b6e9..230f477b6e9 100644
--- a/src/test/run-pass/generics/generic-tag-values.rs
+++ b/src/test/ui/generics/generic-tag-values.rs
diff --git a/src/test/run-pass/generics/generic-tag.rs b/src/test/ui/generics/generic-tag.rs
index 74ef4eeba8a..74ef4eeba8a 100644
--- a/src/test/run-pass/generics/generic-tag.rs
+++ b/src/test/ui/generics/generic-tag.rs
diff --git a/src/test/run-pass/generics/generic-temporary.rs b/src/test/ui/generics/generic-temporary.rs
index b63b534d03f..b63b534d03f 100644
--- a/src/test/run-pass/generics/generic-temporary.rs
+++ b/src/test/ui/generics/generic-temporary.rs
diff --git a/src/test/run-pass/generics/generic-tup.rs b/src/test/ui/generics/generic-tup.rs
index 79ebd648cd4..79ebd648cd4 100644
--- a/src/test/run-pass/generics/generic-tup.rs
+++ b/src/test/ui/generics/generic-tup.rs
diff --git a/src/test/run-pass/generics/generic-type-synonym.rs b/src/test/ui/generics/generic-type-synonym.rs
index 4f181fbcc7e..4f181fbcc7e 100644
--- a/src/test/run-pass/generics/generic-type-synonym.rs
+++ b/src/test/ui/generics/generic-type-synonym.rs
diff --git a/src/test/run-pass/generics/generic-type.rs b/src/test/ui/generics/generic-type.rs
index aa46db07eee..aa46db07eee 100644
--- a/src/test/run-pass/generics/generic-type.rs
+++ b/src/test/ui/generics/generic-type.rs
diff --git a/src/test/run-pass/generics/generic-unique.rs b/src/test/ui/generics/generic-unique.rs
index d36504c75dd..d36504c75dd 100644
--- a/src/test/run-pass/generics/generic-unique.rs
+++ b/src/test/ui/generics/generic-unique.rs
diff --git a/src/test/run-pass/global-scope.rs b/src/test/ui/global-scope.rs
index 22fb0f93dbc..944eee5afc3 100644
--- a/src/test/run-pass/global-scope.rs
+++ b/src/test/ui/global-scope.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn f() -> isize { return 1; }
 
 pub mod foo {
diff --git a/src/test/run-pass/guards-not-exhaustive.rs b/src/test/ui/guards-not-exhaustive.rs
index 752e4f6be41..b74f162c0c6 100644
--- a/src/test/run-pass/guards-not-exhaustive.rs
+++ b/src/test/ui/guards-not-exhaustive.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_snake_case)]
 
 #[derive(Copy, Clone)]
diff --git a/src/test/run-pass/guards.rs b/src/test/ui/guards.rs
index 94095eac161..10a4bb67387 100644
--- a/src/test/run-pass/guards.rs
+++ b/src/test/ui/guards.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_shorthand_field_patterns)]
 
 #[derive(Copy, Clone)]
diff --git a/src/test/run-pass/hashmap-memory.rs b/src/test/ui/hashmap-memory.rs
index 987a3e414f5..3129eb0da82 100644
--- a/src/test/run-pass/hashmap-memory.rs
+++ b/src/test/ui/hashmap-memory.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 #![allow(unused_mut)]
diff --git a/src/test/run-pass/hello.rs b/src/test/ui/hello.rs
index bc8bb23877e..c207c25545e 100644
--- a/src/test/run-pass/hello.rs
+++ b/src/test/ui/hello.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     println!("hello, world");
 }
diff --git a/src/test/run-pass/higher-rank-trait-bounds/hrtb-binder-levels-in-object-types.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-binder-levels-in-object-types.rs
index cc766c0605c..cc766c0605c 100644
--- a/src/test/run-pass/higher-rank-trait-bounds/hrtb-binder-levels-in-object-types.rs
+++ b/src/test/ui/higher-rank-trait-bounds/hrtb-binder-levels-in-object-types.rs
diff --git a/src/test/run-pass/higher-rank-trait-bounds/hrtb-debruijn-object-types-in-closures.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-debruijn-object-types-in-closures.rs
index 8431226a3ec..8431226a3ec 100644
--- a/src/test/run-pass/higher-rank-trait-bounds/hrtb-debruijn-object-types-in-closures.rs
+++ b/src/test/ui/higher-rank-trait-bounds/hrtb-debruijn-object-types-in-closures.rs
diff --git a/src/test/run-pass/higher-rank-trait-bounds/hrtb-fn-like-trait-object.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-fn-like-trait-object.rs
index ff84ad9d298..ff84ad9d298 100644
--- a/src/test/run-pass/higher-rank-trait-bounds/hrtb-fn-like-trait-object.rs
+++ b/src/test/ui/higher-rank-trait-bounds/hrtb-fn-like-trait-object.rs
diff --git a/src/test/run-pass/higher-rank-trait-bounds/hrtb-fn-like-trait.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-fn-like-trait.rs
index afab9986ce2..afab9986ce2 100644
--- a/src/test/run-pass/higher-rank-trait-bounds/hrtb-fn-like-trait.rs
+++ b/src/test/ui/higher-rank-trait-bounds/hrtb-fn-like-trait.rs
diff --git a/src/test/run-pass/higher-rank-trait-bounds/hrtb-opt-in-copy.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-opt-in-copy.rs
index 04519f11600..04519f11600 100644
--- a/src/test/run-pass/higher-rank-trait-bounds/hrtb-opt-in-copy.rs
+++ b/src/test/ui/higher-rank-trait-bounds/hrtb-opt-in-copy.rs
diff --git a/src/test/run-pass/higher-rank-trait-bounds/hrtb-parse.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-parse.rs
index 1fab9758c5c..1fab9758c5c 100644
--- a/src/test/run-pass/higher-rank-trait-bounds/hrtb-parse.rs
+++ b/src/test/ui/higher-rank-trait-bounds/hrtb-parse.rs
diff --git a/src/test/run-pass/higher-rank-trait-bounds/hrtb-precedence-of-plus-where-clause.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-precedence-of-plus-where-clause.rs
index 42247798f66..42247798f66 100644
--- a/src/test/run-pass/higher-rank-trait-bounds/hrtb-precedence-of-plus-where-clause.rs
+++ b/src/test/ui/higher-rank-trait-bounds/hrtb-precedence-of-plus-where-clause.rs
diff --git a/src/test/run-pass/higher-rank-trait-bounds/hrtb-precedence-of-plus.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-precedence-of-plus.rs
index 6834c392d4e..6834c392d4e 100644
--- a/src/test/run-pass/higher-rank-trait-bounds/hrtb-precedence-of-plus.rs
+++ b/src/test/ui/higher-rank-trait-bounds/hrtb-precedence-of-plus.rs
diff --git a/src/test/run-pass/higher-rank-trait-bounds/hrtb-resolve-lifetime.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-resolve-lifetime.rs
index b97fdf4df50..b97fdf4df50 100644
--- a/src/test/run-pass/higher-rank-trait-bounds/hrtb-resolve-lifetime.rs
+++ b/src/test/ui/higher-rank-trait-bounds/hrtb-resolve-lifetime.rs
diff --git a/src/test/run-pass/higher-rank-trait-bounds/hrtb-trait-object-paren-notation.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-trait-object-paren-notation.rs
index d8c726cdd71..d8c726cdd71 100644
--- a/src/test/run-pass/higher-rank-trait-bounds/hrtb-trait-object-paren-notation.rs
+++ b/src/test/ui/higher-rank-trait-bounds/hrtb-trait-object-paren-notation.rs
diff --git a/src/test/run-pass/higher-rank-trait-bounds/hrtb-trait-object-passed-to-closure.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-trait-object-passed-to-closure.rs
index 41ebb3f5a14..41ebb3f5a14 100644
--- a/src/test/run-pass/higher-rank-trait-bounds/hrtb-trait-object-passed-to-closure.rs
+++ b/src/test/ui/higher-rank-trait-bounds/hrtb-trait-object-passed-to-closure.rs
diff --git a/src/test/run-pass/higher-rank-trait-bounds/hrtb-type-outlives.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-type-outlives.rs
index a8f38180cc2..a8f38180cc2 100644
--- a/src/test/run-pass/higher-rank-trait-bounds/hrtb-type-outlives.rs
+++ b/src/test/ui/higher-rank-trait-bounds/hrtb-type-outlives.rs
diff --git a/src/test/run-pass/higher-rank-trait-bounds/hrtb-unboxed-closure-trait.rs b/src/test/ui/higher-rank-trait-bounds/hrtb-unboxed-closure-trait.rs
index a4a8a5ac6cc..a4a8a5ac6cc 100644
--- a/src/test/run-pass/higher-rank-trait-bounds/hrtb-unboxed-closure-trait.rs
+++ b/src/test/ui/higher-rank-trait-bounds/hrtb-unboxed-closure-trait.rs
diff --git a/src/test/run-pass/html-literals.rs b/src/test/ui/html-literals.rs
index 237c6e1a107..ae45e97c8b0 100644
--- a/src/test/run-pass/html-literals.rs
+++ b/src/test/ui/html-literals.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 // A test of the macro system. Can we do HTML literals?
 
diff --git a/src/test/run-pass/if-bot.rs b/src/test/ui/if-bot.rs
index 6d87288dd08..0f09db530d4 100644
--- a/src/test/run-pass/if-bot.rs
+++ b/src/test/ui/if-bot.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let i: isize = if false { panic!() } else { 5 };
     println!("{}", i);
diff --git a/src/test/run-pass/if-check.rs b/src/test/ui/if-check.rs
index 43904f6823f..6593225e7dd 100644
--- a/src/test/run-pass/if-check.rs
+++ b/src/test/ui/if-check.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn even(x: usize) -> bool {
     if x < 2 {
         return false;
diff --git a/src/test/run-pass/if-ret.rs b/src/test/ui/if-ret.rs
index 3c2377466a1..e1e795d83be 100644
--- a/src/test/run-pass/if-ret.rs
+++ b/src/test/ui/if-ret.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_parens)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/ifmt.rs b/src/test/ui/ifmt.rs
index 6660f393f7d..841be20ef86 100644
--- a/src/test/run-pass/ifmt.rs
+++ b/src/test/ui/ifmt.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![deny(warnings)]
 #![allow(unused_must_use)]
 #![allow(unused_features)]
diff --git a/src/test/run-pass/ignore-all-the-things.rs b/src/test/ui/ignore-all-the-things.rs
index 6916a199a10..8c046a289fa 100644
--- a/src/test/run-pass/ignore-all-the-things.rs
+++ b/src/test/ui/ignore-all-the-things.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_shorthand_field_patterns)]
 #![allow(dead_code)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/impl-for-never.rs b/src/test/ui/impl-for-never.rs
index a5287123008..c5f12981ecc 100644
--- a/src/test/run-pass/impl-for-never.rs
+++ b/src/test/ui/impl-for-never.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that we can call static methods on ! both directly and when it appears in a generic
 
 #![feature(never_type)]
diff --git a/src/test/run-pass/impl-inherent-non-conflict.rs b/src/test/ui/impl-inherent-non-conflict.rs
index ed87ffb0198..be524f87c9f 100644
--- a/src/test/run-pass/impl-inherent-non-conflict.rs
+++ b/src/test/ui/impl-inherent-non-conflict.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Ensure that a user-defined type admits multiple inherent methods
 // with the same name, which can be called on values that have a
 // precise enough type to allow distinguishing between the methods.
diff --git a/src/test/run-pass/impl-not-adjacent-to-type.rs b/src/test/ui/impl-not-adjacent-to-type.rs
index c0cdff30cbf..97caf908387 100644
--- a/src/test/run-pass/impl-not-adjacent-to-type.rs
+++ b/src/test/ui/impl-not-adjacent-to-type.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 mod foo {
     pub struct Point {
         pub x: i32,
diff --git a/src/test/run-pass/impl-privacy-xc-1.rs b/src/test/ui/impl-privacy-xc-1.rs
index 42e149eacb5..c9f7f09c7bd 100644
--- a/src/test/run-pass/impl-privacy-xc-1.rs
+++ b/src/test/ui/impl-privacy-xc-1.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:impl_privacy_xc_1.rs
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/impl-privacy-xc-2.rs b/src/test/ui/impl-privacy-xc-2.rs
index 7cdd7146c33..390764588fc 100644
--- a/src/test/run-pass/impl-privacy-xc-2.rs
+++ b/src/test/ui/impl-privacy-xc-2.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:impl_privacy_xc_2.rs
 
 extern crate impl_privacy_xc_2;
diff --git a/src/test/run-pass/impl-trait-in-bindings.rs b/src/test/ui/impl-trait-in-bindings.rs
index 1e3a641b7cf..2e9b6cd5c78 100644
--- a/src/test/run-pass/impl-trait-in-bindings.rs
+++ b/src/test/ui/impl-trait-in-bindings.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(impl_trait_in_bindings)]
 //~^ WARN the feature `impl_trait_in_bindings` is incomplete and may cause the compiler to crash
 
diff --git a/src/test/run-pass/impl-trait-in-bindings.stderr b/src/test/ui/impl-trait-in-bindings.stderr
index 4896deb9d5c..54b42a102fa 100644
--- a/src/test/run-pass/impl-trait-in-bindings.stderr
+++ b/src/test/ui/impl-trait-in-bindings.stderr
@@ -1,5 +1,5 @@
 warning: the feature `impl_trait_in_bindings` is incomplete and may cause the compiler to crash
-  --> $DIR/impl-trait-in-bindings.rs:1:12
+  --> $DIR/impl-trait-in-bindings.rs:3:12
    |
 LL | #![feature(impl_trait_in_bindings)]
    |            ^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/run-pass/impl-trait/auto-trait-leak.rs b/src/test/ui/impl-trait/auto-trait-leak-rpass.rs
index 9976a018b46..9976a018b46 100644
--- a/src/test/run-pass/impl-trait/auto-trait-leak.rs
+++ b/src/test/ui/impl-trait/auto-trait-leak-rpass.rs
diff --git a/src/test/run-pass/impl-trait/auxiliary/xcrate.rs b/src/test/ui/impl-trait/auxiliary/xcrate.rs
index ac016258b7f..ac016258b7f 100644
--- a/src/test/run-pass/impl-trait/auxiliary/xcrate.rs
+++ b/src/test/ui/impl-trait/auxiliary/xcrate.rs
diff --git a/src/test/run-pass/impl-trait/bounds_regression.rs b/src/test/ui/impl-trait/bounds_regression.rs
index 0fdeb6bdee1..0fdeb6bdee1 100644
--- a/src/test/run-pass/impl-trait/bounds_regression.rs
+++ b/src/test/ui/impl-trait/bounds_regression.rs
diff --git a/src/test/run-pass/impl-trait/equality.rs b/src/test/ui/impl-trait/equality-rpass.rs
index 05c9e4173b0..05c9e4173b0 100644
--- a/src/test/run-pass/impl-trait/equality.rs
+++ b/src/test/ui/impl-trait/equality-rpass.rs
diff --git a/src/test/run-pass/impl-trait/example-calendar.rs b/src/test/ui/impl-trait/example-calendar.rs
index f1b1656745e..f1b1656745e 100644
--- a/src/test/run-pass/impl-trait/example-calendar.rs
+++ b/src/test/ui/impl-trait/example-calendar.rs
diff --git a/src/test/run-pass/impl-trait/example-st.rs b/src/test/ui/impl-trait/example-st.rs
index 4e1aa3a0859..4e1aa3a0859 100644
--- a/src/test/run-pass/impl-trait/example-st.rs
+++ b/src/test/ui/impl-trait/example-st.rs
diff --git a/src/test/run-pass/impl-trait/lifetimes.rs b/src/test/ui/impl-trait/lifetimes.rs
index 9a9843375e4..9a9843375e4 100644
--- a/src/test/run-pass/impl-trait/lifetimes.rs
+++ b/src/test/ui/impl-trait/lifetimes.rs
diff --git a/src/test/run-pass/impl-trait/nesting.rs b/src/test/ui/impl-trait/nesting.rs
index 27bdd5fa483..27bdd5fa483 100644
--- a/src/test/run-pass/impl-trait/nesting.rs
+++ b/src/test/ui/impl-trait/nesting.rs
diff --git a/src/test/run-pass/impl-trait/universal_hrtb_anon.rs b/src/test/ui/impl-trait/universal_hrtb_anon.rs
index 30c8d291f6a..30c8d291f6a 100644
--- a/src/test/run-pass/impl-trait/universal_hrtb_anon.rs
+++ b/src/test/ui/impl-trait/universal_hrtb_anon.rs
diff --git a/src/test/run-pass/impl-trait/universal_hrtb_named.rs b/src/test/ui/impl-trait/universal_hrtb_named.rs
index 07ff5d23e0c..07ff5d23e0c 100644
--- a/src/test/run-pass/impl-trait/universal_hrtb_named.rs
+++ b/src/test/ui/impl-trait/universal_hrtb_named.rs
diff --git a/src/test/run-pass/impl-trait/universal_in_adt_in_parameters.rs b/src/test/ui/impl-trait/universal_in_adt_in_parameters.rs
index a3829133dfa..a3829133dfa 100644
--- a/src/test/run-pass/impl-trait/universal_in_adt_in_parameters.rs
+++ b/src/test/ui/impl-trait/universal_in_adt_in_parameters.rs
diff --git a/src/test/run-pass/impl-trait/universal_in_impl_trait_in_parameters.rs b/src/test/ui/impl-trait/universal_in_impl_trait_in_parameters.rs
index e98912d95a5..e98912d95a5 100644
--- a/src/test/run-pass/impl-trait/universal_in_impl_trait_in_parameters.rs
+++ b/src/test/ui/impl-trait/universal_in_impl_trait_in_parameters.rs
diff --git a/src/test/run-pass/impl-trait/universal_in_trait_defn_parameters.rs b/src/test/ui/impl-trait/universal_in_trait_defn_parameters.rs
index 23c217a8f8b..23c217a8f8b 100644
--- a/src/test/run-pass/impl-trait/universal_in_trait_defn_parameters.rs
+++ b/src/test/ui/impl-trait/universal_in_trait_defn_parameters.rs
diff --git a/src/test/run-pass/impl-trait/universal_multiple_bounds.rs b/src/test/ui/impl-trait/universal_multiple_bounds.rs
index 40c1405c39b..40c1405c39b 100644
--- a/src/test/run-pass/impl-trait/universal_multiple_bounds.rs
+++ b/src/test/ui/impl-trait/universal_multiple_bounds.rs
diff --git a/src/test/run-pass/impl-trait/xcrate.rs b/src/test/ui/impl-trait/xcrate.rs
index b73d2946c2b..b73d2946c2b 100644
--- a/src/test/run-pass/impl-trait/xcrate.rs
+++ b/src/test/ui/impl-trait/xcrate.rs
diff --git a/src/test/run-pass/impl-trait/xcrate_simple.rs b/src/test/ui/impl-trait/xcrate_simple.rs
index 2b1fc97e321..2b1fc97e321 100644
--- a/src/test/run-pass/impl-trait/xcrate_simple.rs
+++ b/src/test/ui/impl-trait/xcrate_simple.rs
diff --git a/src/test/run-pass/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs b/src/test/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs
index b76c1680bba..b76c1680bba 100644
--- a/src/test/run-pass/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs
+++ b/src/test/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs
diff --git a/src/test/run-pass/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs b/src/test/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs
index 63611c24299..63611c24299 100644
--- a/src/test/run-pass/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs
+++ b/src/test/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs
diff --git a/src/test/run-pass/imports/import-crate-with-invalid-spans/main.rs b/src/test/ui/imports/import-crate-with-invalid-spans/main.rs
index 64a4deca8c3..64a4deca8c3 100644
--- a/src/test/run-pass/imports/import-crate-with-invalid-spans/main.rs
+++ b/src/test/ui/imports/import-crate-with-invalid-spans/main.rs
diff --git a/src/test/run-pass/imports/import-from.rs b/src/test/ui/imports/import-from.rs
index 2817977b393..2817977b393 100644
--- a/src/test/run-pass/imports/import-from.rs
+++ b/src/test/ui/imports/import-from.rs
diff --git a/src/test/run-pass/imports/import-glob-0.rs b/src/test/ui/imports/import-glob-0-rpass.rs
index 9c6a87279a2..9c6a87279a2 100644
--- a/src/test/run-pass/imports/import-glob-0.rs
+++ b/src/test/ui/imports/import-glob-0-rpass.rs
diff --git a/src/test/run-pass/imports/import-glob-1.rs b/src/test/ui/imports/import-glob-1.rs
index fcc0b63f101..fcc0b63f101 100644
--- a/src/test/run-pass/imports/import-glob-1.rs
+++ b/src/test/ui/imports/import-glob-1.rs
diff --git a/src/test/run-pass/imports/import-glob-crate.rs b/src/test/ui/imports/import-glob-crate.rs
index 501392b7829..501392b7829 100644
--- a/src/test/run-pass/imports/import-glob-crate.rs
+++ b/src/test/ui/imports/import-glob-crate.rs
diff --git a/src/test/run-pass/imports/import-in-block.rs b/src/test/ui/imports/import-in-block.rs
index c0ba6220b54..c0ba6220b54 100644
--- a/src/test/run-pass/imports/import-in-block.rs
+++ b/src/test/ui/imports/import-in-block.rs
diff --git a/src/test/run-pass/imports/import-prefix-macro.rs b/src/test/ui/imports/import-prefix-macro.rs
index d770bb0da80..d770bb0da80 100644
--- a/src/test/run-pass/imports/import-prefix-macro.rs
+++ b/src/test/ui/imports/import-prefix-macro.rs
diff --git a/src/test/run-pass/imports/import-rename.rs b/src/test/ui/imports/import-rename.rs
index 9ad2b34b837..9ad2b34b837 100644
--- a/src/test/run-pass/imports/import-rename.rs
+++ b/src/test/ui/imports/import-rename.rs
diff --git a/src/test/run-pass/imports/import-trailing-comma.rs b/src/test/ui/imports/import-trailing-comma.rs
index f65c5c866a3..f65c5c866a3 100644
--- a/src/test/run-pass/imports/import-trailing-comma.rs
+++ b/src/test/ui/imports/import-trailing-comma.rs
diff --git a/src/test/run-pass/imports/import.rs b/src/test/ui/imports/import.rs
index de8bf626114..de8bf626114 100644
--- a/src/test/run-pass/imports/import.rs
+++ b/src/test/ui/imports/import.rs
diff --git a/src/test/run-pass/imports/import2.rs b/src/test/ui/imports/import2.rs
index 7b70f799ebf..7b70f799ebf 100644
--- a/src/test/run-pass/imports/import2.rs
+++ b/src/test/ui/imports/import2.rs
diff --git a/src/test/run-pass/imports/import3.rs b/src/test/ui/imports/import3.rs
index 17797aed359..17797aed359 100644
--- a/src/test/run-pass/imports/import3.rs
+++ b/src/test/ui/imports/import3.rs
diff --git a/src/test/run-pass/imports/import4.rs b/src/test/ui/imports/import4.rs
index 4fda5386112..4fda5386112 100644
--- a/src/test/run-pass/imports/import4.rs
+++ b/src/test/ui/imports/import4.rs
diff --git a/src/test/run-pass/imports/import5.rs b/src/test/ui/imports/import5.rs
index be2a55c2d41..be2a55c2d41 100644
--- a/src/test/run-pass/imports/import5.rs
+++ b/src/test/ui/imports/import5.rs
diff --git a/src/test/run-pass/imports/import6.rs b/src/test/ui/imports/import6.rs
index e11b28531f9..e11b28531f9 100644
--- a/src/test/run-pass/imports/import6.rs
+++ b/src/test/ui/imports/import6.rs
diff --git a/src/test/run-pass/imports/import7.rs b/src/test/ui/imports/import7.rs
index aca7fbdc4f5..aca7fbdc4f5 100644
--- a/src/test/run-pass/imports/import7.rs
+++ b/src/test/ui/imports/import7.rs
diff --git a/src/test/run-pass/imports/import8.rs b/src/test/ui/imports/import8.rs
index 87f0986bae4..87f0986bae4 100644
--- a/src/test/run-pass/imports/import8.rs
+++ b/src/test/ui/imports/import8.rs
diff --git a/src/test/run-pass/imports/imports.rs b/src/test/ui/imports/imports.rs
index acb2b32b59d..acb2b32b59d 100644
--- a/src/test/run-pass/imports/imports.rs
+++ b/src/test/ui/imports/imports.rs
diff --git a/src/test/run-pass/in-band-lifetimes.rs b/src/test/ui/in-band-lifetimes.rs
index c8922605363..c9f7d28699e 100644
--- a/src/test/run-pass/in-band-lifetimes.rs
+++ b/src/test/ui/in-band-lifetimes.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(warnings)]
 #![feature(in_band_lifetimes)]
 
diff --git a/src/test/run-pass/inc-range-pat.rs b/src/test/ui/inc-range-pat.rs
index a648ff17492..1eb7dd0aa3e 100644
--- a/src/test/run-pass/inc-range-pat.rs
+++ b/src/test/ui/inc-range-pat.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test old and new syntax for inclusive range patterns.
 
 #![allow(ellipsis_inclusive_range_patterns)]
diff --git a/src/test/run-pass/infer-fn-tail-expr.rs b/src/test/ui/infer-fn-tail-expr.rs
index ab0210baa96..413b1877a29 100644
--- a/src/test/run-pass/infer-fn-tail-expr.rs
+++ b/src/test/ui/infer-fn-tail-expr.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // issue #680
 
diff --git a/src/test/run-pass/inherit-env.rs b/src/test/ui/inherit-env.rs
index 229953f1b18..e29fa04bbd5 100644
--- a/src/test/run-pass/inherit-env.rs
+++ b/src/test/ui/inherit-env.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-emscripten
 // ignore-wasm32
 // ignore-sgx no processes
diff --git a/src/test/run-pass/init-large-type.rs b/src/test/ui/init-large-type.rs
index cb64cd0b0f3..a304fc9356b 100644
--- a/src/test/run-pass/init-large-type.rs
+++ b/src/test/ui/init-large-type.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 // Makes sure that zero-initializing large types is reasonably fast,
 // Doing it incorrectly causes massive slowdown in LLVM during
diff --git a/src/test/run-pass/init-res-into-things.rs b/src/test/ui/init-res-into-things.rs
index 832637962bb..ed0c600c1d2 100644
--- a/src/test/run-pass/init-res-into-things.rs
+++ b/src/test/ui/init-res-into-things.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/inlined-main.rs b/src/test/ui/inlined-main.rs
index 3a55a894267..75ff4c87dc6 100644
--- a/src/test/run-pass/inlined-main.rs
+++ b/src/test/ui/inlined-main.rs
@@ -1,2 +1,4 @@
+// run-pass
+
 #[inline(always)]
 fn main() {}
diff --git a/src/test/run-pass/inner-attrs-on-impl.rs b/src/test/ui/inner-attrs-on-impl.rs
index 4cc659562ea..636e8c4885e 100644
--- a/src/test/run-pass/inner-attrs-on-impl.rs
+++ b/src/test/ui/inner-attrs-on-impl.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 struct Foo;
 
 impl Foo {
diff --git a/src/test/run-pass/inner-module.rs b/src/test/ui/inner-module.rs
index d8658691875..363f753e248 100644
--- a/src/test/run-pass/inner-module.rs
+++ b/src/test/ui/inner-module.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 mod inner {
     pub mod inner2 {
         pub fn hello() { println!("hello, modular world"); }
diff --git a/src/test/run-pass/inner-static.rs b/src/test/ui/inner-static.rs
index 6f7d7c22887..adba299ebe2 100644
--- a/src/test/run-pass/inner-static.rs
+++ b/src/test/ui/inner-static.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:inner_static.rs
 
 
diff --git a/src/test/run-pass/instantiable.rs b/src/test/ui/instantiable.rs
index fe8d9f97149..ad0cf3f4ac9 100644
--- a/src/test/run-pass/instantiable.rs
+++ b/src/test/ui/instantiable.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/intrinsics/auxiliary/cci_intrinsic.rs b/src/test/ui/intrinsics/auxiliary/cci_intrinsic.rs
index f65f359875b..f65f359875b 100644
--- a/src/test/run-pass/intrinsics/auxiliary/cci_intrinsic.rs
+++ b/src/test/ui/intrinsics/auxiliary/cci_intrinsic.rs
diff --git a/src/test/run-pass/intrinsics/intrinsic-alignment.rs b/src/test/ui/intrinsics/intrinsic-alignment.rs
index 6a67d04a54c..6a67d04a54c 100644
--- a/src/test/run-pass/intrinsics/intrinsic-alignment.rs
+++ b/src/test/ui/intrinsics/intrinsic-alignment.rs
diff --git a/src/test/run-pass/intrinsics/intrinsic-assume.rs b/src/test/ui/intrinsics/intrinsic-assume.rs
index 3c9d70cb556..3c9d70cb556 100644
--- a/src/test/run-pass/intrinsics/intrinsic-assume.rs
+++ b/src/test/ui/intrinsics/intrinsic-assume.rs
diff --git a/src/test/run-pass/intrinsics/intrinsic-atomics-cc.rs b/src/test/ui/intrinsics/intrinsic-atomics-cc.rs
index 52e891da9ba..52e891da9ba 100644
--- a/src/test/run-pass/intrinsics/intrinsic-atomics-cc.rs
+++ b/src/test/ui/intrinsics/intrinsic-atomics-cc.rs
diff --git a/src/test/run-pass/intrinsics/intrinsic-atomics.rs b/src/test/ui/intrinsics/intrinsic-atomics.rs
index 608cf3dee52..608cf3dee52 100644
--- a/src/test/run-pass/intrinsics/intrinsic-atomics.rs
+++ b/src/test/ui/intrinsics/intrinsic-atomics.rs
diff --git a/src/test/run-pass/intrinsics/intrinsic-move-val-cleanups.rs b/src/test/ui/intrinsics/intrinsic-move-val-cleanups.rs
index a2068429af5..a2068429af5 100644
--- a/src/test/run-pass/intrinsics/intrinsic-move-val-cleanups.rs
+++ b/src/test/ui/intrinsics/intrinsic-move-val-cleanups.rs
diff --git a/src/test/run-pass/intrinsics/intrinsic-move-val.rs b/src/test/ui/intrinsics/intrinsic-move-val.rs
index 75b4ec365fe..75b4ec365fe 100644
--- a/src/test/run-pass/intrinsics/intrinsic-move-val.rs
+++ b/src/test/ui/intrinsics/intrinsic-move-val.rs
diff --git a/src/test/run-pass/intrinsics/intrinsic-unreachable.rs b/src/test/ui/intrinsics/intrinsic-unreachable.rs
index da1a32d58ea..da1a32d58ea 100644
--- a/src/test/run-pass/intrinsics/intrinsic-unreachable.rs
+++ b/src/test/ui/intrinsics/intrinsic-unreachable.rs
diff --git a/src/test/run-pass/intrinsics/intrinsics-integer.rs b/src/test/ui/intrinsics/intrinsics-integer.rs
index 0154f049950..0154f049950 100644
--- a/src/test/run-pass/intrinsics/intrinsics-integer.rs
+++ b/src/test/ui/intrinsics/intrinsics-integer.rs
diff --git a/src/test/run-pass/intrinsics/intrinsics-math.rs b/src/test/ui/intrinsics/intrinsics-math.rs
index aea9fde6915..aea9fde6915 100644
--- a/src/test/run-pass/intrinsics/intrinsics-math.rs
+++ b/src/test/ui/intrinsics/intrinsics-math.rs
diff --git a/src/test/run-pass/invalid_const_promotion.rs b/src/test/ui/invalid_const_promotion.rs
index ddf4dc42424..6d59bb385dc 100644
--- a/src/test/run-pass/invalid_const_promotion.rs
+++ b/src/test/ui/invalid_const_promotion.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_mut)]
 // ignore-wasm32
 // ignore-emscripten
diff --git a/src/test/run-pass/invoke-external-foreign.rs b/src/test/ui/invoke-external-foreign.rs
index d34933cde42..dbd2b4ad865 100644
--- a/src/test/run-pass/invoke-external-foreign.rs
+++ b/src/test/ui/invoke-external-foreign.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:foreign_lib.rs
 // ignore-wasm32-bare no libc to test ffi with
 
diff --git a/src/test/run-pass/irrefutable-unit.rs b/src/test/ui/irrefutable-unit.rs
index f588ae3a557..dd8f03b6dbd 100644
--- a/src/test/run-pass/irrefutable-unit.rs
+++ b/src/test/ui/irrefutable-unit.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 pub fn main() {
diff --git a/src/test/run-pass/issue-59020.rs b/src/test/ui/issue-59020.rs
index e7544934da0..e7544934da0 100644
--- a/src/test/run-pass/issue-59020.rs
+++ b/src/test/ui/issue-59020.rs
diff --git a/src/test/run-pass/issues/.gitattributes b/src/test/ui/issues/.gitattributes
index 4517a4a2f1e..4517a4a2f1e 100644
--- a/src/test/run-pass/issues/.gitattributes
+++ b/src/test/ui/issues/.gitattributes
diff --git a/src/test/run-pass/issues/auxiliary/cgu_test.rs b/src/test/ui/issues/auxiliary/cgu_test.rs
index 5ed973164a1..5ed973164a1 100644
--- a/src/test/run-pass/issues/auxiliary/cgu_test.rs
+++ b/src/test/ui/issues/auxiliary/cgu_test.rs
diff --git a/src/test/run-pass/issues/auxiliary/cgu_test_a.rs b/src/test/ui/issues/auxiliary/cgu_test_a.rs
index a3dcd92012e..a3dcd92012e 100644
--- a/src/test/run-pass/issues/auxiliary/cgu_test_a.rs
+++ b/src/test/ui/issues/auxiliary/cgu_test_a.rs
diff --git a/src/test/run-pass/issues/auxiliary/cgu_test_b.rs b/src/test/ui/issues/auxiliary/cgu_test_b.rs
index a3dcd92012e..a3dcd92012e 100644
--- a/src/test/run-pass/issues/auxiliary/cgu_test_b.rs
+++ b/src/test/ui/issues/auxiliary/cgu_test_b.rs
diff --git a/src/test/run-pass/issues/auxiliary/i8.rs b/src/test/ui/issues/auxiliary/i8.rs
index 889a9c4ebb1..889a9c4ebb1 100644
--- a/src/test/run-pass/issues/auxiliary/i8.rs
+++ b/src/test/ui/issues/auxiliary/i8.rs
diff --git a/src/test/run-pass/issues/auxiliary/iss.rs b/src/test/ui/issues/auxiliary/iss.rs
index cf32f6c2d5d..cf32f6c2d5d 100644
--- a/src/test/run-pass/issues/auxiliary/iss.rs
+++ b/src/test/ui/issues/auxiliary/iss.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-10028.rs b/src/test/ui/issues/auxiliary/issue-10028.rs
index 135f26f4047..135f26f4047 100644
--- a/src/test/run-pass/issues/auxiliary/issue-10028.rs
+++ b/src/test/ui/issues/auxiliary/issue-10028.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-10031-aux.rs b/src/test/ui/issues/auxiliary/issue-10031-aux.rs
index e2abeb99ea8..e2abeb99ea8 100644
--- a/src/test/run-pass/issues/auxiliary/issue-10031-aux.rs
+++ b/src/test/ui/issues/auxiliary/issue-10031-aux.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-11224.rs b/src/test/ui/issues/auxiliary/issue-11224.rs
index 63543621a80..63543621a80 100644
--- a/src/test/run-pass/issues/auxiliary/issue-11224.rs
+++ b/src/test/ui/issues/auxiliary/issue-11224.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-11225-1.rs b/src/test/ui/issues/auxiliary/issue-11225-1.rs
index 2c6f899a0f4..2c6f899a0f4 100644
--- a/src/test/run-pass/issues/auxiliary/issue-11225-1.rs
+++ b/src/test/ui/issues/auxiliary/issue-11225-1.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-11225-2.rs b/src/test/ui/issues/auxiliary/issue-11225-2.rs
index 4381f0a4edf..4381f0a4edf 100644
--- a/src/test/run-pass/issues/auxiliary/issue-11225-2.rs
+++ b/src/test/ui/issues/auxiliary/issue-11225-2.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-11225-3.rs b/src/test/ui/issues/auxiliary/issue-11225-3.rs
index 266e42a10b5..266e42a10b5 100644
--- a/src/test/run-pass/issues/auxiliary/issue-11225-3.rs
+++ b/src/test/ui/issues/auxiliary/issue-11225-3.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-11508.rs b/src/test/ui/issues/auxiliary/issue-11508.rs
index 16bfc65c2b5..16bfc65c2b5 100644
--- a/src/test/run-pass/issues/auxiliary/issue-11508.rs
+++ b/src/test/ui/issues/auxiliary/issue-11508.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-11529.rs b/src/test/ui/issues/auxiliary/issue-11529.rs
index dd3ef438705..dd3ef438705 100644
--- a/src/test/run-pass/issues/auxiliary/issue-11529.rs
+++ b/src/test/ui/issues/auxiliary/issue-11529.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-12133-dylib.rs b/src/test/ui/issues/auxiliary/issue-12133-dylib.rs
index 8bd2b3353b8..8bd2b3353b8 100644
--- a/src/test/run-pass/issues/auxiliary/issue-12133-dylib.rs
+++ b/src/test/ui/issues/auxiliary/issue-12133-dylib.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-12133-dylib2.rs b/src/test/ui/issues/auxiliary/issue-12133-dylib2.rs
index 30de7400600..30de7400600 100644
--- a/src/test/run-pass/issues/auxiliary/issue-12133-dylib2.rs
+++ b/src/test/ui/issues/auxiliary/issue-12133-dylib2.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-12133-rlib.rs b/src/test/ui/issues/auxiliary/issue-12133-rlib.rs
index 39c261e1162..39c261e1162 100644
--- a/src/test/run-pass/issues/auxiliary/issue-12133-rlib.rs
+++ b/src/test/ui/issues/auxiliary/issue-12133-rlib.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-12612-1.rs b/src/test/ui/issues/auxiliary/issue-12612-1.rs
index 01f5a784bb7..01f5a784bb7 100644
--- a/src/test/run-pass/issues/auxiliary/issue-12612-1.rs
+++ b/src/test/ui/issues/auxiliary/issue-12612-1.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-12612-2.rs b/src/test/ui/issues/auxiliary/issue-12612-2.rs
index 2c724787193..2c724787193 100644
--- a/src/test/run-pass/issues/auxiliary/issue-12612-2.rs
+++ b/src/test/ui/issues/auxiliary/issue-12612-2.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-12660-aux.rs b/src/test/ui/issues/auxiliary/issue-12660-aux.rs
index 6dea8662dfe..6dea8662dfe 100644
--- a/src/test/run-pass/issues/auxiliary/issue-12660-aux.rs
+++ b/src/test/ui/issues/auxiliary/issue-12660-aux.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-13507.rs b/src/test/ui/issues/auxiliary/issue-13507.rs
index c91013043eb..c91013043eb 100644
--- a/src/test/run-pass/issues/auxiliary/issue-13507.rs
+++ b/src/test/ui/issues/auxiliary/issue-13507.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-13620-1.rs b/src/test/ui/issues/auxiliary/issue-13620-1.rs
index 1442c0cc7aa..1442c0cc7aa 100644
--- a/src/test/run-pass/issues/auxiliary/issue-13620-1.rs
+++ b/src/test/ui/issues/auxiliary/issue-13620-1.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-13620-2.rs b/src/test/ui/issues/auxiliary/issue-13620-2.rs
index 7efd24407ba..7efd24407ba 100644
--- a/src/test/run-pass/issues/auxiliary/issue-13620-2.rs
+++ b/src/test/ui/issues/auxiliary/issue-13620-2.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-13872-1.rs b/src/test/ui/issues/auxiliary/issue-13872-1.rs
index fa9258834c7..fa9258834c7 100644
--- a/src/test/run-pass/issues/auxiliary/issue-13872-1.rs
+++ b/src/test/ui/issues/auxiliary/issue-13872-1.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-13872-2.rs b/src/test/ui/issues/auxiliary/issue-13872-2.rs
index 8c64f16e3f9..8c64f16e3f9 100644
--- a/src/test/run-pass/issues/auxiliary/issue-13872-2.rs
+++ b/src/test/ui/issues/auxiliary/issue-13872-2.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-13872-3.rs b/src/test/ui/issues/auxiliary/issue-13872-3.rs
index d31d52eb847..d31d52eb847 100644
--- a/src/test/run-pass/issues/auxiliary/issue-13872-3.rs
+++ b/src/test/ui/issues/auxiliary/issue-13872-3.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-14344-1.rs b/src/test/ui/issues/auxiliary/issue-14344-1.rs
index 954a1e554da..954a1e554da 100644
--- a/src/test/run-pass/issues/auxiliary/issue-14344-1.rs
+++ b/src/test/ui/issues/auxiliary/issue-14344-1.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-14344-2.rs b/src/test/ui/issues/auxiliary/issue-14344-2.rs
index c47b8c0ea6c..c47b8c0ea6c 100644
--- a/src/test/run-pass/issues/auxiliary/issue-14344-2.rs
+++ b/src/test/ui/issues/auxiliary/issue-14344-2.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-14421.rs b/src/test/ui/issues/auxiliary/issue-14421.rs
index 5fe4b24cf17..5fe4b24cf17 100644
--- a/src/test/run-pass/issues/auxiliary/issue-14421.rs
+++ b/src/test/ui/issues/auxiliary/issue-14421.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-14422.rs b/src/test/ui/issues/auxiliary/issue-14422.rs
index a6026c1d03f..a6026c1d03f 100644
--- a/src/test/run-pass/issues/auxiliary/issue-14422.rs
+++ b/src/test/ui/issues/auxiliary/issue-14422.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-15562.rs b/src/test/ui/issues/auxiliary/issue-15562.rs
index d5afaaa5622..d5afaaa5622 100644
--- a/src/test/run-pass/issues/auxiliary/issue-15562.rs
+++ b/src/test/ui/issues/auxiliary/issue-15562.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-16643.rs b/src/test/ui/issues/auxiliary/issue-16643.rs
index 7808e0119f6..7808e0119f6 100644
--- a/src/test/run-pass/issues/auxiliary/issue-16643.rs
+++ b/src/test/ui/issues/auxiliary/issue-16643.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-17662.rs b/src/test/ui/issues/auxiliary/issue-17662.rs
index 75efe110cdf..75efe110cdf 100644
--- a/src/test/run-pass/issues/auxiliary/issue-17662.rs
+++ b/src/test/ui/issues/auxiliary/issue-17662.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-17718-aux.rs b/src/test/ui/issues/auxiliary/issue-17718-aux.rs
index 91abdbff868..91abdbff868 100644
--- a/src/test/run-pass/issues/auxiliary/issue-17718-aux.rs
+++ b/src/test/ui/issues/auxiliary/issue-17718-aux.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-18501.rs b/src/test/ui/issues/auxiliary/issue-18501.rs
index dd914b464fa..dd914b464fa 100644
--- a/src/test/run-pass/issues/auxiliary/issue-18501.rs
+++ b/src/test/ui/issues/auxiliary/issue-18501.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-18514.rs b/src/test/ui/issues/auxiliary/issue-18514.rs
index 20c8e60ee45..20c8e60ee45 100644
--- a/src/test/run-pass/issues/auxiliary/issue-18514.rs
+++ b/src/test/ui/issues/auxiliary/issue-18514.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-18711.rs b/src/test/ui/issues/auxiliary/issue-18711.rs
index 5cb1f9c4371..5cb1f9c4371 100644
--- a/src/test/run-pass/issues/auxiliary/issue-18711.rs
+++ b/src/test/ui/issues/auxiliary/issue-18711.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-18913-1.rs b/src/test/ui/issues/auxiliary/issue-18913-1.rs
index 053c5ada5ee..053c5ada5ee 100644
--- a/src/test/run-pass/issues/auxiliary/issue-18913-1.rs
+++ b/src/test/ui/issues/auxiliary/issue-18913-1.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-18913-2.rs b/src/test/ui/issues/auxiliary/issue-18913-2.rs
index 54747b45f52..54747b45f52 100644
--- a/src/test/run-pass/issues/auxiliary/issue-18913-2.rs
+++ b/src/test/ui/issues/auxiliary/issue-18913-2.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-19293.rs b/src/test/ui/issues/auxiliary/issue-19293.rs
index 31359e86559..31359e86559 100644
--- a/src/test/run-pass/issues/auxiliary/issue-19293.rs
+++ b/src/test/ui/issues/auxiliary/issue-19293.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-19340-1.rs b/src/test/ui/issues/auxiliary/issue-19340-1.rs
index 39ee36b8b91..39ee36b8b91 100644
--- a/src/test/run-pass/issues/auxiliary/issue-19340-1.rs
+++ b/src/test/ui/issues/auxiliary/issue-19340-1.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-20389.rs b/src/test/ui/issues/auxiliary/issue-20389.rs
index ae6d44eeb77..ae6d44eeb77 100644
--- a/src/test/run-pass/issues/auxiliary/issue-20389.rs
+++ b/src/test/ui/issues/auxiliary/issue-20389.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-2170-lib.rs b/src/test/ui/issues/auxiliary/issue-2170-lib.rs
index a99385a834d..a99385a834d 100644
--- a/src/test/run-pass/issues/auxiliary/issue-2170-lib.rs
+++ b/src/test/ui/issues/auxiliary/issue-2170-lib.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-2316-a.rs b/src/test/ui/issues/auxiliary/issue-2316-a.rs
index 418ddc0b069..418ddc0b069 100644
--- a/src/test/run-pass/issues/auxiliary/issue-2316-a.rs
+++ b/src/test/ui/issues/auxiliary/issue-2316-a.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-2316-b.rs b/src/test/ui/issues/auxiliary/issue-2316-b.rs
index 550c2d6eb22..550c2d6eb22 100644
--- a/src/test/run-pass/issues/auxiliary/issue-2316-b.rs
+++ b/src/test/ui/issues/auxiliary/issue-2316-b.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-2380.rs b/src/test/ui/issues/auxiliary/issue-2380.rs
index 9a51a73c9a3..9a51a73c9a3 100644
--- a/src/test/run-pass/issues/auxiliary/issue-2380.rs
+++ b/src/test/ui/issues/auxiliary/issue-2380.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-2414-a.rs b/src/test/ui/issues/auxiliary/issue-2414-a.rs
index b90ab32ddc4..b90ab32ddc4 100644
--- a/src/test/run-pass/issues/auxiliary/issue-2414-a.rs
+++ b/src/test/ui/issues/auxiliary/issue-2414-a.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-2414-b.rs b/src/test/ui/issues/auxiliary/issue-2414-b.rs
index fc018349d80..fc018349d80 100644
--- a/src/test/run-pass/issues/auxiliary/issue-2414-b.rs
+++ b/src/test/ui/issues/auxiliary/issue-2414-b.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-2472-b.rs b/src/test/ui/issues/auxiliary/issue-2472-b.rs
index 0d151520fe0..0d151520fe0 100644
--- a/src/test/run-pass/issues/auxiliary/issue-2472-b.rs
+++ b/src/test/ui/issues/auxiliary/issue-2472-b.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-25185-1.rs b/src/test/ui/issues/auxiliary/issue-25185-1.rs
index 77a4787ba94..77a4787ba94 100644
--- a/src/test/run-pass/issues/auxiliary/issue-25185-1.rs
+++ b/src/test/ui/issues/auxiliary/issue-25185-1.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-25185-2.rs b/src/test/ui/issues/auxiliary/issue-25185-2.rs
index 7ce3df255a3..7ce3df255a3 100644
--- a/src/test/run-pass/issues/auxiliary/issue-25185-2.rs
+++ b/src/test/ui/issues/auxiliary/issue-25185-2.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-2526.rs b/src/test/ui/issues/auxiliary/issue-2526.rs
index 3b27f658cda..3b27f658cda 100644
--- a/src/test/run-pass/issues/auxiliary/issue-2526.rs
+++ b/src/test/ui/issues/auxiliary/issue-2526.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-25467.rs b/src/test/ui/issues/auxiliary/issue-25467.rs
index ca9b3097c83..ca9b3097c83 100644
--- a/src/test/run-pass/issues/auxiliary/issue-25467.rs
+++ b/src/test/ui/issues/auxiliary/issue-25467.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-2631-a.rs b/src/test/ui/issues/auxiliary/issue-2631-a.rs
index 1e8211bfaa7..1e8211bfaa7 100644
--- a/src/test/run-pass/issues/auxiliary/issue-2631-a.rs
+++ b/src/test/ui/issues/auxiliary/issue-2631-a.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-2723-a.rs b/src/test/ui/issues/auxiliary/issue-2723-a.rs
index 661b46d829d..661b46d829d 100644
--- a/src/test/run-pass/issues/auxiliary/issue-2723-a.rs
+++ b/src/test/ui/issues/auxiliary/issue-2723-a.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-29485.rs b/src/test/ui/issues/auxiliary/issue-29485.rs
index 1e8891c5120..1e8891c5120 100644
--- a/src/test/run-pass/issues/auxiliary/issue-29485.rs
+++ b/src/test/ui/issues/auxiliary/issue-29485.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-3012-1.rs b/src/test/ui/issues/auxiliary/issue-3012-1.rs
index 509af2a8d7d..509af2a8d7d 100644
--- a/src/test/run-pass/issues/auxiliary/issue-3012-1.rs
+++ b/src/test/ui/issues/auxiliary/issue-3012-1.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-3136-a.rc b/src/test/ui/issues/auxiliary/issue-3136-a.rc
index cd5fd314505..cd5fd314505 100644
--- a/src/test/run-pass/issues/auxiliary/issue-3136-a.rc
+++ b/src/test/ui/issues/auxiliary/issue-3136-a.rc
diff --git a/src/test/run-pass/issues/auxiliary/issue-3136-a.rs b/src/test/ui/issues/auxiliary/issue-3136-a.rs
index 9bb546ab393..9bb546ab393 100644
--- a/src/test/run-pass/issues/auxiliary/issue-3136-a.rs
+++ b/src/test/ui/issues/auxiliary/issue-3136-a.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-31702-1.rs b/src/test/ui/issues/auxiliary/issue-31702-1.rs
index a48d0dc2c64..a48d0dc2c64 100644
--- a/src/test/run-pass/issues/auxiliary/issue-31702-1.rs
+++ b/src/test/ui/issues/auxiliary/issue-31702-1.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-31702-2.rs b/src/test/ui/issues/auxiliary/issue-31702-2.rs
index d360ae0ca7e..d360ae0ca7e 100644
--- a/src/test/run-pass/issues/auxiliary/issue-31702-2.rs
+++ b/src/test/ui/issues/auxiliary/issue-31702-2.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-34796-aux.rs b/src/test/ui/issues/auxiliary/issue-34796-aux.rs
index 09c69b90329..09c69b90329 100644
--- a/src/test/run-pass/issues/auxiliary/issue-34796-aux.rs
+++ b/src/test/ui/issues/auxiliary/issue-34796-aux.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-36954.rs b/src/test/ui/issues/auxiliary/issue-36954.rs
index bc444a3817b..bc444a3817b 100644
--- a/src/test/run-pass/issues/auxiliary/issue-36954.rs
+++ b/src/test/ui/issues/auxiliary/issue-36954.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-38190.rs b/src/test/ui/issues/auxiliary/issue-38190.rs
index 373e646ba2c..373e646ba2c 100644
--- a/src/test/run-pass/issues/auxiliary/issue-38190.rs
+++ b/src/test/ui/issues/auxiliary/issue-38190.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-38226-aux.rs b/src/test/ui/issues/auxiliary/issue-38226-aux.rs
index f968017199f..f968017199f 100644
--- a/src/test/run-pass/issues/auxiliary/issue-38226-aux.rs
+++ b/src/test/ui/issues/auxiliary/issue-38226-aux.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-38715-modern.rs b/src/test/ui/issues/auxiliary/issue-38715-modern.rs
index 15d072957cb..15d072957cb 100644
--- a/src/test/run-pass/issues/auxiliary/issue-38715-modern.rs
+++ b/src/test/ui/issues/auxiliary/issue-38715-modern.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-38715.rs b/src/test/ui/issues/auxiliary/issue-38715.rs
index 5c15073f5a5..5c15073f5a5 100644
--- a/src/test/run-pass/issues/auxiliary/issue-38715.rs
+++ b/src/test/ui/issues/auxiliary/issue-38715.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-3979-traits.rs b/src/test/ui/issues/auxiliary/issue-3979-traits.rs
index 5d03a0e9e99..5d03a0e9e99 100644
--- a/src/test/run-pass/issues/auxiliary/issue-3979-traits.rs
+++ b/src/test/ui/issues/auxiliary/issue-3979-traits.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-39823.rs b/src/test/ui/issues/auxiliary/issue-39823.rs
index 3af9c68f233..3af9c68f233 100644
--- a/src/test/run-pass/issues/auxiliary/issue-39823.rs
+++ b/src/test/ui/issues/auxiliary/issue-39823.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-40469.rs b/src/test/ui/issues/auxiliary/issue-40469.rs
index 4f2f41f2cde..4f2f41f2cde 100644
--- a/src/test/run-pass/issues/auxiliary/issue-40469.rs
+++ b/src/test/ui/issues/auxiliary/issue-40469.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-41053.rs b/src/test/ui/issues/auxiliary/issue-41053.rs
index ae73c3e780f..ae73c3e780f 100644
--- a/src/test/run-pass/issues/auxiliary/issue-41053.rs
+++ b/src/test/ui/issues/auxiliary/issue-41053.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-41394.rs b/src/test/ui/issues/auxiliary/issue-41394.rs
index 2e650efc714..2e650efc714 100644
--- a/src/test/run-pass/issues/auxiliary/issue-41394.rs
+++ b/src/test/ui/issues/auxiliary/issue-41394.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-42007-s.rs b/src/test/ui/issues/auxiliary/issue-42007-s.rs
index 95119a589c9..95119a589c9 100644
--- a/src/test/run-pass/issues/auxiliary/issue-42007-s.rs
+++ b/src/test/ui/issues/auxiliary/issue-42007-s.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-4208-cc.rs b/src/test/ui/issues/auxiliary/issue-4208-cc.rs
index 7b4c8b01a9e..7b4c8b01a9e 100644
--- a/src/test/run-pass/issues/auxiliary/issue-4208-cc.rs
+++ b/src/test/ui/issues/auxiliary/issue-4208-cc.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-4545.rs b/src/test/ui/issues/auxiliary/issue-4545.rs
index 2f609475075..2f609475075 100644
--- a/src/test/run-pass/issues/auxiliary/issue-4545.rs
+++ b/src/test/ui/issues/auxiliary/issue-4545.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-48984-aux.rs b/src/test/ui/issues/auxiliary/issue-48984-aux.rs
index 7cc888cd4cb..7cc888cd4cb 100644
--- a/src/test/run-pass/issues/auxiliary/issue-48984-aux.rs
+++ b/src/test/ui/issues/auxiliary/issue-48984-aux.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-5518.rs b/src/test/ui/issues/auxiliary/issue-5518.rs
index bfe96552a5c..bfe96552a5c 100644
--- a/src/test/run-pass/issues/auxiliary/issue-5518.rs
+++ b/src/test/ui/issues/auxiliary/issue-5518.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-5521.rs b/src/test/ui/issues/auxiliary/issue-5521.rs
index c2f81779b35..c2f81779b35 100644
--- a/src/test/run-pass/issues/auxiliary/issue-5521.rs
+++ b/src/test/ui/issues/auxiliary/issue-5521.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-7178.rs b/src/test/ui/issues/auxiliary/issue-7178.rs
index 56ae5139af4..56ae5139af4 100644
--- a/src/test/run-pass/issues/auxiliary/issue-7178.rs
+++ b/src/test/ui/issues/auxiliary/issue-7178.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-7899.rs b/src/test/ui/issues/auxiliary/issue-7899.rs
index 3af6e871661..3af6e871661 100644
--- a/src/test/run-pass/issues/auxiliary/issue-7899.rs
+++ b/src/test/ui/issues/auxiliary/issue-7899.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-8044.rs b/src/test/ui/issues/auxiliary/issue-8044.rs
index 2ec25f51cde..2ec25f51cde 100644
--- a/src/test/run-pass/issues/auxiliary/issue-8044.rs
+++ b/src/test/ui/issues/auxiliary/issue-8044.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-8259.rs b/src/test/ui/issues/auxiliary/issue-8259.rs
index 891aee099dc..891aee099dc 100644
--- a/src/test/run-pass/issues/auxiliary/issue-8259.rs
+++ b/src/test/ui/issues/auxiliary/issue-8259.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-8401.rs b/src/test/ui/issues/auxiliary/issue-8401.rs
index e35dbbfabfc..e35dbbfabfc 100644
--- a/src/test/run-pass/issues/auxiliary/issue-8401.rs
+++ b/src/test/ui/issues/auxiliary/issue-8401.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-9123.rs b/src/test/ui/issues/auxiliary/issue-9123.rs
index 60af53359e8..60af53359e8 100644
--- a/src/test/run-pass/issues/auxiliary/issue-9123.rs
+++ b/src/test/ui/issues/auxiliary/issue-9123.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-9155.rs b/src/test/ui/issues/auxiliary/issue-9155.rs
index 049a96a655a..049a96a655a 100644
--- a/src/test/run-pass/issues/auxiliary/issue-9155.rs
+++ b/src/test/ui/issues/auxiliary/issue-9155.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-9188.rs b/src/test/ui/issues/auxiliary/issue-9188.rs
index 3bc5697a1a6..3bc5697a1a6 100644
--- a/src/test/run-pass/issues/auxiliary/issue-9188.rs
+++ b/src/test/ui/issues/auxiliary/issue-9188.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-9906.rs b/src/test/ui/issues/auxiliary/issue-9906.rs
index 8a3eea790a2..8a3eea790a2 100644
--- a/src/test/run-pass/issues/auxiliary/issue-9906.rs
+++ b/src/test/ui/issues/auxiliary/issue-9906.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue-9968.rs b/src/test/ui/issues/auxiliary/issue-9968.rs
index 8d795b59ea8..8d795b59ea8 100644
--- a/src/test/run-pass/issues/auxiliary/issue-9968.rs
+++ b/src/test/ui/issues/auxiliary/issue-9968.rs
diff --git a/src/test/run-pass/issues/issue-10025.rs b/src/test/ui/issues/issue-10025.rs
index 193d7ee891f..193d7ee891f 100644
--- a/src/test/run-pass/issues/issue-10025.rs
+++ b/src/test/ui/issues/issue-10025.rs
diff --git a/src/test/run-pass/issues/issue-10028.rs b/src/test/ui/issues/issue-10028.rs
index 1692470e8d1..1692470e8d1 100644
--- a/src/test/run-pass/issues/issue-10028.rs
+++ b/src/test/ui/issues/issue-10028.rs
diff --git a/src/test/run-pass/issues/issue-10031.rs b/src/test/ui/issues/issue-10031.rs
index 136df05c239..136df05c239 100644
--- a/src/test/run-pass/issues/issue-10031.rs
+++ b/src/test/ui/issues/issue-10031.rs
diff --git a/src/test/run-pass/issues/issue-10228.rs b/src/test/ui/issues/issue-10228.rs
index ebf8b436f13..ebf8b436f13 100644
--- a/src/test/run-pass/issues/issue-10228.rs
+++ b/src/test/ui/issues/issue-10228.rs
diff --git a/src/test/run-pass/issues/issue-10392.rs b/src/test/ui/issues/issue-10392.rs
index 926fa94800e..926fa94800e 100644
--- a/src/test/run-pass/issues/issue-10392.rs
+++ b/src/test/ui/issues/issue-10392.rs
diff --git a/src/test/run-pass/issues/issue-10436.rs b/src/test/ui/issues/issue-10436.rs
index a7a20bad517..a7a20bad517 100644
--- a/src/test/run-pass/issues/issue-10436.rs
+++ b/src/test/ui/issues/issue-10436.rs
diff --git a/src/test/run-pass/issues/issue-10626.rs b/src/test/ui/issues/issue-10626.rs
index 78fa8b7c6fb..78fa8b7c6fb 100644
--- a/src/test/run-pass/issues/issue-10626.rs
+++ b/src/test/ui/issues/issue-10626.rs
diff --git a/src/test/run-pass/issues/issue-10638.rs b/src/test/ui/issues/issue-10638.rs
index e359669c00d..e359669c00d 100644
--- a/src/test/run-pass/issues/issue-10638.rs
+++ b/src/test/ui/issues/issue-10638.rs
diff --git a/src/test/run-pass/issues/issue-10682.rs b/src/test/ui/issues/issue-10682.rs
index afaa90f05ca..afaa90f05ca 100644
--- a/src/test/run-pass/issues/issue-10682.rs
+++ b/src/test/ui/issues/issue-10682.rs
diff --git a/src/test/run-pass/issues/issue-10683.rs b/src/test/ui/issues/issue-10683.rs
index dcb221f8c57..dcb221f8c57 100644
--- a/src/test/run-pass/issues/issue-10683.rs
+++ b/src/test/ui/issues/issue-10683.rs
diff --git a/src/test/run-pass/issues/issue-10718.rs b/src/test/ui/issues/issue-10718.rs
index a1de0cfe6ca..a1de0cfe6ca 100644
--- a/src/test/run-pass/issues/issue-10718.rs
+++ b/src/test/ui/issues/issue-10718.rs
diff --git a/src/test/run-pass/issues/issue-10734.rs b/src/test/ui/issues/issue-10734.rs
index 723e6ed22dd..723e6ed22dd 100644
--- a/src/test/run-pass/issues/issue-10734.rs
+++ b/src/test/ui/issues/issue-10734.rs
diff --git a/src/test/run-pass/issues/issue-10764.rs b/src/test/ui/issues/issue-10764-rpass.rs
index 42ed1ae93b5..42ed1ae93b5 100644
--- a/src/test/run-pass/issues/issue-10764.rs
+++ b/src/test/ui/issues/issue-10764-rpass.rs
diff --git a/src/test/run-pass/issues/issue-10767.rs b/src/test/ui/issues/issue-10767.rs
index fa10f073b45..fa10f073b45 100644
--- a/src/test/run-pass/issues/issue-10767.rs
+++ b/src/test/ui/issues/issue-10767.rs
diff --git a/src/test/run-pass/issues/issue-10802.rs b/src/test/ui/issues/issue-10802.rs
index f1d6b37a684..f1d6b37a684 100644
--- a/src/test/run-pass/issues/issue-10802.rs
+++ b/src/test/ui/issues/issue-10802.rs
diff --git a/src/test/run-pass/issues/issue-10806.rs b/src/test/ui/issues/issue-10806.rs
index 2f1d7bb5aaf..2f1d7bb5aaf 100644
--- a/src/test/run-pass/issues/issue-10806.rs
+++ b/src/test/ui/issues/issue-10806.rs
diff --git a/src/test/run-pass/issues/issue-11047.rs b/src/test/ui/issues/issue-11047.rs
index 1fb2b5bb3a1..1fb2b5bb3a1 100644
--- a/src/test/run-pass/issues/issue-11047.rs
+++ b/src/test/ui/issues/issue-11047.rs
diff --git a/src/test/run-pass/issues/issue-11085.rs b/src/test/ui/issues/issue-11085.rs
index 47c03238b55..47c03238b55 100644
--- a/src/test/run-pass/issues/issue-11085.rs
+++ b/src/test/ui/issues/issue-11085.rs
diff --git a/src/test/run-pass/issues/issue-1112.rs b/src/test/ui/issues/issue-1112.rs
index 3ba7bb21708..3ba7bb21708 100644
--- a/src/test/run-pass/issues/issue-1112.rs
+++ b/src/test/ui/issues/issue-1112.rs
diff --git a/src/test/run-pass/issues/issue-11205.rs b/src/test/ui/issues/issue-11205.rs
index ce0951eafdd..ce0951eafdd 100644
--- a/src/test/run-pass/issues/issue-11205.rs
+++ b/src/test/ui/issues/issue-11205.rs
diff --git a/src/test/run-pass/issues/issue-11224.rs b/src/test/ui/issues/issue-11224.rs
index e1c1df99aca..e1c1df99aca 100644
--- a/src/test/run-pass/issues/issue-11224.rs
+++ b/src/test/ui/issues/issue-11224.rs
diff --git a/src/test/run-pass/issues/issue-11225-1.rs b/src/test/ui/issues/issue-11225-1.rs
index d1f2ea5e7de..d1f2ea5e7de 100644
--- a/src/test/run-pass/issues/issue-11225-1.rs
+++ b/src/test/ui/issues/issue-11225-1.rs
diff --git a/src/test/run-pass/issues/issue-11225-2.rs b/src/test/ui/issues/issue-11225-2.rs
index d41c75443f1..d41c75443f1 100644
--- a/src/test/run-pass/issues/issue-11225-2.rs
+++ b/src/test/ui/issues/issue-11225-2.rs
diff --git a/src/test/run-pass/issues/issue-11225-3.rs b/src/test/ui/issues/issue-11225-3.rs
index e69496baa26..e69496baa26 100644
--- a/src/test/run-pass/issues/issue-11225-3.rs
+++ b/src/test/ui/issues/issue-11225-3.rs
diff --git a/src/test/run-pass/issues/issue-11267.rs b/src/test/ui/issues/issue-11267.rs
index 848ed6ac7a8..848ed6ac7a8 100644
--- a/src/test/run-pass/issues/issue-11267.rs
+++ b/src/test/ui/issues/issue-11267.rs
diff --git a/src/test/run-pass/issues/issue-11382.rs b/src/test/ui/issues/issue-11382.rs
index 42a7a0d04a1..42a7a0d04a1 100644
--- a/src/test/run-pass/issues/issue-11382.rs
+++ b/src/test/ui/issues/issue-11382.rs
diff --git a/src/test/run-pass/issues/issue-11508.rs b/src/test/ui/issues/issue-11508.rs
index 49868b73efa..49868b73efa 100644
--- a/src/test/run-pass/issues/issue-11508.rs
+++ b/src/test/ui/issues/issue-11508.rs
diff --git a/src/test/run-pass/issues/issue-11529.rs b/src/test/ui/issues/issue-11529.rs
index 9a6cc8e9fe8..9a6cc8e9fe8 100644
--- a/src/test/run-pass/issues/issue-11529.rs
+++ b/src/test/ui/issues/issue-11529.rs
diff --git a/src/test/run-pass/issues/issue-11552.rs b/src/test/ui/issues/issue-11552.rs
index bae12375da1..bae12375da1 100644
--- a/src/test/run-pass/issues/issue-11552.rs
+++ b/src/test/ui/issues/issue-11552.rs
diff --git a/src/test/run-pass/issues/issue-11577.rs b/src/test/ui/issues/issue-11577.rs
index 70177c5ed0d..70177c5ed0d 100644
--- a/src/test/run-pass/issues/issue-11577.rs
+++ b/src/test/ui/issues/issue-11577.rs
diff --git a/src/test/run-pass/issues/issue-11677.rs b/src/test/ui/issues/issue-11677.rs
index be18c736f14..be18c736f14 100644
--- a/src/test/run-pass/issues/issue-11677.rs
+++ b/src/test/ui/issues/issue-11677.rs
diff --git a/src/test/run-pass/issues/issue-11709.rs b/src/test/ui/issues/issue-11709.rs
index cb5e3dff3b3..cb5e3dff3b3 100644
--- a/src/test/run-pass/issues/issue-11709.rs
+++ b/src/test/ui/issues/issue-11709.rs
diff --git a/src/test/run-pass/issues/issue-11820.rs b/src/test/ui/issues/issue-11820.rs
index 7ffe9652797..7ffe9652797 100644
--- a/src/test/run-pass/issues/issue-11820.rs
+++ b/src/test/ui/issues/issue-11820.rs
diff --git a/src/test/run-pass/issues/issue-11940.rs b/src/test/ui/issues/issue-11940.rs
index 6815c87edd8..6815c87edd8 100644
--- a/src/test/run-pass/issues/issue-11940.rs
+++ b/src/test/ui/issues/issue-11940.rs
diff --git a/src/test/run-pass/issues/issue-11958.rs b/src/test/ui/issues/issue-11958.rs
index 8fe8a8c6061..8fe8a8c6061 100644
--- a/src/test/run-pass/issues/issue-11958.rs
+++ b/src/test/ui/issues/issue-11958.rs
diff --git a/src/test/run-pass/issues/issue-12033.rs b/src/test/ui/issues/issue-12033.rs
index 9dc7573c9d3..9dc7573c9d3 100644
--- a/src/test/run-pass/issues/issue-12033.rs
+++ b/src/test/ui/issues/issue-12033.rs
diff --git a/src/test/run-pass/issues/issue-12133-1.rs b/src/test/ui/issues/issue-12133-1.rs
index 96ad5abd548..96ad5abd548 100644
--- a/src/test/run-pass/issues/issue-12133-1.rs
+++ b/src/test/ui/issues/issue-12133-1.rs
diff --git a/src/test/run-pass/issues/issue-12133-2.rs b/src/test/ui/issues/issue-12133-2.rs
index 02fec65c2ed..02fec65c2ed 100644
--- a/src/test/run-pass/issues/issue-12133-2.rs
+++ b/src/test/ui/issues/issue-12133-2.rs
diff --git a/src/test/run-pass/issues/issue-12133-3.rs b/src/test/ui/issues/issue-12133-3.rs
index c8aa9bf4649..c8aa9bf4649 100644
--- a/src/test/run-pass/issues/issue-12133-3.rs
+++ b/src/test/ui/issues/issue-12133-3.rs
diff --git a/src/test/run-pass/issues/issue-12285.rs b/src/test/ui/issues/issue-12285.rs
index 24ac5d2fbbf..24ac5d2fbbf 100644
--- a/src/test/run-pass/issues/issue-12285.rs
+++ b/src/test/ui/issues/issue-12285.rs
diff --git a/src/test/run-pass/issues/issue-1257.rs b/src/test/ui/issues/issue-1257.rs
index de5a6d35925..de5a6d35925 100644
--- a/src/test/run-pass/issues/issue-1257.rs
+++ b/src/test/ui/issues/issue-1257.rs
diff --git a/src/test/run-pass/issues/issue-12582.rs b/src/test/ui/issues/issue-12582.rs
index f3366704e63..f3366704e63 100644
--- a/src/test/run-pass/issues/issue-12582.rs
+++ b/src/test/ui/issues/issue-12582.rs
diff --git a/src/test/run-pass/issues/issue-12612.rs b/src/test/ui/issues/issue-12612.rs
index d254f6941a3..d254f6941a3 100644
--- a/src/test/run-pass/issues/issue-12612.rs
+++ b/src/test/ui/issues/issue-12612.rs
diff --git a/src/test/run-pass/issues/issue-12660.rs b/src/test/ui/issues/issue-12660.rs
index 44c492b43f0..44c492b43f0 100644
--- a/src/test/run-pass/issues/issue-12660.rs
+++ b/src/test/ui/issues/issue-12660.rs
diff --git a/src/test/run-pass/issues/issue-12677.rs b/src/test/ui/issues/issue-12677.rs
index d0e4c17d4fa..d0e4c17d4fa 100644
--- a/src/test/run-pass/issues/issue-12677.rs
+++ b/src/test/ui/issues/issue-12677.rs
diff --git a/src/test/run-pass/issues/issue-12699.rs b/src/test/ui/issues/issue-12699.rs
index e26c2d7cde2..e26c2d7cde2 100644
--- a/src/test/run-pass/issues/issue-12699.rs
+++ b/src/test/ui/issues/issue-12699.rs
diff --git a/src/test/run-pass/issues/issue-12744.rs b/src/test/ui/issues/issue-12744.rs
index e2756ec970c..e2756ec970c 100644
--- a/src/test/run-pass/issues/issue-12744.rs
+++ b/src/test/ui/issues/issue-12744.rs
diff --git a/src/test/run-pass/issues/issue-12860.rs b/src/test/ui/issues/issue-12860.rs
index 01b642cdfcc..01b642cdfcc 100644
--- a/src/test/run-pass/issues/issue-12860.rs
+++ b/src/test/ui/issues/issue-12860.rs
diff --git a/src/test/run-pass/issues/issue-12909.rs b/src/test/ui/issues/issue-12909.rs
index a68d73a004f..a68d73a004f 100644
--- a/src/test/run-pass/issues/issue-12909.rs
+++ b/src/test/ui/issues/issue-12909.rs
diff --git a/src/test/run-pass/issues/issue-13027.rs b/src/test/ui/issues/issue-13027.rs
index 1bab82a543f..1bab82a543f 100644
--- a/src/test/run-pass/issues/issue-13027.rs
+++ b/src/test/ui/issues/issue-13027.rs
diff --git a/src/test/run-pass/issues/issue-13204.rs b/src/test/ui/issues/issue-13204.rs
index 3d6aba8455a..3d6aba8455a 100644
--- a/src/test/run-pass/issues/issue-13204.rs
+++ b/src/test/ui/issues/issue-13204.rs
diff --git a/src/test/run-pass/issues/issue-13259-windows-tcb-trash.rs b/src/test/ui/issues/issue-13259-windows-tcb-trash.rs
index 740e7780de6..740e7780de6 100644
--- a/src/test/run-pass/issues/issue-13259-windows-tcb-trash.rs
+++ b/src/test/ui/issues/issue-13259-windows-tcb-trash.rs
diff --git a/src/test/run-pass/issues/issue-13264.rs b/src/test/ui/issues/issue-13264.rs
index 691bb63a2fe..691bb63a2fe 100644
--- a/src/test/run-pass/issues/issue-13264.rs
+++ b/src/test/ui/issues/issue-13264.rs
diff --git a/src/test/run-pass/issues/issue-13304.rs b/src/test/ui/issues/issue-13304.rs
index 5698536ab5d..5698536ab5d 100644
--- a/src/test/run-pass/issues/issue-13304.rs
+++ b/src/test/ui/issues/issue-13304.rs
diff --git a/src/test/run-pass/issues/issue-13323.rs b/src/test/ui/issues/issue-13323.rs
index 26847ee7a08..26847ee7a08 100644
--- a/src/test/run-pass/issues/issue-13323.rs
+++ b/src/test/ui/issues/issue-13323.rs
diff --git a/src/test/run-pass/issues/issue-13434.rs b/src/test/ui/issues/issue-13434.rs
index 1b7d3e20173..1b7d3e20173 100644
--- a/src/test/run-pass/issues/issue-13434.rs
+++ b/src/test/ui/issues/issue-13434.rs
diff --git a/src/test/run-pass/issues/issue-13507-2.rs b/src/test/ui/issues/issue-13507-2.rs
index 63f3589c6cc..63f3589c6cc 100644
--- a/src/test/run-pass/issues/issue-13507-2.rs
+++ b/src/test/ui/issues/issue-13507-2.rs
diff --git a/src/test/run-pass/issues/issue-13620.rs b/src/test/ui/issues/issue-13620.rs
index 3c3c19df75d..3c3c19df75d 100644
--- a/src/test/run-pass/issues/issue-13620.rs
+++ b/src/test/ui/issues/issue-13620.rs
diff --git a/src/test/run-pass/issues/issue-13655.rs b/src/test/ui/issues/issue-13655.rs
index 6dd1847995f..6dd1847995f 100644
--- a/src/test/run-pass/issues/issue-13655.rs
+++ b/src/test/ui/issues/issue-13655.rs
diff --git a/src/test/run-pass/issues/issue-13665.rs b/src/test/ui/issues/issue-13665.rs
index a3843c65034..a3843c65034 100644
--- a/src/test/run-pass/issues/issue-13665.rs
+++ b/src/test/ui/issues/issue-13665.rs
diff --git a/src/test/run-pass/issues/issue-13763.rs b/src/test/ui/issues/issue-13763.rs
index dd5f6dbc9dc..dd5f6dbc9dc 100644
--- a/src/test/run-pass/issues/issue-13763.rs
+++ b/src/test/ui/issues/issue-13763.rs
diff --git a/src/test/run-pass/issues/issue-13808.rs b/src/test/ui/issues/issue-13808.rs
index 9f9db067bf4..9f9db067bf4 100644
--- a/src/test/run-pass/issues/issue-13808.rs
+++ b/src/test/ui/issues/issue-13808.rs
diff --git a/src/test/run-pass/issues/issue-13867.rs b/src/test/ui/issues/issue-13867.rs
index e66368f9ba8..e66368f9ba8 100644
--- a/src/test/run-pass/issues/issue-13867.rs
+++ b/src/test/ui/issues/issue-13867.rs
diff --git a/src/test/run-pass/issues/issue-13872.rs b/src/test/ui/issues/issue-13872.rs
index aade6b8367c..aade6b8367c 100644
--- a/src/test/run-pass/issues/issue-13872.rs
+++ b/src/test/ui/issues/issue-13872.rs
diff --git a/src/test/run-pass/issues/issue-13902.rs b/src/test/ui/issues/issue-13902.rs
index 1afde0ebe85..1afde0ebe85 100644
--- a/src/test/run-pass/issues/issue-13902.rs
+++ b/src/test/ui/issues/issue-13902.rs
diff --git a/src/test/run-pass/issues/issue-14229.rs b/src/test/ui/issues/issue-14229.rs
index 477a2c65053..477a2c65053 100644
--- a/src/test/run-pass/issues/issue-14229.rs
+++ b/src/test/ui/issues/issue-14229.rs
diff --git a/src/test/run-pass/issues/issue-14308.rs b/src/test/ui/issues/issue-14308.rs
index e067bcdf34a..e067bcdf34a 100644
--- a/src/test/run-pass/issues/issue-14308.rs
+++ b/src/test/ui/issues/issue-14308.rs
diff --git a/src/test/run-pass/issues/issue-14344.rs b/src/test/ui/issues/issue-14344.rs
index 33b1df827d3..33b1df827d3 100644
--- a/src/test/run-pass/issues/issue-14344.rs
+++ b/src/test/ui/issues/issue-14344.rs
diff --git a/src/test/run-pass/issues/issue-14382.rs b/src/test/ui/issues/issue-14382.rs
index 671e7a22667..671e7a22667 100644
--- a/src/test/run-pass/issues/issue-14382.rs
+++ b/src/test/ui/issues/issue-14382.rs
diff --git a/src/test/run-pass/issues/issue-14393.rs b/src/test/ui/issues/issue-14393.rs
index df635407af6..df635407af6 100644
--- a/src/test/run-pass/issues/issue-14393.rs
+++ b/src/test/ui/issues/issue-14393.rs
diff --git a/src/test/run-pass/issues/issue-14399.rs b/src/test/ui/issues/issue-14399.rs
index 6bf8a589959..6bf8a589959 100644
--- a/src/test/run-pass/issues/issue-14399.rs
+++ b/src/test/ui/issues/issue-14399.rs
diff --git a/src/test/run-pass/issues/issue-14421.rs b/src/test/ui/issues/issue-14421.rs
index c59bd87065f..c59bd87065f 100644
--- a/src/test/run-pass/issues/issue-14421.rs
+++ b/src/test/ui/issues/issue-14421.rs
diff --git a/src/test/run-pass/issues/issue-14422.rs b/src/test/ui/issues/issue-14422.rs
index b9e2065d014..b9e2065d014 100644
--- a/src/test/run-pass/issues/issue-14422.rs
+++ b/src/test/ui/issues/issue-14422.rs
diff --git a/src/test/run-pass/issues/issue-14456.rs b/src/test/ui/issues/issue-14456.rs
index 164d7ef8af2..164d7ef8af2 100644
--- a/src/test/run-pass/issues/issue-14456.rs
+++ b/src/test/ui/issues/issue-14456.rs
diff --git a/src/test/run-pass/issues/issue-1451.rs b/src/test/ui/issues/issue-1451.rs
index ad8928b2043..ad8928b2043 100644
--- a/src/test/run-pass/issues/issue-1451.rs
+++ b/src/test/ui/issues/issue-1451.rs
diff --git a/src/test/run-pass/issues/issue-14589.rs b/src/test/ui/issues/issue-14589.rs
index 5d8aab2ce74..5d8aab2ce74 100644
--- a/src/test/run-pass/issues/issue-14589.rs
+++ b/src/test/ui/issues/issue-14589.rs
diff --git a/src/test/run-pass/issues/issue-1460.rs b/src/test/ui/issues/issue-1460.rs
index 143a0387e21..143a0387e21 100644
--- a/src/test/run-pass/issues/issue-1460.rs
+++ b/src/test/ui/issues/issue-1460.rs
diff --git a/src/test/run-pass/issues/issue-14821.rs b/src/test/ui/issues/issue-14821.rs
index 00b2e3607fc..00b2e3607fc 100644
--- a/src/test/run-pass/issues/issue-14821.rs
+++ b/src/test/ui/issues/issue-14821.rs
diff --git a/src/test/run-pass/issues/issue-14865.rs b/src/test/ui/issues/issue-14865.rs
index 56e78e78f18..56e78e78f18 100644
--- a/src/test/run-pass/issues/issue-14865.rs
+++ b/src/test/ui/issues/issue-14865.rs
diff --git a/src/test/run-pass/issues/issue-14875.rs b/src/test/ui/issues/issue-14875.rs
index a2fd7962458..a2fd7962458 100644
--- a/src/test/run-pass/issues/issue-14875.rs
+++ b/src/test/ui/issues/issue-14875.rs
diff --git a/src/test/run-pass/issues/issue-14919.rs b/src/test/ui/issues/issue-14919.rs
index 94361543354..94361543354 100644
--- a/src/test/run-pass/issues/issue-14919.rs
+++ b/src/test/ui/issues/issue-14919.rs
diff --git a/src/test/run-pass/issues/issue-14940.rs b/src/test/ui/issues/issue-14940.rs
index 785ad6a2c49..785ad6a2c49 100644
--- a/src/test/run-pass/issues/issue-14940.rs
+++ b/src/test/ui/issues/issue-14940.rs
diff --git a/src/test/run-pass/issues/issue-14958.rs b/src/test/ui/issues/issue-14958.rs
index a12564ca9c0..a12564ca9c0 100644
--- a/src/test/run-pass/issues/issue-14958.rs
+++ b/src/test/ui/issues/issue-14958.rs
diff --git a/src/test/run-pass/issues/issue-15043.rs b/src/test/ui/issues/issue-15043.rs
index 53748be8a02..53748be8a02 100644
--- a/src/test/run-pass/issues/issue-15043.rs
+++ b/src/test/ui/issues/issue-15043.rs
diff --git a/src/test/run-pass/issues/issue-15063.rs b/src/test/ui/issues/issue-15063.rs
index 4082675129d..4082675129d 100644
--- a/src/test/run-pass/issues/issue-15063.rs
+++ b/src/test/ui/issues/issue-15063.rs
diff --git a/src/test/run-pass/issues/issue-15080.rs b/src/test/ui/issues/issue-15080.rs
index 4558118a809..4558118a809 100644
--- a/src/test/run-pass/issues/issue-15080.rs
+++ b/src/test/ui/issues/issue-15080.rs
diff --git a/src/test/run-pass/issues/issue-15104.rs b/src/test/ui/issues/issue-15104.rs
index 3a03a52c324..3a03a52c324 100644
--- a/src/test/run-pass/issues/issue-15104.rs
+++ b/src/test/ui/issues/issue-15104.rs
diff --git a/src/test/run-pass/issues/issue-15129.rs b/src/test/ui/issues/issue-15129-rpass.rs
index 522d0209c29..522d0209c29 100644
--- a/src/test/run-pass/issues/issue-15129.rs
+++ b/src/test/ui/issues/issue-15129-rpass.rs
diff --git a/src/test/run-pass/issues/issue-15155.rs b/src/test/ui/issues/issue-15155.rs
index 7b137b4af56..7b137b4af56 100644
--- a/src/test/run-pass/issues/issue-15155.rs
+++ b/src/test/ui/issues/issue-15155.rs
diff --git a/src/test/run-pass/issues/issue-15189.rs b/src/test/ui/issues/issue-15189.rs
index a9c884bdcfd..a9c884bdcfd 100644
--- a/src/test/run-pass/issues/issue-15189.rs
+++ b/src/test/ui/issues/issue-15189.rs
diff --git a/src/test/run-pass/issues/issue-15221.rs b/src/test/ui/issues/issue-15221.rs
index 4b8319a8304..4b8319a8304 100644
--- a/src/test/run-pass/issues/issue-15221.rs
+++ b/src/test/ui/issues/issue-15221.rs
diff --git a/src/test/run-pass/issues/issue-15444.rs b/src/test/ui/issues/issue-15444.rs
index e94afee9634..e94afee9634 100644
--- a/src/test/run-pass/issues/issue-15444.rs
+++ b/src/test/ui/issues/issue-15444.rs
diff --git a/src/test/run-pass/issues/issue-15487.rs b/src/test/ui/issues/issue-15487.rs
index 98714cba0e4..98714cba0e4 100644
--- a/src/test/run-pass/issues/issue-15487.rs
+++ b/src/test/ui/issues/issue-15487.rs
diff --git a/src/test/run-pass/issues/issue-15523-big.rs b/src/test/ui/issues/issue-15523-big.rs
index 05414f1db72..05414f1db72 100644
--- a/src/test/run-pass/issues/issue-15523-big.rs
+++ b/src/test/ui/issues/issue-15523-big.rs
diff --git a/src/test/run-pass/issues/issue-15523.rs b/src/test/ui/issues/issue-15523.rs
index 220a34b9b0f..220a34b9b0f 100644
--- a/src/test/run-pass/issues/issue-15523.rs
+++ b/src/test/ui/issues/issue-15523.rs
diff --git a/src/test/run-pass/issues/issue-15562.rs b/src/test/ui/issues/issue-15562.rs
index b37ba81e291..b37ba81e291 100644
--- a/src/test/run-pass/issues/issue-15562.rs
+++ b/src/test/ui/issues/issue-15562.rs
diff --git a/src/test/run-pass/issues/issue-15571.rs b/src/test/ui/issues/issue-15571.rs
index 5381d65232f..5381d65232f 100644
--- a/src/test/run-pass/issues/issue-15571.rs
+++ b/src/test/ui/issues/issue-15571.rs
diff --git a/src/test/run-pass/issues/issue-15673.rs b/src/test/ui/issues/issue-15673.rs
index a8733d7f157..a8733d7f157 100644
--- a/src/test/run-pass/issues/issue-15673.rs
+++ b/src/test/ui/issues/issue-15673.rs
diff --git a/src/test/run-pass/issues/issue-15689-1.rs b/src/test/ui/issues/issue-15689-1.rs
index d143926b281..d143926b281 100644
--- a/src/test/run-pass/issues/issue-15689-1.rs
+++ b/src/test/ui/issues/issue-15689-1.rs
diff --git a/src/test/run-pass/issues/issue-15730.rs b/src/test/ui/issues/issue-15730.rs
index dacffd154fc..dacffd154fc 100644
--- a/src/test/run-pass/issues/issue-15730.rs
+++ b/src/test/ui/issues/issue-15730.rs
diff --git a/src/test/run-pass/issues/issue-15734.rs b/src/test/ui/issues/issue-15734.rs
index be582060601..be582060601 100644
--- a/src/test/run-pass/issues/issue-15734.rs
+++ b/src/test/ui/issues/issue-15734.rs
diff --git a/src/test/run-pass/issues/issue-15763.rs b/src/test/ui/issues/issue-15763.rs
index 9ceffff2e38..9ceffff2e38 100644
--- a/src/test/run-pass/issues/issue-15763.rs
+++ b/src/test/ui/issues/issue-15763.rs
diff --git a/src/test/run-pass/issues/issue-15774.rs b/src/test/ui/issues/issue-15774.rs
index ed2235758b9..ed2235758b9 100644
--- a/src/test/run-pass/issues/issue-15774.rs
+++ b/src/test/ui/issues/issue-15774.rs
diff --git a/src/test/run-pass/issues/issue-15793.rs b/src/test/ui/issues/issue-15793.rs
index 769012b1ba7..769012b1ba7 100644
--- a/src/test/run-pass/issues/issue-15793.rs
+++ b/src/test/ui/issues/issue-15793.rs
diff --git a/src/test/run-pass/issues/issue-15858.rs b/src/test/ui/issues/issue-15858.rs
index 41d2f13952a..41d2f13952a 100644
--- a/src/test/run-pass/issues/issue-15858.rs
+++ b/src/test/ui/issues/issue-15858.rs
diff --git a/src/test/run-pass/issues/issue-15881-model-lexer-dotdotdot.rs b/src/test/ui/issues/issue-15881-model-lexer-dotdotdot.rs
index dee7f25d7bb..dee7f25d7bb 100644
--- a/src/test/run-pass/issues/issue-15881-model-lexer-dotdotdot.rs
+++ b/src/test/ui/issues/issue-15881-model-lexer-dotdotdot.rs
diff --git a/src/test/run-pass/issues/issue-16151.rs b/src/test/ui/issues/issue-16151.rs
index 48a14b2af7c..48a14b2af7c 100644
--- a/src/test/run-pass/issues/issue-16151.rs
+++ b/src/test/ui/issues/issue-16151.rs
diff --git a/src/test/run-pass/issues/issue-16256.rs b/src/test/ui/issues/issue-16256.rs
index e566eede8d2..e566eede8d2 100644
--- a/src/test/run-pass/issues/issue-16256.rs
+++ b/src/test/ui/issues/issue-16256.rs
diff --git a/src/test/run-pass/issues/issue-16272.rs b/src/test/ui/issues/issue-16272.rs
index 3ba2483f430..3ba2483f430 100644
--- a/src/test/run-pass/issues/issue-16272.rs
+++ b/src/test/ui/issues/issue-16272.rs
diff --git a/src/test/run-pass/issues/issue-16278.rs b/src/test/ui/issues/issue-16278.rs
index 2f47b694ae9..2f47b694ae9 100644
--- a/src/test/run-pass/issues/issue-16278.rs
+++ b/src/test/ui/issues/issue-16278.rs
diff --git a/src/test/run-pass/issues/issue-16441.rs b/src/test/ui/issues/issue-16441.rs
index bae3813f9da..bae3813f9da 100644
--- a/src/test/run-pass/issues/issue-16441.rs
+++ b/src/test/ui/issues/issue-16441.rs
diff --git a/src/test/run-pass/issues/issue-16452.rs b/src/test/ui/issues/issue-16452.rs
index faf9edd3b26..faf9edd3b26 100644
--- a/src/test/run-pass/issues/issue-16452.rs
+++ b/src/test/ui/issues/issue-16452.rs
diff --git a/src/test/run-pass/issues/issue-16492.rs b/src/test/ui/issues/issue-16492.rs
index 7fa808237bf..7fa808237bf 100644
--- a/src/test/run-pass/issues/issue-16492.rs
+++ b/src/test/ui/issues/issue-16492.rs
diff --git a/src/test/run-pass/issues/issue-16530.rs b/src/test/ui/issues/issue-16530.rs
index 22a6ef7fa09..22a6ef7fa09 100644
--- a/src/test/run-pass/issues/issue-16530.rs
+++ b/src/test/ui/issues/issue-16530.rs
diff --git a/src/test/run-pass/issues/issue-16560.rs b/src/test/ui/issues/issue-16560.rs
index d5fffc7ef9b..d5fffc7ef9b 100644
--- a/src/test/run-pass/issues/issue-16560.rs
+++ b/src/test/ui/issues/issue-16560.rs
diff --git a/src/test/run-pass/issues/issue-16597-empty.rs b/src/test/ui/issues/issue-16597-empty.rs
index 2bdd08575c4..2bdd08575c4 100644
--- a/src/test/run-pass/issues/issue-16597-empty.rs
+++ b/src/test/ui/issues/issue-16597-empty.rs
diff --git a/src/test/run-pass/issues/issue-16597.rs b/src/test/ui/issues/issue-16597.rs
index 35769bfc117..35769bfc117 100644
--- a/src/test/run-pass/issues/issue-16597.rs
+++ b/src/test/ui/issues/issue-16597.rs
diff --git a/src/test/run-pass/issues/issue-1660.rs b/src/test/ui/issues/issue-1660.rs
index aa60a8d8a96..aa60a8d8a96 100644
--- a/src/test/run-pass/issues/issue-1660.rs
+++ b/src/test/ui/issues/issue-1660.rs
diff --git a/src/test/run-pass/issues/issue-16602-1.rs b/src/test/ui/issues/issue-16602-1.rs
index dd64ee75b34..dd64ee75b34 100644
--- a/src/test/run-pass/issues/issue-16602-1.rs
+++ b/src/test/ui/issues/issue-16602-1.rs
diff --git a/src/test/run-pass/issues/issue-16602-2.rs b/src/test/ui/issues/issue-16602-2.rs
index 6364630ffa9..6364630ffa9 100644
--- a/src/test/run-pass/issues/issue-16602-2.rs
+++ b/src/test/ui/issues/issue-16602-2.rs
diff --git a/src/test/run-pass/issues/issue-16602-3.rs b/src/test/ui/issues/issue-16602-3.rs
index dbfeef053da..dbfeef053da 100644
--- a/src/test/run-pass/issues/issue-16602-3.rs
+++ b/src/test/ui/issues/issue-16602-3.rs
diff --git a/src/test/run-pass/issues/issue-16643.rs b/src/test/ui/issues/issue-16643.rs
index c74a554af2e..c74a554af2e 100644
--- a/src/test/run-pass/issues/issue-16643.rs
+++ b/src/test/ui/issues/issue-16643.rs
diff --git a/src/test/run-pass/issues/issue-16648.rs b/src/test/ui/issues/issue-16648.rs
index 539f015fa28..539f015fa28 100644
--- a/src/test/run-pass/issues/issue-16648.rs
+++ b/src/test/ui/issues/issue-16648.rs
diff --git a/src/test/run-pass/issues/issue-16671.rs b/src/test/ui/issues/issue-16671.rs
index eff8e275bb5..eff8e275bb5 100644
--- a/src/test/run-pass/issues/issue-16671.rs
+++ b/src/test/ui/issues/issue-16671.rs
diff --git a/src/test/run-pass/issues/issue-16739.rs b/src/test/ui/issues/issue-16739.rs
index 54ad8fd076e..54ad8fd076e 100644
--- a/src/test/run-pass/issues/issue-16739.rs
+++ b/src/test/ui/issues/issue-16739.rs
diff --git a/src/test/run-pass/issues/issue-16745.rs b/src/test/ui/issues/issue-16745.rs
index e9137df0f1e..e9137df0f1e 100644
--- a/src/test/run-pass/issues/issue-16745.rs
+++ b/src/test/ui/issues/issue-16745.rs
diff --git a/src/test/run-pass/issues/issue-16774.rs b/src/test/ui/issues/issue-16774.rs
index 9e9b84034db..9e9b84034db 100644
--- a/src/test/run-pass/issues/issue-16774.rs
+++ b/src/test/ui/issues/issue-16774.rs
diff --git a/src/test/run-pass/issues/issue-16783.rs b/src/test/ui/issues/issue-16783.rs
index 4af4031d278..4af4031d278 100644
--- a/src/test/run-pass/issues/issue-16783.rs
+++ b/src/test/ui/issues/issue-16783.rs
diff --git a/src/test/run-pass/issues/issue-16819.rs b/src/test/ui/issues/issue-16819.rs
index cc0200904e5..cc0200904e5 100644
--- a/src/test/run-pass/issues/issue-16819.rs
+++ b/src/test/ui/issues/issue-16819.rs
diff --git a/src/test/run-pass/issues/issue-16922.rs b/src/test/ui/issues/issue-16922-rpass.rs
index c3c6ff30488..c3c6ff30488 100644
--- a/src/test/run-pass/issues/issue-16922.rs
+++ b/src/test/ui/issues/issue-16922-rpass.rs
diff --git a/src/test/run-pass/issues/issue-1696.rs b/src/test/ui/issues/issue-1696.rs
index b5d77df3a18..b5d77df3a18 100644
--- a/src/test/run-pass/issues/issue-1696.rs
+++ b/src/test/ui/issues/issue-1696.rs
diff --git a/src/test/run-pass/issues/issue-1701.rs b/src/test/ui/issues/issue-1701.rs
index bae32a77765..bae32a77765 100644
--- a/src/test/run-pass/issues/issue-1701.rs
+++ b/src/test/ui/issues/issue-1701.rs
diff --git a/src/test/run-pass/issues/issue-17068.rs b/src/test/ui/issues/issue-17068.rs
index fe2c1a34bb4..fe2c1a34bb4 100644
--- a/src/test/run-pass/issues/issue-17068.rs
+++ b/src/test/ui/issues/issue-17068.rs
diff --git a/src/test/run-pass/issues/issue-17074.rs b/src/test/ui/issues/issue-17074.rs
index 0ed81132ec6..0ed81132ec6 100644
--- a/src/test/run-pass/issues/issue-17074.rs
+++ b/src/test/ui/issues/issue-17074.rs
diff --git a/src/test/run-pass/issues/issue-17170.rs b/src/test/ui/issues/issue-17170.rs
index 8d70dacdc90..8d70dacdc90 100644
--- a/src/test/run-pass/issues/issue-17170.rs
+++ b/src/test/ui/issues/issue-17170.rs
diff --git a/src/test/run-pass/issues/issue-17216.rs b/src/test/ui/issues/issue-17216.rs
index 05baa1bffdd..05baa1bffdd 100644
--- a/src/test/run-pass/issues/issue-17216.rs
+++ b/src/test/ui/issues/issue-17216.rs
diff --git a/src/test/run-pass/issues/issue-17233.rs b/src/test/ui/issues/issue-17233.rs
index 54a12fdf8e8..54a12fdf8e8 100644
--- a/src/test/run-pass/issues/issue-17233.rs
+++ b/src/test/ui/issues/issue-17233.rs
diff --git a/src/test/run-pass/issues/issue-17302.rs b/src/test/ui/issues/issue-17302.rs
index cf7a2f1b063..cf7a2f1b063 100644
--- a/src/test/run-pass/issues/issue-17302.rs
+++ b/src/test/ui/issues/issue-17302.rs
diff --git a/src/test/run-pass/issues/issue-17322.rs b/src/test/ui/issues/issue-17322.rs
index 20a8d136124..20a8d136124 100644
--- a/src/test/run-pass/issues/issue-17322.rs
+++ b/src/test/ui/issues/issue-17322.rs
diff --git a/src/test/run-pass/issues/issue-17351.rs b/src/test/ui/issues/issue-17351.rs
index 62f6bcf15e3..62f6bcf15e3 100644
--- a/src/test/run-pass/issues/issue-17351.rs
+++ b/src/test/ui/issues/issue-17351.rs
diff --git a/src/test/run-pass/issues/issue-17361.rs b/src/test/ui/issues/issue-17361.rs
index e97fc3afd1c..e97fc3afd1c 100644
--- a/src/test/run-pass/issues/issue-17361.rs
+++ b/src/test/ui/issues/issue-17361.rs
diff --git a/src/test/run-pass/issues/issue-17503.rs b/src/test/ui/issues/issue-17503.rs
index 9a92c06e159..9a92c06e159 100644
--- a/src/test/run-pass/issues/issue-17503.rs
+++ b/src/test/ui/issues/issue-17503.rs
diff --git a/src/test/run-pass/issues/issue-17662.rs b/src/test/ui/issues/issue-17662.rs
index a2683808b52..a2683808b52 100644
--- a/src/test/run-pass/issues/issue-17662.rs
+++ b/src/test/ui/issues/issue-17662.rs
diff --git a/src/test/run-pass/issues/issue-17718-borrow-interior.rs b/src/test/ui/issues/issue-17718-borrow-interior.rs
index 5861f218689..5861f218689 100644
--- a/src/test/run-pass/issues/issue-17718-borrow-interior.rs
+++ b/src/test/ui/issues/issue-17718-borrow-interior.rs
diff --git a/src/test/run-pass/issues/issue-17718-parse-const.rs b/src/test/ui/issues/issue-17718-parse-const.rs
index d5a5f445d5b..d5a5f445d5b 100644
--- a/src/test/run-pass/issues/issue-17718-parse-const.rs
+++ b/src/test/ui/issues/issue-17718-parse-const.rs
diff --git a/src/test/run-pass/issues/issue-17718-static-unsafe-interior.rs b/src/test/ui/issues/issue-17718-static-unsafe-interior.rs
index 65a8713ba05..65a8713ba05 100644
--- a/src/test/run-pass/issues/issue-17718-static-unsafe-interior.rs
+++ b/src/test/ui/issues/issue-17718-static-unsafe-interior.rs
diff --git a/src/test/run-pass/issues/issue-17718.rs b/src/test/ui/issues/issue-17718.rs
index c6341d80844..c6341d80844 100644
--- a/src/test/run-pass/issues/issue-17718.rs
+++ b/src/test/ui/issues/issue-17718.rs
diff --git a/src/test/run-pass/issues/issue-17734.rs b/src/test/ui/issues/issue-17734.rs
index ba8d6c21ca8..ba8d6c21ca8 100644
--- a/src/test/run-pass/issues/issue-17734.rs
+++ b/src/test/ui/issues/issue-17734.rs
diff --git a/src/test/run-pass/issues/issue-17756.rs b/src/test/ui/issues/issue-17756.rs
index 1835b177ff3..1835b177ff3 100644
--- a/src/test/run-pass/issues/issue-17756.rs
+++ b/src/test/ui/issues/issue-17756.rs
diff --git a/src/test/run-pass/issues/issue-17771.rs b/src/test/ui/issues/issue-17771.rs
index 2f6464668c2..2f6464668c2 100644
--- a/src/test/run-pass/issues/issue-17771.rs
+++ b/src/test/ui/issues/issue-17771.rs
diff --git a/src/test/run-pass/issues/issue-17816.rs b/src/test/ui/issues/issue-17816.rs
index 7ca47d50335..7ca47d50335 100644
--- a/src/test/run-pass/issues/issue-17816.rs
+++ b/src/test/ui/issues/issue-17816.rs
diff --git a/src/test/run-pass/issues/issue-17877.rs b/src/test/ui/issues/issue-17877.rs
index af22b1ad8f0..af22b1ad8f0 100644
--- a/src/test/run-pass/issues/issue-17877.rs
+++ b/src/test/ui/issues/issue-17877.rs
diff --git a/src/test/run-pass/issues/issue-17897.rs b/src/test/ui/issues/issue-17897.rs
index 6873c7ccb7f..6873c7ccb7f 100644
--- a/src/test/run-pass/issues/issue-17897.rs
+++ b/src/test/ui/issues/issue-17897.rs
diff --git a/src/test/run-pass/issues/issue-18060.rs b/src/test/ui/issues/issue-18060.rs
index b5f3d0f74bc..b5f3d0f74bc 100644
--- a/src/test/run-pass/issues/issue-18060.rs
+++ b/src/test/ui/issues/issue-18060.rs
diff --git a/src/test/run-pass/issues/issue-18075.rs b/src/test/ui/issues/issue-18075.rs
index ee6845c1278..ee6845c1278 100644
--- a/src/test/run-pass/issues/issue-18075.rs
+++ b/src/test/ui/issues/issue-18075.rs
diff --git a/src/test/run-pass/issues/issue-18110.rs b/src/test/ui/issues/issue-18110.rs
index 41c29e77da5..41c29e77da5 100644
--- a/src/test/run-pass/issues/issue-18110.rs
+++ b/src/test/ui/issues/issue-18110.rs
diff --git a/src/test/run-pass/issues/issue-18173.rs b/src/test/ui/issues/issue-18173.rs
index 11468040ee5..11468040ee5 100644
--- a/src/test/run-pass/issues/issue-18173.rs
+++ b/src/test/ui/issues/issue-18173.rs
diff --git a/src/test/run-pass/issues/issue-18232.rs b/src/test/ui/issues/issue-18232.rs
index 7e6f6ef0f39..7e6f6ef0f39 100644
--- a/src/test/run-pass/issues/issue-18232.rs
+++ b/src/test/ui/issues/issue-18232.rs
diff --git a/src/test/run-pass/issues/issue-18352.rs b/src/test/ui/issues/issue-18352.rs
index 5d93ed0646c..5d93ed0646c 100644
--- a/src/test/run-pass/issues/issue-18352.rs
+++ b/src/test/ui/issues/issue-18352.rs
diff --git a/src/test/run-pass/issues/issue-18353.rs b/src/test/ui/issues/issue-18353.rs
index 3d15c9980c3..3d15c9980c3 100644
--- a/src/test/run-pass/issues/issue-18353.rs
+++ b/src/test/ui/issues/issue-18353.rs
diff --git a/src/test/run-pass/issues/issue-18412.rs b/src/test/ui/issues/issue-18412.rs
index fe1cfb3dffa..fe1cfb3dffa 100644
--- a/src/test/run-pass/issues/issue-18412.rs
+++ b/src/test/ui/issues/issue-18412.rs
diff --git a/src/test/run-pass/issues/issue-18425.rs b/src/test/ui/issues/issue-18425.rs
index 354c14a756a..354c14a756a 100644
--- a/src/test/run-pass/issues/issue-18425.rs
+++ b/src/test/ui/issues/issue-18425.rs
diff --git a/src/test/run-pass/issues/issue-18464.rs b/src/test/ui/issues/issue-18464.rs
index 14d2d0a6c8d..14d2d0a6c8d 100644
--- a/src/test/run-pass/issues/issue-18464.rs
+++ b/src/test/ui/issues/issue-18464.rs
diff --git a/src/test/run-pass/issues/issue-18501.rs b/src/test/ui/issues/issue-18501.rs
index 0ca23074c55..0ca23074c55 100644
--- a/src/test/run-pass/issues/issue-18501.rs
+++ b/src/test/ui/issues/issue-18501.rs
diff --git a/src/test/run-pass/issues/issue-18514.rs b/src/test/ui/issues/issue-18514.rs
index 48e7f07418f..48e7f07418f 100644
--- a/src/test/run-pass/issues/issue-18514.rs
+++ b/src/test/ui/issues/issue-18514.rs
diff --git a/src/test/run-pass/issues/issue-18539.rs b/src/test/ui/issues/issue-18539.rs
index 745df26e320..745df26e320 100644
--- a/src/test/run-pass/issues/issue-18539.rs
+++ b/src/test/ui/issues/issue-18539.rs
diff --git a/src/test/run-pass/issues/issue-18652.rs b/src/test/ui/issues/issue-18652.rs
index 59aa0156842..59aa0156842 100644
--- a/src/test/run-pass/issues/issue-18652.rs
+++ b/src/test/ui/issues/issue-18652.rs
diff --git a/src/test/run-pass/issues/issue-18655.rs b/src/test/ui/issues/issue-18655.rs
index 3d18542acdc..3d18542acdc 100644
--- a/src/test/run-pass/issues/issue-18655.rs
+++ b/src/test/ui/issues/issue-18655.rs
diff --git a/src/test/run-pass/issues/issue-18661.rs b/src/test/ui/issues/issue-18661.rs
index e2427243235..e2427243235 100644
--- a/src/test/run-pass/issues/issue-18661.rs
+++ b/src/test/ui/issues/issue-18661.rs
diff --git a/src/test/run-pass/issues/issue-18685.rs b/src/test/ui/issues/issue-18685.rs
index bfe24b663f6..bfe24b663f6 100644
--- a/src/test/run-pass/issues/issue-18685.rs
+++ b/src/test/ui/issues/issue-18685.rs
diff --git a/src/test/run-pass/issues/issue-18711.rs b/src/test/ui/issues/issue-18711.rs
index 43584187752..43584187752 100644
--- a/src/test/run-pass/issues/issue-18711.rs
+++ b/src/test/ui/issues/issue-18711.rs
diff --git a/src/test/run-pass/issues/issue-18767.rs b/src/test/ui/issues/issue-18767.rs
index 2a5721b7295..2a5721b7295 100644
--- a/src/test/run-pass/issues/issue-18767.rs
+++ b/src/test/ui/issues/issue-18767.rs
diff --git a/src/test/run-pass/issues/issue-18804/auxiliary/lib.rs b/src/test/ui/issues/issue-18804/auxiliary/lib.rs
index ae27dd520e9..ae27dd520e9 100644
--- a/src/test/run-pass/issues/issue-18804/auxiliary/lib.rs
+++ b/src/test/ui/issues/issue-18804/auxiliary/lib.rs
diff --git a/src/test/run-pass/issues/issue-18804/main.rs b/src/test/ui/issues/issue-18804/main.rs
index c36048ea545..c36048ea545 100644
--- a/src/test/run-pass/issues/issue-18804/main.rs
+++ b/src/test/ui/issues/issue-18804/main.rs
diff --git a/src/test/run-pass/issues/issue-18845.rs b/src/test/ui/issues/issue-18845.rs
index 83fab4b5e8f..83fab4b5e8f 100644
--- a/src/test/run-pass/issues/issue-18845.rs
+++ b/src/test/ui/issues/issue-18845.rs
diff --git a/src/test/run-pass/issues/issue-18859.rs b/src/test/ui/issues/issue-18859.rs
index c4575bce925..c4575bce925 100644
--- a/src/test/run-pass/issues/issue-18859.rs
+++ b/src/test/ui/issues/issue-18859.rs
diff --git a/src/test/run-pass/issues/issue-18913.rs b/src/test/ui/issues/issue-18913.rs
index 27fae6d7757..27fae6d7757 100644
--- a/src/test/run-pass/issues/issue-18913.rs
+++ b/src/test/ui/issues/issue-18913.rs
diff --git a/src/test/run-pass/issues/issue-18937-1.rs b/src/test/ui/issues/issue-18937-1.rs
index 57e56d832c6..57e56d832c6 100644
--- a/src/test/run-pass/issues/issue-18937-1.rs
+++ b/src/test/ui/issues/issue-18937-1.rs
diff --git a/src/test/run-pass/issues/issue-18952.rs b/src/test/ui/issues/issue-18952.rs
index 56378b59e36..56378b59e36 100644
--- a/src/test/run-pass/issues/issue-18952.rs
+++ b/src/test/ui/issues/issue-18952.rs
diff --git a/src/test/run-pass/issues/issue-19001.rs b/src/test/ui/issues/issue-19001.rs
index 76c380c2fc9..76c380c2fc9 100644
--- a/src/test/run-pass/issues/issue-19001.rs
+++ b/src/test/ui/issues/issue-19001.rs
diff --git a/src/test/run-pass/issues/issue-19127.rs b/src/test/ui/issues/issue-19127.rs
index c847ac9e435..c847ac9e435 100644
--- a/src/test/run-pass/issues/issue-19127.rs
+++ b/src/test/ui/issues/issue-19127.rs
diff --git a/src/test/run-pass/issues/issue-19135.rs b/src/test/ui/issues/issue-19135.rs
index 84540a3ff5f..84540a3ff5f 100644
--- a/src/test/run-pass/issues/issue-19135.rs
+++ b/src/test/ui/issues/issue-19135.rs
diff --git a/src/test/run-pass/issues/issue-19244.rs b/src/test/ui/issues/issue-19244.rs
index 44d9748fd2a..44d9748fd2a 100644
--- a/src/test/run-pass/issues/issue-19244.rs
+++ b/src/test/ui/issues/issue-19244.rs
diff --git a/src/test/run-pass/issues/issue-19293.rs b/src/test/ui/issues/issue-19293.rs
index b6e9e3d065a..b6e9e3d065a 100644
--- a/src/test/run-pass/issues/issue-19293.rs
+++ b/src/test/ui/issues/issue-19293.rs
diff --git a/src/test/run-pass/issues/issue-19340-1.rs b/src/test/ui/issues/issue-19340-1.rs
index e3cc2daae9b..e3cc2daae9b 100644
--- a/src/test/run-pass/issues/issue-19340-1.rs
+++ b/src/test/ui/issues/issue-19340-1.rs
diff --git a/src/test/run-pass/issues/issue-19340-2.rs b/src/test/ui/issues/issue-19340-2.rs
index a222e9e4621..a222e9e4621 100644
--- a/src/test/run-pass/issues/issue-19340-2.rs
+++ b/src/test/ui/issues/issue-19340-2.rs
diff --git a/src/test/run-pass/issues/issue-19358.rs b/src/test/ui/issues/issue-19358.rs
index f66e0a1c078..f66e0a1c078 100644
--- a/src/test/run-pass/issues/issue-19358.rs
+++ b/src/test/ui/issues/issue-19358.rs
diff --git a/src/test/run-pass/issues/issue-19367.rs b/src/test/ui/issues/issue-19367.rs
index 0699533e72b..0699533e72b 100644
--- a/src/test/run-pass/issues/issue-19367.rs
+++ b/src/test/ui/issues/issue-19367.rs
diff --git a/src/test/run-pass/issues/issue-19499.rs b/src/test/ui/issues/issue-19499.rs
index d09056ce3de..d09056ce3de 100644
--- a/src/test/run-pass/issues/issue-19499.rs
+++ b/src/test/ui/issues/issue-19499.rs
diff --git a/src/test/run-pass/issues/issue-1974.rs b/src/test/ui/issues/issue-1974.rs
index 74a54a6029e..74a54a6029e 100644
--- a/src/test/run-pass/issues/issue-1974.rs
+++ b/src/test/ui/issues/issue-1974.rs
diff --git a/src/test/run-pass/issues/issue-19811-escape-unicode.rs b/src/test/ui/issues/issue-19811-escape-unicode.rs
index a2c50bc022d..a2c50bc022d 100644
--- a/src/test/run-pass/issues/issue-19811-escape-unicode.rs
+++ b/src/test/ui/issues/issue-19811-escape-unicode.rs
diff --git a/src/test/run-pass/issues/issue-20055-box-trait.rs b/src/test/ui/issues/issue-20055-box-trait.rs
index 772cd9d7eda..772cd9d7eda 100644
--- a/src/test/run-pass/issues/issue-20055-box-trait.rs
+++ b/src/test/ui/issues/issue-20055-box-trait.rs
diff --git a/src/test/run-pass/issues/issue-20055-box-unsized-array.rs b/src/test/ui/issues/issue-20055-box-unsized-array.rs
index 1246c80651f..1246c80651f 100644
--- a/src/test/run-pass/issues/issue-20055-box-unsized-array.rs
+++ b/src/test/ui/issues/issue-20055-box-unsized-array.rs
diff --git a/src/test/run-pass/issues/issue-20174.rs b/src/test/ui/issues/issue-20174.rs
index 4ed5a97c172..4ed5a97c172 100644
--- a/src/test/run-pass/issues/issue-20174.rs
+++ b/src/test/ui/issues/issue-20174.rs
diff --git a/src/test/run-pass/issues/issue-20313.rs b/src/test/ui/issues/issue-20313-rpass.rs
index 09352044b01..09352044b01 100644
--- a/src/test/run-pass/issues/issue-20313.rs
+++ b/src/test/ui/issues/issue-20313-rpass.rs
diff --git a/src/test/run-pass/issues/issue-20343.rs b/src/test/ui/issues/issue-20343.rs
index 000b6398442..000b6398442 100644
--- a/src/test/run-pass/issues/issue-20343.rs
+++ b/src/test/ui/issues/issue-20343.rs
diff --git a/src/test/run-pass/issues/issue-20389.rs b/src/test/ui/issues/issue-20389.rs
index 9bc3efcc1c4..9bc3efcc1c4 100644
--- a/src/test/run-pass/issues/issue-20389.rs
+++ b/src/test/ui/issues/issue-20389.rs
diff --git a/src/test/run-pass/issues/issue-20427.rs b/src/test/ui/issues/issue-20427.rs
index fa2ea6cf592..fa2ea6cf592 100644
--- a/src/test/run-pass/issues/issue-20427.rs
+++ b/src/test/ui/issues/issue-20427.rs
diff --git a/src/test/run-pass/issues/issue-20544.rs b/src/test/ui/issues/issue-20544.rs
index 0f4d314f166..0f4d314f166 100644
--- a/src/test/run-pass/issues/issue-20544.rs
+++ b/src/test/ui/issues/issue-20544.rs
diff --git a/src/test/run-pass/issues/issue-20575.rs b/src/test/ui/issues/issue-20575.rs
index 0ca67d9dc71..0ca67d9dc71 100644
--- a/src/test/run-pass/issues/issue-20575.rs
+++ b/src/test/ui/issues/issue-20575.rs
diff --git a/src/test/run-pass/issues/issue-20616.rs b/src/test/ui/issues/issue-20616.rs
index 6c24d437272..6c24d437272 100644
--- a/src/test/run-pass/issues/issue-20616.rs
+++ b/src/test/ui/issues/issue-20616.rs
diff --git a/src/test/run-pass/issues/issue-2063.rs b/src/test/ui/issues/issue-2063.rs
index 9dbac6ccee1..9dbac6ccee1 100644
--- a/src/test/run-pass/issues/issue-2063.rs
+++ b/src/test/ui/issues/issue-2063.rs
diff --git a/src/test/run-pass/issues/issue-20676.rs b/src/test/ui/issues/issue-20676.rs
index 2bc5034960a..2bc5034960a 100644
--- a/src/test/run-pass/issues/issue-20676.rs
+++ b/src/test/ui/issues/issue-20676.rs
diff --git a/src/test/run-pass/issues/issue-2074.rs b/src/test/ui/issues/issue-2074.rs
index bd5f015cca0..bd5f015cca0 100644
--- a/src/test/run-pass/issues/issue-2074.rs
+++ b/src/test/ui/issues/issue-2074.rs
diff --git a/src/test/run-pass/issues/issue-20803.rs b/src/test/ui/issues/issue-20803.rs
index f657cf6cdd7..f657cf6cdd7 100644
--- a/src/test/run-pass/issues/issue-20803.rs
+++ b/src/test/ui/issues/issue-20803.rs
diff --git a/src/test/run-pass/issues/issue-20823.rs b/src/test/ui/issues/issue-20823.rs
index 9e209d5d33a..9e209d5d33a 100644
--- a/src/test/run-pass/issues/issue-20823.rs
+++ b/src/test/ui/issues/issue-20823.rs
diff --git a/src/test/run-pass/issues/issue-20847.rs b/src/test/ui/issues/issue-20847.rs
index 0cd7edf89db..0cd7edf89db 100644
--- a/src/test/run-pass/issues/issue-20847.rs
+++ b/src/test/ui/issues/issue-20847.rs
diff --git a/src/test/run-pass/issues/issue-20953.rs b/src/test/ui/issues/issue-20953.rs
index 4ec7e3195eb..4ec7e3195eb 100644
--- a/src/test/run-pass/issues/issue-20953.rs
+++ b/src/test/ui/issues/issue-20953.rs
diff --git a/src/test/run-pass/issues/issue-21033.rs b/src/test/ui/issues/issue-21033.rs
index 86cc7707e50..86cc7707e50 100644
--- a/src/test/run-pass/issues/issue-21033.rs
+++ b/src/test/ui/issues/issue-21033.rs
diff --git a/src/test/run-pass/issues/issue-21058.rs b/src/test/ui/issues/issue-21058.rs
index 6facf0b2dd5..6facf0b2dd5 100644
--- a/src/test/run-pass/issues/issue-21058.rs
+++ b/src/test/ui/issues/issue-21058.rs
diff --git a/src/test/run-pass/issues/issue-21291.rs b/src/test/ui/issues/issue-21291.rs
index b351e22d862..b351e22d862 100644
--- a/src/test/run-pass/issues/issue-21291.rs
+++ b/src/test/ui/issues/issue-21291.rs
diff --git a/src/test/run-pass/issues/issue-21306.rs b/src/test/ui/issues/issue-21306.rs
index b06a475e4df..b06a475e4df 100644
--- a/src/test/run-pass/issues/issue-21306.rs
+++ b/src/test/ui/issues/issue-21306.rs
diff --git a/src/test/run-pass/issues/issue-21361.rs b/src/test/ui/issues/issue-21361.rs
index c970e77abb7..c970e77abb7 100644
--- a/src/test/run-pass/issues/issue-21361.rs
+++ b/src/test/ui/issues/issue-21361.rs
diff --git a/src/test/run-pass/issues/issue-21384.rs b/src/test/ui/issues/issue-21384.rs
index caa99a15982..caa99a15982 100644
--- a/src/test/run-pass/issues/issue-21384.rs
+++ b/src/test/ui/issues/issue-21384.rs
diff --git a/src/test/run-pass/issues/issue-21400.rs b/src/test/ui/issues/issue-21400.rs
index 4a85158d97a..4a85158d97a 100644
--- a/src/test/run-pass/issues/issue-21400.rs
+++ b/src/test/ui/issues/issue-21400.rs
diff --git a/src/test/run-pass/issues/issue-21475.rs b/src/test/ui/issues/issue-21475.rs
index 16d003aba7c..16d003aba7c 100644
--- a/src/test/run-pass/issues/issue-21475.rs
+++ b/src/test/ui/issues/issue-21475.rs
diff --git a/src/test/run-pass/issues/issue-21486.rs b/src/test/ui/issues/issue-21486.rs
index 46d6ccd56bd..46d6ccd56bd 100644
--- a/src/test/run-pass/issues/issue-21486.rs
+++ b/src/test/ui/issues/issue-21486.rs
diff --git a/src/test/run-pass/issues/issue-21655.rs b/src/test/ui/issues/issue-21655.rs
index d1cd4ec7b8a..d1cd4ec7b8a 100644
--- a/src/test/run-pass/issues/issue-21655.rs
+++ b/src/test/ui/issues/issue-21655.rs
diff --git a/src/test/run-pass/issues/issue-2170-exe.rs b/src/test/ui/issues/issue-2170-exe.rs
index a89579706c8..a89579706c8 100644
--- a/src/test/run-pass/issues/issue-2170-exe.rs
+++ b/src/test/ui/issues/issue-2170-exe.rs
diff --git a/src/test/run-pass/issues/issue-21721.rs b/src/test/ui/issues/issue-21721.rs
index 4c1411e1ecf..4c1411e1ecf 100644
--- a/src/test/run-pass/issues/issue-21721.rs
+++ b/src/test/ui/issues/issue-21721.rs
diff --git a/src/test/run-pass/issues/issue-2190-1.rs b/src/test/ui/issues/issue-2190-1.rs
index e67a924b9ee..e67a924b9ee 100644
--- a/src/test/run-pass/issues/issue-2190-1.rs
+++ b/src/test/ui/issues/issue-2190-1.rs
diff --git a/src/test/run-pass/issues/issue-21909.rs b/src/test/ui/issues/issue-21909.rs
index 7cb558d9a4f..7cb558d9a4f 100644
--- a/src/test/run-pass/issues/issue-21909.rs
+++ b/src/test/ui/issues/issue-21909.rs
diff --git a/src/test/run-pass/issues/issue-21922.rs b/src/test/ui/issues/issue-21922.rs
index 9727b2efe9a..9727b2efe9a 100644
--- a/src/test/run-pass/issues/issue-21922.rs
+++ b/src/test/ui/issues/issue-21922.rs
diff --git a/src/test/run-pass/issues/issue-22008.rs b/src/test/ui/issues/issue-22008.rs
index 00425582266..00425582266 100644
--- a/src/test/run-pass/issues/issue-22008.rs
+++ b/src/test/ui/issues/issue-22008.rs
diff --git a/src/test/run-pass/issues/issue-22036.rs b/src/test/ui/issues/issue-22036.rs
index 30da2130a31..30da2130a31 100644
--- a/src/test/run-pass/issues/issue-22036.rs
+++ b/src/test/ui/issues/issue-22036.rs
diff --git a/src/test/run-pass/issues/issue-2214.rs b/src/test/ui/issues/issue-2214.rs
index 22f33545cb9..22f33545cb9 100644
--- a/src/test/run-pass/issues/issue-2214.rs
+++ b/src/test/ui/issues/issue-2214.rs
diff --git a/src/test/run-pass/issues/issue-2216.rs b/src/test/ui/issues/issue-2216.rs
index fa712edcd1b..fa712edcd1b 100644
--- a/src/test/run-pass/issues/issue-2216.rs
+++ b/src/test/ui/issues/issue-2216.rs
diff --git a/src/test/run-pass/issues/issue-22258.rs b/src/test/ui/issues/issue-22258.rs
index 93ead5818d5..93ead5818d5 100644
--- a/src/test/run-pass/issues/issue-22258.rs
+++ b/src/test/ui/issues/issue-22258.rs
diff --git a/src/test/run-pass/issues/issue-22346.rs b/src/test/ui/issues/issue-22346.rs
index 5f6d9dcc9ae..5f6d9dcc9ae 100644
--- a/src/test/run-pass/issues/issue-22346.rs
+++ b/src/test/ui/issues/issue-22346.rs
diff --git a/src/test/run-pass/issues/issue-22403.rs b/src/test/ui/issues/issue-22403.rs
index 8d855909435..8d855909435 100644
--- a/src/test/run-pass/issues/issue-22403.rs
+++ b/src/test/ui/issues/issue-22403.rs
diff --git a/src/test/run-pass/issues/issue-22426.rs b/src/test/ui/issues/issue-22426.rs
index adf060a8292..adf060a8292 100644
--- a/src/test/run-pass/issues/issue-22426.rs
+++ b/src/test/ui/issues/issue-22426.rs
diff --git a/src/test/run-pass/issues/issue-22463.rs b/src/test/ui/issues/issue-22463.rs
index fdf5a2fca72..fdf5a2fca72 100644
--- a/src/test/run-pass/issues/issue-22463.rs
+++ b/src/test/ui/issues/issue-22463.rs
diff --git a/src/test/run-pass/issues/issue-22536-copy-mustnt-zero.rs b/src/test/ui/issues/issue-22536-copy-mustnt-zero.rs
index 017f36484c1..017f36484c1 100644
--- a/src/test/run-pass/issues/issue-22536-copy-mustnt-zero.rs
+++ b/src/test/ui/issues/issue-22536-copy-mustnt-zero.rs
diff --git a/src/test/run-pass/issues/issue-22546.rs b/src/test/ui/issues/issue-22546.rs
index c26e457f9e4..c26e457f9e4 100644
--- a/src/test/run-pass/issues/issue-22546.rs
+++ b/src/test/ui/issues/issue-22546.rs
diff --git a/src/test/run-pass/issues/issue-22577.rs b/src/test/ui/issues/issue-22577.rs
index 24f4f60aa2f..24f4f60aa2f 100644
--- a/src/test/run-pass/issues/issue-22577.rs
+++ b/src/test/ui/issues/issue-22577.rs
diff --git a/src/test/run-pass/issues/issue-22629.rs b/src/test/ui/issues/issue-22629.rs
index 7beeb126ee4..7beeb126ee4 100644
--- a/src/test/run-pass/issues/issue-22629.rs
+++ b/src/test/ui/issues/issue-22629.rs
diff --git a/src/test/run-pass/issues/issue-22828.rs b/src/test/ui/issues/issue-22828.rs
index adf4dd6ce75..adf4dd6ce75 100644
--- a/src/test/run-pass/issues/issue-22828.rs
+++ b/src/test/ui/issues/issue-22828.rs
diff --git a/src/test/run-pass/issues/issue-2284.rs b/src/test/ui/issues/issue-2284.rs
index 6f2c958341b..6f2c958341b 100644
--- a/src/test/run-pass/issues/issue-2284.rs
+++ b/src/test/ui/issues/issue-2284.rs
diff --git a/src/test/run-pass/issues/issue-22864-1.rs b/src/test/ui/issues/issue-22864-1.rs
index 0fad5433d6c..0fad5433d6c 100644
--- a/src/test/run-pass/issues/issue-22864-1.rs
+++ b/src/test/ui/issues/issue-22864-1.rs
diff --git a/src/test/run-pass/issues/issue-22864-2.rs b/src/test/ui/issues/issue-22864-2.rs
index 4aa9e3e086b..4aa9e3e086b 100644
--- a/src/test/run-pass/issues/issue-22864-2.rs
+++ b/src/test/ui/issues/issue-22864-2.rs
diff --git a/src/test/run-pass/issues/issue-2288.rs b/src/test/ui/issues/issue-2288.rs
index c74e53fca60..c74e53fca60 100644
--- a/src/test/run-pass/issues/issue-2288.rs
+++ b/src/test/ui/issues/issue-2288.rs
diff --git a/src/test/run-pass/issues/issue-22992-2.rs b/src/test/ui/issues/issue-22992-2.rs
index 042af40eda6..042af40eda6 100644
--- a/src/test/run-pass/issues/issue-22992-2.rs
+++ b/src/test/ui/issues/issue-22992-2.rs
diff --git a/src/test/run-pass/issues/issue-22992.rs b/src/test/ui/issues/issue-22992.rs
index e2ae1f96ee5..e2ae1f96ee5 100644
--- a/src/test/run-pass/issues/issue-22992.rs
+++ b/src/test/ui/issues/issue-22992.rs
diff --git a/src/test/run-pass/issues/issue-23036.rs b/src/test/ui/issues/issue-23036.rs
index a307e7eed95..a307e7eed95 100644
--- a/src/test/run-pass/issues/issue-23036.rs
+++ b/src/test/ui/issues/issue-23036.rs
diff --git a/src/test/run-pass/issues/issue-2316-c.rs b/src/test/ui/issues/issue-2316-c.rs
index d975aa695c8..d975aa695c8 100644
--- a/src/test/run-pass/issues/issue-2316-c.rs
+++ b/src/test/ui/issues/issue-2316-c.rs
diff --git a/src/test/run-pass/issues/issue-23208.rs b/src/test/ui/issues/issue-23208.rs
index fd4ffe5d6e1..fd4ffe5d6e1 100644
--- a/src/test/run-pass/issues/issue-23208.rs
+++ b/src/test/ui/issues/issue-23208.rs
diff --git a/src/test/run-pass/issues/issue-23261.rs b/src/test/ui/issues/issue-23261.rs
index e21f86351ee..e21f86351ee 100644
--- a/src/test/run-pass/issues/issue-23261.rs
+++ b/src/test/ui/issues/issue-23261.rs
diff --git a/src/test/run-pass/issues/issue-23304-1.rs b/src/test/ui/issues/issue-23304-1.rs
index 1805c1c19b9..1805c1c19b9 100644
--- a/src/test/run-pass/issues/issue-23304-1.rs
+++ b/src/test/ui/issues/issue-23304-1.rs
diff --git a/src/test/run-pass/issues/issue-23304-2.rs b/src/test/ui/issues/issue-23304-2.rs
index 6376fdb6545..6376fdb6545 100644
--- a/src/test/run-pass/issues/issue-23304-2.rs
+++ b/src/test/ui/issues/issue-23304-2.rs
diff --git a/src/test/run-pass/issues/issue-23311.rs b/src/test/ui/issues/issue-23311.rs
index f275c6338b1..f275c6338b1 100644
--- a/src/test/run-pass/issues/issue-23311.rs
+++ b/src/test/ui/issues/issue-23311.rs
diff --git a/src/test/run-pass/issues/issue-23336.rs b/src/test/ui/issues/issue-23336.rs
index cd71d7eed89..cd71d7eed89 100644
--- a/src/test/run-pass/issues/issue-23336.rs
+++ b/src/test/ui/issues/issue-23336.rs
diff --git a/src/test/run-pass/issues/issue-23338-ensure-param-drop-order.rs b/src/test/ui/issues/issue-23338-ensure-param-drop-order.rs
index 823be8c832d..823be8c832d 100644
--- a/src/test/run-pass/issues/issue-23338-ensure-param-drop-order.rs
+++ b/src/test/ui/issues/issue-23338-ensure-param-drop-order.rs
diff --git a/src/test/run-pass/issues/issue-23338-params-outlive-temps-of-body.rs b/src/test/ui/issues/issue-23338-params-outlive-temps-of-body.rs
index d45aaa843fb..d45aaa843fb 100644
--- a/src/test/run-pass/issues/issue-23338-params-outlive-temps-of-body.rs
+++ b/src/test/ui/issues/issue-23338-params-outlive-temps-of-body.rs
diff --git a/src/test/run-pass/issues/issue-23433.rs b/src/test/ui/issues/issue-23433.rs
index d4fbbde62ff..d4fbbde62ff 100644
--- a/src/test/run-pass/issues/issue-23433.rs
+++ b/src/test/ui/issues/issue-23433.rs
diff --git a/src/test/run-pass/issues/issue-23485.rs b/src/test/ui/issues/issue-23485.rs
index 1dd3d9293bc..1dd3d9293bc 100644
--- a/src/test/run-pass/issues/issue-23485.rs
+++ b/src/test/ui/issues/issue-23485.rs
diff --git a/src/test/run-pass/issues/issue-23491.rs b/src/test/ui/issues/issue-23491.rs
index d2ded88aeff..d2ded88aeff 100644
--- a/src/test/run-pass/issues/issue-23491.rs
+++ b/src/test/ui/issues/issue-23491.rs
diff --git a/src/test/run-pass/issues/issue-23611-enum-swap-in-drop.rs b/src/test/ui/issues/issue-23611-enum-swap-in-drop.rs
index 6ef7fd42ec6..6ef7fd42ec6 100644
--- a/src/test/run-pass/issues/issue-23611-enum-swap-in-drop.rs
+++ b/src/test/ui/issues/issue-23611-enum-swap-in-drop.rs
diff --git a/src/test/run-pass/issues/issue-23649-1.rs b/src/test/ui/issues/issue-23649-1.rs
index fc0c9a605fa..fc0c9a605fa 100644
--- a/src/test/run-pass/issues/issue-23649-1.rs
+++ b/src/test/ui/issues/issue-23649-1.rs
diff --git a/src/test/run-pass/issues/issue-23649-2.rs b/src/test/ui/issues/issue-23649-2.rs
index f5fb8b65020..f5fb8b65020 100644
--- a/src/test/run-pass/issues/issue-23649-2.rs
+++ b/src/test/ui/issues/issue-23649-2.rs
diff --git a/src/test/run-pass/issues/issue-23699.rs b/src/test/ui/issues/issue-23699.rs
index 952548837e4..952548837e4 100644
--- a/src/test/run-pass/issues/issue-23699.rs
+++ b/src/test/ui/issues/issue-23699.rs
diff --git a/src/test/run-pass/issues/issue-23781.rs b/src/test/ui/issues/issue-23781.rs
index 220ebdb1872..220ebdb1872 100644
--- a/src/test/run-pass/issues/issue-23781.rs
+++ b/src/test/ui/issues/issue-23781.rs
diff --git a/src/test/run-pass/issues/issue-2380-b.rs b/src/test/ui/issues/issue-2380-b.rs
index d708c7b4213..d708c7b4213 100644
--- a/src/test/run-pass/issues/issue-2380-b.rs
+++ b/src/test/ui/issues/issue-2380-b.rs
diff --git a/src/test/run-pass/issues/issue-23808.rs b/src/test/ui/issues/issue-23808.rs
index 0988b09fce9..0988b09fce9 100644
--- a/src/test/run-pass/issues/issue-23808.rs
+++ b/src/test/ui/issues/issue-23808.rs
diff --git a/src/test/run-pass/issues/issue-23825.rs b/src/test/ui/issues/issue-23825.rs
index a9f0095d2e2..a9f0095d2e2 100644
--- a/src/test/run-pass/issues/issue-23825.rs
+++ b/src/test/ui/issues/issue-23825.rs
diff --git a/src/test/run-pass/issues/issue-2383.rs b/src/test/ui/issues/issue-2383.rs
index 06e61ce680b..06e61ce680b 100644
--- a/src/test/run-pass/issues/issue-2383.rs
+++ b/src/test/ui/issues/issue-2383.rs
diff --git a/src/test/run-pass/issues/issue-23833.rs b/src/test/ui/issues/issue-23833.rs
index 77dc5c50d7a..77dc5c50d7a 100644
--- a/src/test/run-pass/issues/issue-23833.rs
+++ b/src/test/ui/issues/issue-23833.rs
diff --git a/src/test/run-pass/issues/issue-23891.rs b/src/test/ui/issues/issue-23891.rs
index 73467f715cb..73467f715cb 100644
--- a/src/test/run-pass/issues/issue-23891.rs
+++ b/src/test/ui/issues/issue-23891.rs
diff --git a/src/test/run-pass/issues/issue-23898.rs b/src/test/ui/issues/issue-23898.rs
index a8787f279b7..a8787f279b7 100644
--- a/src/test/run-pass/issues/issue-23898.rs
+++ b/src/test/ui/issues/issue-23898.rs
diff --git a/src/test/run-pass/issues/issue-23958.rs b/src/test/ui/issues/issue-23958.rs
index 7e90d758600..7e90d758600 100644
--- a/src/test/run-pass/issues/issue-23958.rs
+++ b/src/test/ui/issues/issue-23958.rs
diff --git a/src/test/run-pass/issues/issue-23968-const-not-overflow.rs b/src/test/ui/issues/issue-23968-const-not-overflow.rs
index b9593021235..b9593021235 100644
--- a/src/test/run-pass/issues/issue-23968-const-not-overflow.rs
+++ b/src/test/ui/issues/issue-23968-const-not-overflow.rs
diff --git a/src/test/run-pass/issues/issue-23992.rs b/src/test/ui/issues/issue-23992.rs
index 1ff44bd7f2d..1ff44bd7f2d 100644
--- a/src/test/run-pass/issues/issue-23992.rs
+++ b/src/test/ui/issues/issue-23992.rs
diff --git a/src/test/run-pass/issues/issue-24010.rs b/src/test/ui/issues/issue-24010.rs
index 264e1ee22cd..f1818533487 100644
--- a/src/test/run-pass/issues/issue-24010.rs
+++ b/src/test/ui/issues/issue-24010.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 trait Foo: Fn(i32) -> i32 + Send {}
 
 impl<T: ?Sized + Fn(i32) -> i32 + Send> Foo for T {}
diff --git a/src/test/run-pass/issues/issue-24086.rs b/src/test/ui/issues/issue-24086.rs
index 54622afbcfc..54622afbcfc 100644
--- a/src/test/run-pass/issues/issue-24086.rs
+++ b/src/test/ui/issues/issue-24086.rs
diff --git a/src/test/run-pass/issues/issue-2414-c.rs b/src/test/ui/issues/issue-2414-c.rs
index f6fe9798067..f6fe9798067 100644
--- a/src/test/run-pass/issues/issue-2414-c.rs
+++ b/src/test/ui/issues/issue-2414-c.rs
diff --git a/src/test/run-pass/issues/issue-2428.rs b/src/test/ui/issues/issue-2428.rs
index 94b830de3e6..94b830de3e6 100644
--- a/src/test/run-pass/issues/issue-2428.rs
+++ b/src/test/ui/issues/issue-2428.rs
diff --git a/src/test/run-pass/issues/issue-24308.rs b/src/test/ui/issues/issue-24308.rs
index 9c39a5d2238..9c39a5d2238 100644
--- a/src/test/run-pass/issues/issue-24308.rs
+++ b/src/test/ui/issues/issue-24308.rs
diff --git a/src/test/run-pass/issues/issue-24313.rs b/src/test/ui/issues/issue-24313.rs
index 2c420dc056f..2c420dc056f 100644
--- a/src/test/run-pass/issues/issue-24313.rs
+++ b/src/test/ui/issues/issue-24313.rs
diff --git a/src/test/run-pass/issues/issue-24353.rs b/src/test/ui/issues/issue-24353.rs
index f78255b7e2b..f78255b7e2b 100644
--- a/src/test/run-pass/issues/issue-24353.rs
+++ b/src/test/ui/issues/issue-24353.rs
diff --git a/src/test/run-pass/issues/issue-2445-b.rs b/src/test/ui/issues/issue-2445-b.rs
index f369eae3af3..f369eae3af3 100644
--- a/src/test/run-pass/issues/issue-2445-b.rs
+++ b/src/test/ui/issues/issue-2445-b.rs
diff --git a/src/test/run-pass/issues/issue-2445.rs b/src/test/ui/issues/issue-2445.rs
index 5730ce16574..5730ce16574 100644
--- a/src/test/run-pass/issues/issue-2445.rs
+++ b/src/test/ui/issues/issue-2445.rs
diff --git a/src/test/run-pass/issues/issue-24533.rs b/src/test/ui/issues/issue-24533.rs
index 8592bf43072..8592bf43072 100644
--- a/src/test/run-pass/issues/issue-24533.rs
+++ b/src/test/ui/issues/issue-24533.rs
diff --git a/src/test/run-pass/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs b/src/test/ui/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs
index 48362d0bb62..48362d0bb62 100644
--- a/src/test/run-pass/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs
+++ b/src/test/ui/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs
diff --git a/src/test/run-pass/issues/issue-24589.rs b/src/test/ui/issues/issue-24589.rs
index 6b03e14f961..6b03e14f961 100644
--- a/src/test/run-pass/issues/issue-24589.rs
+++ b/src/test/ui/issues/issue-24589.rs
diff --git a/src/test/run-pass/issues/issue-2463.rs b/src/test/ui/issues/issue-2463.rs
index d24a47c53d9..d24a47c53d9 100644
--- a/src/test/run-pass/issues/issue-2463.rs
+++ b/src/test/ui/issues/issue-2463.rs
diff --git a/src/test/run-pass/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-lib.rs b/src/test/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-lib.rs
index 5b1b1389ceb..5b1b1389ceb 100644
--- a/src/test/run-pass/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-lib.rs
+++ b/src/test/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-lib.rs
diff --git a/src/test/run-pass/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-mbcs-in-comments.rs b/src/test/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-mbcs-in-comments.rs
index 215145a64b1..215145a64b1 100644
--- a/src/test/run-pass/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-mbcs-in-comments.rs
+++ b/src/test/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-mbcs-in-comments.rs
diff --git a/src/test/run-pass/issues/issue-24687-embed-debuginfo/main.rs b/src/test/ui/issues/issue-24687-embed-debuginfo/main.rs
index 773792c7a3f..773792c7a3f 100644
--- a/src/test/run-pass/issues/issue-24687-embed-debuginfo/main.rs
+++ b/src/test/ui/issues/issue-24687-embed-debuginfo/main.rs
diff --git a/src/test/run-pass/issues/issue-2472.rs b/src/test/ui/issues/issue-2472.rs
index c790bc2d095..c790bc2d095 100644
--- a/src/test/run-pass/issues/issue-2472.rs
+++ b/src/test/ui/issues/issue-2472.rs
diff --git a/src/test/run-pass/issues/issue-24779.rs b/src/test/ui/issues/issue-24779.rs
index f1283d0dcf5..f1283d0dcf5 100644
--- a/src/test/run-pass/issues/issue-24779.rs
+++ b/src/test/ui/issues/issue-24779.rs
diff --git a/src/test/run-pass/issues/issue-24805-dropck-itemless.rs b/src/test/ui/issues/issue-24805-dropck-itemless.rs
index 555eefeb3a1..555eefeb3a1 100644
--- a/src/test/run-pass/issues/issue-24805-dropck-itemless.rs
+++ b/src/test/ui/issues/issue-24805-dropck-itemless.rs
diff --git a/src/test/run-pass/issues/issue-24945-repeat-dash-opts.rs b/src/test/ui/issues/issue-24945-repeat-dash-opts.rs
index cf3834952c6..cf3834952c6 100644
--- a/src/test/run-pass/issues/issue-24945-repeat-dash-opts.rs
+++ b/src/test/ui/issues/issue-24945-repeat-dash-opts.rs
diff --git a/src/test/run-pass/issues/issue-24947.rs b/src/test/ui/issues/issue-24947.rs
index 23705b4c9e7..23705b4c9e7 100644
--- a/src/test/run-pass/issues/issue-24947.rs
+++ b/src/test/ui/issues/issue-24947.rs
diff --git a/src/test/run-pass/issues/issue-24954.rs b/src/test/ui/issues/issue-24954.rs
index 0177dd4eae5..0177dd4eae5 100644
--- a/src/test/run-pass/issues/issue-24954.rs
+++ b/src/test/ui/issues/issue-24954.rs
diff --git a/src/test/run-pass/issues/issue-25089.rs b/src/test/ui/issues/issue-25089.rs
index cf261d43c55..cf261d43c55 100644
--- a/src/test/run-pass/issues/issue-25089.rs
+++ b/src/test/ui/issues/issue-25089.rs
diff --git a/src/test/run-pass/issues/issue-25145.rs b/src/test/ui/issues/issue-25145.rs
index f5ae28fbbab..f5ae28fbbab 100644
--- a/src/test/run-pass/issues/issue-25145.rs
+++ b/src/test/ui/issues/issue-25145.rs
diff --git a/src/test/run-pass/issues/issue-25185.rs b/src/test/ui/issues/issue-25185.rs
index 383c9a1e9c4..383c9a1e9c4 100644
--- a/src/test/run-pass/issues/issue-25185.rs
+++ b/src/test/ui/issues/issue-25185.rs
diff --git a/src/test/run-pass/issues/issue-2526-a.rs b/src/test/ui/issues/issue-2526-a.rs
index f3fdc0bd377..f3fdc0bd377 100644
--- a/src/test/run-pass/issues/issue-2526-a.rs
+++ b/src/test/ui/issues/issue-2526-a.rs
diff --git a/src/test/run-pass/issues/issue-25279.rs b/src/test/ui/issues/issue-25279.rs
index fdc516d3761..fdc516d3761 100644
--- a/src/test/run-pass/issues/issue-25279.rs
+++ b/src/test/ui/issues/issue-25279.rs
diff --git a/src/test/run-pass/issues/issue-25339.rs b/src/test/ui/issues/issue-25339.rs
index 6f8ec700951..6f8ec700951 100644
--- a/src/test/run-pass/issues/issue-25339.rs
+++ b/src/test/ui/issues/issue-25339.rs
diff --git a/src/test/run-pass/issues/issue-25343.rs b/src/test/ui/issues/issue-25343.rs
index 95a0bd9155d..95a0bd9155d 100644
--- a/src/test/run-pass/issues/issue-25343.rs
+++ b/src/test/ui/issues/issue-25343.rs
diff --git a/src/test/run-pass/issues/issue-25467.rs b/src/test/ui/issues/issue-25467.rs
index 31ac5f0f34b..31ac5f0f34b 100644
--- a/src/test/run-pass/issues/issue-25467.rs
+++ b/src/test/ui/issues/issue-25467.rs
diff --git a/src/test/run-pass/issues/issue-25497.rs b/src/test/ui/issues/issue-25497.rs
index 25f5ab90f7f..25f5ab90f7f 100644
--- a/src/test/run-pass/issues/issue-25497.rs
+++ b/src/test/ui/issues/issue-25497.rs
diff --git a/src/test/run-pass/issues/issue-2550.rs b/src/test/ui/issues/issue-2550.rs
index 04ec66b80d7..04ec66b80d7 100644
--- a/src/test/run-pass/issues/issue-2550.rs
+++ b/src/test/ui/issues/issue-2550.rs
diff --git a/src/test/run-pass/issues/issue-25515.rs b/src/test/ui/issues/issue-25515.rs
index e7b9ea3acfc..e7b9ea3acfc 100644
--- a/src/test/run-pass/issues/issue-25515.rs
+++ b/src/test/ui/issues/issue-25515.rs
diff --git a/src/test/run-pass/issues/issue-25549-multiple-drop.rs b/src/test/ui/issues/issue-25549-multiple-drop.rs
index 25a2da707dc..25a2da707dc 100644
--- a/src/test/run-pass/issues/issue-25549-multiple-drop.rs
+++ b/src/test/ui/issues/issue-25549-multiple-drop.rs
diff --git a/src/test/run-pass/issues/issue-25679.rs b/src/test/ui/issues/issue-25679.rs
index 89544c9eb88..89544c9eb88 100644
--- a/src/test/run-pass/issues/issue-25679.rs
+++ b/src/test/ui/issues/issue-25679.rs
diff --git a/src/test/run-pass/issues/issue-25693.rs b/src/test/ui/issues/issue-25693.rs
index 9af0ba100e8..9af0ba100e8 100644
--- a/src/test/run-pass/issues/issue-25693.rs
+++ b/src/test/ui/issues/issue-25693.rs
diff --git a/src/test/run-pass/issues/issue-25700-1.rs b/src/test/ui/issues/issue-25700-1.rs
index 7bc9673a5be..7bc9673a5be 100644
--- a/src/test/run-pass/issues/issue-25700-1.rs
+++ b/src/test/ui/issues/issue-25700-1.rs
diff --git a/src/test/run-pass/issues/issue-25700-2.rs b/src/test/ui/issues/issue-25700-2.rs
index b161e68abaf..b161e68abaf 100644
--- a/src/test/run-pass/issues/issue-25700-2.rs
+++ b/src/test/ui/issues/issue-25700-2.rs
diff --git a/src/test/run-pass/issues/issue-25746-bool-transmute.rs b/src/test/ui/issues/issue-25746-bool-transmute.rs
index bc2f4a7c1b7..bc2f4a7c1b7 100644
--- a/src/test/run-pass/issues/issue-25746-bool-transmute.rs
+++ b/src/test/ui/issues/issue-25746-bool-transmute.rs
diff --git a/src/test/run-pass/issues/issue-25757.rs b/src/test/ui/issues/issue-25757.rs
index ec1864d7deb..ec1864d7deb 100644
--- a/src/test/run-pass/issues/issue-25757.rs
+++ b/src/test/ui/issues/issue-25757.rs
diff --git a/src/test/run-pass/issues/issue-25810.rs b/src/test/ui/issues/issue-25810.rs
index f32216f3254..f32216f3254 100644
--- a/src/test/run-pass/issues/issue-25810.rs
+++ b/src/test/ui/issues/issue-25810.rs
diff --git a/src/test/run-pass/issues/issue-25916.rs b/src/test/ui/issues/issue-25916.rs
index 0b415947965..0b415947965 100644
--- a/src/test/run-pass/issues/issue-25916.rs
+++ b/src/test/ui/issues/issue-25916.rs
diff --git a/src/test/run-pass/issues/issue-26127.rs b/src/test/ui/issues/issue-26127.rs
index cb479a23085..cb479a23085 100644
--- a/src/test/run-pass/issues/issue-26127.rs
+++ b/src/test/ui/issues/issue-26127.rs
diff --git a/src/test/run-pass/issues/issue-26251.rs b/src/test/ui/issues/issue-26251.rs
index 0434ef9e5a9..0434ef9e5a9 100644
--- a/src/test/run-pass/issues/issue-26251.rs
+++ b/src/test/ui/issues/issue-26251.rs
diff --git a/src/test/run-pass/issues/issue-2631-b.rs b/src/test/ui/issues/issue-2631-b.rs
index c7f6728e3f2..c7f6728e3f2 100644
--- a/src/test/run-pass/issues/issue-2631-b.rs
+++ b/src/test/ui/issues/issue-2631-b.rs
diff --git a/src/test/run-pass/issues/issue-26322.rs b/src/test/ui/issues/issue-26322.rs
index c1dc80eb7c5..c1dc80eb7c5 100644
--- a/src/test/run-pass/issues/issue-26322.rs
+++ b/src/test/ui/issues/issue-26322.rs
diff --git a/src/test/run-pass/issues/issue-2633-2.rs b/src/test/ui/issues/issue-2633-2.rs
index 02c1a166301..02c1a166301 100644
--- a/src/test/run-pass/issues/issue-2633-2.rs
+++ b/src/test/ui/issues/issue-2633-2.rs
diff --git a/src/test/run-pass/issues/issue-2633.rs b/src/test/ui/issues/issue-2633.rs
index 7e8cea75fc8..7e8cea75fc8 100644
--- a/src/test/run-pass/issues/issue-2633.rs
+++ b/src/test/ui/issues/issue-2633.rs
diff --git a/src/test/run-pass/issues/issue-2642.rs b/src/test/ui/issues/issue-2642.rs
index 95c5632258e..95c5632258e 100644
--- a/src/test/run-pass/issues/issue-2642.rs
+++ b/src/test/ui/issues/issue-2642.rs
diff --git a/src/test/run-pass/issues/issue-26468.rs b/src/test/ui/issues/issue-26468.rs
index 71cc90e8bd1..71cc90e8bd1 100644
--- a/src/test/run-pass/issues/issue-26468.rs
+++ b/src/test/ui/issues/issue-26468.rs
diff --git a/src/test/run-pass/issues/issue-26484.rs b/src/test/ui/issues/issue-26484.rs
index 3b40b3dd8f0..3b40b3dd8f0 100644
--- a/src/test/run-pass/issues/issue-26484.rs
+++ b/src/test/ui/issues/issue-26484.rs
diff --git a/src/test/run-pass/issues/issue-26641.rs b/src/test/ui/issues/issue-26641.rs
index 4b6f2c2b3bc..4b6f2c2b3bc 100644
--- a/src/test/run-pass/issues/issue-26641.rs
+++ b/src/test/ui/issues/issue-26641.rs
diff --git a/src/test/run-pass/issues/issue-26655.rs b/src/test/ui/issues/issue-26655.rs
index 4c01183a440..4c01183a440 100644
--- a/src/test/run-pass/issues/issue-26655.rs
+++ b/src/test/ui/issues/issue-26655.rs
diff --git a/src/test/run-pass/issues/issue-26709.rs b/src/test/ui/issues/issue-26709.rs
index 281ae13399d..281ae13399d 100644
--- a/src/test/run-pass/issues/issue-26709.rs
+++ b/src/test/ui/issues/issue-26709.rs
diff --git a/src/test/run-pass/issues/issue-26802.rs b/src/test/ui/issues/issue-26802.rs
index 307a6716098..307a6716098 100644
--- a/src/test/run-pass/issues/issue-26802.rs
+++ b/src/test/ui/issues/issue-26802.rs
diff --git a/src/test/run-pass/issues/issue-26805.rs b/src/test/ui/issues/issue-26805.rs
index bcf8a673191..bcf8a673191 100644
--- a/src/test/run-pass/issues/issue-26805.rs
+++ b/src/test/ui/issues/issue-26805.rs
diff --git a/src/test/run-pass/issues/issue-26873-multifile.rs b/src/test/ui/issues/issue-26873-multifile.rs
index da2acf6c9f7..da2acf6c9f7 100644
--- a/src/test/run-pass/issues/issue-26873-multifile.rs
+++ b/src/test/ui/issues/issue-26873-multifile.rs
diff --git a/src/test/run-pass/issues/issue-26873-multifile/A/B.rs b/src/test/ui/issues/issue-26873-multifile/A/B.rs
index ab7b0d81605..ab7b0d81605 100644
--- a/src/test/run-pass/issues/issue-26873-multifile/A/B.rs
+++ b/src/test/ui/issues/issue-26873-multifile/A/B.rs
diff --git a/src/test/run-pass/issues/issue-26873-multifile/A/C.rs b/src/test/ui/issues/issue-26873-multifile/A/C.rs
index b287283df53..b287283df53 100644
--- a/src/test/run-pass/issues/issue-26873-multifile/A/C.rs
+++ b/src/test/ui/issues/issue-26873-multifile/A/C.rs
diff --git a/src/test/run-pass/issues/issue-26873-multifile/A/mod.rs b/src/test/ui/issues/issue-26873-multifile/A/mod.rs
index 0f18772bf1b..0f18772bf1b 100644
--- a/src/test/run-pass/issues/issue-26873-multifile/A/mod.rs
+++ b/src/test/ui/issues/issue-26873-multifile/A/mod.rs
diff --git a/src/test/run-pass/issues/issue-26873-multifile/compiletest-ignore-dir b/src/test/ui/issues/issue-26873-multifile/compiletest-ignore-dir
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/run-pass/issues/issue-26873-multifile/compiletest-ignore-dir
+++ b/src/test/ui/issues/issue-26873-multifile/compiletest-ignore-dir
diff --git a/src/test/run-pass/issues/issue-26873-multifile/mod.rs b/src/test/ui/issues/issue-26873-multifile/mod.rs
index a1ba53f9191..a1ba53f9191 100644
--- a/src/test/run-pass/issues/issue-26873-multifile/mod.rs
+++ b/src/test/ui/issues/issue-26873-multifile/mod.rs
diff --git a/src/test/run-pass/issues/issue-26873-onefile.rs b/src/test/ui/issues/issue-26873-onefile.rs
index f06c6499eb0..f06c6499eb0 100644
--- a/src/test/run-pass/issues/issue-26873-onefile.rs
+++ b/src/test/ui/issues/issue-26873-onefile.rs
diff --git a/src/test/run-pass/issues/issue-26905.rs b/src/test/ui/issues/issue-26905-rpass.rs
index 2d5827f476b..2d5827f476b 100644
--- a/src/test/run-pass/issues/issue-26905.rs
+++ b/src/test/ui/issues/issue-26905-rpass.rs
diff --git a/src/test/run-pass/issues/issue-26996.rs b/src/test/ui/issues/issue-26996.rs
index 04382be27d7..04382be27d7 100644
--- a/src/test/run-pass/issues/issue-26996.rs
+++ b/src/test/ui/issues/issue-26996.rs
diff --git a/src/test/run-pass/issues/issue-27021.rs b/src/test/ui/issues/issue-27021.rs
index 30551375450..30551375450 100644
--- a/src/test/run-pass/issues/issue-27021.rs
+++ b/src/test/ui/issues/issue-27021.rs
diff --git a/src/test/run-pass/issues/issue-27054-primitive-binary-ops.rs b/src/test/ui/issues/issue-27054-primitive-binary-ops.rs
index c6f925de5d7..c6f925de5d7 100644
--- a/src/test/run-pass/issues/issue-27054-primitive-binary-ops.rs
+++ b/src/test/ui/issues/issue-27054-primitive-binary-ops.rs
diff --git a/src/test/run-pass/issues/issue-27060.rs b/src/test/ui/issues/issue-27060-rpass.rs
index b6ffc3ecb51..b6ffc3ecb51 100644
--- a/src/test/run-pass/issues/issue-27060.rs
+++ b/src/test/ui/issues/issue-27060-rpass.rs
diff --git a/src/test/run-pass/issues/issue-2708.rs b/src/test/ui/issues/issue-2708.rs
index abd5e9507f8..abd5e9507f8 100644
--- a/src/test/run-pass/issues/issue-2708.rs
+++ b/src/test/ui/issues/issue-2708.rs
diff --git a/src/test/run-pass/issues/issue-2718.rs b/src/test/ui/issues/issue-2718.rs
index 6449337eea4..6449337eea4 100644
--- a/src/test/run-pass/issues/issue-2718.rs
+++ b/src/test/ui/issues/issue-2718.rs
diff --git a/src/test/run-pass/issues/issue-2723-b.rs b/src/test/ui/issues/issue-2723-b.rs
index 1910561d0ba..1910561d0ba 100644
--- a/src/test/run-pass/issues/issue-2723-b.rs
+++ b/src/test/ui/issues/issue-2723-b.rs
diff --git a/src/test/run-pass/issues/issue-27240.rs b/src/test/ui/issues/issue-27240.rs
index a22db76b9bc..a22db76b9bc 100644
--- a/src/test/run-pass/issues/issue-27240.rs
+++ b/src/test/ui/issues/issue-27240.rs
diff --git a/src/test/run-pass/issues/issue-27268.rs b/src/test/ui/issues/issue-27268.rs
index 161e2d4d204..161e2d4d204 100644
--- a/src/test/run-pass/issues/issue-27268.rs
+++ b/src/test/ui/issues/issue-27268.rs
diff --git a/src/test/run-pass/issues/issue-27320.rs b/src/test/ui/issues/issue-27320.rs
index d1aa56b915b..d1aa56b915b 100644
--- a/src/test/run-pass/issues/issue-27320.rs
+++ b/src/test/ui/issues/issue-27320.rs
diff --git a/src/test/run-pass/issues/issue-2734.rs b/src/test/ui/issues/issue-2734.rs
index d449f6449aa..d449f6449aa 100644
--- a/src/test/run-pass/issues/issue-2734.rs
+++ b/src/test/ui/issues/issue-2734.rs
diff --git a/src/test/run-pass/issues/issue-2735-2.rs b/src/test/ui/issues/issue-2735-2.rs
index 70ebce9d35a..70ebce9d35a 100644
--- a/src/test/run-pass/issues/issue-2735-2.rs
+++ b/src/test/ui/issues/issue-2735-2.rs
diff --git a/src/test/run-pass/issues/issue-2735-3.rs b/src/test/ui/issues/issue-2735-3.rs
index 23301537835..23301537835 100644
--- a/src/test/run-pass/issues/issue-2735-3.rs
+++ b/src/test/ui/issues/issue-2735-3.rs
diff --git a/src/test/run-pass/issues/issue-2735.rs b/src/test/ui/issues/issue-2735.rs
index 794c7d4edaa..794c7d4edaa 100644
--- a/src/test/run-pass/issues/issue-2735.rs
+++ b/src/test/ui/issues/issue-2735.rs
diff --git a/src/test/run-pass/issues/issue-27401-dropflag-reinit.rs b/src/test/ui/issues/issue-27401-dropflag-reinit.rs
index e137575c2f8..e137575c2f8 100644
--- a/src/test/run-pass/issues/issue-27401-dropflag-reinit.rs
+++ b/src/test/ui/issues/issue-27401-dropflag-reinit.rs
diff --git a/src/test/run-pass/issues/issue-2748-b.rs b/src/test/ui/issues/issue-2748-b.rs
index 8df735ac88e..8df735ac88e 100644
--- a/src/test/run-pass/issues/issue-2748-b.rs
+++ b/src/test/ui/issues/issue-2748-b.rs
diff --git a/src/test/run-pass/issues/issue-27639.rs b/src/test/ui/issues/issue-27639.rs
index 945fbad91f6..945fbad91f6 100644
--- a/src/test/run-pass/issues/issue-27639.rs
+++ b/src/test/ui/issues/issue-27639.rs
diff --git a/src/test/run-pass/issues/issue-27859.rs b/src/test/ui/issues/issue-27859.rs
index 259d706fa2a..259d706fa2a 100644
--- a/src/test/run-pass/issues/issue-27859.rs
+++ b/src/test/ui/issues/issue-27859.rs
diff --git a/src/test/run-pass/issues/issue-27890.rs b/src/test/ui/issues/issue-27890.rs
index 9f85473380f..9f85473380f 100644
--- a/src/test/run-pass/issues/issue-27890.rs
+++ b/src/test/ui/issues/issue-27890.rs
diff --git a/src/test/run-pass/issues/issue-27901.rs b/src/test/ui/issues/issue-27901.rs
index ffd90b68983..ffd90b68983 100644
--- a/src/test/run-pass/issues/issue-27901.rs
+++ b/src/test/ui/issues/issue-27901.rs
diff --git a/src/test/run-pass/issues/issue-27949.rs b/src/test/ui/issues/issue-27949.rs
index e905da72aad..e905da72aad 100644
--- a/src/test/run-pass/issues/issue-27949.rs
+++ b/src/test/ui/issues/issue-27949.rs
diff --git a/src/test/run-pass/issues/issue-27997.rs b/src/test/ui/issues/issue-27997.rs
index dd74cf75249..dd74cf75249 100644
--- a/src/test/run-pass/issues/issue-27997.rs
+++ b/src/test/ui/issues/issue-27997.rs
diff --git a/src/test/run-pass/issues/issue-28181.rs b/src/test/ui/issues/issue-28181.rs
index c46e131c6ac..c46e131c6ac 100644
--- a/src/test/run-pass/issues/issue-28181.rs
+++ b/src/test/ui/issues/issue-28181.rs
diff --git a/src/test/run-pass/issues/issue-28498-must-work-ex1.rs b/src/test/ui/issues/issue-28498-must-work-ex1.rs
index 4699d3352ad..4699d3352ad 100644
--- a/src/test/run-pass/issues/issue-28498-must-work-ex1.rs
+++ b/src/test/ui/issues/issue-28498-must-work-ex1.rs
diff --git a/src/test/run-pass/issues/issue-28498-must-work-ex2.rs b/src/test/ui/issues/issue-28498-must-work-ex2.rs
index cadf62461fd..cadf62461fd 100644
--- a/src/test/run-pass/issues/issue-28498-must-work-ex2.rs
+++ b/src/test/ui/issues/issue-28498-must-work-ex2.rs
diff --git a/src/test/run-pass/issues/issue-28498-ugeh-ex1.rs b/src/test/ui/issues/issue-28498-ugeh-ex1.rs
index 90cf2cddcf0..90cf2cddcf0 100644
--- a/src/test/run-pass/issues/issue-28498-ugeh-ex1.rs
+++ b/src/test/ui/issues/issue-28498-ugeh-ex1.rs
diff --git a/src/test/run-pass/issues/issue-28498-ugeh-with-lifetime-param.rs b/src/test/ui/issues/issue-28498-ugeh-with-lifetime-param.rs
index aea9fde5309..aea9fde5309 100644
--- a/src/test/run-pass/issues/issue-28498-ugeh-with-lifetime-param.rs
+++ b/src/test/ui/issues/issue-28498-ugeh-with-lifetime-param.rs
diff --git a/src/test/run-pass/issues/issue-28498-ugeh-with-passed-to-fn.rs b/src/test/ui/issues/issue-28498-ugeh-with-passed-to-fn.rs
index 91ef5a7c98d..91ef5a7c98d 100644
--- a/src/test/run-pass/issues/issue-28498-ugeh-with-passed-to-fn.rs
+++ b/src/test/ui/issues/issue-28498-ugeh-with-passed-to-fn.rs
diff --git a/src/test/run-pass/issues/issue-28498-ugeh-with-trait-bound.rs b/src/test/ui/issues/issue-28498-ugeh-with-trait-bound.rs
index 808f3b6e81e..808f3b6e81e 100644
--- a/src/test/run-pass/issues/issue-28498-ugeh-with-trait-bound.rs
+++ b/src/test/ui/issues/issue-28498-ugeh-with-trait-bound.rs
diff --git a/src/test/run-pass/issues/issue-28550.rs b/src/test/ui/issues/issue-28550.rs
index 95583f80515..95583f80515 100644
--- a/src/test/run-pass/issues/issue-28550.rs
+++ b/src/test/ui/issues/issue-28550.rs
diff --git a/src/test/run-pass/issues/issue-28676.rs b/src/test/ui/issues/issue-28676.rs
index 2b83478ca61..2b83478ca61 100644
--- a/src/test/run-pass/issues/issue-28676.rs
+++ b/src/test/ui/issues/issue-28676.rs
diff --git a/src/test/run-pass/issues/issue-28777.rs b/src/test/ui/issues/issue-28777.rs
index 74de00adadb..74de00adadb 100644
--- a/src/test/run-pass/issues/issue-28777.rs
+++ b/src/test/ui/issues/issue-28777.rs
diff --git a/src/test/run-pass/issues/issue-28828.rs b/src/test/ui/issues/issue-28828.rs
index 03968809eb7..03968809eb7 100644
--- a/src/test/run-pass/issues/issue-28828.rs
+++ b/src/test/ui/issues/issue-28828.rs
diff --git a/src/test/run-pass/issues/issue-28839.rs b/src/test/ui/issues/issue-28839.rs
index 73be87a0c1e..73be87a0c1e 100644
--- a/src/test/run-pass/issues/issue-28839.rs
+++ b/src/test/ui/issues/issue-28839.rs
diff --git a/src/test/run-pass/issues/issue-2895.rs b/src/test/ui/issues/issue-2895.rs
index d8c08996bc3..d8c08996bc3 100644
--- a/src/test/run-pass/issues/issue-2895.rs
+++ b/src/test/ui/issues/issue-2895.rs
diff --git a/src/test/run-pass/issues/issue-28950.rs b/src/test/ui/issues/issue-28950.rs
index 8b55f42f3f4..8b55f42f3f4 100644
--- a/src/test/run-pass/issues/issue-28950.rs
+++ b/src/test/ui/issues/issue-28950.rs
diff --git a/src/test/run-pass/issues/issue-28983.rs b/src/test/ui/issues/issue-28983.rs
index 3db26a1ee5f..3db26a1ee5f 100644
--- a/src/test/run-pass/issues/issue-28983.rs
+++ b/src/test/ui/issues/issue-28983.rs
diff --git a/src/test/run-pass/issues/issue-29053.rs b/src/test/ui/issues/issue-29053.rs
index 34c4a0f8f3e..34c4a0f8f3e 100644
--- a/src/test/run-pass/issues/issue-29053.rs
+++ b/src/test/ui/issues/issue-29053.rs
diff --git a/src/test/run-pass/issues/issue-29071-2.rs b/src/test/ui/issues/issue-29071-2.rs
index f27bf0261db..f27bf0261db 100644
--- a/src/test/run-pass/issues/issue-29071-2.rs
+++ b/src/test/ui/issues/issue-29071-2.rs
diff --git a/src/test/run-pass/issues/issue-29092.rs b/src/test/ui/issues/issue-29092.rs
index f20d2a424b0..f20d2a424b0 100644
--- a/src/test/run-pass/issues/issue-29092.rs
+++ b/src/test/ui/issues/issue-29092.rs
diff --git a/src/test/run-pass/issues/issue-29147.rs b/src/test/ui/issues/issue-29147-rpass.rs
index 101bca307f1..101bca307f1 100644
--- a/src/test/run-pass/issues/issue-29147.rs
+++ b/src/test/ui/issues/issue-29147-rpass.rs
diff --git a/src/test/run-pass/issues/issue-29166.rs b/src/test/ui/issues/issue-29166.rs
index ca819ba39a2..ca819ba39a2 100644
--- a/src/test/run-pass/issues/issue-29166.rs
+++ b/src/test/ui/issues/issue-29166.rs
diff --git a/src/test/run-pass/issues/issue-29227.rs b/src/test/ui/issues/issue-29227.rs
index e9dfc2840e5..e9dfc2840e5 100644
--- a/src/test/run-pass/issues/issue-29227.rs
+++ b/src/test/ui/issues/issue-29227.rs
diff --git a/src/test/run-pass/issues/issue-2935.rs b/src/test/ui/issues/issue-2935.rs
index 11641ca7380..11641ca7380 100644
--- a/src/test/run-pass/issues/issue-2935.rs
+++ b/src/test/ui/issues/issue-2935.rs
diff --git a/src/test/run-pass/issues/issue-2936.rs b/src/test/ui/issues/issue-2936.rs
index 6b932d01d55..6b932d01d55 100644
--- a/src/test/run-pass/issues/issue-2936.rs
+++ b/src/test/ui/issues/issue-2936.rs
diff --git a/src/test/run-pass/issues/issue-29466.rs b/src/test/ui/issues/issue-29466.rs
index f8785a63217..f8785a63217 100644
--- a/src/test/run-pass/issues/issue-29466.rs
+++ b/src/test/ui/issues/issue-29466.rs
diff --git a/src/test/run-pass/issues/issue-29485.rs b/src/test/ui/issues/issue-29485.rs
index 6b2fb7126e3..6b2fb7126e3 100644
--- a/src/test/run-pass/issues/issue-29485.rs
+++ b/src/test/ui/issues/issue-29485.rs
diff --git a/src/test/run-pass/issues/issue-29488.rs b/src/test/ui/issues/issue-29488.rs
index 3c9a6a80dbf..3c9a6a80dbf 100644
--- a/src/test/run-pass/issues/issue-29488.rs
+++ b/src/test/ui/issues/issue-29488.rs
diff --git a/src/test/run-pass/issues/issue-29522.rs b/src/test/ui/issues/issue-29522.rs
index 3d2de5ef63a..3d2de5ef63a 100644
--- a/src/test/run-pass/issues/issue-29522.rs
+++ b/src/test/ui/issues/issue-29522.rs
diff --git a/src/test/run-pass/issues/issue-29663.rs b/src/test/ui/issues/issue-29663.rs
index e2e89a8bfa3..e2e89a8bfa3 100644
--- a/src/test/run-pass/issues/issue-29663.rs
+++ b/src/test/ui/issues/issue-29663.rs
diff --git a/src/test/run-pass/issues/issue-29668.rs b/src/test/ui/issues/issue-29668.rs
index 3d6c27bcda1..3d6c27bcda1 100644
--- a/src/test/run-pass/issues/issue-29668.rs
+++ b/src/test/ui/issues/issue-29668.rs
diff --git a/src/test/run-pass/issues/issue-29746.rs b/src/test/ui/issues/issue-29746.rs
index 428cc637f55..428cc637f55 100644
--- a/src/test/run-pass/issues/issue-29746.rs
+++ b/src/test/ui/issues/issue-29746.rs
diff --git a/src/test/run-pass/issues/issue-29844.rs b/src/test/ui/issues/issue-29844.rs
index e08942da5e4..e08942da5e4 100644
--- a/src/test/run-pass/issues/issue-29844.rs
+++ b/src/test/ui/issues/issue-29844.rs
diff --git a/src/test/run-pass/issues/issue-2989.rs b/src/test/ui/issues/issue-2989.rs
index c0b67374370..c0b67374370 100644
--- a/src/test/run-pass/issues/issue-2989.rs
+++ b/src/test/ui/issues/issue-2989.rs
diff --git a/src/test/run-pass/issues/issue-29914-2.rs b/src/test/ui/issues/issue-29914-2.rs
index 626de269d95..626de269d95 100644
--- a/src/test/run-pass/issues/issue-29914-2.rs
+++ b/src/test/ui/issues/issue-29914-2.rs
diff --git a/src/test/run-pass/issues/issue-29914-3.rs b/src/test/ui/issues/issue-29914-3.rs
index 1c6c64eb316..1c6c64eb316 100644
--- a/src/test/run-pass/issues/issue-29914-3.rs
+++ b/src/test/ui/issues/issue-29914-3.rs
diff --git a/src/test/run-pass/issues/issue-29914.rs b/src/test/ui/issues/issue-29914.rs
index 6da63664dfa..6da63664dfa 100644
--- a/src/test/run-pass/issues/issue-29914.rs
+++ b/src/test/ui/issues/issue-29914.rs
diff --git a/src/test/run-pass/issues/issue-29927-1.rs b/src/test/ui/issues/issue-29927-1.rs
index a236e491375..a236e491375 100644
--- a/src/test/run-pass/issues/issue-29927-1.rs
+++ b/src/test/ui/issues/issue-29927-1.rs
diff --git a/src/test/run-pass/issues/issue-29927.rs b/src/test/ui/issues/issue-29927.rs
index 3385e4e6e94..3385e4e6e94 100644
--- a/src/test/run-pass/issues/issue-29927.rs
+++ b/src/test/ui/issues/issue-29927.rs
diff --git a/src/test/run-pass/issues/issue-29948.rs b/src/test/ui/issues/issue-29948.rs
index 8ede8143ea6..8ede8143ea6 100644
--- a/src/test/run-pass/issues/issue-29948.rs
+++ b/src/test/ui/issues/issue-29948.rs
diff --git a/src/test/run-pass/issues/issue-30018-nopanic.rs b/src/test/ui/issues/issue-30018-nopanic.rs
index 291bab2736d..291bab2736d 100644
--- a/src/test/run-pass/issues/issue-30018-nopanic.rs
+++ b/src/test/ui/issues/issue-30018-nopanic.rs
diff --git a/src/test/run-pass/issues/issue-30018-panic.rs b/src/test/ui/issues/issue-30018-panic.rs
index 50749b0c742..50749b0c742 100644
--- a/src/test/run-pass/issues/issue-30018-panic.rs
+++ b/src/test/ui/issues/issue-30018-panic.rs
diff --git a/src/test/run-pass/issues/issue-30081.rs b/src/test/ui/issues/issue-30081.rs
index e7fca96ed9e..e7fca96ed9e 100644
--- a/src/test/run-pass/issues/issue-30081.rs
+++ b/src/test/ui/issues/issue-30081.rs
diff --git a/src/test/run-pass/issues/issue-3012-2.rs b/src/test/ui/issues/issue-3012-2.rs
index 7d32c51f569..7d32c51f569 100644
--- a/src/test/run-pass/issues/issue-3012-2.rs
+++ b/src/test/ui/issues/issue-3012-2.rs
diff --git a/src/test/run-pass/issues/issue-30240.rs b/src/test/ui/issues/issue-30240-rpass.rs
index ab16614fd30..ab16614fd30 100644
--- a/src/test/run-pass/issues/issue-30240.rs
+++ b/src/test/ui/issues/issue-30240-rpass.rs
diff --git a/src/test/run-pass/issues/issue-3026.rs b/src/test/ui/issues/issue-3026.rs
index 1dea8134fba..1dea8134fba 100644
--- a/src/test/run-pass/issues/issue-3026.rs
+++ b/src/test/ui/issues/issue-3026.rs
diff --git a/src/test/run-pass/issues/issue-3037.rs b/src/test/ui/issues/issue-3037.rs
index ff4d32c2840..ff4d32c2840 100644
--- a/src/test/run-pass/issues/issue-3037.rs
+++ b/src/test/ui/issues/issue-3037.rs
diff --git a/src/test/run-pass/issues/issue-30371.rs b/src/test/ui/issues/issue-30371.rs
index 58521b95cf6..58521b95cf6 100644
--- a/src/test/run-pass/issues/issue-30371.rs
+++ b/src/test/ui/issues/issue-30371.rs
diff --git a/src/test/run-pass/issues/issue-30490.rs b/src/test/ui/issues/issue-30490.rs
index 76e72246887..76e72246887 100644
--- a/src/test/run-pass/issues/issue-30490.rs
+++ b/src/test/ui/issues/issue-30490.rs
diff --git a/src/test/run-pass/issues/issue-3052.rs b/src/test/ui/issues/issue-3052.rs
index ee2456da3e2..ee2456da3e2 100644
--- a/src/test/run-pass/issues/issue-3052.rs
+++ b/src/test/ui/issues/issue-3052.rs
diff --git a/src/test/run-pass/issues/issue-30530.rs b/src/test/ui/issues/issue-30530.rs
index 111fb8aa506..111fb8aa506 100644
--- a/src/test/run-pass/issues/issue-30530.rs
+++ b/src/test/ui/issues/issue-30530.rs
diff --git a/src/test/run-pass/issues/issue-30615.rs b/src/test/ui/issues/issue-30615.rs
index c718449d84e..c718449d84e 100644
--- a/src/test/run-pass/issues/issue-30615.rs
+++ b/src/test/ui/issues/issue-30615.rs
diff --git a/src/test/run-pass/issues/issue-30756.rs b/src/test/ui/issues/issue-30756.rs
index 836db951bb7..836db951bb7 100644
--- a/src/test/run-pass/issues/issue-30756.rs
+++ b/src/test/ui/issues/issue-30756.rs
diff --git a/src/test/run-pass/issues/issue-30891.rs b/src/test/ui/issues/issue-30891.rs
index 30f55e0bd64..30f55e0bd64 100644
--- a/src/test/run-pass/issues/issue-30891.rs
+++ b/src/test/ui/issues/issue-30891.rs
diff --git a/src/test/run-pass/issues/issue-3091.rs b/src/test/ui/issues/issue-3091.rs
index 0c0a412420a..0c0a412420a 100644
--- a/src/test/run-pass/issues/issue-3091.rs
+++ b/src/test/ui/issues/issue-3091.rs
diff --git a/src/test/run-pass/issues/issue-3109.rs b/src/test/ui/issues/issue-3109.rs
index bd807cad753..bd807cad753 100644
--- a/src/test/run-pass/issues/issue-3109.rs
+++ b/src/test/ui/issues/issue-3109.rs
diff --git a/src/test/run-pass/issues/issue-3121.rs b/src/test/ui/issues/issue-3121.rs
index f7bbfa9f6f4..f7bbfa9f6f4 100644
--- a/src/test/run-pass/issues/issue-3121.rs
+++ b/src/test/ui/issues/issue-3121.rs
diff --git a/src/test/run-pass/issues/issue-31267-additional.rs b/src/test/ui/issues/issue-31267-additional.rs
index 70dce2c9490..70dce2c9490 100644
--- a/src/test/run-pass/issues/issue-31267-additional.rs
+++ b/src/test/ui/issues/issue-31267-additional.rs
diff --git a/src/test/run-pass/issues/issue-31267.rs b/src/test/ui/issues/issue-31267.rs
index 50843c89eb4..50843c89eb4 100644
--- a/src/test/run-pass/issues/issue-31267.rs
+++ b/src/test/ui/issues/issue-31267.rs
diff --git a/src/test/run-pass/issues/issue-31299.rs b/src/test/ui/issues/issue-31299.rs
index abed18d81f8..abed18d81f8 100644
--- a/src/test/run-pass/issues/issue-31299.rs
+++ b/src/test/ui/issues/issue-31299.rs
diff --git a/src/test/run-pass/issues/issue-3136-b.rs b/src/test/ui/issues/issue-3136-b.rs
index c4ca7236e76..c4ca7236e76 100644
--- a/src/test/run-pass/issues/issue-3136-b.rs
+++ b/src/test/ui/issues/issue-3136-b.rs
diff --git a/src/test/run-pass/issues/issue-31702.rs b/src/test/ui/issues/issue-31702.rs
index 5b24eead345..5b24eead345 100644
--- a/src/test/run-pass/issues/issue-31702.rs
+++ b/src/test/ui/issues/issue-31702.rs
diff --git a/src/test/run-pass/issues/issue-31776.rs b/src/test/ui/issues/issue-31776.rs
index c0d2c91e577..c0d2c91e577 100644
--- a/src/test/run-pass/issues/issue-31776.rs
+++ b/src/test/ui/issues/issue-31776.rs
diff --git a/src/test/run-pass/issues/issue-32008.rs b/src/test/ui/issues/issue-32008.rs
index 6c2e206796f..6c2e206796f 100644
--- a/src/test/run-pass/issues/issue-32008.rs
+++ b/src/test/ui/issues/issue-32008.rs
diff --git a/src/test/run-pass/issues/issue-3211.rs b/src/test/ui/issues/issue-3211.rs
index 49dd4fa7360..49dd4fa7360 100644
--- a/src/test/run-pass/issues/issue-3211.rs
+++ b/src/test/ui/issues/issue-3211.rs
diff --git a/src/test/run-pass/issues/issue-3220.rs b/src/test/ui/issues/issue-3220.rs
index 7dc672edb54..7dc672edb54 100644
--- a/src/test/run-pass/issues/issue-3220.rs
+++ b/src/test/ui/issues/issue-3220.rs
diff --git a/src/test/run-pass/issues/issue-32292.rs b/src/test/ui/issues/issue-32292.rs
index 99b865391de..99b865391de 100644
--- a/src/test/run-pass/issues/issue-32292.rs
+++ b/src/test/ui/issues/issue-32292.rs
diff --git a/src/test/run-pass/issues/issue-32389.rs b/src/test/ui/issues/issue-32389.rs
index cc94cc819d6..cc94cc819d6 100644
--- a/src/test/run-pass/issues/issue-32389.rs
+++ b/src/test/ui/issues/issue-32389.rs
diff --git a/src/test/run-pass/issues/issue-32518.rs b/src/test/ui/issues/issue-32518.rs
index 808b40f71b3..808b40f71b3 100644
--- a/src/test/run-pass/issues/issue-32518.rs
+++ b/src/test/ui/issues/issue-32518.rs
diff --git a/src/test/run-pass/issues/issue-32805.rs b/src/test/ui/issues/issue-32805.rs
index 23c19473903..23c19473903 100644
--- a/src/test/run-pass/issues/issue-32805.rs
+++ b/src/test/ui/issues/issue-32805.rs
diff --git a/src/test/run-pass/issues/issue-3290.rs b/src/test/ui/issues/issue-3290.rs
index 63e1b28a60a..63e1b28a60a 100644
--- a/src/test/run-pass/issues/issue-3290.rs
+++ b/src/test/ui/issues/issue-3290.rs
diff --git a/src/test/run-pass/issues/issue-32947.rs b/src/test/ui/issues/issue-32947.rs
index b07def21e88..b07def21e88 100644
--- a/src/test/run-pass/issues/issue-32947.rs
+++ b/src/test/ui/issues/issue-32947.rs
diff --git a/src/test/run-pass/issues/issue-33096.rs b/src/test/ui/issues/issue-33096.rs
index f0b472e2fe8..f0b472e2fe8 100644
--- a/src/test/run-pass/issues/issue-33096.rs
+++ b/src/test/ui/issues/issue-33096.rs
diff --git a/src/test/run-pass/issues/issue-33185.rs b/src/test/ui/issues/issue-33185.rs
index 0d6669146a6..0d6669146a6 100644
--- a/src/test/run-pass/issues/issue-33185.rs
+++ b/src/test/ui/issues/issue-33185.rs
diff --git a/src/test/run-pass/issues/issue-33187.rs b/src/test/ui/issues/issue-33187.rs
index 5226f9faf56..5226f9faf56 100644
--- a/src/test/run-pass/issues/issue-33187.rs
+++ b/src/test/ui/issues/issue-33187.rs
diff --git a/src/test/run-pass/issues/issue-33202.rs b/src/test/ui/issues/issue-33202.rs
index 11b89ae1b47..11b89ae1b47 100644
--- a/src/test/run-pass/issues/issue-33202.rs
+++ b/src/test/ui/issues/issue-33202.rs
diff --git a/src/test/run-pass/issues/issue-333.rs b/src/test/ui/issues/issue-333.rs
index 0753aaa0797..0753aaa0797 100644
--- a/src/test/run-pass/issues/issue-333.rs
+++ b/src/test/ui/issues/issue-333.rs
diff --git a/src/test/run-pass/issues/issue-33387.rs b/src/test/ui/issues/issue-33387.rs
index 499fa7c1f27..499fa7c1f27 100644
--- a/src/test/run-pass/issues/issue-33387.rs
+++ b/src/test/ui/issues/issue-33387.rs
diff --git a/src/test/run-pass/issues/issue-33461.rs b/src/test/ui/issues/issue-33461.rs
index 4e01d4d3061..4e01d4d3061 100644
--- a/src/test/run-pass/issues/issue-33461.rs
+++ b/src/test/ui/issues/issue-33461.rs
diff --git a/src/test/run-pass/issues/issue-33498.rs b/src/test/ui/issues/issue-33498.rs
index 9c8a97e7e6b..9c8a97e7e6b 100644
--- a/src/test/run-pass/issues/issue-33498.rs
+++ b/src/test/ui/issues/issue-33498.rs
diff --git a/src/test/run-pass/issues/issue-33537.rs b/src/test/ui/issues/issue-33537.rs
index 3539aa64776..3539aa64776 100644
--- a/src/test/run-pass/issues/issue-33537.rs
+++ b/src/test/ui/issues/issue-33537.rs
diff --git a/src/test/run-pass/issues/issue-33687.rs b/src/test/ui/issues/issue-33687.rs
index ac802ed86dc..ac802ed86dc 100644
--- a/src/test/run-pass/issues/issue-33687.rs
+++ b/src/test/ui/issues/issue-33687.rs
diff --git a/src/test/run-pass/issues/issue-33770.rs b/src/test/ui/issues/issue-33770.rs
index 39ae009c996..39ae009c996 100644
--- a/src/test/run-pass/issues/issue-33770.rs
+++ b/src/test/ui/issues/issue-33770.rs
diff --git a/src/test/run-pass/issues/issue-3389.rs b/src/test/ui/issues/issue-3389.rs
index 294a07229fb..294a07229fb 100644
--- a/src/test/run-pass/issues/issue-3389.rs
+++ b/src/test/ui/issues/issue-3389.rs
diff --git a/src/test/run-pass/issues/issue-33992.rs b/src/test/ui/issues/issue-33992.rs
index 94fccff9fc6..94fccff9fc6 100644
--- a/src/test/run-pass/issues/issue-33992.rs
+++ b/src/test/ui/issues/issue-33992.rs
diff --git a/src/test/run-pass/issues/issue-34053.rs b/src/test/ui/issues/issue-34053.rs
index fa23ae8f95b..fa23ae8f95b 100644
--- a/src/test/run-pass/issues/issue-34053.rs
+++ b/src/test/ui/issues/issue-34053.rs
diff --git a/src/test/run-pass/issues/issue-34074.rs b/src/test/ui/issues/issue-34074.rs
index 0600d3937c1..0600d3937c1 100644
--- a/src/test/run-pass/issues/issue-34074.rs
+++ b/src/test/ui/issues/issue-34074.rs
diff --git a/src/test/run-pass/issues/issue-3429.rs b/src/test/ui/issues/issue-3429.rs
index 9d94c3ff61c..9d94c3ff61c 100644
--- a/src/test/run-pass/issues/issue-3429.rs
+++ b/src/test/ui/issues/issue-3429.rs
diff --git a/src/test/run-pass/issues/issue-34427.rs b/src/test/ui/issues/issue-34427.rs
index a14b5b9e278..a14b5b9e278 100644
--- a/src/test/run-pass/issues/issue-34427.rs
+++ b/src/test/ui/issues/issue-34427.rs
diff --git a/src/test/run-pass/issues/issue-3447.rs b/src/test/ui/issues/issue-3447.rs
index 1e329d1522a..1e329d1522a 100644
--- a/src/test/run-pass/issues/issue-3447.rs
+++ b/src/test/ui/issues/issue-3447.rs
diff --git a/src/test/run-pass/issues/issue-34503.rs b/src/test/ui/issues/issue-34503.rs
index 26e7358408f..26e7358408f 100644
--- a/src/test/run-pass/issues/issue-34503.rs
+++ b/src/test/ui/issues/issue-34503.rs
diff --git a/src/test/run-pass/issues/issue-34569.rs b/src/test/ui/issues/issue-34569.rs
index 1f68560509e..1f68560509e 100644
--- a/src/test/run-pass/issues/issue-34569.rs
+++ b/src/test/ui/issues/issue-34569.rs
diff --git a/src/test/run-pass/issues/issue-34571.rs b/src/test/ui/issues/issue-34571.rs
index bad1bebc697..bad1bebc697 100644
--- a/src/test/run-pass/issues/issue-34571.rs
+++ b/src/test/ui/issues/issue-34571.rs
diff --git a/src/test/run-pass/issues/issue-34784.rs b/src/test/ui/issues/issue-34784.rs
index d3206e99430..d3206e99430 100644
--- a/src/test/run-pass/issues/issue-34784.rs
+++ b/src/test/ui/issues/issue-34784.rs
diff --git a/src/test/run-pass/issues/issue-34796.rs b/src/test/ui/issues/issue-34796.rs
index 88d5c50a27d..88d5c50a27d 100644
--- a/src/test/run-pass/issues/issue-34796.rs
+++ b/src/test/ui/issues/issue-34796.rs
diff --git a/src/test/run-pass/issues/issue-34798.rs b/src/test/ui/issues/issue-34798.rs
index f0d710123cd..f0d710123cd 100644
--- a/src/test/run-pass/issues/issue-34798.rs
+++ b/src/test/ui/issues/issue-34798.rs
diff --git a/src/test/run-pass/issues/issue-34932.rs b/src/test/ui/issues/issue-34932.rs
index 3a5fd20ebc3..3a5fd20ebc3 100644
--- a/src/test/run-pass/issues/issue-34932.rs
+++ b/src/test/ui/issues/issue-34932.rs
diff --git a/src/test/run-pass/issues/issue-3500.rs b/src/test/ui/issues/issue-3500.rs
index 7b39cc16cab..7b39cc16cab 100644
--- a/src/test/run-pass/issues/issue-3500.rs
+++ b/src/test/ui/issues/issue-3500.rs
diff --git a/src/test/run-pass/issues/issue-35423.rs b/src/test/ui/issues/issue-35423.rs
index 202ffcc1d0d..202ffcc1d0d 100644
--- a/src/test/run-pass/issues/issue-35423.rs
+++ b/src/test/ui/issues/issue-35423.rs
diff --git a/src/test/run-pass/issues/issue-3556.rs b/src/test/ui/issues/issue-3556.rs
index 3c1934ade35..3c1934ade35 100644
--- a/src/test/run-pass/issues/issue-3556.rs
+++ b/src/test/ui/issues/issue-3556.rs
diff --git a/src/test/run-pass/issues/issue-3559.rs b/src/test/ui/issues/issue-3559.rs
index 9d498584a9d..9d498584a9d 100644
--- a/src/test/run-pass/issues/issue-3559.rs
+++ b/src/test/ui/issues/issue-3559.rs
diff --git a/src/test/run-pass/issues/issue-35600.rs b/src/test/ui/issues/issue-35600.rs
index 9d74726d279..9d74726d279 100644
--- a/src/test/run-pass/issues/issue-35600.rs
+++ b/src/test/ui/issues/issue-35600.rs
diff --git a/src/test/run-pass/issues/issue-3563-3.rs b/src/test/ui/issues/issue-3563-3.rs
index bedfdab97d5..bedfdab97d5 100644
--- a/src/test/run-pass/issues/issue-3563-3.rs
+++ b/src/test/ui/issues/issue-3563-3.rs
diff --git a/src/test/run-pass/issues/issue-3574.rs b/src/test/ui/issues/issue-3574.rs
index eb967577ffb..eb967577ffb 100644
--- a/src/test/run-pass/issues/issue-3574.rs
+++ b/src/test/ui/issues/issue-3574.rs
diff --git a/src/test/run-pass/issues/issue-35815.rs b/src/test/ui/issues/issue-35815.rs
index 05fd1b15d43..05fd1b15d43 100644
--- a/src/test/run-pass/issues/issue-35815.rs
+++ b/src/test/ui/issues/issue-35815.rs
diff --git a/src/test/run-pass/issues/issue-36023.rs b/src/test/ui/issues/issue-36023.rs
index 64d92bf8c3c..64d92bf8c3c 100644
--- a/src/test/run-pass/issues/issue-36023.rs
+++ b/src/test/ui/issues/issue-36023.rs
diff --git a/src/test/run-pass/issues/issue-36036-associated-type-layout.rs b/src/test/ui/issues/issue-36036-associated-type-layout.rs
index 022f9a5d556..022f9a5d556 100644
--- a/src/test/run-pass/issues/issue-36036-associated-type-layout.rs
+++ b/src/test/ui/issues/issue-36036-associated-type-layout.rs
diff --git a/src/test/run-pass/issues/issue-36053.rs b/src/test/ui/issues/issue-36053.rs
index a61c02c0a12..a61c02c0a12 100644
--- a/src/test/run-pass/issues/issue-36053.rs
+++ b/src/test/ui/issues/issue-36053.rs
diff --git a/src/test/run-pass/issues/issue-36139-normalize-closure-sig.rs b/src/test/ui/issues/issue-36139-normalize-closure-sig.rs
index 2d49151ffcc..2d49151ffcc 100644
--- a/src/test/run-pass/issues/issue-36139-normalize-closure-sig.rs
+++ b/src/test/ui/issues/issue-36139-normalize-closure-sig.rs
diff --git a/src/test/run-pass/issues/issue-36260.rs b/src/test/ui/issues/issue-36260.rs
index d96dc80ea71..d96dc80ea71 100644
--- a/src/test/run-pass/issues/issue-36260.rs
+++ b/src/test/ui/issues/issue-36260.rs
diff --git a/src/test/run-pass/issues/issue-36278-prefix-nesting.rs b/src/test/ui/issues/issue-36278-prefix-nesting.rs
index 62d1f5f8258..62d1f5f8258 100644
--- a/src/test/run-pass/issues/issue-36278-prefix-nesting.rs
+++ b/src/test/ui/issues/issue-36278-prefix-nesting.rs
diff --git a/src/test/run-pass/issues/issue-36381.rs b/src/test/ui/issues/issue-36381.rs
index 7db56f1dce8..7db56f1dce8 100644
--- a/src/test/run-pass/issues/issue-36381.rs
+++ b/src/test/ui/issues/issue-36381.rs
diff --git a/src/test/run-pass/issues/issue-36401.rs b/src/test/ui/issues/issue-36401.rs
index f51197b01c7..f51197b01c7 100644
--- a/src/test/run-pass/issues/issue-36401.rs
+++ b/src/test/ui/issues/issue-36401.rs
diff --git a/src/test/run-pass/issues/issue-36474.rs b/src/test/ui/issues/issue-36474.rs
index 90ee5b3cd4b..90ee5b3cd4b 100644
--- a/src/test/run-pass/issues/issue-36474.rs
+++ b/src/test/ui/issues/issue-36474.rs
diff --git a/src/test/run-pass/issues/issue-3656.rs b/src/test/ui/issues/issue-3656.rs
index d55a22a72b6..d55a22a72b6 100644
--- a/src/test/run-pass/issues/issue-3656.rs
+++ b/src/test/ui/issues/issue-3656.rs
diff --git a/src/test/run-pass/issues/issue-36744-bitcast-args-if-needed.rs b/src/test/ui/issues/issue-36744-bitcast-args-if-needed.rs
index 34bbb66d979..34bbb66d979 100644
--- a/src/test/run-pass/issues/issue-36744-bitcast-args-if-needed.rs
+++ b/src/test/ui/issues/issue-36744-bitcast-args-if-needed.rs
diff --git a/src/test/run-pass/issues/issue-36768.rs b/src/test/ui/issues/issue-36768.rs
index f671cbc8205..f671cbc8205 100644
--- a/src/test/run-pass/issues/issue-36768.rs
+++ b/src/test/ui/issues/issue-36768.rs
diff --git a/src/test/run-pass/issues/issue-36786-resolve-call.rs b/src/test/ui/issues/issue-36786-resolve-call.rs
index e5341ba7dbe..e5341ba7dbe 100644
--- a/src/test/run-pass/issues/issue-36786-resolve-call.rs
+++ b/src/test/ui/issues/issue-36786-resolve-call.rs
diff --git a/src/test/run-pass/issues/issue-36792.rs b/src/test/ui/issues/issue-36792.rs
index 99ae633dd0e..99ae633dd0e 100644
--- a/src/test/run-pass/issues/issue-36792.rs
+++ b/src/test/ui/issues/issue-36792.rs
diff --git a/src/test/run-pass/issues/issue-36816.rs b/src/test/ui/issues/issue-36816.rs
index 54690b43c46..54690b43c46 100644
--- a/src/test/run-pass/issues/issue-36816.rs
+++ b/src/test/ui/issues/issue-36816.rs
diff --git a/src/test/run-pass/issues/issue-3683.rs b/src/test/ui/issues/issue-3683.rs
index b12c450c937..b12c450c937 100644
--- a/src/test/run-pass/issues/issue-3683.rs
+++ b/src/test/ui/issues/issue-3683.rs
diff --git a/src/test/run-pass/issues/issue-36856.rs b/src/test/ui/issues/issue-36856.rs
index f2dfaf3dd36..f2dfaf3dd36 100644
--- a/src/test/run-pass/issues/issue-36856.rs
+++ b/src/test/ui/issues/issue-36856.rs
diff --git a/src/test/run-pass/issues/issue-36936.rs b/src/test/ui/issues/issue-36936.rs
index 486a422b754..486a422b754 100644
--- a/src/test/run-pass/issues/issue-36936.rs
+++ b/src/test/ui/issues/issue-36936.rs
diff --git a/src/test/run-pass/issues/issue-36954.rs b/src/test/ui/issues/issue-36954.rs
index 56ff9926ef1..56ff9926ef1 100644
--- a/src/test/run-pass/issues/issue-36954.rs
+++ b/src/test/ui/issues/issue-36954.rs
diff --git a/src/test/run-pass/issues/issue-3702.rs b/src/test/ui/issues/issue-3702.rs
index f48d549b3eb..f48d549b3eb 100644
--- a/src/test/run-pass/issues/issue-3702.rs
+++ b/src/test/ui/issues/issue-3702.rs
diff --git a/src/test/run-pass/issues/issue-37109.rs b/src/test/ui/issues/issue-37109.rs
index 1e57d5f95e8..1e57d5f95e8 100644
--- a/src/test/run-pass/issues/issue-37109.rs
+++ b/src/test/ui/issues/issue-37109.rs
diff --git a/src/test/run-pass/issues/issue-37175.rs b/src/test/ui/issues/issue-37175.rs
index 9ec9d48d18b..9ec9d48d18b 100644
--- a/src/test/run-pass/issues/issue-37175.rs
+++ b/src/test/ui/issues/issue-37175.rs
diff --git a/src/test/run-pass/issues/issue-37222.rs b/src/test/ui/issues/issue-37222.rs
index 8ea5f6b7a27..8ea5f6b7a27 100644
--- a/src/test/run-pass/issues/issue-37222.rs
+++ b/src/test/ui/issues/issue-37222.rs
diff --git a/src/test/run-pass/issues/issue-37291/auxiliary/lib.rs b/src/test/ui/issues/issue-37291/auxiliary/lib.rs
index 1b163ee1391..1b163ee1391 100644
--- a/src/test/run-pass/issues/issue-37291/auxiliary/lib.rs
+++ b/src/test/ui/issues/issue-37291/auxiliary/lib.rs
diff --git a/src/test/run-pass/issues/issue-37291/main.rs b/src/test/ui/issues/issue-37291/main.rs
index 6fb6b50da20..6fb6b50da20 100644
--- a/src/test/run-pass/issues/issue-37291/main.rs
+++ b/src/test/ui/issues/issue-37291/main.rs
diff --git a/src/test/run-pass/issues/issue-3743.rs b/src/test/ui/issues/issue-3743.rs
index 07741914f80..07741914f80 100644
--- a/src/test/run-pass/issues/issue-3743.rs
+++ b/src/test/ui/issues/issue-3743.rs
diff --git a/src/test/run-pass/issues/issue-3753.rs b/src/test/ui/issues/issue-3753.rs
index dc9e42bad97..dc9e42bad97 100644
--- a/src/test/run-pass/issues/issue-3753.rs
+++ b/src/test/ui/issues/issue-3753.rs
diff --git a/src/test/run-pass/issues/issue-37686.rs b/src/test/ui/issues/issue-37686.rs
index 8c376251449..8c376251449 100644
--- a/src/test/run-pass/issues/issue-37686.rs
+++ b/src/test/ui/issues/issue-37686.rs
diff --git a/src/test/run-pass/issues/issue-3794.rs b/src/test/ui/issues/issue-3794.rs
index 408d8d866d8..408d8d866d8 100644
--- a/src/test/run-pass/issues/issue-3794.rs
+++ b/src/test/ui/issues/issue-3794.rs
diff --git a/src/test/run-pass/issues/issue-37991.rs b/src/test/ui/issues/issue-37991.rs
index a6ac4d5ca2e..a6ac4d5ca2e 100644
--- a/src/test/run-pass/issues/issue-37991.rs
+++ b/src/test/ui/issues/issue-37991.rs
diff --git a/src/test/run-pass/issues/issue-38002.rs b/src/test/ui/issues/issue-38002.rs
index fdb31fc44a1..fdb31fc44a1 100644
--- a/src/test/run-pass/issues/issue-38002.rs
+++ b/src/test/ui/issues/issue-38002.rs
diff --git a/src/test/run-pass/issues/issue-38033.rs b/src/test/ui/issues/issue-38033.rs
index 16b867ec88f..16b867ec88f 100644
--- a/src/test/run-pass/issues/issue-38033.rs
+++ b/src/test/ui/issues/issue-38033.rs
diff --git a/src/test/run-pass/issues/issue-38074.rs b/src/test/ui/issues/issue-38074.rs
index 214d6752cef..214d6752cef 100644
--- a/src/test/run-pass/issues/issue-38074.rs
+++ b/src/test/ui/issues/issue-38074.rs
diff --git a/src/test/run-pass/issues/issue-38091.rs b/src/test/ui/issues/issue-38091.rs
index 00aa810f830..00aa810f830 100644
--- a/src/test/run-pass/issues/issue-38091.rs
+++ b/src/test/ui/issues/issue-38091.rs
diff --git a/src/test/run-pass/issues/issue-38190.rs b/src/test/ui/issues/issue-38190.rs
index cfa0420c80d..cfa0420c80d 100644
--- a/src/test/run-pass/issues/issue-38190.rs
+++ b/src/test/ui/issues/issue-38190.rs
diff --git a/src/test/run-pass/issues/issue-38226.rs b/src/test/ui/issues/issue-38226.rs
index 3213e3618a8..3213e3618a8 100644
--- a/src/test/run-pass/issues/issue-38226.rs
+++ b/src/test/ui/issues/issue-38226.rs
diff --git a/src/test/run-pass/issues/issue-38437.rs b/src/test/ui/issues/issue-38437.rs
index e1412169065..e1412169065 100644
--- a/src/test/run-pass/issues/issue-38437.rs
+++ b/src/test/ui/issues/issue-38437.rs
diff --git a/src/test/run-pass/issues/issue-3847.rs b/src/test/ui/issues/issue-3847.rs
index 16e0b00b39a..16e0b00b39a 100644
--- a/src/test/run-pass/issues/issue-3847.rs
+++ b/src/test/ui/issues/issue-3847.rs
diff --git a/src/test/run-pass/issues/issue-38556.rs b/src/test/ui/issues/issue-38556.rs
index 63fd9db08ff..63fd9db08ff 100644
--- a/src/test/run-pass/issues/issue-38556.rs
+++ b/src/test/ui/issues/issue-38556.rs
diff --git a/src/test/run-pass/issues/issue-38715.rs b/src/test/ui/issues/issue-38715-rpass.rs
index e3c3a027f3c..e3c3a027f3c 100644
--- a/src/test/run-pass/issues/issue-38715.rs
+++ b/src/test/ui/issues/issue-38715-rpass.rs
diff --git a/src/test/run-pass/issues/issue-38763.rs b/src/test/ui/issues/issue-38763.rs
index 6e6de09225f..6e6de09225f 100644
--- a/src/test/run-pass/issues/issue-38763.rs
+++ b/src/test/ui/issues/issue-38763.rs
diff --git a/src/test/run-pass/issues/issue-3878.rs b/src/test/ui/issues/issue-3878.rs
index a121f0ba878..a121f0ba878 100644
--- a/src/test/run-pass/issues/issue-3878.rs
+++ b/src/test/ui/issues/issue-3878.rs
diff --git a/src/test/run-pass/issues/issue-38942.rs b/src/test/ui/issues/issue-38942.rs
index 308bdd6e28c..308bdd6e28c 100644
--- a/src/test/run-pass/issues/issue-38942.rs
+++ b/src/test/ui/issues/issue-38942.rs
diff --git a/src/test/run-pass/issues/issue-3895.rs b/src/test/ui/issues/issue-3895.rs
index c560ca60dd3..c560ca60dd3 100644
--- a/src/test/run-pass/issues/issue-3895.rs
+++ b/src/test/ui/issues/issue-3895.rs
diff --git a/src/test/run-pass/issues/issue-38987.rs b/src/test/ui/issues/issue-38987.rs
index cb4e1b0d409..cb4e1b0d409 100644
--- a/src/test/run-pass/issues/issue-38987.rs
+++ b/src/test/ui/issues/issue-38987.rs
diff --git a/src/test/run-pass/issues/issue-3904.rs b/src/test/ui/issues/issue-3904.rs
index 7beb91a28d2..7beb91a28d2 100644
--- a/src/test/run-pass/issues/issue-3904.rs
+++ b/src/test/ui/issues/issue-3904.rs
diff --git a/src/test/run-pass/issues/issue-39292.rs b/src/test/ui/issues/issue-39292.rs
index 968cf08916f..968cf08916f 100644
--- a/src/test/run-pass/issues/issue-39292.rs
+++ b/src/test/ui/issues/issue-39292.rs
diff --git a/src/test/run-pass/issues/issue-3935.rs b/src/test/ui/issues/issue-3935.rs
index e98d68e0eb2..e98d68e0eb2 100644
--- a/src/test/run-pass/issues/issue-3935.rs
+++ b/src/test/ui/issues/issue-3935.rs
diff --git a/src/test/run-pass/issues/issue-39367.rs b/src/test/ui/issues/issue-39367.rs
index 8314be3d14c..8314be3d14c 100644
--- a/src/test/run-pass/issues/issue-39367.rs
+++ b/src/test/ui/issues/issue-39367.rs
diff --git a/src/test/run-pass/issues/issue-39548.rs b/src/test/ui/issues/issue-39548.rs
index 304e37bf3d6..304e37bf3d6 100644
--- a/src/test/run-pass/issues/issue-39548.rs
+++ b/src/test/ui/issues/issue-39548.rs
diff --git a/src/test/run-pass/issues/issue-39709.rs b/src/test/ui/issues/issue-39709.rs
index 69ef2700ef3..69ef2700ef3 100644
--- a/src/test/run-pass/issues/issue-39709.rs
+++ b/src/test/ui/issues/issue-39709.rs
diff --git a/src/test/run-pass/issues/issue-39720.rs b/src/test/ui/issues/issue-39720.rs
index a3baa361d57..a3baa361d57 100644
--- a/src/test/run-pass/issues/issue-39720.rs
+++ b/src/test/ui/issues/issue-39720.rs
diff --git a/src/test/run-pass/issues/issue-39720.stderr b/src/test/ui/issues/issue-39720.stderr
index 8121ed28940..8121ed28940 100644
--- a/src/test/run-pass/issues/issue-39720.stderr
+++ b/src/test/ui/issues/issue-39720.stderr
diff --git a/src/test/run-pass/issues/issue-3979-generics.rs b/src/test/ui/issues/issue-3979-generics.rs
index 519de1cad6e..519de1cad6e 100644
--- a/src/test/run-pass/issues/issue-3979-generics.rs
+++ b/src/test/ui/issues/issue-3979-generics.rs
diff --git a/src/test/run-pass/issues/issue-3979-xcrate.rs b/src/test/ui/issues/issue-3979-xcrate.rs
index fcb1f55c32f..fcb1f55c32f 100644
--- a/src/test/run-pass/issues/issue-3979-xcrate.rs
+++ b/src/test/ui/issues/issue-3979-xcrate.rs
diff --git a/src/test/run-pass/issues/issue-3979.rs b/src/test/ui/issues/issue-3979.rs
index 72949d8c757..72949d8c757 100644
--- a/src/test/run-pass/issues/issue-3979.rs
+++ b/src/test/ui/issues/issue-3979.rs
diff --git a/src/test/run-pass/issues/issue-39808.rs b/src/test/ui/issues/issue-39808.rs
index a4701367373..a4701367373 100644
--- a/src/test/run-pass/issues/issue-39808.rs
+++ b/src/test/ui/issues/issue-39808.rs
diff --git a/src/test/run-pass/issues/issue-39823.rs b/src/test/ui/issues/issue-39823.rs
index 148cf527e7c..148cf527e7c 100644
--- a/src/test/run-pass/issues/issue-39823.rs
+++ b/src/test/ui/issues/issue-39823.rs
diff --git a/src/test/run-pass/issues/issue-39827.rs b/src/test/ui/issues/issue-39827.rs
index 782c668c843..782c668c843 100644
--- a/src/test/run-pass/issues/issue-39827.rs
+++ b/src/test/ui/issues/issue-39827.rs
diff --git a/src/test/run-pass/issues/issue-40003.rs b/src/test/ui/issues/issue-40003.rs
index 642de6b8fe3..642de6b8fe3 100644
--- a/src/test/run-pass/issues/issue-40003.rs
+++ b/src/test/ui/issues/issue-40003.rs
diff --git a/src/test/run-pass/issues/issue-40085.rs b/src/test/ui/issues/issue-40085.rs
index 132044cfd6d..132044cfd6d 100644
--- a/src/test/run-pass/issues/issue-40085.rs
+++ b/src/test/ui/issues/issue-40085.rs
diff --git a/src/test/run-pass/issues/issue-40235.rs b/src/test/ui/issues/issue-40235.rs
index 0f799c3503f..0f799c3503f 100644
--- a/src/test/run-pass/issues/issue-40235.rs
+++ b/src/test/ui/issues/issue-40235.rs
diff --git a/src/test/run-pass/issues/issue-40408.rs b/src/test/ui/issues/issue-40408.rs
index 81acc41cb83..81acc41cb83 100644
--- a/src/test/run-pass/issues/issue-40408.rs
+++ b/src/test/ui/issues/issue-40408.rs
diff --git a/src/test/run-pass/issues/issue-40469.rs b/src/test/ui/issues/issue-40469.rs
index 25e08ef85e9..25e08ef85e9 100644
--- a/src/test/run-pass/issues/issue-40469.rs
+++ b/src/test/ui/issues/issue-40469.rs
diff --git a/src/test/run-pass/issues/issue-40770.rs b/src/test/ui/issues/issue-40770.rs
index c9713c15798..c9713c15798 100644
--- a/src/test/run-pass/issues/issue-40770.rs
+++ b/src/test/ui/issues/issue-40770.rs
diff --git a/src/test/run-pass/issues/issue-40847.rs b/src/test/ui/issues/issue-40847.rs
index 087b40ad6cd..087b40ad6cd 100644
--- a/src/test/run-pass/issues/issue-40847.rs
+++ b/src/test/ui/issues/issue-40847.rs
diff --git a/src/test/run-pass/issues/issue-40883.rs b/src/test/ui/issues/issue-40883.rs
index 37e61b1b0e6..37e61b1b0e6 100644
--- a/src/test/run-pass/issues/issue-40883.rs
+++ b/src/test/ui/issues/issue-40883.rs
diff --git a/src/test/run-pass/issues/issue-40951.rs b/src/test/ui/issues/issue-40951.rs
index 49171eba6b3..49171eba6b3 100644
--- a/src/test/run-pass/issues/issue-40951.rs
+++ b/src/test/ui/issues/issue-40951.rs
diff --git a/src/test/run-pass/issues/issue-41053.rs b/src/test/ui/issues/issue-41053.rs
index 967edfd4415..967edfd4415 100644
--- a/src/test/run-pass/issues/issue-41053.rs
+++ b/src/test/ui/issues/issue-41053.rs
diff --git a/src/test/run-pass/issues/issue-4107.rs b/src/test/ui/issues/issue-4107.rs
index 98433e806e3..98433e806e3 100644
--- a/src/test/run-pass/issues/issue-4107.rs
+++ b/src/test/ui/issues/issue-4107.rs
diff --git a/src/test/run-pass/issues/issue-41213.rs b/src/test/ui/issues/issue-41213.rs
index 5c91bf71102..5c91bf71102 100644
--- a/src/test/run-pass/issues/issue-41213.rs
+++ b/src/test/ui/issues/issue-41213.rs
diff --git a/src/test/run-pass/issues/issue-41394.rs b/src/test/ui/issues/issue-41394-rpass.rs
index 37c6525234d..37c6525234d 100644
--- a/src/test/run-pass/issues/issue-41394.rs
+++ b/src/test/ui/issues/issue-41394-rpass.rs
diff --git a/src/test/run-pass/issues/issue-41479.rs b/src/test/ui/issues/issue-41479.rs
index 6daaf440e4b..6daaf440e4b 100644
--- a/src/test/run-pass/issues/issue-41479.rs
+++ b/src/test/ui/issues/issue-41479.rs
diff --git a/src/test/run-pass/issues/issue-41498.rs b/src/test/ui/issues/issue-41498.rs
index ad918ecddeb..ad918ecddeb 100644
--- a/src/test/run-pass/issues/issue-41498.rs
+++ b/src/test/ui/issues/issue-41498.rs
diff --git a/src/test/run-pass/issues/issue-41604.rs b/src/test/ui/issues/issue-41604.rs
index 11a1cc25b71..11a1cc25b71 100644
--- a/src/test/run-pass/issues/issue-41604.rs
+++ b/src/test/ui/issues/issue-41604.rs
diff --git a/src/test/run-pass/issues/issue-41677.rs b/src/test/ui/issues/issue-41677.rs
index afddbc799b7..afddbc799b7 100644
--- a/src/test/run-pass/issues/issue-41677.rs
+++ b/src/test/ui/issues/issue-41677.rs
diff --git a/src/test/run-pass/issues/issue-41696.rs b/src/test/ui/issues/issue-41696.rs
index d094f71942f..d094f71942f 100644
--- a/src/test/run-pass/issues/issue-41696.rs
+++ b/src/test/ui/issues/issue-41696.rs
diff --git a/src/test/run-pass/issues/issue-41744.rs b/src/test/ui/issues/issue-41744.rs
index dcdd1c21ee5..dcdd1c21ee5 100644
--- a/src/test/run-pass/issues/issue-41744.rs
+++ b/src/test/ui/issues/issue-41744.rs
diff --git a/src/test/run-pass/issues/issue-41803.rs b/src/test/ui/issues/issue-41803.rs
index 19ab81d04d0..19ab81d04d0 100644
--- a/src/test/run-pass/issues/issue-41803.rs
+++ b/src/test/ui/issues/issue-41803.rs
diff --git a/src/test/run-pass/issues/issue-41849-variance-req.rs b/src/test/ui/issues/issue-41849-variance-req.rs
index af081083a35..af081083a35 100644
--- a/src/test/run-pass/issues/issue-41849-variance-req.rs
+++ b/src/test/ui/issues/issue-41849-variance-req.rs
diff --git a/src/test/run-pass/issues/issue-41888.rs b/src/test/ui/issues/issue-41888.rs
index 32df520f279..32df520f279 100644
--- a/src/test/run-pass/issues/issue-41888.rs
+++ b/src/test/ui/issues/issue-41888.rs
diff --git a/src/test/run-pass/issues/issue-42007.rs b/src/test/ui/issues/issue-42007.rs
index a477e476eb9..a477e476eb9 100644
--- a/src/test/run-pass/issues/issue-42007.rs
+++ b/src/test/ui/issues/issue-42007.rs
diff --git a/src/test/run-pass/issues/issue-4208.rs b/src/test/ui/issues/issue-4208.rs
index 3b01811a9e8..3b01811a9e8 100644
--- a/src/test/run-pass/issues/issue-4208.rs
+++ b/src/test/ui/issues/issue-4208.rs
diff --git a/src/test/run-pass/issues/issue-42148.rs b/src/test/ui/issues/issue-42148.rs
index cb8c0d6edb6..cb8c0d6edb6 100644
--- a/src/test/run-pass/issues/issue-42148.rs
+++ b/src/test/ui/issues/issue-42148.rs
diff --git a/src/test/run-pass/issues/issue-42210.rs b/src/test/ui/issues/issue-42210.rs
index 318e3099f98..318e3099f98 100644
--- a/src/test/run-pass/issues/issue-42210.rs
+++ b/src/test/ui/issues/issue-42210.rs
diff --git a/src/test/run-pass/issues/issue-4228.rs b/src/test/ui/issues/issue-4228.rs
index 491000b6510..491000b6510 100644
--- a/src/test/run-pass/issues/issue-4228.rs
+++ b/src/test/ui/issues/issue-4228.rs
diff --git a/src/test/run-pass/issues/issue-42453.rs b/src/test/ui/issues/issue-42453.rs
index 92fefceabc1..92fefceabc1 100644
--- a/src/test/run-pass/issues/issue-42453.rs
+++ b/src/test/ui/issues/issue-42453.rs
diff --git a/src/test/run-pass/issues/issue-42463.rs b/src/test/ui/issues/issue-42463.rs
index 51d6ea3f7a8..51d6ea3f7a8 100644
--- a/src/test/run-pass/issues/issue-42463.rs
+++ b/src/test/ui/issues/issue-42463.rs
diff --git a/src/test/run-pass/issues/issue-4252.rs b/src/test/ui/issues/issue-4252.rs
index 48e617fd7eb..48e617fd7eb 100644
--- a/src/test/run-pass/issues/issue-4252.rs
+++ b/src/test/ui/issues/issue-4252.rs
diff --git a/src/test/run-pass/issues/issue-42552.rs b/src/test/ui/issues/issue-42552.rs
index 50d28a2f0c6..50d28a2f0c6 100644
--- a/src/test/run-pass/issues/issue-42552.rs
+++ b/src/test/ui/issues/issue-42552.rs
diff --git a/src/test/run-pass/issues/issue-42679.rs b/src/test/ui/issues/issue-42679.rs
index 596309f2568..596309f2568 100644
--- a/src/test/run-pass/issues/issue-42679.rs
+++ b/src/test/ui/issues/issue-42679.rs
diff --git a/src/test/run-pass/issues/issue-42747.rs b/src/test/ui/issues/issue-42747.rs
index fec65878210..fec65878210 100644
--- a/src/test/run-pass/issues/issue-42747.rs
+++ b/src/test/ui/issues/issue-42747.rs
diff --git a/src/test/run-pass/issues/issue-43132.rs b/src/test/ui/issues/issue-43132.rs
index c886f4b0a2d..c886f4b0a2d 100644
--- a/src/test/run-pass/issues/issue-43132.rs
+++ b/src/test/ui/issues/issue-43132.rs
diff --git a/src/test/run-pass/issues/issue-43205.rs b/src/test/ui/issues/issue-43205.rs
index 894a61f3eff..894a61f3eff 100644
--- a/src/test/run-pass/issues/issue-43205.rs
+++ b/src/test/ui/issues/issue-43205.rs
diff --git a/src/test/run-pass/issues/issue-43291.rs b/src/test/ui/issues/issue-43291.rs
index 52b629e35c8..52b629e35c8 100644
--- a/src/test/run-pass/issues/issue-43291.rs
+++ b/src/test/ui/issues/issue-43291.rs
diff --git a/src/test/run-pass/issues/issue-4333.rs b/src/test/ui/issues/issue-4333.rs
index 3df319b683f..3df319b683f 100644
--- a/src/test/run-pass/issues/issue-4333.rs
+++ b/src/test/ui/issues/issue-4333.rs
diff --git a/src/test/run-pass/issues/issue-43692.rs b/src/test/ui/issues/issue-43692.rs
index a9999c22651..a9999c22651 100644
--- a/src/test/run-pass/issues/issue-43692.rs
+++ b/src/test/ui/issues/issue-43692.rs
diff --git a/src/test/run-pass/issues/issue-43853.rs b/src/test/ui/issues/issue-43853.rs
index 47c3ab59aa2..47c3ab59aa2 100644
--- a/src/test/run-pass/issues/issue-43853.rs
+++ b/src/test/ui/issues/issue-43853.rs
diff --git a/src/test/run-pass/issues/issue-4387.rs b/src/test/ui/issues/issue-4387.rs
index 84592f16a4c..84592f16a4c 100644
--- a/src/test/run-pass/issues/issue-4387.rs
+++ b/src/test/ui/issues/issue-4387.rs
diff --git a/src/test/run-pass/issues/issue-43910.rs b/src/test/ui/issues/issue-43910.rs
index d8c87732930..d8c87732930 100644
--- a/src/test/run-pass/issues/issue-43910.rs
+++ b/src/test/ui/issues/issue-43910.rs
diff --git a/src/test/run-pass/issues/issue-43923.rs b/src/test/ui/issues/issue-43923.rs
index ad35a668554..ad35a668554 100644
--- a/src/test/run-pass/issues/issue-43923.rs
+++ b/src/test/ui/issues/issue-43923.rs
diff --git a/src/test/run-pass/issues/issue-4401.rs b/src/test/ui/issues/issue-4401.rs
index fef73fbe1f5..fef73fbe1f5 100644
--- a/src/test/run-pass/issues/issue-4401.rs
+++ b/src/test/ui/issues/issue-4401.rs
diff --git a/src/test/run-pass/issues/issue-44333.rs b/src/test/ui/issues/issue-44333.rs
index fffef975043..fffef975043 100644
--- a/src/test/run-pass/issues/issue-44333.rs
+++ b/src/test/ui/issues/issue-44333.rs
diff --git a/src/test/run-pass/issues/issue-4446.rs b/src/test/ui/issues/issue-4446.rs
index 948f2a7bdf3..948f2a7bdf3 100644
--- a/src/test/run-pass/issues/issue-4446.rs
+++ b/src/test/ui/issues/issue-4446.rs
diff --git a/src/test/run-pass/issues/issue-4448.rs b/src/test/ui/issues/issue-4448.rs
index 27d0326891b..27d0326891b 100644
--- a/src/test/run-pass/issues/issue-4448.rs
+++ b/src/test/ui/issues/issue-4448.rs
diff --git a/src/test/run-pass/issues/issue-45124.rs b/src/test/ui/issues/issue-45124.rs
index 942014c9184..942014c9184 100644
--- a/src/test/run-pass/issues/issue-45124.rs
+++ b/src/test/ui/issues/issue-45124.rs
diff --git a/src/test/run-pass/issues/issue-45152.rs b/src/test/ui/issues/issue-45152.rs
index fb1c9fb78f3..fb1c9fb78f3 100644
--- a/src/test/run-pass/issues/issue-45152.rs
+++ b/src/test/ui/issues/issue-45152.rs
diff --git a/src/test/run-pass/issues/issue-4541.rs b/src/test/ui/issues/issue-4541.rs
index 1f871fcf613..1f871fcf613 100644
--- a/src/test/run-pass/issues/issue-4541.rs
+++ b/src/test/ui/issues/issue-4541.rs
diff --git a/src/test/run-pass/issues/issue-4542.rs b/src/test/ui/issues/issue-4542.rs
index 24752114e9f..24752114e9f 100644
--- a/src/test/run-pass/issues/issue-4542.rs
+++ b/src/test/ui/issues/issue-4542.rs
diff --git a/src/test/run-pass/issues/issue-4545.rs b/src/test/ui/issues/issue-4545.rs
index 86fcf9af21f..86fcf9af21f 100644
--- a/src/test/run-pass/issues/issue-4545.rs
+++ b/src/test/ui/issues/issue-4545.rs
diff --git a/src/test/run-pass/issues/issue-45510.rs b/src/test/ui/issues/issue-45510.rs
index 9e104ce6c4f..9e104ce6c4f 100644
--- a/src/test/run-pass/issues/issue-45510.rs
+++ b/src/test/ui/issues/issue-45510.rs
diff --git a/src/test/run-pass/issues/issue-45731.rs b/src/test/ui/issues/issue-45731.rs
index d20c07276a8..d20c07276a8 100644
--- a/src/test/run-pass/issues/issue-45731.rs
+++ b/src/test/ui/issues/issue-45731.rs
diff --git a/src/test/run-pass/issues/issue-46069.rs b/src/test/ui/issues/issue-46069.rs
index 1d4f789828d..1d4f789828d 100644
--- a/src/test/run-pass/issues/issue-46069.rs
+++ b/src/test/ui/issues/issue-46069.rs
diff --git a/src/test/run-pass/issues/issue-46095.rs b/src/test/ui/issues/issue-46095.rs
index 59ddb60c9f2..59ddb60c9f2 100644
--- a/src/test/run-pass/issues/issue-46095.rs
+++ b/src/test/ui/issues/issue-46095.rs
diff --git a/src/test/run-pass/issues/issue-46519.rs b/src/test/ui/issues/issue-46519.rs
index 461ea2498b0..461ea2498b0 100644
--- a/src/test/run-pass/issues/issue-46519.rs
+++ b/src/test/ui/issues/issue-46519.rs
diff --git a/src/test/run-pass/issues/issue-46553.rs b/src/test/ui/issues/issue-46553.rs
index e21a532effd..e21a532effd 100644
--- a/src/test/run-pass/issues/issue-46553.rs
+++ b/src/test/ui/issues/issue-46553.rs
diff --git a/src/test/run-pass/issues/issue-46845.rs b/src/test/ui/issues/issue-46845.rs
index fc85b25519a..fc85b25519a 100644
--- a/src/test/run-pass/issues/issue-46845.rs
+++ b/src/test/ui/issues/issue-46845.rs
diff --git a/src/test/run-pass/issues/issue-46855.rs b/src/test/ui/issues/issue-46855.rs
index aa6378f8594..aa6378f8594 100644
--- a/src/test/run-pass/issues/issue-46855.rs
+++ b/src/test/ui/issues/issue-46855.rs
diff --git a/src/test/run-pass/issues/issue-46920-byte-array-patterns.rs b/src/test/ui/issues/issue-46920-byte-array-patterns.rs
index 2a8b4bb4922..2a8b4bb4922 100644
--- a/src/test/run-pass/issues/issue-46920-byte-array-patterns.rs
+++ b/src/test/ui/issues/issue-46920-byte-array-patterns.rs
diff --git a/src/test/run-pass/issues/issue-47139-1.rs b/src/test/ui/issues/issue-47139-1.rs
index c55fc34346c..c55fc34346c 100644
--- a/src/test/run-pass/issues/issue-47139-1.rs
+++ b/src/test/ui/issues/issue-47139-1.rs
diff --git a/src/test/run-pass/issues/issue-47139-2.rs b/src/test/ui/issues/issue-47139-2.rs
index d2ef8942530..d2ef8942530 100644
--- a/src/test/run-pass/issues/issue-47139-2.rs
+++ b/src/test/ui/issues/issue-47139-2.rs
diff --git a/src/test/run-pass/issues/issue-4734.rs b/src/test/ui/issues/issue-4734.rs
index 29c965d7ff5..29c965d7ff5 100644
--- a/src/test/run-pass/issues/issue-4734.rs
+++ b/src/test/ui/issues/issue-4734.rs
diff --git a/src/test/run-pass/issues/issue-4735.rs b/src/test/ui/issues/issue-4735.rs
index 3ea4b01cd2b..3ea4b01cd2b 100644
--- a/src/test/run-pass/issues/issue-4735.rs
+++ b/src/test/ui/issues/issue-4735.rs
diff --git a/src/test/run-pass/issues/issue-47364.rs b/src/test/ui/issues/issue-47364.rs
index b524354d9a1..b524354d9a1 100644
--- a/src/test/run-pass/issues/issue-47364.rs
+++ b/src/test/ui/issues/issue-47364.rs
diff --git a/src/test/run-pass/issues/issue-4759-1.rs b/src/test/ui/issues/issue-4759-1.rs
index 96fae0fecd9..96fae0fecd9 100644
--- a/src/test/run-pass/issues/issue-4759-1.rs
+++ b/src/test/ui/issues/issue-4759-1.rs
diff --git a/src/test/run-pass/issues/issue-4759.rs b/src/test/ui/issues/issue-4759.rs
index 53785af0962..53785af0962 100644
--- a/src/test/run-pass/issues/issue-4759.rs
+++ b/src/test/ui/issues/issue-4759.rs
diff --git a/src/test/run-pass/issues/issue-47638.rs b/src/test/ui/issues/issue-47638.rs
index a1ed3c36544..a1ed3c36544 100644
--- a/src/test/run-pass/issues/issue-47638.rs
+++ b/src/test/ui/issues/issue-47638.rs
diff --git a/src/test/run-pass/issues/issue-48006.rs b/src/test/ui/issues/issue-48006.rs
index 8e7105cf10c..3a862ace55e 100644
--- a/src/test/run-pass/issues/issue-48006.rs
+++ b/src/test/ui/issues/issue-48006.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(step_trait)]
 
 use std::iter::Step;
diff --git a/src/test/run-pass/issues/issue-48159.rs b/src/test/ui/issues/issue-48159.rs
index fc8f31fb1ef..fc8f31fb1ef 100644
--- a/src/test/run-pass/issues/issue-48159.rs
+++ b/src/test/ui/issues/issue-48159.rs
diff --git a/src/test/run-pass/issues/issue-48508-aux.rs b/src/test/ui/issues/issue-48508-aux.rs
index ebdc70a04df..ebdc70a04df 100644
--- a/src/test/run-pass/issues/issue-48508-aux.rs
+++ b/src/test/ui/issues/issue-48508-aux.rs
diff --git a/src/test/run-pass/issues/issue-48508.rs b/src/test/ui/issues/issue-48508.rs
index 385192b882b..385192b882b 100644
--- a/src/test/run-pass/issues/issue-48508.rs
+++ b/src/test/ui/issues/issue-48508.rs
diff --git a/src/test/run-pass/issues/issue-4865-1.rs b/src/test/ui/issues/issue-4865-1.rs
index 68fbee37d01..68fbee37d01 100644
--- a/src/test/run-pass/issues/issue-4865-1.rs
+++ b/src/test/ui/issues/issue-4865-1.rs
diff --git a/src/test/run-pass/issues/issue-4865-2.rs b/src/test/ui/issues/issue-4865-2.rs
index cbe1d0d32c6..cbe1d0d32c6 100644
--- a/src/test/run-pass/issues/issue-4865-2.rs
+++ b/src/test/ui/issues/issue-4865-2.rs
diff --git a/src/test/run-pass/issues/issue-4865-3.rs b/src/test/ui/issues/issue-4865-3.rs
index 12f9bba18d8..12f9bba18d8 100644
--- a/src/test/run-pass/issues/issue-4865-3.rs
+++ b/src/test/ui/issues/issue-4865-3.rs
diff --git a/src/test/run-pass/issues/issue-4875.rs b/src/test/ui/issues/issue-4875.rs
index 8d361314f73..8d361314f73 100644
--- a/src/test/run-pass/issues/issue-4875.rs
+++ b/src/test/ui/issues/issue-4875.rs
diff --git a/src/test/run-pass/issues/issue-48962.rs b/src/test/ui/issues/issue-48962.rs
index 80d815379be..80d815379be 100644
--- a/src/test/run-pass/issues/issue-48962.rs
+++ b/src/test/ui/issues/issue-48962.rs
diff --git a/src/test/run-pass/issues/issue-48984.rs b/src/test/ui/issues/issue-48984.rs
index cb340f84897..cb340f84897 100644
--- a/src/test/run-pass/issues/issue-48984.rs
+++ b/src/test/ui/issues/issue-48984.rs
diff --git a/src/test/run-pass/issues/issue-49298.rs b/src/test/ui/issues/issue-49298.rs
index 697a160b4ec..697a160b4ec 100644
--- a/src/test/run-pass/issues/issue-49298.rs
+++ b/src/test/ui/issues/issue-49298.rs
diff --git a/src/test/run-pass/issues/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs b/src/test/ui/issues/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs
index f30d7e2edcc..f30d7e2edcc 100644
--- a/src/test/run-pass/issues/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs
+++ b/src/test/ui/issues/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs
diff --git a/src/test/run-pass/issues/issue-49632.rs b/src/test/ui/issues/issue-49632.rs
index 155fd0d24eb..155fd0d24eb 100644
--- a/src/test/run-pass/issues/issue-49632.rs
+++ b/src/test/ui/issues/issue-49632.rs
diff --git a/src/test/run-pass/issues/issue-49685.rs b/src/test/ui/issues/issue-49685.rs
index fb328d67b75..fb328d67b75 100644
--- a/src/test/run-pass/issues/issue-49685.rs
+++ b/src/test/ui/issues/issue-49685.rs
diff --git a/src/test/run-pass/issues/issue-49854.rs b/src/test/ui/issues/issue-49854.rs
index 0e1db00a34c..0e1db00a34c 100644
--- a/src/test/run-pass/issues/issue-49854.rs
+++ b/src/test/ui/issues/issue-49854.rs
diff --git a/src/test/run-pass/issues/issue-49955-2.rs b/src/test/ui/issues/issue-49955-2.rs
index 267ed746322..267ed746322 100644
--- a/src/test/run-pass/issues/issue-49955-2.rs
+++ b/src/test/ui/issues/issue-49955-2.rs
diff --git a/src/test/run-pass/issues/issue-49955.rs b/src/test/ui/issues/issue-49955.rs
index f2f3ebff2db..f2f3ebff2db 100644
--- a/src/test/run-pass/issues/issue-49955.rs
+++ b/src/test/ui/issues/issue-49955.rs
diff --git a/src/test/run-pass/issues/issue-49973.rs b/src/test/ui/issues/issue-49973.rs
index af421c52fb0..af421c52fb0 100644
--- a/src/test/run-pass/issues/issue-49973.rs
+++ b/src/test/ui/issues/issue-49973.rs
diff --git a/src/test/run-pass/issues/issue-5008-borrowed-traitobject-method-call.rs b/src/test/ui/issues/issue-5008-borrowed-traitobject-method-call.rs
index fc869ae4fec..fc869ae4fec 100644
--- a/src/test/run-pass/issues/issue-5008-borrowed-traitobject-method-call.rs
+++ b/src/test/ui/issues/issue-5008-borrowed-traitobject-method-call.rs
diff --git a/src/test/run-pass/issues/issue-50415.rs b/src/test/ui/issues/issue-50415.rs
index 20c7be772f9..20c7be772f9 100644
--- a/src/test/run-pass/issues/issue-50415.rs
+++ b/src/test/ui/issues/issue-50415.rs
diff --git a/src/test/run-pass/issues/issue-50442.rs b/src/test/ui/issues/issue-50442.rs
index 25c7dde7a5f..25c7dde7a5f 100644
--- a/src/test/run-pass/issues/issue-50442.rs
+++ b/src/test/ui/issues/issue-50442.rs
diff --git a/src/test/run-pass/issues/issue-5060.rs b/src/test/ui/issues/issue-5060.rs
index c4760bc029b..c4760bc029b 100644
--- a/src/test/run-pass/issues/issue-5060.rs
+++ b/src/test/ui/issues/issue-5060.rs
diff --git a/src/test/run-pass/issues/issue-50689.rs b/src/test/ui/issues/issue-50689.rs
index b49f2950020..b49f2950020 100644
--- a/src/test/run-pass/issues/issue-50689.rs
+++ b/src/test/ui/issues/issue-50689.rs
diff --git a/src/test/run-pass/issues/issue-50731.rs b/src/test/ui/issues/issue-50731.rs
index 209c1e1279b..209c1e1279b 100644
--- a/src/test/run-pass/issues/issue-50731.rs
+++ b/src/test/ui/issues/issue-50731.rs
diff --git a/src/test/run-pass/issues/issue-50811.rs b/src/test/ui/issues/issue-50811.rs
index 63d87e03c48..63d87e03c48 100644
--- a/src/test/run-pass/issues/issue-50811.rs
+++ b/src/test/ui/issues/issue-50811.rs
diff --git a/src/test/run-pass/issues/issue-50865-private-impl-trait/auxiliary/lib.rs b/src/test/ui/issues/issue-50865-private-impl-trait/auxiliary/lib.rs
index f3a51b415fa..f3a51b415fa 100644
--- a/src/test/run-pass/issues/issue-50865-private-impl-trait/auxiliary/lib.rs
+++ b/src/test/ui/issues/issue-50865-private-impl-trait/auxiliary/lib.rs
diff --git a/src/test/run-pass/issues/issue-50865-private-impl-trait/main.rs b/src/test/ui/issues/issue-50865-private-impl-trait/main.rs
index 16dfac53ad1..16dfac53ad1 100644
--- a/src/test/run-pass/issues/issue-50865-private-impl-trait/main.rs
+++ b/src/test/ui/issues/issue-50865-private-impl-trait/main.rs
diff --git a/src/test/run-pass/issues/issue-51185.rs b/src/test/ui/issues/issue-51185.rs
index 52a2b25539d..52a2b25539d 100644
--- a/src/test/run-pass/issues/issue-51185.rs
+++ b/src/test/ui/issues/issue-51185.rs
diff --git a/src/test/run-pass/issues/issue-51345.rs b/src/test/ui/issues/issue-51345.rs
index 15571e8bf5b..15571e8bf5b 100644
--- a/src/test/run-pass/issues/issue-51345.rs
+++ b/src/test/ui/issues/issue-51345.rs
diff --git a/src/test/run-pass/issues/issue-51582.rs b/src/test/ui/issues/issue-51582.rs
index 63ef05729bc..63ef05729bc 100644
--- a/src/test/run-pass/issues/issue-51582.rs
+++ b/src/test/ui/issues/issue-51582.rs
diff --git a/src/test/run-pass/issues/issue-51907.rs b/src/test/ui/issues/issue-51907.rs
index 3691fe19117..3691fe19117 100644
--- a/src/test/run-pass/issues/issue-51907.rs
+++ b/src/test/ui/issues/issue-51907.rs
diff --git a/src/test/run-pass/issues/issue-5192.rs b/src/test/ui/issues/issue-5192.rs
index 5a83d1c2ff9..5a83d1c2ff9 100644
--- a/src/test/run-pass/issues/issue-5192.rs
+++ b/src/test/ui/issues/issue-5192.rs
diff --git a/src/test/run-pass/issues/issue-52140/auxiliary/some_crate.rs b/src/test/ui/issues/issue-52140/auxiliary/some_crate.rs
index 087005849d1..087005849d1 100644
--- a/src/test/run-pass/issues/issue-52140/auxiliary/some_crate.rs
+++ b/src/test/ui/issues/issue-52140/auxiliary/some_crate.rs
diff --git a/src/test/run-pass/issues/issue-52140/main.rs b/src/test/ui/issues/issue-52140/main.rs
index aeac4340455..aeac4340455 100644
--- a/src/test/run-pass/issues/issue-52140/main.rs
+++ b/src/test/ui/issues/issue-52140/main.rs
diff --git a/src/test/run-pass/issues/issue-52141/auxiliary/some_crate.rs b/src/test/ui/issues/issue-52141/auxiliary/some_crate.rs
index 087005849d1..087005849d1 100644
--- a/src/test/run-pass/issues/issue-52141/auxiliary/some_crate.rs
+++ b/src/test/ui/issues/issue-52141/auxiliary/some_crate.rs
diff --git a/src/test/run-pass/issues/issue-52141/main.rs b/src/test/ui/issues/issue-52141/main.rs
index 7eea1726cf3..7eea1726cf3 100644
--- a/src/test/run-pass/issues/issue-52141/main.rs
+++ b/src/test/ui/issues/issue-52141/main.rs
diff --git a/src/test/run-pass/issues/issue-52169.rs b/src/test/ui/issues/issue-52169.rs
index 60be97f0aee..60be97f0aee 100644
--- a/src/test/run-pass/issues/issue-52169.rs
+++ b/src/test/ui/issues/issue-52169.rs
diff --git a/src/test/run-pass/issues/issue-5239-2.rs b/src/test/ui/issues/issue-5239-2.rs
index b501c6e1853..b501c6e1853 100644
--- a/src/test/run-pass/issues/issue-5239-2.rs
+++ b/src/test/ui/issues/issue-5239-2.rs
diff --git a/src/test/run-pass/issues/issue-5243.rs b/src/test/ui/issues/issue-5243.rs
index c511d45f02d..c511d45f02d 100644
--- a/src/test/run-pass/issues/issue-5243.rs
+++ b/src/test/ui/issues/issue-5243.rs
diff --git a/src/test/run-pass/issues/issue-52557.rs b/src/test/ui/issues/issue-52557.rs
index 09f7a8c5131..09f7a8c5131 100644
--- a/src/test/run-pass/issues/issue-52557.rs
+++ b/src/test/ui/issues/issue-52557.rs
diff --git a/src/test/run-pass/issues/issue-52705/auxiliary/png2.rs b/src/test/ui/issues/issue-52705/auxiliary/png2.rs
index fa9956e440d..fa9956e440d 100644
--- a/src/test/run-pass/issues/issue-52705/auxiliary/png2.rs
+++ b/src/test/ui/issues/issue-52705/auxiliary/png2.rs
diff --git a/src/test/run-pass/issues/issue-52705/main.rs b/src/test/ui/issues/issue-52705/main.rs
index 90bb8ca7537..90bb8ca7537 100644
--- a/src/test/run-pass/issues/issue-52705/main.rs
+++ b/src/test/ui/issues/issue-52705/main.rs
diff --git a/src/test/run-pass/issues/issue-5280.rs b/src/test/ui/issues/issue-5280.rs
index 3c97dad6b14..3c97dad6b14 100644
--- a/src/test/run-pass/issues/issue-5280.rs
+++ b/src/test/ui/issues/issue-5280.rs
diff --git a/src/test/run-pass/issues/issue-5315.rs b/src/test/ui/issues/issue-5315.rs
index 38c98254b93..38c98254b93 100644
--- a/src/test/run-pass/issues/issue-5315.rs
+++ b/src/test/ui/issues/issue-5315.rs
diff --git a/src/test/run-pass/issues/issue-5321-immediates-with-bare-self.rs b/src/test/ui/issues/issue-5321-immediates-with-bare-self.rs
index 64aa2836a7d..64aa2836a7d 100644
--- a/src/test/run-pass/issues/issue-5321-immediates-with-bare-self.rs
+++ b/src/test/ui/issues/issue-5321-immediates-with-bare-self.rs
diff --git a/src/test/run-pass/issues/issue-53333.rs b/src/test/ui/issues/issue-53333.rs
index ccc9971f93c..ccc9971f93c 100644
--- a/src/test/run-pass/issues/issue-53333.rs
+++ b/src/test/ui/issues/issue-53333.rs
diff --git a/src/test/run-pass/issues/issue-53728.rs b/src/test/ui/issues/issue-53728.rs
index 00666972e25..77b5010f776 100644
--- a/src/test/run-pass/issues/issue-53728.rs
+++ b/src/test/ui/issues/issue-53728.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #[repr(u16)]
 enum DeviceKind {
diff --git a/src/test/ui/issues/issue-53787-inline-assembler-macro.rs b/src/test/ui/issues/issue-53787-inline-assembler-macro.rs
index 937bce1b655..09e8d55c06b 100644
--- a/src/test/ui/issues/issue-53787-inline-assembler-macro.rs
+++ b/src/test/ui/issues/issue-53787-inline-assembler-macro.rs
@@ -1,5 +1,7 @@
 // Regression test for Issue #53787: Fix ICE when creating a label in inline assembler with macros.
 
+// ignore-emscripten
+
 #![feature(asm)]
 
 macro_rules! fake_jump {
diff --git a/src/test/ui/issues/issue-53787-inline-assembler-macro.stderr b/src/test/ui/issues/issue-53787-inline-assembler-macro.stderr
index 7edf235652f..6a4416d78f3 100644
--- a/src/test/ui/issues/issue-53787-inline-assembler-macro.stderr
+++ b/src/test/ui/issues/issue-53787-inline-assembler-macro.stderr
@@ -1,5 +1,5 @@
 error[E0669]: invalid value for constraint in inline assembly
-  --> $DIR/issue-53787-inline-assembler-macro.rs:21:16
+  --> $DIR/issue-53787-inline-assembler-macro.rs:23:16
    |
 LL |     fake_jump!("FirstFunc");
    |                ^^^^^^^^^^^
diff --git a/src/test/run-pass/issues/issue-53843.rs b/src/test/ui/issues/issue-53843.rs
index 53728ec4d9f..f305b370ce6 100644
--- a/src/test/run-pass/issues/issue-53843.rs
+++ b/src/test/ui/issues/issue-53843.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::ops::Deref;
 
 pub struct Pin<P>(P);
diff --git a/src/test/run-pass/issues/issue-54462-mutable-noalias-correctness.rs b/src/test/ui/issues/issue-54462-mutable-noalias-correctness.rs
index e7966b2978f..412028bdcdc 100644
--- a/src/test/run-pass/issues/issue-54462-mutable-noalias-correctness.rs
+++ b/src/test/ui/issues/issue-54462-mutable-noalias-correctness.rs
@@ -1,3 +1,4 @@
+// run-pass
 //
 // compile-flags: -Ccodegen-units=1 -O
 
diff --git a/src/test/run-pass/issues/issue-54467.rs b/src/test/ui/issues/issue-54467.rs
index 52a9828b548..734bf2768c2 100644
--- a/src/test/run-pass/issues/issue-54467.rs
+++ b/src/test/ui/issues/issue-54467.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub trait Stream {
     type Item;
     type Error;
diff --git a/src/test/run-pass/issues/issue-54477-reduced-2.rs b/src/test/ui/issues/issue-54477-reduced-2.rs
index 28731d4b0df..199d69b4540 100644
--- a/src/test/run-pass/issues/issue-54477-reduced-2.rs
+++ b/src/test/ui/issues/issue-54477-reduced-2.rs
@@ -1,3 +1,4 @@
+// run-pass
 // rust-lang/rust#54477: runtime bug in the VecDeque library that was
 // exposed by this test case, derived from test suite of crates.io
 // `collection` crate.
diff --git a/src/test/run-pass/issues/issue-54696.rs b/src/test/ui/issues/issue-54696.rs
index d8408ed8549..d8408ed8549 100644
--- a/src/test/run-pass/issues/issue-54696.rs
+++ b/src/test/ui/issues/issue-54696.rs
diff --git a/src/test/run-pass/issues/issue-5518.rs b/src/test/ui/issues/issue-5518.rs
index 97ed9ef309d..97ed9ef309d 100644
--- a/src/test/run-pass/issues/issue-5518.rs
+++ b/src/test/ui/issues/issue-5518.rs
diff --git a/src/test/run-pass/issues/issue-5521.rs b/src/test/ui/issues/issue-5521.rs
index cafdbc39961..cafdbc39961 100644
--- a/src/test/run-pass/issues/issue-5521.rs
+++ b/src/test/ui/issues/issue-5521.rs
diff --git a/src/test/run-pass/issues/issue-5530.rs b/src/test/ui/issues/issue-5530.rs
index 72731cbb177..72731cbb177 100644
--- a/src/test/run-pass/issues/issue-5530.rs
+++ b/src/test/ui/issues/issue-5530.rs
diff --git a/src/test/run-pass/issues/issue-55376.rs b/src/test/ui/issues/issue-55376.rs
index fa92a85a445..4adff2b4544 100644
--- a/src/test/run-pass/issues/issue-55376.rs
+++ b/src/test/ui/issues/issue-55376.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests that paths in `pub(...)` don't fail HIR verification.
 
 #![allow(unused_imports)]
diff --git a/src/test/run-pass/issues/issue-55380.rs b/src/test/ui/issues/issue-55380.rs
index 862218e2192..862218e2192 100644
--- a/src/test/run-pass/issues/issue-55380.rs
+++ b/src/test/ui/issues/issue-55380.rs
diff --git a/src/test/run-pass/issues/issue-5550.rs b/src/test/ui/issues/issue-5550.rs
index 6ea24747b39..6ea24747b39 100644
--- a/src/test/run-pass/issues/issue-5550.rs
+++ b/src/test/ui/issues/issue-5550.rs
diff --git a/src/test/run-pass/issues/issue-5554.rs b/src/test/ui/issues/issue-5554.rs
index 7737536f43d..7737536f43d 100644
--- a/src/test/run-pass/issues/issue-5554.rs
+++ b/src/test/ui/issues/issue-5554.rs
diff --git a/src/test/run-pass/issues/issue-56237.rs b/src/test/ui/issues/issue-56237.rs
index 87e10e83612..534b85acec8 100644
--- a/src/test/run-pass/issues/issue-56237.rs
+++ b/src/test/ui/issues/issue-56237.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::ops::Deref;
 
 fn foo<P>(_value: <P as Deref>::Target)
diff --git a/src/test/run-pass/issues/issue-5666.rs b/src/test/ui/issues/issue-5666.rs
index aa513277830..aa513277830 100644
--- a/src/test/run-pass/issues/issue-5666.rs
+++ b/src/test/ui/issues/issue-5666.rs
diff --git a/src/test/run-pass/issues/issue-5688.rs b/src/test/ui/issues/issue-5688.rs
index b6e364c2f40..b6e364c2f40 100644
--- a/src/test/run-pass/issues/issue-5688.rs
+++ b/src/test/ui/issues/issue-5688.rs
diff --git a/src/test/run-pass/issues/issue-5708.rs b/src/test/ui/issues/issue-5708.rs
index 6fe9943d368..6fe9943d368 100644
--- a/src/test/run-pass/issues/issue-5708.rs
+++ b/src/test/ui/issues/issue-5708.rs
diff --git a/src/test/run-pass/issues/issue-5718.rs b/src/test/ui/issues/issue-5718.rs
index 63efec95311..63efec95311 100644
--- a/src/test/run-pass/issues/issue-5718.rs
+++ b/src/test/ui/issues/issue-5718.rs
diff --git a/src/test/run-pass/issues/issue-5741.rs b/src/test/ui/issues/issue-5741.rs
index b9eaf0be7fb..b9eaf0be7fb 100644
--- a/src/test/run-pass/issues/issue-5741.rs
+++ b/src/test/ui/issues/issue-5741.rs
diff --git a/src/test/run-pass/issues/issue-5791.rs b/src/test/ui/issues/issue-5791.rs
index 2f8bf1e9369..2f8bf1e9369 100644
--- a/src/test/run-pass/issues/issue-5791.rs
+++ b/src/test/ui/issues/issue-5791.rs
diff --git a/src/test/run-pass/issues/issue-58212.rs b/src/test/ui/issues/issue-58212.rs
index d4ce6496cae..21dcdd56bf6 100644
--- a/src/test/run-pass/issues/issue-58212.rs
+++ b/src/test/ui/issues/issue-58212.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 trait FromUnchecked {
     unsafe fn from_unchecked();
 }
diff --git a/src/test/run-pass/issues/issue-58435-ice-with-assoc-const.rs b/src/test/ui/issues/issue-58435-ice-with-assoc-const.rs
index 94e2b2563df..fac727d2d7d 100644
--- a/src/test/run-pass/issues/issue-58435-ice-with-assoc-const.rs
+++ b/src/test/ui/issues/issue-58435-ice-with-assoc-const.rs
@@ -1,3 +1,4 @@
+// run-pass
 // The const-evaluator was at one point ICE'ing while trying to
 // evaluate the body of `fn id` during the `s.id()` call in main.
 
diff --git a/src/test/run-pass/issues/issue-58463.rs b/src/test/ui/issues/issue-58463.rs
index 8ab845366b7..8ab845366b7 100644
--- a/src/test/run-pass/issues/issue-58463.rs
+++ b/src/test/ui/issues/issue-58463.rs
diff --git a/src/test/run-pass/issues/issue-5917.rs b/src/test/ui/issues/issue-5917.rs
index 6ab7081cf88..6ab7081cf88 100644
--- a/src/test/run-pass/issues/issue-5917.rs
+++ b/src/test/ui/issues/issue-5917.rs
diff --git a/src/test/run-pass/issues/issue-5988.rs b/src/test/ui/issues/issue-5988.rs
index 303fb4fbc94..303fb4fbc94 100644
--- a/src/test/run-pass/issues/issue-5988.rs
+++ b/src/test/ui/issues/issue-5988.rs
diff --git a/src/test/run-pass/issues/issue-5997.rs b/src/test/ui/issues/issue-5997.rs
index 145e3a7928d..145e3a7928d 100644
--- a/src/test/run-pass/issues/issue-5997.rs
+++ b/src/test/ui/issues/issue-5997.rs
diff --git a/src/test/run-pass/issues/issue-6117.rs b/src/test/ui/issues/issue-6117.rs
index 5235d53d84a..5235d53d84a 100644
--- a/src/test/run-pass/issues/issue-6117.rs
+++ b/src/test/ui/issues/issue-6117.rs
diff --git a/src/test/run-pass/issues/issue-6128.rs b/src/test/ui/issues/issue-6128.rs
index 8859fbe6afb..8859fbe6afb 100644
--- a/src/test/run-pass/issues/issue-6128.rs
+++ b/src/test/ui/issues/issue-6128.rs
diff --git a/src/test/run-pass/issues/issue-6130.rs b/src/test/ui/issues/issue-6130.rs
index a33ea686947..a33ea686947 100644
--- a/src/test/run-pass/issues/issue-6130.rs
+++ b/src/test/ui/issues/issue-6130.rs
diff --git a/src/test/run-pass/issues/issue-6153.rs b/src/test/ui/issues/issue-6153.rs
index 25f026f214b..25f026f214b 100644
--- a/src/test/run-pass/issues/issue-6153.rs
+++ b/src/test/ui/issues/issue-6153.rs
diff --git a/src/test/run-pass/issues/issue-6157.rs b/src/test/ui/issues/issue-6157.rs
index b7a44ed8623..b7a44ed8623 100644
--- a/src/test/run-pass/issues/issue-6157.rs
+++ b/src/test/ui/issues/issue-6157.rs
diff --git a/src/test/run-pass/issues/issue-61696.rs b/src/test/ui/issues/issue-61696.rs
index 381e5a632e7..dca52927fd7 100644
--- a/src/test/run-pass/issues/issue-61696.rs
+++ b/src/test/ui/issues/issue-61696.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub enum Infallible {}
 
 // The check that the `bool` field of `V1` is encoding a "niche variant"
diff --git a/src/test/run-pass/issues/issue-61894.rs b/src/test/ui/issues/issue-61894.rs
index 4d407125299..c018ac73fb5 100644
--- a/src/test/run-pass/issues/issue-61894.rs
+++ b/src/test/ui/issues/issue-61894.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(core_intrinsics)]
 
 use std::any::type_name;
diff --git a/src/test/run-pass/issues/issue-6318.rs b/src/test/ui/issues/issue-6318.rs
index d8bd83f0dc6..d8bd83f0dc6 100644
--- a/src/test/run-pass/issues/issue-6318.rs
+++ b/src/test/ui/issues/issue-6318.rs
diff --git a/src/test/run-pass/issues/issue-6334.rs b/src/test/ui/issues/issue-6334.rs
index acf48da1543..acf48da1543 100644
--- a/src/test/run-pass/issues/issue-6334.rs
+++ b/src/test/ui/issues/issue-6334.rs
diff --git a/src/test/run-pass/issues/issue-6344-let.rs b/src/test/ui/issues/issue-6344-let.rs
index a7b6a2e2d66..a7b6a2e2d66 100644
--- a/src/test/run-pass/issues/issue-6344-let.rs
+++ b/src/test/ui/issues/issue-6344-let.rs
diff --git a/src/test/run-pass/issues/issue-6344-match.rs b/src/test/ui/issues/issue-6344-match.rs
index 4505a34c716..4505a34c716 100644
--- a/src/test/run-pass/issues/issue-6344-match.rs
+++ b/src/test/ui/issues/issue-6344-match.rs
diff --git a/src/test/run-pass/issues/issue-6449.rs b/src/test/ui/issues/issue-6449.rs
index bfd4c123208..bfd4c123208 100644
--- a/src/test/run-pass/issues/issue-6449.rs
+++ b/src/test/ui/issues/issue-6449.rs
diff --git a/src/test/run-pass/issues/issue-6892.rs b/src/test/ui/issues/issue-6892.rs
index a361461a4ce..a361461a4ce 100644
--- a/src/test/run-pass/issues/issue-6892.rs
+++ b/src/test/ui/issues/issue-6892.rs
diff --git a/src/test/run-pass/issues/issue-6919.rs b/src/test/ui/issues/issue-6919.rs
index 11aed120873..11aed120873 100644
--- a/src/test/run-pass/issues/issue-6919.rs
+++ b/src/test/ui/issues/issue-6919.rs
diff --git a/src/test/run-pass/issues/issue-7012.rs b/src/test/ui/issues/issue-7012.rs
index 90eba170695..90eba170695 100644
--- a/src/test/run-pass/issues/issue-7012.rs
+++ b/src/test/ui/issues/issue-7012.rs
diff --git a/src/test/run-pass/issues/issue-7178.rs b/src/test/ui/issues/issue-7178.rs
index 30aa736cdc6..30aa736cdc6 100644
--- a/src/test/run-pass/issues/issue-7178.rs
+++ b/src/test/ui/issues/issue-7178.rs
diff --git a/src/test/run-pass/issues/issue-7222.rs b/src/test/ui/issues/issue-7222.rs
index 64907316626..64907316626 100644
--- a/src/test/run-pass/issues/issue-7222.rs
+++ b/src/test/ui/issues/issue-7222.rs
diff --git a/src/test/run-pass/issues/issue-7344.rs b/src/test/ui/issues/issue-7344.rs
index f1727d0c1ae..f1727d0c1ae 100644
--- a/src/test/run-pass/issues/issue-7344.rs
+++ b/src/test/ui/issues/issue-7344.rs
diff --git a/src/test/run-pass/issues/issue-7519-match-unit-in-arg.rs b/src/test/ui/issues/issue-7519-match-unit-in-arg.rs
index 7d838cbb09b..7d838cbb09b 100644
--- a/src/test/run-pass/issues/issue-7519-match-unit-in-arg.rs
+++ b/src/test/ui/issues/issue-7519-match-unit-in-arg.rs
diff --git a/src/test/run-pass/issues/issue-7563.rs b/src/test/ui/issues/issue-7563.rs
index c62405554b4..c62405554b4 100644
--- a/src/test/run-pass/issues/issue-7563.rs
+++ b/src/test/ui/issues/issue-7563.rs
diff --git a/src/test/run-pass/issues/issue-7575.rs b/src/test/ui/issues/issue-7575.rs
index ac69f2b1c80..ac69f2b1c80 100644
--- a/src/test/run-pass/issues/issue-7575.rs
+++ b/src/test/ui/issues/issue-7575.rs
diff --git a/src/test/run-pass/issues/issue-7660.rs b/src/test/ui/issues/issue-7660.rs
index ad0b8ecff39..ad0b8ecff39 100644
--- a/src/test/run-pass/issues/issue-7660.rs
+++ b/src/test/ui/issues/issue-7660.rs
diff --git a/src/test/run-pass/issues/issue-7663.rs b/src/test/ui/issues/issue-7663.rs
index b15e215db0f..b15e215db0f 100644
--- a/src/test/run-pass/issues/issue-7663.rs
+++ b/src/test/ui/issues/issue-7663.rs
diff --git a/src/test/run-pass/issues/issue-7784.rs b/src/test/ui/issues/issue-7784.rs
index b75e547079e..b75e547079e 100644
--- a/src/test/run-pass/issues/issue-7784.rs
+++ b/src/test/ui/issues/issue-7784.rs
diff --git a/src/test/run-pass/issues/issue-7899.rs b/src/test/ui/issues/issue-7899.rs
index fb631f83697..fb631f83697 100644
--- a/src/test/run-pass/issues/issue-7899.rs
+++ b/src/test/ui/issues/issue-7899.rs
diff --git a/src/test/run-pass/issues/issue-7911.rs b/src/test/ui/issues/issue-7911.rs
index de833324bd2..de833324bd2 100644
--- a/src/test/run-pass/issues/issue-7911.rs
+++ b/src/test/ui/issues/issue-7911.rs
diff --git a/src/test/run-pass/issues/issue-8044.rs b/src/test/ui/issues/issue-8044.rs
index 858f98b654d..858f98b654d 100644
--- a/src/test/run-pass/issues/issue-8044.rs
+++ b/src/test/ui/issues/issue-8044.rs
diff --git a/src/test/run-pass/issues/issue-8248.rs b/src/test/ui/issues/issue-8248.rs
index 31a305c31be..31a305c31be 100644
--- a/src/test/run-pass/issues/issue-8248.rs
+++ b/src/test/ui/issues/issue-8248.rs
diff --git a/src/test/run-pass/issues/issue-8249.rs b/src/test/ui/issues/issue-8249.rs
index d09dff3a697..d09dff3a697 100644
--- a/src/test/run-pass/issues/issue-8249.rs
+++ b/src/test/ui/issues/issue-8249.rs
diff --git a/src/test/run-pass/issues/issue-8259.rs b/src/test/ui/issues/issue-8259.rs
index 2802bea7fe0..2802bea7fe0 100644
--- a/src/test/run-pass/issues/issue-8259.rs
+++ b/src/test/ui/issues/issue-8259.rs
diff --git a/src/test/run-pass/issues/issue-8351-1.rs b/src/test/ui/issues/issue-8351-1.rs
index 139f027cb90..139f027cb90 100644
--- a/src/test/run-pass/issues/issue-8351-1.rs
+++ b/src/test/ui/issues/issue-8351-1.rs
diff --git a/src/test/run-pass/issues/issue-8351-2.rs b/src/test/ui/issues/issue-8351-2.rs
index bc66cbb77c0..bc66cbb77c0 100644
--- a/src/test/run-pass/issues/issue-8351-2.rs
+++ b/src/test/ui/issues/issue-8351-2.rs
diff --git a/src/test/run-pass/issues/issue-8391.rs b/src/test/ui/issues/issue-8391.rs
index 1a90369659b..1a90369659b 100644
--- a/src/test/run-pass/issues/issue-8391.rs
+++ b/src/test/ui/issues/issue-8391.rs
diff --git a/src/test/run-pass/issues/issue-8401.rs b/src/test/ui/issues/issue-8401.rs
index 1257bab6c0c..1257bab6c0c 100644
--- a/src/test/run-pass/issues/issue-8401.rs
+++ b/src/test/ui/issues/issue-8401.rs
diff --git a/src/test/run-pass/issues/issue-8460.rs b/src/test/ui/issues/issue-8460.rs
index b7fc564a9b5..b7fc564a9b5 100644
--- a/src/test/run-pass/issues/issue-8460.rs
+++ b/src/test/ui/issues/issue-8460.rs
diff --git a/src/test/run-pass/issues/issue-8498.rs b/src/test/ui/issues/issue-8498.rs
index e6241b76109..e6241b76109 100644
--- a/src/test/run-pass/issues/issue-8498.rs
+++ b/src/test/ui/issues/issue-8498.rs
diff --git a/src/test/run-pass/issues/issue-8506.rs b/src/test/ui/issues/issue-8506.rs
index cc32b89234f..cc32b89234f 100644
--- a/src/test/run-pass/issues/issue-8506.rs
+++ b/src/test/ui/issues/issue-8506.rs
diff --git a/src/test/run-pass/issues/issue-868.rs b/src/test/ui/issues/issue-868.rs
index ce0a3c7ca52..ce0a3c7ca52 100644
--- a/src/test/run-pass/issues/issue-868.rs
+++ b/src/test/ui/issues/issue-868.rs
diff --git a/src/test/run-pass/issues/issue-8709.rs b/src/test/ui/issues/issue-8709.rs
index ea7525d4477..ea7525d4477 100644
--- a/src/test/run-pass/issues/issue-8709.rs
+++ b/src/test/ui/issues/issue-8709.rs
diff --git a/src/test/run-pass/issues/issue-8783.rs b/src/test/ui/issues/issue-8783.rs
index 4eb49c82161..4eb49c82161 100644
--- a/src/test/run-pass/issues/issue-8783.rs
+++ b/src/test/ui/issues/issue-8783.rs
diff --git a/src/test/run-pass/issues/issue-8827.rs b/src/test/ui/issues/issue-8827.rs
index 95be7616a4f..95be7616a4f 100644
--- a/src/test/run-pass/issues/issue-8827.rs
+++ b/src/test/ui/issues/issue-8827.rs
diff --git a/src/test/run-pass/issues/issue-8851.rs b/src/test/ui/issues/issue-8851.rs
index faacfe5f895..faacfe5f895 100644
--- a/src/test/run-pass/issues/issue-8851.rs
+++ b/src/test/ui/issues/issue-8851.rs
diff --git a/src/test/run-pass/issues/issue-8860.rs b/src/test/ui/issues/issue-8860.rs
index b89a80c1307..b89a80c1307 100644
--- a/src/test/run-pass/issues/issue-8860.rs
+++ b/src/test/ui/issues/issue-8860.rs
diff --git a/src/test/run-pass/issues/issue-8898.rs b/src/test/ui/issues/issue-8898.rs
index 31d5ff86e7c..31d5ff86e7c 100644
--- a/src/test/run-pass/issues/issue-8898.rs
+++ b/src/test/ui/issues/issue-8898.rs
diff --git a/src/test/run-pass/issues/issue-9047.rs b/src/test/ui/issues/issue-9047.rs
index fa8d75aec7a..fa8d75aec7a 100644
--- a/src/test/run-pass/issues/issue-9047.rs
+++ b/src/test/ui/issues/issue-9047.rs
diff --git a/src/test/run-pass/issues/issue-9123.rs b/src/test/ui/issues/issue-9123.rs
index 8c21d06c477..8c21d06c477 100644
--- a/src/test/run-pass/issues/issue-9123.rs
+++ b/src/test/ui/issues/issue-9123.rs
diff --git a/src/test/run-pass/issues/issue-9129.rs b/src/test/ui/issues/issue-9129.rs
index 3d87e1c2037..3d87e1c2037 100644
--- a/src/test/run-pass/issues/issue-9129.rs
+++ b/src/test/ui/issues/issue-9129.rs
diff --git a/src/test/run-pass/issues/issue-9155.rs b/src/test/ui/issues/issue-9155.rs
index 4b5c451e853..4b5c451e853 100644
--- a/src/test/run-pass/issues/issue-9155.rs
+++ b/src/test/ui/issues/issue-9155.rs
diff --git a/src/test/run-pass/issues/issue-9188.rs b/src/test/ui/issues/issue-9188.rs
index 34e61fdf68b..34e61fdf68b 100644
--- a/src/test/run-pass/issues/issue-9188.rs
+++ b/src/test/ui/issues/issue-9188.rs
diff --git a/src/test/run-pass/issues/issue-9259.rs b/src/test/ui/issues/issue-9259.rs
index d838edbdd66..d838edbdd66 100644
--- a/src/test/run-pass/issues/issue-9259.rs
+++ b/src/test/ui/issues/issue-9259.rs
diff --git a/src/test/run-pass/issues/issue-9382.rs b/src/test/ui/issues/issue-9382.rs
index dbb0fa524ef..dbb0fa524ef 100644
--- a/src/test/run-pass/issues/issue-9382.rs
+++ b/src/test/ui/issues/issue-9382.rs
diff --git a/src/test/run-pass/issues/issue-9394-inherited-trait-calls.rs b/src/test/ui/issues/issue-9394-inherited-trait-calls.rs
index cc0dd4fc14a..cc0dd4fc14a 100644
--- a/src/test/run-pass/issues/issue-9394-inherited-trait-calls.rs
+++ b/src/test/ui/issues/issue-9394-inherited-trait-calls.rs
diff --git a/src/test/run-pass/issues/issue-9396.rs b/src/test/ui/issues/issue-9396.rs
index 27b5185377d..27b5185377d 100644
--- a/src/test/run-pass/issues/issue-9396.rs
+++ b/src/test/ui/issues/issue-9396.rs
diff --git a/src/test/run-pass/issues/issue-9446.rs b/src/test/ui/issues/issue-9446.rs
index e200840d290..e200840d290 100644
--- a/src/test/run-pass/issues/issue-9446.rs
+++ b/src/test/ui/issues/issue-9446.rs
diff --git a/src/test/run-pass/issues/issue-9737.rs b/src/test/ui/issues/issue-9737.rs
index 7d3e0567847..7d3e0567847 100644
--- a/src/test/run-pass/issues/issue-9737.rs
+++ b/src/test/ui/issues/issue-9737.rs
diff --git a/src/test/run-pass/issues/issue-979.rs b/src/test/ui/issues/issue-979.rs
index 57a99b325ad..57a99b325ad 100644
--- a/src/test/run-pass/issues/issue-979.rs
+++ b/src/test/ui/issues/issue-979.rs
diff --git a/src/test/run-pass/issues/issue-9837.rs b/src/test/ui/issues/issue-9837.rs
index 5d2c822a576..5d2c822a576 100644
--- a/src/test/run-pass/issues/issue-9837.rs
+++ b/src/test/ui/issues/issue-9837.rs
diff --git a/src/test/run-pass/issues/issue-9906.rs b/src/test/ui/issues/issue-9906.rs
index a2870cf0f6e..a2870cf0f6e 100644
--- a/src/test/run-pass/issues/issue-9906.rs
+++ b/src/test/ui/issues/issue-9906.rs
diff --git a/src/test/run-pass/issues/issue-9918.rs b/src/test/ui/issues/issue-9918.rs
index 63ad7040d67..63ad7040d67 100644
--- a/src/test/run-pass/issues/issue-9918.rs
+++ b/src/test/ui/issues/issue-9918.rs
diff --git a/src/test/run-pass/issues/issue-9942.rs b/src/test/ui/issues/issue-9942.rs
index f4880446526..f4880446526 100644
--- a/src/test/run-pass/issues/issue-9942.rs
+++ b/src/test/ui/issues/issue-9942.rs
diff --git a/src/test/run-pass/issues/issue-9951.rs b/src/test/ui/issues/issue-9951.rs
index 2698a3b17c6..2698a3b17c6 100644
--- a/src/test/run-pass/issues/issue-9951.rs
+++ b/src/test/ui/issues/issue-9951.rs
diff --git a/src/test/run-pass/issues/issue-9968.rs b/src/test/ui/issues/issue-9968.rs
index 3ab90d99af9..3ab90d99af9 100644
--- a/src/test/run-pass/issues/issue-9968.rs
+++ b/src/test/ui/issues/issue-9968.rs
diff --git a/src/test/run-pass/istr.rs b/src/test/ui/istr.rs
index af11e49e56e..dca6d40d59a 100644
--- a/src/test/run-pass/istr.rs
+++ b/src/test/ui/istr.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::string::String;
 
 fn test_stack_assign() {
diff --git a/src/test/run-pass/item-name-overload.rs b/src/test/ui/item-name-overload.rs
index 58ef977919c..c8a302a2c5b 100644
--- a/src/test/run-pass/item-name-overload.rs
+++ b/src/test/ui/item-name-overload.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 
diff --git a/src/test/run-pass/iterators/into-iterator-type-inference-shift.rs b/src/test/ui/iterators/into-iterator-type-inference-shift.rs
index 9151172fd15..9151172fd15 100644
--- a/src/test/run-pass/iterators/into-iterator-type-inference-shift.rs
+++ b/src/test/ui/iterators/into-iterator-type-inference-shift.rs
diff --git a/src/test/run-pass/iterators/iter-cloned-type-inference.rs b/src/test/ui/iterators/iter-cloned-type-inference.rs
index 898e3371971..898e3371971 100644
--- a/src/test/run-pass/iterators/iter-cloned-type-inference.rs
+++ b/src/test/ui/iterators/iter-cloned-type-inference.rs
diff --git a/src/test/run-pass/iterators/iter-range.rs b/src/test/ui/iterators/iter-range.rs
index 993d93790e0..993d93790e0 100644
--- a/src/test/run-pass/iterators/iter-range.rs
+++ b/src/test/ui/iterators/iter-range.rs
diff --git a/src/test/run-pass/iterators/iter-step-overflow-debug.rs b/src/test/ui/iterators/iter-step-overflow-debug.rs
index 5d67c7cbb42..5d67c7cbb42 100644
--- a/src/test/run-pass/iterators/iter-step-overflow-debug.rs
+++ b/src/test/ui/iterators/iter-step-overflow-debug.rs
diff --git a/src/test/run-pass/iterators/iter-step-overflow-ndebug.rs b/src/test/ui/iterators/iter-step-overflow-ndebug.rs
index a0ad92071b6..a0ad92071b6 100644
--- a/src/test/run-pass/iterators/iter-step-overflow-ndebug.rs
+++ b/src/test/ui/iterators/iter-step-overflow-ndebug.rs
diff --git a/src/test/run-pass/iterators/iter-sum-overflow-debug.rs b/src/test/ui/iterators/iter-sum-overflow-debug.rs
index ee4ab4d24c6..ee4ab4d24c6 100644
--- a/src/test/run-pass/iterators/iter-sum-overflow-debug.rs
+++ b/src/test/ui/iterators/iter-sum-overflow-debug.rs
diff --git a/src/test/run-pass/iterators/iter-sum-overflow-ndebug.rs b/src/test/ui/iterators/iter-sum-overflow-ndebug.rs
index 61d63d41fb8..61d63d41fb8 100644
--- a/src/test/run-pass/iterators/iter-sum-overflow-ndebug.rs
+++ b/src/test/ui/iterators/iter-sum-overflow-ndebug.rs
diff --git a/src/test/run-pass/iterators/iter-sum-overflow-overflow-checks.rs b/src/test/ui/iterators/iter-sum-overflow-overflow-checks.rs
index 429f8e0bc96..429f8e0bc96 100644
--- a/src/test/run-pass/iterators/iter-sum-overflow-overflow-checks.rs
+++ b/src/test/ui/iterators/iter-sum-overflow-overflow-checks.rs
diff --git a/src/test/run-pass/iterators/iter-zip.rs b/src/test/ui/iterators/iter-zip.rs
index a76fa2408bb..a76fa2408bb 100644
--- a/src/test/run-pass/iterators/iter-zip.rs
+++ b/src/test/ui/iterators/iter-zip.rs
diff --git a/src/test/run-pass/keyword-changes-2012-07-31.rs b/src/test/ui/keyword-changes-2012-07-31.rs
index 73b0d07090b..1b38527ec29 100644
--- a/src/test/run-pass/keyword-changes-2012-07-31.rs
+++ b/src/test/ui/keyword-changes-2012-07-31.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // return -> return
 // mod -> module
diff --git a/src/test/run-pass/kindck-implicit-close-over-mut-var.rs b/src/test/ui/kindck-implicit-close-over-mut-var.rs
index 3b2991ede99..5b5d86eec2c 100644
--- a/src/test/run-pass/kindck-implicit-close-over-mut-var.rs
+++ b/src/test/ui/kindck-implicit-close-over-mut-var.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(dead_code)]
 use std::thread;
diff --git a/src/test/run-pass/kinds-in-metadata.rs b/src/test/ui/kinds-in-metadata.rs
index 7cfc28b12b9..136037a7acf 100644
--- a/src/test/run-pass/kinds-in-metadata.rs
+++ b/src/test/ui/kinds-in-metadata.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:kinds_in_metadata.rs
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/lambda-infer-unresolved.rs b/src/test/ui/lambda-infer-unresolved.rs
index 751801e7c21..9cc466b28ec 100644
--- a/src/test/run-pass/lambda-infer-unresolved.rs
+++ b/src/test/ui/lambda-infer-unresolved.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_mut)]
 // This should typecheck even though the type of e is not fully
 // resolved when we finish typechecking the ||.
diff --git a/src/test/run-pass/lambda-var-hygiene.rs b/src/test/ui/lambda-var-hygiene.rs
index 9cc4cc29bf5..bf06765e5dd 100644
--- a/src/test/run-pass/lambda-var-hygiene.rs
+++ b/src/test/ui/lambda-var-hygiene.rs
@@ -1,3 +1,4 @@
+// run-pass
 // shouldn't affect evaluation of $ex:
 macro_rules! bad_macro {
     ($ex:expr) => ({(|_x| { $ex }) (9) })
diff --git a/src/test/run-pass/large-records.rs b/src/test/ui/large-records.rs
index 9786ea79780..7f850a94e89 100644
--- a/src/test/run-pass/large-records.rs
+++ b/src/test/ui/large-records.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 
diff --git a/src/test/run-pass/last-use-in-block.rs b/src/test/ui/last-use-in-block.rs
index 2bfd982995d..1ab847dcd8a 100644
--- a/src/test/run-pass/last-use-in-block.rs
+++ b/src/test/ui/last-use-in-block.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_parens)]
 // Issue #1818
diff --git a/src/test/run-pass/last-use-in-cap-clause.rs b/src/test/ui/last-use-in-cap-clause.rs
index 42dc6a4b06e..98d43463287 100644
--- a/src/test/run-pass/last-use-in-cap-clause.rs
+++ b/src/test/ui/last-use-in-cap-clause.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Make sure #1399 stays fixed
 
diff --git a/src/test/run-pass/last-use-is-capture.rs b/src/test/ui/last-use-is-capture.rs
index 2fa85e2d5b2..af230877793 100644
--- a/src/test/run-pass/last-use-is-capture.rs
+++ b/src/test/ui/last-use-is-capture.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Make sure #1399 stays fixed
 
diff --git a/src/test/run-pass/lazy-and-or.rs b/src/test/ui/lazy-and-or.rs
index d1f564fbe4c..0b44a70a569 100644
--- a/src/test/run-pass/lazy-and-or.rs
+++ b/src/test/ui/lazy-and-or.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn incr(x: &mut isize) -> bool { *x += 1; assert!((false)); return false; }
 
 pub fn main() {
diff --git a/src/test/run-pass/lazy-init.rs b/src/test/ui/lazy-init.rs
index 1d7001b49ee..a4b5d18bb33 100644
--- a/src/test/run-pass/lazy-init.rs
+++ b/src/test/ui/lazy-init.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_mut)]
 
 
diff --git a/src/test/run-pass/leak-unique-as-tydesc.rs b/src/test/ui/leak-unique-as-tydesc.rs
index 2293e3c823f..752081b78f2 100644
--- a/src/test/run-pass/leak-unique-as-tydesc.rs
+++ b/src/test/ui/leak-unique-as-tydesc.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/lex-bare-cr-nondoc-comment.rs b/src/test/ui/lex-bare-cr-nondoc-comment.rs
index da18ab268ff..5b528d6e1e1 100644
--- a/src/test/run-pass/lex-bare-cr-nondoc-comment.rs
+++ b/src/test/ui/lex-bare-cr-nondoc-comment.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-tidy-cr
 
 // nondoc comment with bare CR: '
'
diff --git a/src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs b/src/test/ui/lexer-crlf-line-endings-string-literal-doc-comment.rs
index f9d1b17b8dd..ada253aacfb 100644
--- a/src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs
+++ b/src/test/ui/lexer-crlf-line-endings-string-literal-doc-comment.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-tidy-cr ignore-license
 // ignore-tidy-cr (repeated again because of tidy bug)
 // license is ignored because tidy can't handle the CRLF here properly.
diff --git a/src/test/run-pass/lexical-scoping.rs b/src/test/ui/lexical-scoping.rs
index 15797eee9b8..04904958a6c 100644
--- a/src/test/run-pass/lexical-scoping.rs
+++ b/src/test/ui/lexical-scoping.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests that items in subscopes can shadow type parameters and local variables (see issue #23880).
 
 #![allow(unused)]
diff --git a/src/test/run-pass/lib-defaults.rs b/src/test/ui/lib-defaults.rs
index dcf537866c5..cd0b0bb2321 100644
--- a/src/test/run-pass/lib-defaults.rs
+++ b/src/test/ui/lib-defaults.rs
@@ -1,3 +1,4 @@
+// run-pass
 // dont-check-compiler-stderr (rust-lang/rust#54222)
 
 // ignore-wasm32-bare no libc to test ffi with
diff --git a/src/test/run-pass/link-cfg-works.rs b/src/test/ui/link-cfg-works.rs
index d7a248fd4d5..fe1b569dff6 100644
--- a/src/test/run-pass/link-cfg-works.rs
+++ b/src/test/ui/link-cfg-works.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:link-cfg-works-transitive-rlib.rs
 // aux-build:link-cfg-works-transitive-dylib.rs
 
diff --git a/src/test/run-pass/link-section.rs b/src/test/ui/link-section.rs
index 1c2d3eaaa3b..6958eeda697 100644
--- a/src/test/run-pass/link-section.rs
+++ b/src/test/ui/link-section.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_upper_case_globals)]
 #[cfg(not(target_os = "macos"))]
 #[link_section=".moretext"]
diff --git a/src/test/run-pass/linkage1.rs b/src/test/ui/linkage1.rs
index da07385ead7..bda4da53dbc 100644
--- a/src/test/run-pass/linkage1.rs
+++ b/src/test/ui/linkage1.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-windows
 // ignore-macos
 // ignore-emscripten doesn't support this linkage
diff --git a/src/test/run-pass/lint-cap.rs b/src/test/ui/lint-cap.rs
index f03bb691892..461b923ccd4 100644
--- a/src/test/run-pass/lint-cap.rs
+++ b/src/test/ui/lint-cap.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: --cap-lints allow
 
 #![deny(warnings)]
diff --git a/src/test/run-pass/lint-dead-code-associated-type.rs b/src/test/ui/lint-dead-code-associated-type.rs
index 576ba6d170c..1cf66e75a95 100644
--- a/src/test/run-pass/lint-dead-code-associated-type.rs
+++ b/src/test/ui/lint-dead-code-associated-type.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![deny(dead_code)]
 
 trait Foo {
diff --git a/src/test/run-pass/lint-dead-code-variant.rs b/src/test/ui/lint-dead-code-variant.rs
index 3838b83e45f..91c97232eed 100644
--- a/src/test/run-pass/lint-dead-code-variant.rs
+++ b/src/test/ui/lint-dead-code-variant.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![deny(dead_code)]
 
 enum Foo {
diff --git a/src/test/run-pass/lint-expr-stmt-attrs-for-early-lints.rs b/src/test/ui/lint-expr-stmt-attrs-for-early-lints.rs
index 9ca3ecc72d2..07a32904a5e 100644
--- a/src/test/run-pass/lint-expr-stmt-attrs-for-early-lints.rs
+++ b/src/test/ui/lint-expr-stmt-attrs-for-early-lints.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(stmt_expr_attributes)]
 #![deny(unused_parens)]
 
diff --git a/src/test/run-pass/lint-unknown-lints-at-crate-level.rs b/src/test/ui/lint-unknown-lints-at-crate-level.rs
index fe2fbeabac6..61d27f1eff1 100644
--- a/src/test/run-pass/lint-unknown-lints-at-crate-level.rs
+++ b/src/test/ui/lint-unknown-lints-at-crate-level.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -D warnings -D unknown-lints
 
 #![allow(unknown_lints)]
diff --git a/src/test/run-pass/list.rs b/src/test/ui/list.rs
index 62c04bcac75..2ac5733b419 100644
--- a/src/test/run-pass/list.rs
+++ b/src/test/ui/list.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/liveness-assign-imm-local-after-ret.rs b/src/test/ui/liveness-assign-imm-local-after-ret.rs
index 3dc27dde52b..b463f4368d1 100644
--- a/src/test/run-pass/liveness-assign-imm-local-after-ret.rs
+++ b/src/test/ui/liveness-assign-imm-local-after-ret.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unreachable_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/llvm-pr32379.rs b/src/test/ui/llvm-pr32379.rs
index a18a5386d81..8a1f03241b1 100644
--- a/src/test/run-pass/llvm-pr32379.rs
+++ b/src/test/ui/llvm-pr32379.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:llvm_pr32379.rs
 
 // LLVM PR #32379 (https://bugs.llvm.org/show_bug.cgi?id=32379), which
diff --git a/src/test/run-pass/log-err-phi.rs b/src/test/ui/log-err-phi.rs
index fd12ffe36f8..c0e04d2c973 100644
--- a/src/test/run-pass/log-err-phi.rs
+++ b/src/test/ui/log-err-phi.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     if false {
         println!("{}", "foobar");
diff --git a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs b/src/test/ui/log-knows-the-names-of-variants-in-std.rs
index 3f4d1c701bf..c5a40edbeef 100644
--- a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs
+++ b/src/test/ui/log-knows-the-names-of-variants-in-std.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 #[derive(Clone, Debug)]
diff --git a/src/test/run-pass/log-knows-the-names-of-variants.rs b/src/test/ui/log-knows-the-names-of-variants.rs
index a16ff802376..cf2876b6eee 100644
--- a/src/test/run-pass/log-knows-the-names-of-variants.rs
+++ b/src/test/ui/log-knows-the-names-of-variants.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 #[derive(Debug)]
diff --git a/src/test/run-pass/log-poly.rs b/src/test/ui/log-poly.rs
index 32dbb95a723..14e1b40e168 100644
--- a/src/test/run-pass/log-poly.rs
+++ b/src/test/ui/log-poly.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #[derive(Debug)]
 enum Numbers {
     Three
diff --git a/src/test/run-pass/logging-only-prints-once.rs b/src/test/ui/logging-only-prints-once.rs
index 1a4c4d89e7d..6b49c441d1e 100644
--- a/src/test/run-pass/logging-only-prints-once.rs
+++ b/src/test/ui/logging-only-prints-once.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-windows
 // ignore-emscripten no threads support
 // exec-env:RUSTC_LOG=debug
diff --git a/src/test/run-pass/logging_before_rt_started.rs b/src/test/ui/logging_before_rt_started.rs
index 69cfc54c465..540d2b4f58a 100644
--- a/src/test/run-pass/logging_before_rt_started.rs
+++ b/src/test/ui/logging_before_rt_started.rs
@@ -1,3 +1,4 @@
+// run-pass
 // exec-env:RUSTC_LOG=std::ptr
 
 // In issue #9487, it was realized that std::ptr was invoking the logging
diff --git a/src/test/run-pass/long-while.rs b/src/test/ui/long-while.rs
index 4a3ee6f9713..529cca7b731 100644
--- a/src/test/run-pass/long-while.rs
+++ b/src/test/ui/long-while.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/lto-many-codegen-units.rs b/src/test/ui/lto-many-codegen-units.rs
index 17c345beb84..f0f461ffec8 100644
--- a/src/test/run-pass/lto-many-codegen-units.rs
+++ b/src/test/ui/lto-many-codegen-units.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -C lto -C codegen-units=8
 // no-prefer-dynamic
 
diff --git a/src/test/run-pass/lto-still-runs-thread-dtors.rs b/src/test/ui/lto-still-runs-thread-dtors.rs
index 732681af037..635ad783b31 100644
--- a/src/test/run-pass/lto-still-runs-thread-dtors.rs
+++ b/src/test/ui/lto-still-runs-thread-dtors.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -C lto
 // no-prefer-dynamic
 // ignore-emscripten no threads support
diff --git a/src/test/run-pass/lub-glb-with-unbound-infer-var.rs b/src/test/ui/lub-glb-with-unbound-infer-var.rs
index 7e430d26b26..c9e117089f5 100644
--- a/src/test/run-pass/lub-glb-with-unbound-infer-var.rs
+++ b/src/test/ui/lub-glb-with-unbound-infer-var.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test for a specific corner case: when we compute the LUB of two fn
 // types and their parameters have unbound variables. In that case, we
 // wind up relating those two variables. This was causing an ICE in an
diff --git a/src/test/run-pass/macro-quote-cond.rs b/src/test/ui/macro-quote-cond.rs
index 4d6bcf501ee..569451e4259 100644
--- a/src/test/run-pass/macro-quote-cond.rs
+++ b/src/test/ui/macro-quote-cond.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_parens)]
 // aux-build:cond_plugin.rs
 
diff --git a/src/test/run-pass/macro-quote-test.rs b/src/test/ui/macro-quote-test.rs
index d00e8edf28b..7815b8e6df1 100644
--- a/src/test/run-pass/macro-quote-test.rs
+++ b/src/test/ui/macro-quote-test.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that a macro can emit delimiters with nothing inside - `()`, `{}`
 
 // aux-build:hello_macro.rs
diff --git a/src/test/run-pass/macros/assert-eq-macro-success.rs b/src/test/ui/macros/assert-eq-macro-success.rs
index 57858b34837..57858b34837 100644
--- a/src/test/run-pass/macros/assert-eq-macro-success.rs
+++ b/src/test/ui/macros/assert-eq-macro-success.rs
diff --git a/src/test/run-pass/macros/assert-eq-macro-unsized.rs b/src/test/ui/macros/assert-eq-macro-unsized.rs
index 00823216bf6..00823216bf6 100644
--- a/src/test/run-pass/macros/assert-eq-macro-unsized.rs
+++ b/src/test/ui/macros/assert-eq-macro-unsized.rs
diff --git a/src/test/run-pass/macros/assert-ne-macro-success.rs b/src/test/ui/macros/assert-ne-macro-success.rs
index 89b3a4c9d6a..89b3a4c9d6a 100644
--- a/src/test/run-pass/macros/assert-ne-macro-success.rs
+++ b/src/test/ui/macros/assert-ne-macro-success.rs
diff --git a/src/test/run-pass/macros/assert-ne-macro-unsized.rs b/src/test/ui/macros/assert-ne-macro-unsized.rs
index e8a86e3da06..e8a86e3da06 100644
--- a/src/test/run-pass/macros/assert-ne-macro-unsized.rs
+++ b/src/test/ui/macros/assert-ne-macro-unsized.rs
diff --git a/src/test/run-pass/macros/auxiliary/macro-comma-support.rs b/src/test/ui/macros/auxiliary/macro-comma-support.rs
index 6a452c185a8..6a452c185a8 100644
--- a/src/test/run-pass/macros/auxiliary/macro-comma-support.rs
+++ b/src/test/ui/macros/auxiliary/macro-comma-support.rs
diff --git a/src/test/run-pass/macros/auxiliary/macro-include-items-expr.rs b/src/test/ui/macros/auxiliary/macro-include-items-expr.rs
index 7394f194b80..7394f194b80 100644
--- a/src/test/run-pass/macros/auxiliary/macro-include-items-expr.rs
+++ b/src/test/ui/macros/auxiliary/macro-include-items-expr.rs
diff --git a/src/test/run-pass/macros/auxiliary/macro-include-items-item.rs b/src/test/ui/macros/auxiliary/macro-include-items-item.rs
index 7d54745e03b..7d54745e03b 100644
--- a/src/test/run-pass/macros/auxiliary/macro-include-items-item.rs
+++ b/src/test/ui/macros/auxiliary/macro-include-items-item.rs
diff --git a/src/test/run-pass/macros/auxiliary/macro_crate_def_only.rs b/src/test/ui/macros/auxiliary/macro_crate_def_only.rs
index c267eefde02..c267eefde02 100644
--- a/src/test/run-pass/macros/auxiliary/macro_crate_def_only.rs
+++ b/src/test/ui/macros/auxiliary/macro_crate_def_only.rs
diff --git a/src/test/run-pass/macros/auxiliary/macro_export_inner_module.rs b/src/test/ui/macros/auxiliary/macro_export_inner_module.rs
index d71af9ee6f2..d71af9ee6f2 100644
--- a/src/test/run-pass/macros/auxiliary/macro_export_inner_module.rs
+++ b/src/test/ui/macros/auxiliary/macro_export_inner_module.rs
diff --git a/src/test/run-pass/macros/auxiliary/macro_with_super_1.rs b/src/test/ui/macros/auxiliary/macro_with_super_1.rs
index b015500df06..b015500df06 100644
--- a/src/test/run-pass/macros/auxiliary/macro_with_super_1.rs
+++ b/src/test/ui/macros/auxiliary/macro_with_super_1.rs
diff --git a/src/test/run-pass/macros/auxiliary/two_macros.rs b/src/test/ui/macros/auxiliary/two_macros-rpass.rs
index 441a978dd69..441a978dd69 100644
--- a/src/test/run-pass/macros/auxiliary/two_macros.rs
+++ b/src/test/ui/macros/auxiliary/two_macros-rpass.rs
diff --git a/src/test/run-pass/macros/auxiliary/use-macro-self.rs b/src/test/ui/macros/auxiliary/use-macro-self.rs
index f1307411a7f..f1307411a7f 100644
--- a/src/test/run-pass/macros/auxiliary/use-macro-self.rs
+++ b/src/test/ui/macros/auxiliary/use-macro-self.rs
diff --git a/src/test/run-pass/macros/colorful-write-macros.rs b/src/test/ui/macros/colorful-write-macros.rs
index eb1872cc7f0..eb1872cc7f0 100644
--- a/src/test/run-pass/macros/colorful-write-macros.rs
+++ b/src/test/ui/macros/colorful-write-macros.rs
diff --git a/src/test/run-pass/macros/conditional-debug-macro-on.rs b/src/test/ui/macros/conditional-debug-macro-on.rs
index 8665da89758..8665da89758 100644
--- a/src/test/run-pass/macros/conditional-debug-macro-on.rs
+++ b/src/test/ui/macros/conditional-debug-macro-on.rs
diff --git a/src/test/run-pass/macros/die-macro.rs b/src/test/ui/macros/die-macro.rs
index 2a726efe822..2a726efe822 100644
--- a/src/test/run-pass/macros/die-macro.rs
+++ b/src/test/ui/macros/die-macro.rs
diff --git a/src/test/run-pass/macros/issue-25274.rs b/src/test/ui/macros/issue-25274.rs
index e81b2c7a723..65b29bba8c8 100644
--- a/src/test/run-pass/macros/issue-25274.rs
+++ b/src/test/ui/macros/issue-25274.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 macro_rules! test {
     (
         fn fun() -> Option<Box<$t:ty>>;
diff --git a/src/test/run-pass/macros/log_syntax-trace_macros-macro-locations.rs b/src/test/ui/macros/log_syntax-trace_macros-macro-locations.rs
index 2d78ae6f908..2d78ae6f908 100644
--- a/src/test/run-pass/macros/log_syntax-trace_macros-macro-locations.rs
+++ b/src/test/ui/macros/log_syntax-trace_macros-macro-locations.rs
diff --git a/src/test/run-pass/macros/log_syntax-trace_macros-macro-locations.stdout b/src/test/ui/macros/log_syntax-trace_macros-macro-locations.stdout
index b28b04f6431..b28b04f6431 100644
--- a/src/test/run-pass/macros/log_syntax-trace_macros-macro-locations.stdout
+++ b/src/test/ui/macros/log_syntax-trace_macros-macro-locations.stdout
diff --git a/src/test/run-pass/macros/macro-2.rs b/src/test/ui/macros/macro-2.rs
index 4890c991dcd..4890c991dcd 100644
--- a/src/test/run-pass/macros/macro-2.rs
+++ b/src/test/ui/macros/macro-2.rs
diff --git a/src/test/run-pass/macros/macro-as-fn-body.rs b/src/test/ui/macros/macro-as-fn-body.rs
index 6781c9a9ed4..6781c9a9ed4 100644
--- a/src/test/run-pass/macros/macro-as-fn-body.rs
+++ b/src/test/ui/macros/macro-as-fn-body.rs
diff --git a/src/test/run-pass/macros/macro-at-most-once-rep-2015.rs b/src/test/ui/macros/macro-at-most-once-rep-2015-rpass.rs
index 66597c0acf6..66597c0acf6 100644
--- a/src/test/run-pass/macros/macro-at-most-once-rep-2015.rs
+++ b/src/test/ui/macros/macro-at-most-once-rep-2015-rpass.rs
diff --git a/src/test/run-pass/macros/macro-at-most-once-rep-2018.rs b/src/test/ui/macros/macro-at-most-once-rep-2018-rpass.rs
index b37f3853016..b37f3853016 100644
--- a/src/test/run-pass/macros/macro-at-most-once-rep-2018.rs
+++ b/src/test/ui/macros/macro-at-most-once-rep-2018-rpass.rs
diff --git a/src/test/run-pass/macros/macro-attribute-expansion.rs b/src/test/ui/macros/macro-attribute-expansion.rs
index f01e5c44a67..f01e5c44a67 100644
--- a/src/test/run-pass/macros/macro-attribute-expansion.rs
+++ b/src/test/ui/macros/macro-attribute-expansion.rs
diff --git a/src/test/run-pass/macros/macro-attributes.rs b/src/test/ui/macros/macro-attributes.rs
index d382e8b7197..d382e8b7197 100644
--- a/src/test/run-pass/macros/macro-attributes.rs
+++ b/src/test/ui/macros/macro-attributes.rs
diff --git a/src/test/run-pass/macros/macro-block-nonterminal.rs b/src/test/ui/macros/macro-block-nonterminal.rs
index a6c9dd6e187..a6c9dd6e187 100644
--- a/src/test/run-pass/macros/macro-block-nonterminal.rs
+++ b/src/test/ui/macros/macro-block-nonterminal.rs
diff --git a/src/test/run-pass/macros/macro-comma-behavior.rs b/src/test/ui/macros/macro-comma-behavior-rpass.rs
index 9f1a31d1ae2..9f1a31d1ae2 100644
--- a/src/test/run-pass/macros/macro-comma-behavior.rs
+++ b/src/test/ui/macros/macro-comma-behavior-rpass.rs
diff --git a/src/test/run-pass/macros/macro-comma-support.rs b/src/test/ui/macros/macro-comma-support-rpass.rs
index 12a612c153a..12a612c153a 100644
--- a/src/test/run-pass/macros/macro-comma-support.rs
+++ b/src/test/ui/macros/macro-comma-support-rpass.rs
diff --git a/src/test/run-pass/macros/macro-crate-def-only.rs b/src/test/ui/macros/macro-crate-def-only.rs
index 514b33e3897..514b33e3897 100644
--- a/src/test/run-pass/macros/macro-crate-def-only.rs
+++ b/src/test/ui/macros/macro-crate-def-only.rs
diff --git a/src/test/run-pass/macros/macro-crate-nonterminal-renamed.rs b/src/test/ui/macros/macro-crate-nonterminal-renamed.rs
index 87bd397f065..87bd397f065 100644
--- a/src/test/run-pass/macros/macro-crate-nonterminal-renamed.rs
+++ b/src/test/ui/macros/macro-crate-nonterminal-renamed.rs
diff --git a/src/test/run-pass/macros/macro-crate-nonterminal.rs b/src/test/ui/macros/macro-crate-nonterminal.rs
index 4b1056fc725..4b1056fc725 100644
--- a/src/test/run-pass/macros/macro-crate-nonterminal.rs
+++ b/src/test/ui/macros/macro-crate-nonterminal.rs
diff --git a/src/test/run-pass/macros/macro-crate-use.rs b/src/test/ui/macros/macro-crate-use.rs
index 5c37cac9686..5c37cac9686 100644
--- a/src/test/run-pass/macros/macro-crate-use.rs
+++ b/src/test/ui/macros/macro-crate-use.rs
diff --git a/src/test/run-pass/macros/macro-deep_expansion.rs b/src/test/ui/macros/macro-deep_expansion.rs
index e13d8e1fc84..e13d8e1fc84 100644
--- a/src/test/run-pass/macros/macro-deep_expansion.rs
+++ b/src/test/ui/macros/macro-deep_expansion.rs
diff --git a/src/test/run-pass/macros/macro-delimiter-significance.rs b/src/test/ui/macros/macro-delimiter-significance.rs
index 89f222b0530..89f222b0530 100644
--- a/src/test/run-pass/macros/macro-delimiter-significance.rs
+++ b/src/test/ui/macros/macro-delimiter-significance.rs
diff --git a/src/test/run-pass/macros/macro-doc-comments.rs b/src/test/ui/macros/macro-doc-comments.rs
index fcc64cc0670..fcc64cc0670 100644
--- a/src/test/run-pass/macros/macro-doc-comments.rs
+++ b/src/test/ui/macros/macro-doc-comments.rs
diff --git a/src/test/run-pass/macros/macro-doc-escapes.rs b/src/test/ui/macros/macro-doc-escapes.rs
index ff5a5793b20..ff5a5793b20 100644
--- a/src/test/run-pass/macros/macro-doc-escapes.rs
+++ b/src/test/ui/macros/macro-doc-escapes.rs
diff --git a/src/test/run-pass/macros/macro-doc-raw-str-hashes.rs b/src/test/ui/macros/macro-doc-raw-str-hashes.rs
index a003bff3c04..a003bff3c04 100644
--- a/src/test/run-pass/macros/macro-doc-raw-str-hashes.rs
+++ b/src/test/ui/macros/macro-doc-raw-str-hashes.rs
diff --git a/src/test/run-pass/macros/macro-export-inner-module.rs b/src/test/ui/macros/macro-export-inner-module.rs
index 1f23e90b65c..1f23e90b65c 100644
--- a/src/test/run-pass/macros/macro-export-inner-module.rs
+++ b/src/test/ui/macros/macro-export-inner-module.rs
diff --git a/src/test/run-pass/macros/macro-first-set.rs b/src/test/ui/macros/macro-first-set.rs
index a21e4cd201a..a21e4cd201a 100644
--- a/src/test/run-pass/macros/macro-first-set.rs
+++ b/src/test/ui/macros/macro-first-set.rs
diff --git a/src/test/run-pass/macros/macro-follow.rs b/src/test/ui/macros/macro-follow-rpass.rs
index ca93655631f..ca93655631f 100644
--- a/src/test/run-pass/macros/macro-follow.rs
+++ b/src/test/ui/macros/macro-follow-rpass.rs
diff --git a/src/test/run-pass/macros/macro-followed-by-seq.rs b/src/test/ui/macros/macro-followed-by-seq.rs
index 71d59d8d31b..71d59d8d31b 100644
--- a/src/test/run-pass/macros/macro-followed-by-seq.rs
+++ b/src/test/ui/macros/macro-followed-by-seq.rs
diff --git a/src/test/run-pass/macros/macro-include-items.rs b/src/test/ui/macros/macro-include-items.rs
index 332bf59c944..332bf59c944 100644
--- a/src/test/run-pass/macros/macro-include-items.rs
+++ b/src/test/ui/macros/macro-include-items.rs
diff --git a/src/test/run-pass/macros/macro-interpolation.rs b/src/test/ui/macros/macro-interpolation.rs
index abe1f2aaf15..abe1f2aaf15 100644
--- a/src/test/run-pass/macros/macro-interpolation.rs
+++ b/src/test/ui/macros/macro-interpolation.rs
diff --git a/src/test/run-pass/macros/macro-invocation-in-count-expr-fixed-array-type.rs b/src/test/ui/macros/macro-invocation-in-count-expr-fixed-array-type.rs
index 8f9dcb94794..8f9dcb94794 100644
--- a/src/test/run-pass/macros/macro-invocation-in-count-expr-fixed-array-type.rs
+++ b/src/test/ui/macros/macro-invocation-in-count-expr-fixed-array-type.rs
diff --git a/src/test/run-pass/macros/macro-lifetime-used-with-bound.rs b/src/test/ui/macros/macro-lifetime-used-with-bound.rs
index ea3f74c9ada..ea3f74c9ada 100644
--- a/src/test/run-pass/macros/macro-lifetime-used-with-bound.rs
+++ b/src/test/ui/macros/macro-lifetime-used-with-bound.rs
diff --git a/src/test/run-pass/macros/macro-lifetime-used-with-labels.rs b/src/test/ui/macros/macro-lifetime-used-with-labels.rs
index 4c4bccbc12b..4c4bccbc12b 100644
--- a/src/test/run-pass/macros/macro-lifetime-used-with-labels.rs
+++ b/src/test/ui/macros/macro-lifetime-used-with-labels.rs
diff --git a/src/test/run-pass/macros/macro-lifetime-used-with-labels.stderr b/src/test/ui/macros/macro-lifetime-used-with-labels.stderr
index 05418d9bddf..05418d9bddf 100644
--- a/src/test/run-pass/macros/macro-lifetime-used-with-labels.stderr
+++ b/src/test/ui/macros/macro-lifetime-used-with-labels.stderr
diff --git a/src/test/run-pass/macros/macro-lifetime-used-with-static.rs b/src/test/ui/macros/macro-lifetime-used-with-static.rs
index 8552c4b8163..8552c4b8163 100644
--- a/src/test/run-pass/macros/macro-lifetime-used-with-static.rs
+++ b/src/test/ui/macros/macro-lifetime-used-with-static.rs
diff --git a/src/test/run-pass/macros/macro-lifetime.rs b/src/test/ui/macros/macro-lifetime.rs
index 5931fe00907..5931fe00907 100644
--- a/src/test/run-pass/macros/macro-lifetime.rs
+++ b/src/test/ui/macros/macro-lifetime.rs
diff --git a/src/test/run-pass/macros/macro-literal.rs b/src/test/ui/macros/macro-literal.rs
index e08d0a67b43..e08d0a67b43 100644
--- a/src/test/run-pass/macros/macro-literal.rs
+++ b/src/test/ui/macros/macro-literal.rs
diff --git a/src/test/run-pass/macros/macro-meta-items.rs b/src/test/ui/macros/macro-meta-items.rs
index 4cbc252aebf..4cbc252aebf 100644
--- a/src/test/run-pass/macros/macro-meta-items.rs
+++ b/src/test/ui/macros/macro-meta-items.rs
diff --git a/src/test/run-pass/macros/macro-method-issue-4621.rs b/src/test/ui/macros/macro-method-issue-4621.rs
index 342fad5f62e..342fad5f62e 100644
--- a/src/test/run-pass/macros/macro-method-issue-4621.rs
+++ b/src/test/ui/macros/macro-method-issue-4621.rs
diff --git a/src/test/run-pass/macros/macro-multiple-items.rs b/src/test/ui/macros/macro-multiple-items.rs
index 3b6dfd9bc5e..3b6dfd9bc5e 100644
--- a/src/test/run-pass/macros/macro-multiple-items.rs
+++ b/src/test/ui/macros/macro-multiple-items.rs
diff --git a/src/test/run-pass/macros/macro-named-default.rs b/src/test/ui/macros/macro-named-default.rs
index 9b6cd191640..9b6cd191640 100644
--- a/src/test/run-pass/macros/macro-named-default.rs
+++ b/src/test/ui/macros/macro-named-default.rs
diff --git a/src/test/run-pass/macros/macro-nested_definition_issue-31946.rs b/src/test/ui/macros/macro-nested_definition_issue-31946.rs
index a83c5b2e44f..a83c5b2e44f 100644
--- a/src/test/run-pass/macros/macro-nested_definition_issue-31946.rs
+++ b/src/test/ui/macros/macro-nested_definition_issue-31946.rs
diff --git a/src/test/run-pass/macros/macro-nested_expr.rs b/src/test/ui/macros/macro-nested_expr.rs
index f1433cbf4f9..f1433cbf4f9 100644
--- a/src/test/run-pass/macros/macro-nested_expr.rs
+++ b/src/test/ui/macros/macro-nested_expr.rs
diff --git a/src/test/run-pass/macros/macro-nested_stmt_macros.rs b/src/test/ui/macros/macro-nested_stmt_macros.rs
index 5d4758a0c7b..5d4758a0c7b 100644
--- a/src/test/run-pass/macros/macro-nested_stmt_macros.rs
+++ b/src/test/ui/macros/macro-nested_stmt_macros.rs
diff --git a/src/test/run-pass/macros/macro-nt-list.rs b/src/test/ui/macros/macro-nt-list.rs
index 36aa74f0825..36aa74f0825 100644
--- a/src/test/run-pass/macros/macro-nt-list.rs
+++ b/src/test/ui/macros/macro-nt-list.rs
diff --git a/src/test/run-pass/macros/macro-of-higher-order.rs b/src/test/ui/macros/macro-of-higher-order.rs
index ec551d6cdbc..ec551d6cdbc 100644
--- a/src/test/run-pass/macros/macro-of-higher-order.rs
+++ b/src/test/ui/macros/macro-of-higher-order.rs
diff --git a/src/test/run-pass/macros/macro-pat-follow.rs b/src/test/ui/macros/macro-pat-follow.rs
index 8673cf79467..8673cf79467 100644
--- a/src/test/run-pass/macros/macro-pat-follow.rs
+++ b/src/test/ui/macros/macro-pat-follow.rs
diff --git a/src/test/run-pass/macros/macro-pat-neg-lit.rs b/src/test/ui/macros/macro-pat-neg-lit.rs
index 79c68fd2541..79c68fd2541 100644
--- a/src/test/run-pass/macros/macro-pat-neg-lit.rs
+++ b/src/test/ui/macros/macro-pat-neg-lit.rs
diff --git a/src/test/run-pass/macros/macro-pat.rs b/src/test/ui/macros/macro-pat.rs
index baf816e53ea..baf816e53ea 100644
--- a/src/test/run-pass/macros/macro-pat.rs
+++ b/src/test/ui/macros/macro-pat.rs
diff --git a/src/test/run-pass/macros/macro-path.rs b/src/test/ui/macros/macro-path.rs
index be59d8d139b..be59d8d139b 100644
--- a/src/test/run-pass/macros/macro-path.rs
+++ b/src/test/ui/macros/macro-path.rs
diff --git a/src/test/run-pass/macros/macro-pub-matcher.rs b/src/test/ui/macros/macro-pub-matcher.rs
index c02e6794edb..c02e6794edb 100644
--- a/src/test/run-pass/macros/macro-pub-matcher.rs
+++ b/src/test/ui/macros/macro-pub-matcher.rs
diff --git a/src/test/run-pass/macros/macro-seq-followed-by-seq.rs b/src/test/ui/macros/macro-seq-followed-by-seq.rs
index 8f0f4fd4a0d..8f0f4fd4a0d 100644
--- a/src/test/run-pass/macros/macro-seq-followed-by-seq.rs
+++ b/src/test/ui/macros/macro-seq-followed-by-seq.rs
diff --git a/src/test/run-pass/macros/macro-stability.rs b/src/test/ui/macros/macro-stability-rpass.rs
index 817bddf6956..817bddf6956 100644
--- a/src/test/run-pass/macros/macro-stability.rs
+++ b/src/test/ui/macros/macro-stability-rpass.rs
diff --git a/src/test/run-pass/macros/macro-stmt.rs b/src/test/ui/macros/macro-stmt.rs
index c9a0b879a0f..c9a0b879a0f 100644
--- a/src/test/run-pass/macros/macro-stmt.rs
+++ b/src/test/ui/macros/macro-stmt.rs
diff --git a/src/test/run-pass/macros/macro-stmt_macro_in_expr_macro.rs b/src/test/ui/macros/macro-stmt_macro_in_expr_macro.rs
index 528d0b28bf6..528d0b28bf6 100644
--- a/src/test/run-pass/macros/macro-stmt_macro_in_expr_macro.rs
+++ b/src/test/ui/macros/macro-stmt_macro_in_expr_macro.rs
diff --git a/src/test/run-pass/macros/macro-tt-followed-by-seq.rs b/src/test/ui/macros/macro-tt-followed-by-seq.rs
index 90131ebd920..90131ebd920 100644
--- a/src/test/run-pass/macros/macro-tt-followed-by-seq.rs
+++ b/src/test/ui/macros/macro-tt-followed-by-seq.rs
diff --git a/src/test/run-pass/macros/macro-use-all-and-none.rs b/src/test/ui/macros/macro-use-all-and-none.rs
index 5fdcda0f78a..e5f67d458d2 100644
--- a/src/test/run-pass/macros/macro-use-all-and-none.rs
+++ b/src/test/ui/macros/macro-use-all-and-none.rs
@@ -1,9 +1,11 @@
 // run-pass
-// aux-build:two_macros.rs
+// aux-build:two_macros-rpass.rs
+
+#![warn(unused_attributes)]
 
 #[macro_use]
 #[macro_use()]
-extern crate two_macros;
+extern crate two_macros_rpass;
 
 pub fn main() {
     macro_one!();
diff --git a/src/test/ui/macros/macro-use-all-and-none.stderr b/src/test/ui/macros/macro-use-all-and-none.stderr
new file mode 100644
index 00000000000..e7de7e7ad08
--- /dev/null
+++ b/src/test/ui/macros/macro-use-all-and-none.stderr
@@ -0,0 +1,12 @@
+warning: unused attribute
+  --> $DIR/macro-use-all-and-none.rs:7:1
+   |
+LL | #[macro_use()]
+   | ^^^^^^^^^^^^^^
+   |
+note: lint level defined here
+  --> $DIR/macro-use-all-and-none.rs:4:9
+   |
+LL | #![warn(unused_attributes)]
+   |         ^^^^^^^^^^^^^^^^^
+
diff --git a/src/test/run-pass/macros/macro-use-all.rs b/src/test/ui/macros/macro-use-all.rs
index 48c7b77e579..48c7b77e579 100644
--- a/src/test/run-pass/macros/macro-use-all.rs
+++ b/src/test/ui/macros/macro-use-all.rs
diff --git a/src/test/run-pass/macros/macro-use-both.rs b/src/test/ui/macros/macro-use-both.rs
index ed5d1312f96..ed5d1312f96 100644
--- a/src/test/run-pass/macros/macro-use-both.rs
+++ b/src/test/ui/macros/macro-use-both.rs
diff --git a/src/test/run-pass/macros/macro-use-one.rs b/src/test/ui/macros/macro-use-one.rs
index f74795e68dc..f74795e68dc 100644
--- a/src/test/run-pass/macros/macro-use-one.rs
+++ b/src/test/ui/macros/macro-use-one.rs
diff --git a/src/test/run-pass/macros/macro-with-attrs1.rs b/src/test/ui/macros/macro-with-attrs1.rs
index 4e943b224cd..4e943b224cd 100644
--- a/src/test/run-pass/macros/macro-with-attrs1.rs
+++ b/src/test/ui/macros/macro-with-attrs1.rs
diff --git a/src/test/run-pass/macros/macro-with-attrs2.rs b/src/test/ui/macros/macro-with-attrs2.rs
index 78c40810207..78c40810207 100644
--- a/src/test/run-pass/macros/macro-with-attrs2.rs
+++ b/src/test/ui/macros/macro-with-attrs2.rs
diff --git a/src/test/run-pass/macros/macro-with-braces-in-expr-position.rs b/src/test/ui/macros/macro-with-braces-in-expr-position.rs
index f7d87434ded..f7d87434ded 100644
--- a/src/test/run-pass/macros/macro-with-braces-in-expr-position.rs
+++ b/src/test/ui/macros/macro-with-braces-in-expr-position.rs
diff --git a/src/test/run-pass/macros/macro_with_super_2.rs b/src/test/ui/macros/macro_with_super_2.rs
index 2901a74f612..2901a74f612 100644
--- a/src/test/run-pass/macros/macro_with_super_2.rs
+++ b/src/test/ui/macros/macro_with_super_2.rs
diff --git a/src/test/run-pass/macros/macros-in-extern.rs b/src/test/ui/macros/macros-in-extern-rpass.rs
index 28abef5cf4e..28abef5cf4e 100644
--- a/src/test/run-pass/macros/macros-in-extern.rs
+++ b/src/test/ui/macros/macros-in-extern-rpass.rs
diff --git a/src/test/run-pass/macros/meta-variable-misuse.rs b/src/test/ui/macros/meta-variable-misuse.rs
index 99a2f940176..99a2f940176 100644
--- a/src/test/run-pass/macros/meta-variable-misuse.rs
+++ b/src/test/ui/macros/meta-variable-misuse.rs
diff --git a/src/test/run-pass/macros/parse-complex-macro-invoc-op.rs b/src/test/ui/macros/parse-complex-macro-invoc-op.rs
index 8fef9b0ed87..8fef9b0ed87 100644
--- a/src/test/run-pass/macros/parse-complex-macro-invoc-op.rs
+++ b/src/test/ui/macros/parse-complex-macro-invoc-op.rs
diff --git a/src/test/run-pass/macros/paths-in-macro-invocations.rs b/src/test/ui/macros/paths-in-macro-invocations.rs
index 4f745b85c2f..622818a926f 100644
--- a/src/test/run-pass/macros/paths-in-macro-invocations.rs
+++ b/src/test/ui/macros/paths-in-macro-invocations.rs
@@ -1,8 +1,8 @@
 // run-pass
 #![allow(dead_code)]
-// aux-build:two_macros.rs
+// aux-build:two_macros-rpass.rs
 
-extern crate two_macros;
+extern crate two_macros_rpass as two_macros;
 
 ::two_macros::macro_one!();
 two_macros::macro_one!();
diff --git a/src/test/run-pass/macros/pub-item-inside-macro.rs b/src/test/ui/macros/pub-item-inside-macro.rs
index d07681453a2..d07681453a2 100644
--- a/src/test/run-pass/macros/pub-item-inside-macro.rs
+++ b/src/test/ui/macros/pub-item-inside-macro.rs
diff --git a/src/test/run-pass/macros/pub-method-inside-macro.rs b/src/test/ui/macros/pub-method-inside-macro.rs
index bc918c7a4dc..bc918c7a4dc 100644
--- a/src/test/run-pass/macros/pub-method-inside-macro.rs
+++ b/src/test/ui/macros/pub-method-inside-macro.rs
diff --git a/src/test/run-pass/macros/semi-after-macro-ty.rs b/src/test/ui/macros/semi-after-macro-ty.rs
index f83ace8fada..f83ace8fada 100644
--- a/src/test/run-pass/macros/semi-after-macro-ty.rs
+++ b/src/test/ui/macros/semi-after-macro-ty.rs
diff --git a/src/test/run-pass/macros/stmt_expr_attr_macro_parse.rs b/src/test/ui/macros/stmt_expr_attr_macro_parse.rs
index 3ab50db0ea1..3ab50db0ea1 100644
--- a/src/test/run-pass/macros/stmt_expr_attr_macro_parse.rs
+++ b/src/test/ui/macros/stmt_expr_attr_macro_parse.rs
diff --git a/src/test/run-pass/macros/syntax-extension-cfg.rs b/src/test/ui/macros/syntax-extension-cfg.rs
index 2e929fc1dfa..2e929fc1dfa 100644
--- a/src/test/run-pass/macros/syntax-extension-cfg.rs
+++ b/src/test/ui/macros/syntax-extension-cfg.rs
diff --git a/src/test/run-pass/macros/syntax-extension-source-utils-files/includeme.fragment b/src/test/ui/macros/syntax-extension-source-utils-files/includeme.fragment
index d752015a4dc..d752015a4dc 100644
--- a/src/test/run-pass/macros/syntax-extension-source-utils-files/includeme.fragment
+++ b/src/test/ui/macros/syntax-extension-source-utils-files/includeme.fragment
diff --git a/src/test/run-pass/macros/syntax-extension-source-utils.rs b/src/test/ui/macros/syntax-extension-source-utils.rs
index 7e46260d516..7e46260d516 100644
--- a/src/test/run-pass/macros/syntax-extension-source-utils.rs
+++ b/src/test/ui/macros/syntax-extension-source-utils.rs
diff --git a/src/test/run-pass/macros/try-macro.rs b/src/test/ui/macros/try-macro.rs
index 83b30a8b7ba..83b30a8b7ba 100644
--- a/src/test/run-pass/macros/try-macro.rs
+++ b/src/test/ui/macros/try-macro.rs
diff --git a/src/test/run-pass/macros/two-macro-use.rs b/src/test/ui/macros/two-macro-use.rs
index 07022bb01e3..07022bb01e3 100644
--- a/src/test/run-pass/macros/two-macro-use.rs
+++ b/src/test/ui/macros/two-macro-use.rs
diff --git a/src/test/run-pass/macros/type-macros-hlist.rs b/src/test/ui/macros/type-macros-hlist.rs
index 77d866cea9c..77d866cea9c 100644
--- a/src/test/run-pass/macros/type-macros-hlist.rs
+++ b/src/test/ui/macros/type-macros-hlist.rs
diff --git a/src/test/run-pass/macros/type-macros-simple.rs b/src/test/ui/macros/type-macros-simple.rs
index dd3ad2ef0ac..dd3ad2ef0ac 100644
--- a/src/test/run-pass/macros/type-macros-simple.rs
+++ b/src/test/ui/macros/type-macros-simple.rs
diff --git a/src/test/run-pass/macros/typeck-macro-interaction-issue-8852.rs b/src/test/ui/macros/typeck-macro-interaction-issue-8852.rs
index f2b089b74b5..f2b089b74b5 100644
--- a/src/test/run-pass/macros/typeck-macro-interaction-issue-8852.rs
+++ b/src/test/ui/macros/typeck-macro-interaction-issue-8852.rs
diff --git a/src/test/run-pass/macros/use-macro-self.rs b/src/test/ui/macros/use-macro-self.rs
index 06464ab0bc9..06464ab0bc9 100644
--- a/src/test/run-pass/macros/use-macro-self.rs
+++ b/src/test/ui/macros/use-macro-self.rs
diff --git a/src/test/run-pass/max-min-classes.rs b/src/test/ui/max-min-classes.rs
index 9ae5bae19e5..f9a39e486da 100644
--- a/src/test/run-pass/max-min-classes.rs
+++ b/src/test/ui/max-min-classes.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_snake_case)]
 trait Product {
     fn product(&self) -> isize;
diff --git a/src/test/run-pass/methods/auxiliary/method_self_arg1.rs b/src/test/ui/methods/auxiliary/method_self_arg1.rs
index 8258fdd9ab9..8258fdd9ab9 100644
--- a/src/test/run-pass/methods/auxiliary/method_self_arg1.rs
+++ b/src/test/ui/methods/auxiliary/method_self_arg1.rs
diff --git a/src/test/run-pass/methods/auxiliary/method_self_arg2.rs b/src/test/ui/methods/auxiliary/method_self_arg2.rs
index 94a4a016c3e..94a4a016c3e 100644
--- a/src/test/run-pass/methods/auxiliary/method_self_arg2.rs
+++ b/src/test/ui/methods/auxiliary/method_self_arg2.rs
diff --git a/src/test/run-pass/methods/method-argument-inference-associated-type.rs b/src/test/ui/methods/method-argument-inference-associated-type.rs
index acd4a8465b0..acd4a8465b0 100644
--- a/src/test/run-pass/methods/method-argument-inference-associated-type.rs
+++ b/src/test/ui/methods/method-argument-inference-associated-type.rs
diff --git a/src/test/run-pass/methods/method-early-bound-lifetimes-on-self.rs b/src/test/ui/methods/method-early-bound-lifetimes-on-self.rs
index f2ace32c6b6..f2ace32c6b6 100644
--- a/src/test/run-pass/methods/method-early-bound-lifetimes-on-self.rs
+++ b/src/test/ui/methods/method-early-bound-lifetimes-on-self.rs
diff --git a/src/test/run-pass/methods/method-mut-self-modifies-mut-slice-lvalue.rs b/src/test/ui/methods/method-mut-self-modifies-mut-slice-lvalue.rs
index daff037b27b..daff037b27b 100644
--- a/src/test/run-pass/methods/method-mut-self-modifies-mut-slice-lvalue.rs
+++ b/src/test/ui/methods/method-mut-self-modifies-mut-slice-lvalue.rs
diff --git a/src/test/run-pass/methods/method-normalize-bounds-issue-20604.rs b/src/test/ui/methods/method-normalize-bounds-issue-20604.rs
index 9c0b952849e..9c0b952849e 100644
--- a/src/test/run-pass/methods/method-normalize-bounds-issue-20604.rs
+++ b/src/test/ui/methods/method-normalize-bounds-issue-20604.rs
diff --git a/src/test/run-pass/methods/method-probe-no-guessing-dyn-trait.rs b/src/test/ui/methods/method-probe-no-guessing-dyn-trait.rs
index 8c8165a1004..af362efe15c 100644
--- a/src/test/run-pass/methods/method-probe-no-guessing-dyn-trait.rs
+++ b/src/test/ui/methods/method-probe-no-guessing-dyn-trait.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Check that method matching does not make "guesses" depending on
 // Deref impls that don't eventually end up being picked.
 
diff --git a/src/test/run-pass/methods/method-projection.rs b/src/test/ui/methods/method-projection.rs
index cf33d53968b..cf33d53968b 100644
--- a/src/test/run-pass/methods/method-projection.rs
+++ b/src/test/ui/methods/method-projection.rs
diff --git a/src/test/run-pass/methods/method-recursive-blanket-impl.rs b/src/test/ui/methods/method-recursive-blanket-impl.rs
index a2db75b4e85..a2db75b4e85 100644
--- a/src/test/run-pass/methods/method-recursive-blanket-impl.rs
+++ b/src/test/ui/methods/method-recursive-blanket-impl.rs
diff --git a/src/test/run-pass/methods/method-self-arg-aux1.rs b/src/test/ui/methods/method-self-arg-aux1.rs
index 9e38ff7de34..9e38ff7de34 100644
--- a/src/test/run-pass/methods/method-self-arg-aux1.rs
+++ b/src/test/ui/methods/method-self-arg-aux1.rs
diff --git a/src/test/run-pass/methods/method-self-arg-aux2.rs b/src/test/ui/methods/method-self-arg-aux2.rs
index 8e70399d047..8e70399d047 100644
--- a/src/test/run-pass/methods/method-self-arg-aux2.rs
+++ b/src/test/ui/methods/method-self-arg-aux2.rs
diff --git a/src/test/run-pass/methods/method-self-arg-trait.rs b/src/test/ui/methods/method-self-arg-trait.rs
index 227b1eab25d..227b1eab25d 100644
--- a/src/test/run-pass/methods/method-self-arg-trait.rs
+++ b/src/test/ui/methods/method-self-arg-trait.rs
diff --git a/src/test/run-pass/methods/method-self-arg.rs b/src/test/ui/methods/method-self-arg.rs
index 2d25b0dbad1..2d25b0dbad1 100644
--- a/src/test/run-pass/methods/method-self-arg.rs
+++ b/src/test/ui/methods/method-self-arg.rs
diff --git a/src/test/run-pass/methods/method-two-trait-defer-resolution-1.rs b/src/test/ui/methods/method-two-trait-defer-resolution-1.rs
index b768620cd3a..b768620cd3a 100644
--- a/src/test/run-pass/methods/method-two-trait-defer-resolution-1.rs
+++ b/src/test/ui/methods/method-two-trait-defer-resolution-1.rs
diff --git a/src/test/run-pass/methods/method-two-trait-defer-resolution-2.rs b/src/test/ui/methods/method-two-trait-defer-resolution-2.rs
index 8af3dcf5c3d..8af3dcf5c3d 100644
--- a/src/test/run-pass/methods/method-two-trait-defer-resolution-2.rs
+++ b/src/test/ui/methods/method-two-trait-defer-resolution-2.rs
diff --git a/src/test/run-pass/methods/method-two-traits-distinguished-via-where-clause.rs b/src/test/ui/methods/method-two-traits-distinguished-via-where-clause.rs
index d820d2ad08a..d820d2ad08a 100644
--- a/src/test/run-pass/methods/method-two-traits-distinguished-via-where-clause.rs
+++ b/src/test/ui/methods/method-two-traits-distinguished-via-where-clause.rs
diff --git a/src/test/run-pass/methods/method-where-clause.rs b/src/test/ui/methods/method-where-clause.rs
index 01692abf9b6..01692abf9b6 100644
--- a/src/test/run-pass/methods/method-where-clause.rs
+++ b/src/test/ui/methods/method-where-clause.rs
diff --git a/src/test/run-pass/mid-path-type-params.rs b/src/test/ui/mid-path-type-params.rs
index e8ed0424e4a..a8128207c80 100644
--- a/src/test/run-pass/mid-path-type-params.rs
+++ b/src/test/ui/mid-path-type-params.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/minmax-stability-issue-23687.rs b/src/test/ui/minmax-stability-issue-23687.rs
index d043a99688a..9100bfbde95 100644
--- a/src/test/run-pass/minmax-stability-issue-23687.rs
+++ b/src/test/ui/minmax-stability-issue-23687.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::fmt::Debug;
 use std::cmp::{self, PartialOrd, Ordering};
 
diff --git a/src/test/run-pass/mir/auxiliary/mir_external_refs.rs b/src/test/ui/mir/auxiliary/mir_external_refs.rs
index 9fd58f1d714..9fd58f1d714 100644
--- a/src/test/run-pass/mir/auxiliary/mir_external_refs.rs
+++ b/src/test/ui/mir/auxiliary/mir_external_refs.rs
diff --git a/src/test/run-pass/mir/mir-inlining/ice-issue-45493.rs b/src/test/ui/mir/mir-inlining/ice-issue-45493.rs
index 1bd16dc43e1..1bd16dc43e1 100644
--- a/src/test/run-pass/mir/mir-inlining/ice-issue-45493.rs
+++ b/src/test/ui/mir/mir-inlining/ice-issue-45493.rs
diff --git a/src/test/run-pass/mir/mir-inlining/ice-issue-45885.rs b/src/test/ui/mir/mir-inlining/ice-issue-45885.rs
index e930a4d1ccd..e930a4d1ccd 100644
--- a/src/test/run-pass/mir/mir-inlining/ice-issue-45885.rs
+++ b/src/test/ui/mir/mir-inlining/ice-issue-45885.rs
diff --git a/src/test/run-pass/mir/mir-inlining/no-trait-method-issue-40473.rs b/src/test/ui/mir/mir-inlining/no-trait-method-issue-40473.rs
index 8f570dbd4ad..8f570dbd4ad 100644
--- a/src/test/run-pass/mir/mir-inlining/no-trait-method-issue-40473.rs
+++ b/src/test/ui/mir/mir-inlining/no-trait-method-issue-40473.rs
diff --git a/src/test/run-pass/mir/mir-typeck-normalize-fn-sig.rs b/src/test/ui/mir/mir-typeck-normalize-fn-sig.rs
index bdd9321afd7..bdd9321afd7 100644
--- a/src/test/run-pass/mir/mir-typeck-normalize-fn-sig.rs
+++ b/src/test/ui/mir/mir-typeck-normalize-fn-sig.rs
diff --git a/src/test/run-pass/mir/mir_adt_construction.rs b/src/test/ui/mir/mir_adt_construction.rs
index 9fb5896de6b..9fb5896de6b 100644
--- a/src/test/run-pass/mir/mir_adt_construction.rs
+++ b/src/test/ui/mir/mir_adt_construction.rs
diff --git a/src/test/run-pass/mir/mir_ascription_coercion.rs b/src/test/ui/mir/mir_ascription_coercion.rs
index 0ebd20e97d7..0ebd20e97d7 100644
--- a/src/test/run-pass/mir/mir_ascription_coercion.rs
+++ b/src/test/ui/mir/mir_ascription_coercion.rs
diff --git a/src/test/run-pass/mir/mir_augmented_assignments.rs b/src/test/ui/mir/mir_augmented_assignments.rs
index 44454f8f417..44454f8f417 100644
--- a/src/test/run-pass/mir/mir_augmented_assignments.rs
+++ b/src/test/ui/mir/mir_augmented_assignments.rs
diff --git a/src/test/run-pass/mir/mir_autoderef.rs b/src/test/ui/mir/mir_autoderef.rs
index a0e615a7387..a0e615a7387 100644
--- a/src/test/run-pass/mir/mir_autoderef.rs
+++ b/src/test/ui/mir/mir_autoderef.rs
diff --git a/src/test/run-pass/mir/mir_boxing.rs b/src/test/ui/mir/mir_boxing.rs
index 83e1cfb640a..83e1cfb640a 100644
--- a/src/test/run-pass/mir/mir_boxing.rs
+++ b/src/test/ui/mir/mir_boxing.rs
diff --git a/src/test/run-pass/mir/mir_build_match_comparisons.rs b/src/test/ui/mir/mir_build_match_comparisons.rs
index 04570055763..04570055763 100644
--- a/src/test/run-pass/mir/mir_build_match_comparisons.rs
+++ b/src/test/ui/mir/mir_build_match_comparisons.rs
diff --git a/src/test/run-pass/mir/mir_call_with_associated_type.rs b/src/test/ui/mir/mir_call_with_associated_type.rs
index 7103533e1da..7103533e1da 100644
--- a/src/test/run-pass/mir/mir_call_with_associated_type.rs
+++ b/src/test/ui/mir/mir_call_with_associated_type.rs
diff --git a/src/test/run-pass/mir/mir_calls_to_shims.rs b/src/test/ui/mir/mir_calls_to_shims.rs
index 6f13d5612ce..6f13d5612ce 100644
--- a/src/test/run-pass/mir/mir_calls_to_shims.rs
+++ b/src/test/ui/mir/mir_calls_to_shims.rs
diff --git a/src/test/run-pass/mir/mir_cast_fn_ret.rs b/src/test/ui/mir/mir_cast_fn_ret.rs
index 69fd64c1c09..69fd64c1c09 100644
--- a/src/test/run-pass/mir/mir_cast_fn_ret.rs
+++ b/src/test/ui/mir/mir_cast_fn_ret.rs
diff --git a/src/test/run-pass/mir/mir_codegen_array.rs b/src/test/ui/mir/mir_codegen_array.rs
index 38e443d8e39..38e443d8e39 100644
--- a/src/test/run-pass/mir/mir_codegen_array.rs
+++ b/src/test/ui/mir/mir_codegen_array.rs
diff --git a/src/test/run-pass/mir/mir_codegen_array_2.rs b/src/test/ui/mir/mir_codegen_array_2.rs
index 03d3aa5ade6..03d3aa5ade6 100644
--- a/src/test/run-pass/mir/mir_codegen_array_2.rs
+++ b/src/test/ui/mir/mir_codegen_array_2.rs
diff --git a/src/test/run-pass/mir/mir_codegen_call_converging.rs b/src/test/ui/mir/mir_codegen_call_converging.rs
index 9c340e4e036..9c340e4e036 100644
--- a/src/test/run-pass/mir/mir_codegen_call_converging.rs
+++ b/src/test/ui/mir/mir_codegen_call_converging.rs
diff --git a/src/test/run-pass/mir/mir_codegen_calls.rs b/src/test/ui/mir/mir_codegen_calls.rs
index fc0db03e3a9..fc0db03e3a9 100644
--- a/src/test/run-pass/mir/mir_codegen_calls.rs
+++ b/src/test/ui/mir/mir_codegen_calls.rs
diff --git a/src/test/run-pass/mir/mir_codegen_calls_variadic.rs b/src/test/ui/mir/mir_codegen_calls_variadic.rs
index dc9fee03b77..dc9fee03b77 100644
--- a/src/test/run-pass/mir/mir_codegen_calls_variadic.rs
+++ b/src/test/ui/mir/mir_codegen_calls_variadic.rs
diff --git a/src/test/run-pass/mir/mir_codegen_critical_edge.rs b/src/test/ui/mir/mir_codegen_critical_edge.rs
index 5c1f1c3b701..5c1f1c3b701 100644
--- a/src/test/run-pass/mir/mir_codegen_critical_edge.rs
+++ b/src/test/ui/mir/mir_codegen_critical_edge.rs
diff --git a/src/test/run-pass/mir/mir_codegen_spike1.rs b/src/test/ui/mir/mir_codegen_spike1.rs
index 90bdd6b4bd7..90bdd6b4bd7 100644
--- a/src/test/run-pass/mir/mir_codegen_spike1.rs
+++ b/src/test/ui/mir/mir_codegen_spike1.rs
diff --git a/src/test/run-pass/mir/mir_codegen_switch.rs b/src/test/ui/mir/mir_codegen_switch.rs
index d2589ae4ad2..d2589ae4ad2 100644
--- a/src/test/run-pass/mir/mir_codegen_switch.rs
+++ b/src/test/ui/mir/mir_codegen_switch.rs
diff --git a/src/test/run-pass/mir/mir_codegen_switchint.rs b/src/test/ui/mir/mir_codegen_switchint.rs
index c092a6c31b2..c092a6c31b2 100644
--- a/src/test/run-pass/mir/mir_codegen_switchint.rs
+++ b/src/test/ui/mir/mir_codegen_switchint.rs
diff --git a/src/test/run-pass/mir/mir_coercion_casts.rs b/src/test/ui/mir/mir_coercion_casts.rs
index 7d761181d80..7d761181d80 100644
--- a/src/test/run-pass/mir/mir_coercion_casts.rs
+++ b/src/test/ui/mir/mir_coercion_casts.rs
diff --git a/src/test/run-pass/mir/mir_coercions.rs b/src/test/ui/mir/mir_coercions.rs
index f3dcc6b85fd..f3dcc6b85fd 100644
--- a/src/test/run-pass/mir/mir_coercions.rs
+++ b/src/test/ui/mir/mir_coercions.rs
diff --git a/src/test/run-pass/mir/mir_constval_adts.rs b/src/test/ui/mir/mir_constval_adts.rs
index ee9d73451f4..ee9d73451f4 100644
--- a/src/test/run-pass/mir/mir_constval_adts.rs
+++ b/src/test/ui/mir/mir_constval_adts.rs
diff --git a/src/test/run-pass/mir/mir_drop_order.rs b/src/test/ui/mir/mir_drop_order.rs
index 2949437b1e4..2949437b1e4 100644
--- a/src/test/run-pass/mir/mir_drop_order.rs
+++ b/src/test/ui/mir/mir_drop_order.rs
diff --git a/src/test/run-pass/mir/mir_early_return_scope.rs b/src/test/ui/mir/mir_early_return_scope.rs
index a696471c361..a696471c361 100644
--- a/src/test/run-pass/mir/mir_early_return_scope.rs
+++ b/src/test/ui/mir/mir_early_return_scope.rs
diff --git a/src/test/run-pass/mir/mir_fat_ptr.rs b/src/test/ui/mir/mir_fat_ptr.rs
index fb34de62f31..fb34de62f31 100644
--- a/src/test/run-pass/mir/mir_fat_ptr.rs
+++ b/src/test/ui/mir/mir_fat_ptr.rs
diff --git a/src/test/run-pass/mir/mir_fat_ptr_drop.rs b/src/test/ui/mir/mir_fat_ptr_drop.rs
index d865c3499b2..d865c3499b2 100644
--- a/src/test/run-pass/mir/mir_fat_ptr_drop.rs
+++ b/src/test/ui/mir/mir_fat_ptr_drop.rs
diff --git a/src/test/run-pass/mir/mir_heavy_promoted.rs b/src/test/ui/mir/mir_heavy_promoted.rs
index 092299880e2..092299880e2 100644
--- a/src/test/run-pass/mir/mir_heavy_promoted.rs
+++ b/src/test/ui/mir/mir_heavy_promoted.rs
diff --git a/src/test/run-pass/mir/mir_match_arm_guard.rs b/src/test/ui/mir/mir_match_arm_guard.rs
index 65e4ed041bb..65e4ed041bb 100644
--- a/src/test/run-pass/mir/mir_match_arm_guard.rs
+++ b/src/test/ui/mir/mir_match_arm_guard.rs
diff --git a/src/test/run-pass/mir/mir_match_test.rs b/src/test/ui/mir/mir_match_test.rs
index 1f96d6737e0..1f96d6737e0 100644
--- a/src/test/run-pass/mir/mir_match_test.rs
+++ b/src/test/ui/mir/mir_match_test.rs
diff --git a/src/test/run-pass/mir/mir_misc_casts.rs b/src/test/ui/mir/mir_misc_casts.rs
index 2e7fbeee5da..2e7fbeee5da 100644
--- a/src/test/run-pass/mir/mir_misc_casts.rs
+++ b/src/test/ui/mir/mir_misc_casts.rs
diff --git a/src/test/run-pass/mir/mir_overflow_off.rs b/src/test/ui/mir/mir_overflow_off.rs
index 922ec36e531..922ec36e531 100644
--- a/src/test/run-pass/mir/mir_overflow_off.rs
+++ b/src/test/ui/mir/mir_overflow_off.rs
diff --git a/src/test/run-pass/mir/mir_raw_fat_ptr.rs b/src/test/ui/mir/mir_raw_fat_ptr.rs
index 6583852aa9b..6583852aa9b 100644
--- a/src/test/run-pass/mir/mir_raw_fat_ptr.rs
+++ b/src/test/ui/mir/mir_raw_fat_ptr.rs
diff --git a/src/test/run-pass/mir/mir_refs_correct.rs b/src/test/ui/mir/mir_refs_correct.rs
index 729db2d25f5..729db2d25f5 100644
--- a/src/test/run-pass/mir/mir_refs_correct.rs
+++ b/src/test/ui/mir/mir_refs_correct.rs
diff --git a/src/test/run-pass/mir/mir_small_agg_arg.rs b/src/test/ui/mir/mir_small_agg_arg.rs
index 5a22a0420c5..5a22a0420c5 100644
--- a/src/test/run-pass/mir/mir_small_agg_arg.rs
+++ b/src/test/ui/mir/mir_small_agg_arg.rs
diff --git a/src/test/run-pass/mir/mir_static_subtype.rs b/src/test/ui/mir/mir_static_subtype.rs
index 5b1ccd7ddf6..d471b8f149d 100644
--- a/src/test/run-pass/mir/mir_static_subtype.rs
+++ b/src/test/ui/mir/mir_static_subtype.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that subtyping the body of a static doesn't cause an ICE.
 
 fn foo(_ : &()) {}
diff --git a/src/test/run-pass/mir/mir_struct_with_assoc_ty.rs b/src/test/ui/mir/mir_struct_with_assoc_ty.rs
index 26d026bdfdd..26d026bdfdd 100644
--- a/src/test/run-pass/mir/mir_struct_with_assoc_ty.rs
+++ b/src/test/ui/mir/mir_struct_with_assoc_ty.rs
diff --git a/src/test/run-pass/mir/mir_temp_promotions.rs b/src/test/ui/mir/mir_temp_promotions.rs
index 845dc4c0444..845dc4c0444 100644
--- a/src/test/run-pass/mir/mir_temp_promotions.rs
+++ b/src/test/ui/mir/mir_temp_promotions.rs
diff --git a/src/test/run-pass/mir/mir_void_return.rs b/src/test/ui/mir/mir_void_return.rs
index d257affc268..d257affc268 100644
--- a/src/test/run-pass/mir/mir_void_return.rs
+++ b/src/test/ui/mir/mir_void_return.rs
diff --git a/src/test/run-pass/mir/mir_void_return_2.rs b/src/test/ui/mir/mir_void_return_2.rs
index a1fb0a7db17..a1fb0a7db17 100644
--- a/src/test/run-pass/mir/mir_void_return_2.rs
+++ b/src/test/ui/mir/mir_void_return_2.rs
diff --git a/src/test/run-pass/modules/auxiliary/two_macros_2.rs b/src/test/ui/modules/auxiliary/two_macros_2.rs
index 8ad2c0f1275..8ad2c0f1275 100644
--- a/src/test/run-pass/modules/auxiliary/two_macros_2.rs
+++ b/src/test/ui/modules/auxiliary/two_macros_2.rs
diff --git a/src/test/run-pass/modules/mod-inside-fn.rs b/src/test/ui/modules/mod-inside-fn.rs
index 93050c8919a..93050c8919a 100644
--- a/src/test/run-pass/modules/mod-inside-fn.rs
+++ b/src/test/ui/modules/mod-inside-fn.rs
diff --git a/src/test/run-pass/modules/mod-view-items.rs b/src/test/ui/modules/mod-view-items.rs
index db2b303668b..db2b303668b 100644
--- a/src/test/run-pass/modules/mod-view-items.rs
+++ b/src/test/ui/modules/mod-view-items.rs
diff --git a/src/test/run-pass/modules/mod_dir_implicit.rs b/src/test/ui/modules/mod_dir_implicit.rs
index d6ea6a98bda..d6ea6a98bda 100644
--- a/src/test/run-pass/modules/mod_dir_implicit.rs
+++ b/src/test/ui/modules/mod_dir_implicit.rs
diff --git a/src/test/run-pass/modules/mod_dir_implicit_aux/compiletest-ignore-dir b/src/test/ui/modules/mod_dir_implicit_aux/compiletest-ignore-dir
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/run-pass/modules/mod_dir_implicit_aux/compiletest-ignore-dir
+++ b/src/test/ui/modules/mod_dir_implicit_aux/compiletest-ignore-dir
diff --git a/src/test/run-pass/modules/mod_dir_implicit_aux/mod.rs b/src/test/ui/modules/mod_dir_implicit_aux/mod.rs
index 4f1eb85e4cc..4f1eb85e4cc 100644
--- a/src/test/run-pass/modules/mod_dir_implicit_aux/mod.rs
+++ b/src/test/ui/modules/mod_dir_implicit_aux/mod.rs
diff --git a/src/test/run-pass/modules/mod_dir_path.rs b/src/test/ui/modules/mod_dir_path.rs
index 70f592d0c0e..70f592d0c0e 100644
--- a/src/test/run-pass/modules/mod_dir_path.rs
+++ b/src/test/ui/modules/mod_dir_path.rs
diff --git a/src/test/run-pass/modules/mod_dir_path2.rs b/src/test/ui/modules/mod_dir_path2.rs
index c3e3e1d639e..c3e3e1d639e 100644
--- a/src/test/run-pass/modules/mod_dir_path2.rs
+++ b/src/test/ui/modules/mod_dir_path2.rs
diff --git a/src/test/run-pass/modules/mod_dir_path3.rs b/src/test/ui/modules/mod_dir_path3.rs
index fed70c1bc98..fed70c1bc98 100644
--- a/src/test/run-pass/modules/mod_dir_path3.rs
+++ b/src/test/ui/modules/mod_dir_path3.rs
diff --git a/src/test/run-pass/modules/mod_dir_path_multi.rs b/src/test/ui/modules/mod_dir_path_multi.rs
index 2b805141a63..2b805141a63 100644
--- a/src/test/run-pass/modules/mod_dir_path_multi.rs
+++ b/src/test/ui/modules/mod_dir_path_multi.rs
diff --git a/src/test/run-pass/modules/mod_dir_recursive.rs b/src/test/ui/modules/mod_dir_recursive.rs
index b109d13d164..b109d13d164 100644
--- a/src/test/run-pass/modules/mod_dir_recursive.rs
+++ b/src/test/ui/modules/mod_dir_recursive.rs
diff --git a/src/test/run-pass/modules/mod_dir_simple.rs b/src/test/ui/modules/mod_dir_simple.rs
index 1d92c968a8f..1d92c968a8f 100644
--- a/src/test/run-pass/modules/mod_dir_simple.rs
+++ b/src/test/ui/modules/mod_dir_simple.rs
diff --git a/src/test/run-pass/modules/mod_dir_simple/compiletest-ignore-dir b/src/test/ui/modules/mod_dir_simple/compiletest-ignore-dir
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/run-pass/modules/mod_dir_simple/compiletest-ignore-dir
+++ b/src/test/ui/modules/mod_dir_simple/compiletest-ignore-dir
diff --git a/src/test/run-pass/modules/mod_dir_simple/load_another_mod.rs b/src/test/ui/modules/mod_dir_simple/load_another_mod.rs
index f96b546aa2f..f96b546aa2f 100644
--- a/src/test/run-pass/modules/mod_dir_simple/load_another_mod.rs
+++ b/src/test/ui/modules/mod_dir_simple/load_another_mod.rs
diff --git a/src/test/run-pass/modules/mod_dir_simple/test.rs b/src/test/ui/modules/mod_dir_simple/test.rs
index 4f1eb85e4cc..4f1eb85e4cc 100644
--- a/src/test/run-pass/modules/mod_dir_simple/test.rs
+++ b/src/test/ui/modules/mod_dir_simple/test.rs
diff --git a/src/test/run-pass/modules/mod_file.rs b/src/test/ui/modules/mod_file.rs
index 0ca52889e5c..0ca52889e5c 100644
--- a/src/test/run-pass/modules/mod_file.rs
+++ b/src/test/ui/modules/mod_file.rs
diff --git a/src/test/run-pass/modules/mod_file_aux.rs b/src/test/ui/modules/mod_file_aux.rs
index 6d052272eb3..6d052272eb3 100644
--- a/src/test/run-pass/modules/mod_file_aux.rs
+++ b/src/test/ui/modules/mod_file_aux.rs
diff --git a/src/test/run-pass/modules/mod_file_with_path_attr.rs b/src/test/ui/modules/mod_file_with_path_attr.rs
index 48e253eadae..48e253eadae 100644
--- a/src/test/run-pass/modules/mod_file_with_path_attr.rs
+++ b/src/test/ui/modules/mod_file_with_path_attr.rs
diff --git a/src/test/run-pass/modules/module-polymorphism3-files/compiletest-ignore-dir b/src/test/ui/modules/module-polymorphism3-files/compiletest-ignore-dir
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/run-pass/modules/module-polymorphism3-files/compiletest-ignore-dir
+++ b/src/test/ui/modules/module-polymorphism3-files/compiletest-ignore-dir
diff --git a/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_f32.rs b/src/test/ui/modules/module-polymorphism3-files/float-template/inst_f32.rs
index ae9811ac024..49d2b3d4b85 100644
--- a/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_f32.rs
+++ b/src/test/ui/modules/module-polymorphism3-files/float-template/inst_f32.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub type T = f32;
diff --git a/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_f64.rs b/src/test/ui/modules/module-polymorphism3-files/float-template/inst_f64.rs
index df276449c4f..e2aad480e3d 100644
--- a/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_f64.rs
+++ b/src/test/ui/modules/module-polymorphism3-files/float-template/inst_f64.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub type T = f64;
diff --git a/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_float.rs b/src/test/ui/modules/module-polymorphism3-files/float-template/inst_float.rs
index 7a0d84f3a51..5828718cddc 100644
--- a/src/test/run-pass/modules/module-polymorphism3-files/float-template/inst_float.rs
+++ b/src/test/ui/modules/module-polymorphism3-files/float-template/inst_float.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub type T = float;
diff --git a/src/test/run-pass/monad.rs b/src/test/ui/monad.rs
index f0781c2920d..5d0612cf8dc 100644
--- a/src/test/run-pass/monad.rs
+++ b/src/test/ui/monad.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 
 
diff --git a/src/test/run-pass/monomorphize-abi-alignment.rs b/src/test/ui/monomorphize-abi-alignment.rs
index a26f324f7dc..637b09fc04e 100644
--- a/src/test/run-pass/monomorphize-abi-alignment.rs
+++ b/src/test/ui/monomorphize-abi-alignment.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_upper_case_globals)]
 /*!
  * On x86_64-linux-gnu and possibly other platforms, structs get 8-byte "preferred" alignment,
diff --git a/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs b/src/test/ui/monomorphized-callees-with-ty-params-3314.rs
index ec7ff2d8a51..bc314a39d8e 100644
--- a/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs
+++ b/src/test/ui/monomorphized-callees-with-ty-params-3314.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 trait Serializer {
diff --git a/src/test/run-pass/moves/move-1-unique.rs b/src/test/ui/moves/move-1-unique.rs
index 48baead074a..48baead074a 100644
--- a/src/test/run-pass/moves/move-1-unique.rs
+++ b/src/test/ui/moves/move-1-unique.rs
diff --git a/src/test/run-pass/moves/move-2-unique.rs b/src/test/ui/moves/move-2-unique.rs
index 910a88c102f..910a88c102f 100644
--- a/src/test/run-pass/moves/move-2-unique.rs
+++ b/src/test/ui/moves/move-2-unique.rs
diff --git a/src/test/run-pass/moves/move-2.rs b/src/test/ui/moves/move-2.rs
index 4ad53e96e50..4ad53e96e50 100644
--- a/src/test/run-pass/moves/move-2.rs
+++ b/src/test/ui/moves/move-2.rs
diff --git a/src/test/run-pass/moves/move-3-unique.rs b/src/test/ui/moves/move-3-unique.rs
index 55b10e057d8..55b10e057d8 100644
--- a/src/test/run-pass/moves/move-3-unique.rs
+++ b/src/test/ui/moves/move-3-unique.rs
diff --git a/src/test/run-pass/moves/move-4-unique.rs b/src/test/ui/moves/move-4-unique.rs
index 1787caadb7a..1787caadb7a 100644
--- a/src/test/run-pass/moves/move-4-unique.rs
+++ b/src/test/ui/moves/move-4-unique.rs
diff --git a/src/test/run-pass/moves/move-4.rs b/src/test/ui/moves/move-4.rs
index c87c605df77..c87c605df77 100644
--- a/src/test/run-pass/moves/move-4.rs
+++ b/src/test/ui/moves/move-4.rs
diff --git a/src/test/run-pass/moves/move-arg-2-unique.rs b/src/test/ui/moves/move-arg-2-unique.rs
index fcfd5e14765..fcfd5e14765 100644
--- a/src/test/run-pass/moves/move-arg-2-unique.rs
+++ b/src/test/ui/moves/move-arg-2-unique.rs
diff --git a/src/test/run-pass/moves/move-arg-2.rs b/src/test/ui/moves/move-arg-2.rs
index 4cd1f6fe810..4cd1f6fe810 100644
--- a/src/test/run-pass/moves/move-arg-2.rs
+++ b/src/test/ui/moves/move-arg-2.rs
diff --git a/src/test/run-pass/moves/move-arg.rs b/src/test/ui/moves/move-arg.rs
index 5942cd89fd9..5942cd89fd9 100644
--- a/src/test/run-pass/moves/move-arg.rs
+++ b/src/test/ui/moves/move-arg.rs
diff --git a/src/test/run-pass/moves/move-nullary-fn.rs b/src/test/ui/moves/move-nullary-fn.rs
index 14c9262c74d..14c9262c74d 100644
--- a/src/test/run-pass/moves/move-nullary-fn.rs
+++ b/src/test/ui/moves/move-nullary-fn.rs
diff --git a/src/test/run-pass/moves/move-out-of-field.rs b/src/test/ui/moves/move-out-of-field.rs
index 9f697db4f79..9f697db4f79 100644
--- a/src/test/run-pass/moves/move-out-of-field.rs
+++ b/src/test/ui/moves/move-out-of-field.rs
diff --git a/src/test/run-pass/moves/move-scalar.rs b/src/test/ui/moves/move-scalar.rs
index 98bfeb1bc05..98bfeb1bc05 100644
--- a/src/test/run-pass/moves/move-scalar.rs
+++ b/src/test/ui/moves/move-scalar.rs
diff --git a/src/test/run-pass/moves/moves-based-on-type-capture-clause.rs b/src/test/ui/moves/moves-based-on-type-capture-clause.rs
index 4a6a4ed281d..4a6a4ed281d 100644
--- a/src/test/run-pass/moves/moves-based-on-type-capture-clause.rs
+++ b/src/test/ui/moves/moves-based-on-type-capture-clause.rs
diff --git a/src/test/run-pass/mpsc_stress.rs b/src/test/ui/mpsc_stress.rs
index cf8d92b2278..bce5fdcd119 100644
--- a/src/test/run-pass/mpsc_stress.rs
+++ b/src/test/ui/mpsc_stress.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags:--test
 // ignore-emscripten
 // ignore-sgx no thread sleep support
diff --git a/src/test/run-pass/msvc-data-only.rs b/src/test/ui/msvc-data-only.rs
index ae4103e96c3..f668b0b0682 100644
--- a/src/test/run-pass/msvc-data-only.rs
+++ b/src/test/ui/msvc-data-only.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:msvc-data-only-lib.rs
 
 extern crate msvc_data_only_lib;
diff --git a/src/test/run-pass/multi-panic.rs b/src/test/ui/multi-panic.rs
index 8bc00020652..e4b41e41806 100644
--- a/src/test/run-pass/multi-panic.rs
+++ b/src/test/ui/multi-panic.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 // ignore-sgx no processes
diff --git a/src/test/run-pass/multibyte.rs b/src/test/ui/multibyte.rs
index 889f0cb75c7..7e3a577f9f2 100644
--- a/src/test/run-pass/multibyte.rs
+++ b/src/test/ui/multibyte.rs
@@ -1,3 +1,4 @@
+// run-pass
 //
 
 // Test that multibyte characters don't crash the compiler
diff --git a/src/test/run-pass/multidispatch-conditional-impl-not-considered.rs b/src/test/ui/multidispatch-conditional-impl-not-considered.rs
index 72aa9edd0f3..f845e198aa5 100644
--- a/src/test/run-pass/multidispatch-conditional-impl-not-considered.rs
+++ b/src/test/ui/multidispatch-conditional-impl-not-considered.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that we correctly ignore the blanket impl
 // because (in this case) `T` does not impl `Clone`.
 //
diff --git a/src/test/run-pass/multidispatch1.rs b/src/test/ui/multidispatch1.rs
index ac22aeac12e..f2469e1490e 100644
--- a/src/test/run-pass/multidispatch1.rs
+++ b/src/test/ui/multidispatch1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::fmt::Debug;
 
 trait MyTrait<T> {
diff --git a/src/test/run-pass/multidispatch2.rs b/src/test/ui/multidispatch2.rs
index 517f8157489..20608aabb3b 100644
--- a/src/test/run-pass/multidispatch2.rs
+++ b/src/test/ui/multidispatch2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::fmt::Debug;
 use std::default::Default;
 
diff --git a/src/test/run-pass/multiline-comment.rs b/src/test/ui/multiline-comment.rs
index 76f9284eb3e..01aaac28232 100644
--- a/src/test/run-pass/multiline-comment.rs
+++ b/src/test/ui/multiline-comment.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 /*
diff --git a/src/test/run-pass/multiple-reprs.rs b/src/test/ui/multiple-reprs.rs
index 97c5d930f73..4be503a0ef4 100644
--- a/src/test/run-pass/multiple-reprs.rs
+++ b/src/test/ui/multiple-reprs.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 use std::mem::{size_of, align_of};
diff --git a/src/test/run-pass/mut-function-arguments.rs b/src/test/ui/mut-function-arguments.rs
index 924d754b325..620d00edbbc 100644
--- a/src/test/run-pass/mut-function-arguments.rs
+++ b/src/test/ui/mut-function-arguments.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(box_syntax)]
 
 fn f(mut y: Box<isize>) {
diff --git a/src/test/run-pass/mut-vstore-expr.rs b/src/test/ui/mut-vstore-expr.rs
index d598e3b88db..75b309a4839 100644
--- a/src/test/run-pass/mut-vstore-expr.rs
+++ b/src/test/ui/mut-vstore-expr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 pub fn main() {
diff --git a/src/test/run-pass/mutual-recursion-group.rs b/src/test/ui/mutual-recursion-group.rs
index 3be87b5a490..86b0f1d840e 100644
--- a/src/test/run-pass/mutual-recursion-group.rs
+++ b/src/test/ui/mutual-recursion-group.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/native-print-no-runtime.rs b/src/test/ui/native-print-no-runtime.rs
index e4d7eb82c67..f17c9fa6ca9 100644
--- a/src/test/run-pass/native-print-no-runtime.rs
+++ b/src/test/ui/native-print-no-runtime.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(start)]
 
 #[start]
diff --git a/src/test/run-pass/negative.rs b/src/test/ui/negative.rs
index cc75d2ee86a..9601e9118aa 100644
--- a/src/test/run-pass/negative.rs
+++ b/src/test/ui/negative.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     match -5 {
       -5 => {}
diff --git a/src/test/run-pass/nested-block-comment.rs b/src/test/ui/nested-block-comment.rs
index 62d038024a2..f8dfb5fa8ca 100644
--- a/src/test/run-pass/nested-block-comment.rs
+++ b/src/test/ui/nested-block-comment.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 /* This test checks that nested comments are supported
diff --git a/src/test/run-pass/nested-class.rs b/src/test/ui/nested-class.rs
index 1b98291c375..303273618e1 100644
--- a/src/test/run-pass/nested-class.rs
+++ b/src/test/ui/nested-class.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 
 pub fn main() {
diff --git a/src/test/run-pass/nested-function-names-issue-8587.rs b/src/test/ui/nested-function-names-issue-8587.rs
index 7a6164383df..8fafd41d9bc 100644
--- a/src/test/run-pass/nested-function-names-issue-8587.rs
+++ b/src/test/ui/nested-function-names-issue-8587.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Make sure nested functions are separate, even if they have
 // equal name.
 //
diff --git a/src/test/run-pass/nested_item_main.rs b/src/test/ui/nested_item_main.rs
index 225619ad47a..2fe00aede00 100644
--- a/src/test/run-pass/nested_item_main.rs
+++ b/src/test/ui/nested_item_main.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:nested_item.rs
 
 
diff --git a/src/test/run-pass/never-result.rs b/src/test/ui/never-result.rs
index 808377ffa11..98ce326aa66 100644
--- a/src/test/run-pass/never-result.rs
+++ b/src/test/ui/never-result.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 #![allow(unreachable_code)]
 // Test that we can extract a ! through pattern matching then use it as several different types.
diff --git a/src/test/run-pass/never-type-rvalues.rs b/src/test/ui/never-type-rvalues.rs
index 2de8567924e..9ccc73dbf92 100644
--- a/src/test/run-pass/never-type-rvalues.rs
+++ b/src/test/ui/never-type-rvalues.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(never_type)]
 #![allow(dead_code)]
 #![allow(path_statements)]
diff --git a/src/test/run-pass/never_coercions.rs b/src/test/ui/never_coercions.rs
index f32e2973813..105c3863533 100644
--- a/src/test/run-pass/never_coercions.rs
+++ b/src/test/ui/never_coercions.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that having something of type ! doesn't screw up type-checking and that it coerces to the
 // LUB type of the other match arms.
 
diff --git a/src/test/run-pass/new-box-syntax.rs b/src/test/ui/new-box-syntax.rs
index a39803c2eb8..418cf554b49 100644
--- a/src/test/run-pass/new-box-syntax.rs
+++ b/src/test/ui/new-box-syntax.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 /* Any copyright is dedicated to the Public Domain.
diff --git a/src/test/run-pass/new-box.rs b/src/test/ui/new-box.rs
index 5539518c370..d11f0d045a7 100644
--- a/src/test/run-pass/new-box.rs
+++ b/src/test/ui/new-box.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(box_syntax)]
 
 fn f(x: Box<isize>) {
diff --git a/src/test/run-pass/new-impl-syntax.rs b/src/test/ui/new-impl-syntax.rs
index d02136d9309..e1f2bea9afa 100644
--- a/src/test/run-pass/new-impl-syntax.rs
+++ b/src/test/ui/new-impl-syntax.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::fmt;
 
 struct Thingy {
diff --git a/src/test/run-pass/new-import-syntax.rs b/src/test/ui/new-import-syntax.rs
index 67cf5ab2e1f..f132ed57ce9 100644
--- a/src/test/run-pass/new-import-syntax.rs
+++ b/src/test/ui/new-import-syntax.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     println!("Hello world!");
 }
diff --git a/src/test/run-pass/new-style-constants.rs b/src/test/ui/new-style-constants.rs
index 1ded0cd1c8b..82ed7b55740 100644
--- a/src/test/run-pass/new-style-constants.rs
+++ b/src/test/ui/new-style-constants.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 static FOO: isize = 3;
 
 pub fn main() {
diff --git a/src/test/run-pass/new-unicode-escapes.rs b/src/test/ui/new-unicode-escapes.rs
index 1bce71a9ed9..850b0de44b7 100644
--- a/src/test/run-pass/new-unicode-escapes.rs
+++ b/src/test/ui/new-unicode-escapes.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let s = "\u{2603}";
     assert_eq!(s, "☃");
diff --git a/src/test/run-pass/new-unsafe-pointers.rs b/src/test/ui/new-unsafe-pointers.rs
index a80ef141087..d99eb4cbd1c 100644
--- a/src/test/run-pass/new-unsafe-pointers.rs
+++ b/src/test/ui/new-unsafe-pointers.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 fn main() {
diff --git a/src/test/run-pass/newlambdas-ret-infer.rs b/src/test/ui/newlambdas-ret-infer.rs
index 79c9f7dc011..9b629838ffd 100644
--- a/src/test/run-pass/newlambdas-ret-infer.rs
+++ b/src/test/ui/newlambdas-ret-infer.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Test that the lambda kind is inferred correctly as a return
 // expression
diff --git a/src/test/run-pass/newlambdas-ret-infer2.rs b/src/test/ui/newlambdas-ret-infer2.rs
index 104f5be7767..abe31a05f22 100644
--- a/src/test/run-pass/newlambdas-ret-infer2.rs
+++ b/src/test/ui/newlambdas-ret-infer2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Test that the lambda kind is inferred correctly as a return
 // expression
diff --git a/src/test/run-pass/newlambdas.rs b/src/test/ui/newlambdas.rs
index 93199f8ccd5..90de53856c0 100644
--- a/src/test/run-pass/newlambdas.rs
+++ b/src/test/ui/newlambdas.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests for the new |args| expr lambda syntax
 
 
diff --git a/src/test/run-pass/newtype-polymorphic.rs b/src/test/ui/newtype-polymorphic.rs
index c79b76d646c..a6a725211ad 100644
--- a/src/test/run-pass/newtype-polymorphic.rs
+++ b/src/test/ui/newtype-polymorphic.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 
 
diff --git a/src/test/run-pass/newtype-temporary.rs b/src/test/ui/newtype-temporary.rs
index f8d6cde2aa8..8ee75b2fef1 100644
--- a/src/test/run-pass/newtype-temporary.rs
+++ b/src/test/ui/newtype-temporary.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #[derive(PartialEq, Debug)]
 struct Foo(usize);
 
diff --git a/src/test/run-pass/newtype.rs b/src/test/ui/newtype.rs
index 56d908ad0b7..f02b66f450f 100644
--- a/src/test/run-pass/newtype.rs
+++ b/src/test/ui/newtype.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #[derive(Copy, Clone)]
 struct mytype(Mytype);
diff --git a/src/test/run-pass/nil-decl-in-foreign.rs b/src/test/ui/nil-decl-in-foreign.rs
index faff6b48730..98422665b9c 100644
--- a/src/test/run-pass/nil-decl-in-foreign.rs
+++ b/src/test/ui/nil-decl-in-foreign.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(improper_ctypes)]
 #![allow(dead_code)]
 // Issue #901
diff --git a/src/test/run-pass/nll/issue-47153-generic-const.rs b/src/test/ui/nll/issue-47153-generic-const.rs
index 9f4d57111bb..9f4d57111bb 100644
--- a/src/test/run-pass/nll/issue-47153-generic-const.rs
+++ b/src/test/ui/nll/issue-47153-generic-const.rs
diff --git a/src/test/run-pass/nll/issue-47589.rs b/src/test/ui/nll/issue-47589.rs
index 280bf081138..280bf081138 100644
--- a/src/test/run-pass/nll/issue-47589.rs
+++ b/src/test/ui/nll/issue-47589.rs
diff --git a/src/test/run-pass/nll/issue-48623-closure.rs b/src/test/ui/nll/issue-48623-closure.rs
index 3f8587eed41..3f8587eed41 100644
--- a/src/test/run-pass/nll/issue-48623-closure.rs
+++ b/src/test/ui/nll/issue-48623-closure.rs
diff --git a/src/test/run-pass/nll/issue-48623-generator.rs b/src/test/ui/nll/issue-48623-generator.rs
index ba3eccff495..ba3eccff495 100644
--- a/src/test/run-pass/nll/issue-48623-generator.rs
+++ b/src/test/ui/nll/issue-48623-generator.rs
diff --git a/src/test/run-pass/nll/issue-50343.rs b/src/test/ui/nll/issue-50343.rs
index 55a2d231e19..55a2d231e19 100644
--- a/src/test/run-pass/nll/issue-50343.rs
+++ b/src/test/ui/nll/issue-50343.rs
diff --git a/src/test/run-pass/nll/issue-50461-used-mut-from-moves.rs b/src/test/ui/nll/issue-50461-used-mut-from-moves.rs
index 69d7cdd83a6..69d7cdd83a6 100644
--- a/src/test/run-pass/nll/issue-50461-used-mut-from-moves.rs
+++ b/src/test/ui/nll/issue-50461-used-mut-from-moves.rs
diff --git a/src/test/run-pass/nll/issue-53123-raw-pointer-cast.rs b/src/test/ui/nll/issue-53123-raw-pointer-cast.rs
index 941c9eeb411..941c9eeb411 100644
--- a/src/test/run-pass/nll/issue-53123-raw-pointer-cast.rs
+++ b/src/test/ui/nll/issue-53123-raw-pointer-cast.rs
diff --git a/src/test/run-pass/nll/mutating_references.rs b/src/test/ui/nll/mutating_references.rs
index eb46b30b6b9..eb46b30b6b9 100644
--- a/src/test/run-pass/nll/mutating_references.rs
+++ b/src/test/ui/nll/mutating_references.rs
diff --git a/src/test/run-pass/nll/process_or_insert_default.rs b/src/test/ui/nll/process_or_insert_default.rs
index 84ac9bbd0dd..84ac9bbd0dd 100644
--- a/src/test/run-pass/nll/process_or_insert_default.rs
+++ b/src/test/ui/nll/process_or_insert_default.rs
diff --git a/src/test/run-pass/nll/rc-loop.rs b/src/test/ui/nll/rc-loop.rs
index e59303d1f78..e59303d1f78 100644
--- a/src/test/run-pass/nll/rc-loop.rs
+++ b/src/test/ui/nll/rc-loop.rs
diff --git a/src/test/run-pass/no-core-1.rs b/src/test/ui/no-core-1.rs
index 36a3050d3df..9374f546ac9 100644
--- a/src/test/run-pass/no-core-1.rs
+++ b/src/test/ui/no-core-1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 #![feature(no_core, core)]
 #![no_core]
diff --git a/src/test/run-pass/no-core-2.rs b/src/test/ui/no-core-2.rs
index e09f8f6b7a8..b08e63dc7cf 100644
--- a/src/test/run-pass/no-core-2.rs
+++ b/src/test/ui/no-core-2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code, unused_imports)]
 #![feature(no_core)]
 #![no_core]
diff --git a/src/test/run-pass/no-landing-pads.rs b/src/test/ui/no-landing-pads.rs
index 46497865826..d9d53210612 100644
--- a/src/test/run-pass/no-landing-pads.rs
+++ b/src/test/ui/no-landing-pads.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Z no-landing-pads -C codegen-units=1
 // ignore-emscripten no threads support
 
diff --git a/src/test/run-pass/no-std-1.rs b/src/test/ui/no-std-1.rs
index fecf7397c8f..5b59e9b4eb3 100644
--- a/src/test/run-pass/no-std-1.rs
+++ b/src/test/ui/no-std-1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![no_std]
 
 extern crate std;
diff --git a/src/test/run-pass/no-std-2.rs b/src/test/ui/no-std-2.rs
index 946f993ca88..487d41649f4 100644
--- a/src/test/run-pass/no-std-2.rs
+++ b/src/test/ui/no-std-2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![no_std]
 
 extern crate std;
diff --git a/src/test/run-pass/no-std-3.rs b/src/test/ui/no-std-3.rs
index f937d2593a0..f6c4ed5794c 100644
--- a/src/test/run-pass/no-std-3.rs
+++ b/src/test/ui/no-std-3.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![no_std]
 
 extern crate std;
diff --git a/src/test/run-pass/no-stdio.rs b/src/test/ui/no-stdio.rs
index aae1d0b7f81..e72b7b26e22 100644
--- a/src/test/run-pass/no-stdio.rs
+++ b/src/test/ui/no-stdio.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-android
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
diff --git a/src/test/run-pass/non-built-in-quote.rs b/src/test/ui/non-built-in-quote.rs
index 75df2788d79..92efa99e396 100644
--- a/src/test/run-pass/non-built-in-quote.rs
+++ b/src/test/ui/non-built-in-quote.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 macro_rules! quote_tokens { () => (()) }
diff --git a/src/test/run-pass/non-legacy-modes.rs b/src/test/ui/non-legacy-modes.rs
index a3abbeb8156..38c83e00a6a 100644
--- a/src/test/run-pass/non-legacy-modes.rs
+++ b/src/test/ui/non-legacy-modes.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 struct X {
     repr: isize
 }
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod.rs b/src/test/ui/non_modrs_mods/foors_mod.rs
index 1ed2e0d88df..5bf35fbf7fb 100644
--- a/src/test/run-pass/non_modrs_mods/foors_mod.rs
+++ b/src/test/ui/non_modrs_mods/foors_mod.rs
@@ -1,3 +1,4 @@
+// run-pass
 //
 // ignore-test: not a test, used by non_modrs_mods.rs
 
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/compiletest-ignore-dir b/src/test/ui/non_modrs_mods/foors_mod/compiletest-ignore-dir
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/run-pass/non_modrs_mods/foors_mod/compiletest-ignore-dir
+++ b/src/test/ui/non_modrs_mods/foors_mod/compiletest-ignore-dir
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inline/somename.rs b/src/test/ui/non_modrs_mods/foors_mod/inline/somename.rs
index b76b4321d62..04585f918fd 100644
--- a/src/test/run-pass/non_modrs_mods/foors_mod/inline/somename.rs
+++ b/src/test/ui/non_modrs_mods/foors_mod/inline/somename.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub fn foo() {}
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs b/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod.rs
index 68429e9831f..4d8eb350bd2 100644
--- a/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs
+++ b/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub mod innest;
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs b/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs
index b76b4321d62..04585f918fd 100644
--- a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs
+++ b/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub fn foo() {}
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs b/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs
index b76b4321d62..04585f918fd 100644
--- a/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs
+++ b/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub fn foo() {}
diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs b/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs
index 68429e9831f..4d8eb350bd2 100644
--- a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs
+++ b/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub mod innest;
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/compiletest-ignore-dir b/src/test/ui/non_modrs_mods/modrs_mod/compiletest-ignore-dir
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/run-pass/non_modrs_mods/modrs_mod/compiletest-ignore-dir
+++ b/src/test/ui/non_modrs_mods/modrs_mod/compiletest-ignore-dir
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inline/somename.rs b/src/test/ui/non_modrs_mods/modrs_mod/inline/somename.rs
index b76b4321d62..04585f918fd 100644
--- a/src/test/run-pass/non_modrs_mods/modrs_mod/inline/somename.rs
+++ b/src/test/ui/non_modrs_mods/modrs_mod/inline/somename.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub fn foo() {}
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs b/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod.rs
index 68429e9831f..4d8eb350bd2 100644
--- a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs
+++ b/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub mod innest;
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs b/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs
index b76b4321d62..04585f918fd 100644
--- a/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs
+++ b/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub fn foo() {}
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs b/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs
index b76b4321d62..04585f918fd 100644
--- a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs
+++ b/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub fn foo() {}
diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs b/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs
index 68429e9831f..4d8eb350bd2 100644
--- a/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs
+++ b/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub mod innest;
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/mod.rs b/src/test/ui/non_modrs_mods/modrs_mod/mod.rs
index 46add00996b..c8efa66d665 100644
--- a/src/test/run-pass/non_modrs_mods/modrs_mod/mod.rs
+++ b/src/test/ui/non_modrs_mods/modrs_mod/mod.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub mod inner_modrs_mod;
 pub mod inner_foors_mod;
 pub mod inline {
diff --git a/src/test/run-pass/non_modrs_mods/non_modrs_mods.rs b/src/test/ui/non_modrs_mods/non_modrs_mods.rs
index f664b0166d8..f664b0166d8 100644
--- a/src/test/run-pass/non_modrs_mods/non_modrs_mods.rs
+++ b/src/test/ui/non_modrs_mods/non_modrs_mods.rs
diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs
index 97441eb5e57..7d5d5b9e5ca 100644
--- a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs
+++ b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub mod inner_modrs_mod;
diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir
+++ b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir
diff --git a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs
new file mode 100644
index 00000000000..04585f918fd
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs
@@ -0,0 +1,3 @@
+// run-pass
+
+pub fn foo() {}
diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs
index 68429e9831f..4d8eb350bd2 100644
--- a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs
+++ b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs
@@ -1 +1,3 @@
+// run-pass
+
 pub mod innest;
diff --git a/src/test/run-pass/nul-characters.rs b/src/test/ui/nul-characters.rs
index d93219d83d2..11b6e9fe376 100644
--- a/src/test/run-pass/nul-characters.rs
+++ b/src/test/ui/nul-characters.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main()
 {
     let all_nuls1 = "\0\x00\u{0}\u{0}";
diff --git a/src/test/run-pass/nullable-pointer-ffi-compat.rs b/src/test/ui/nullable-pointer-ffi-compat.rs
index 0487052799a..0647a18c3c4 100644
--- a/src/test/run-pass/nullable-pointer-ffi-compat.rs
+++ b/src/test/ui/nullable-pointer-ffi-compat.rs
@@ -1,3 +1,4 @@
+// run-pass
 // #11303, #11040:
 // This would previously crash on i686 Linux due to abi differences
 // between returning an Option<T> and T, where T is a non nullable
diff --git a/src/test/run-pass/nullable-pointer-iotareduction.rs b/src/test/ui/nullable-pointer-iotareduction.rs
index 42aad550c1a..4c6964f294b 100644
--- a/src/test/run-pass/nullable-pointer-iotareduction.rs
+++ b/src/test/ui/nullable-pointer-iotareduction.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(box_syntax)]
 
 // Iota-reduction is a rule in the Calculus of (Co-)Inductive Constructions,
diff --git a/src/test/run-pass/nullable-pointer-size.rs b/src/test/ui/nullable-pointer-size.rs
index efd5cea6a4b..63a106f1292 100644
--- a/src/test/run-pass/nullable-pointer-size.rs
+++ b/src/test/ui/nullable-pointer-size.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 use std::mem;
diff --git a/src/test/run-pass/numbers-arithmetic/arith-0.rs b/src/test/ui/numbers-arithmetic/arith-0.rs
index 7943cb908d1..7943cb908d1 100644
--- a/src/test/run-pass/numbers-arithmetic/arith-0.rs
+++ b/src/test/ui/numbers-arithmetic/arith-0.rs
diff --git a/src/test/run-pass/numbers-arithmetic/arith-1.rs b/src/test/ui/numbers-arithmetic/arith-1.rs
index c13c8d8b765..c13c8d8b765 100644
--- a/src/test/run-pass/numbers-arithmetic/arith-1.rs
+++ b/src/test/ui/numbers-arithmetic/arith-1.rs
diff --git a/src/test/run-pass/numbers-arithmetic/arith-2.rs b/src/test/ui/numbers-arithmetic/arith-2.rs
index 46c280677ce..46c280677ce 100644
--- a/src/test/run-pass/numbers-arithmetic/arith-2.rs
+++ b/src/test/ui/numbers-arithmetic/arith-2.rs
diff --git a/src/test/run-pass/numbers-arithmetic/arith-unsigned.rs b/src/test/ui/numbers-arithmetic/arith-unsigned.rs
index ad57d9f8645..ad57d9f8645 100644
--- a/src/test/run-pass/numbers-arithmetic/arith-unsigned.rs
+++ b/src/test/ui/numbers-arithmetic/arith-unsigned.rs
diff --git a/src/test/run-pass/numbers-arithmetic/div-mod.rs b/src/test/ui/numbers-arithmetic/div-mod.rs
index acb92a7df73..acb92a7df73 100644
--- a/src/test/run-pass/numbers-arithmetic/div-mod.rs
+++ b/src/test/ui/numbers-arithmetic/div-mod.rs
diff --git a/src/test/run-pass/numbers-arithmetic/float-int-invalid-const-cast.rs b/src/test/ui/numbers-arithmetic/float-int-invalid-const-cast.rs
index d210abdf499..d210abdf499 100644
--- a/src/test/run-pass/numbers-arithmetic/float-int-invalid-const-cast.rs
+++ b/src/test/ui/numbers-arithmetic/float-int-invalid-const-cast.rs
diff --git a/src/test/run-pass/numbers-arithmetic/float-literal-inference.rs b/src/test/ui/numbers-arithmetic/float-literal-inference.rs
index c4645e4f8ff..c4645e4f8ff 100644
--- a/src/test/run-pass/numbers-arithmetic/float-literal-inference.rs
+++ b/src/test/ui/numbers-arithmetic/float-literal-inference.rs
diff --git a/src/test/run-pass/numbers-arithmetic/float-nan.rs b/src/test/ui/numbers-arithmetic/float-nan.rs
index ee87b8cccfe..ee87b8cccfe 100644
--- a/src/test/run-pass/numbers-arithmetic/float-nan.rs
+++ b/src/test/ui/numbers-arithmetic/float-nan.rs
diff --git a/src/test/run-pass/numbers-arithmetic/float-signature.rs b/src/test/ui/numbers-arithmetic/float-signature.rs
index d47280ea2e7..d47280ea2e7 100644
--- a/src/test/run-pass/numbers-arithmetic/float-signature.rs
+++ b/src/test/ui/numbers-arithmetic/float-signature.rs
diff --git a/src/test/run-pass/numbers-arithmetic/float.rs b/src/test/ui/numbers-arithmetic/float.rs
index d55c05857b6..d55c05857b6 100644
--- a/src/test/run-pass/numbers-arithmetic/float.rs
+++ b/src/test/ui/numbers-arithmetic/float.rs
diff --git a/src/test/run-pass/numbers-arithmetic/float2.rs b/src/test/ui/numbers-arithmetic/float2.rs
index b1bcf8da5a3..b1bcf8da5a3 100644
--- a/src/test/run-pass/numbers-arithmetic/float2.rs
+++ b/src/test/ui/numbers-arithmetic/float2.rs
diff --git a/src/test/run-pass/numbers-arithmetic/float_math.rs b/src/test/ui/numbers-arithmetic/float_math.rs
index a2902ee5608..a2902ee5608 100644
--- a/src/test/run-pass/numbers-arithmetic/float_math.rs
+++ b/src/test/ui/numbers-arithmetic/float_math.rs
diff --git a/src/test/run-pass/numbers-arithmetic/floatlits.rs b/src/test/ui/numbers-arithmetic/floatlits.rs
index 07049af315b..07049af315b 100644
--- a/src/test/run-pass/numbers-arithmetic/floatlits.rs
+++ b/src/test/ui/numbers-arithmetic/floatlits.rs
diff --git a/src/test/run-pass/numbers-arithmetic/i128-ffi.rs b/src/test/ui/numbers-arithmetic/i128-ffi.rs
index 19edf9779f3..19edf9779f3 100644
--- a/src/test/run-pass/numbers-arithmetic/i128-ffi.rs
+++ b/src/test/ui/numbers-arithmetic/i128-ffi.rs
diff --git a/src/test/run-pass/numbers-arithmetic/i128.rs b/src/test/ui/numbers-arithmetic/i128.rs
index ea0ef95e4f1..ea0ef95e4f1 100644
--- a/src/test/run-pass/numbers-arithmetic/i128.rs
+++ b/src/test/ui/numbers-arithmetic/i128.rs
diff --git a/src/test/run-pass/numbers-arithmetic/i32-sub.rs b/src/test/ui/numbers-arithmetic/i32-sub.rs
index 56df772b4e1..56df772b4e1 100644
--- a/src/test/run-pass/numbers-arithmetic/i32-sub.rs
+++ b/src/test/ui/numbers-arithmetic/i32-sub.rs
diff --git a/src/test/run-pass/numbers-arithmetic/i8-incr.rs b/src/test/ui/numbers-arithmetic/i8-incr.rs
index 718d259f735..718d259f735 100644
--- a/src/test/run-pass/numbers-arithmetic/i8-incr.rs
+++ b/src/test/ui/numbers-arithmetic/i8-incr.rs
diff --git a/src/test/run-pass/numbers-arithmetic/int-abs-overflow.rs b/src/test/ui/numbers-arithmetic/int-abs-overflow.rs
index 2bc018445db..2bc018445db 100644
--- a/src/test/run-pass/numbers-arithmetic/int-abs-overflow.rs
+++ b/src/test/ui/numbers-arithmetic/int-abs-overflow.rs
diff --git a/src/test/run-pass/numbers-arithmetic/int.rs b/src/test/ui/numbers-arithmetic/int.rs
index b496a70a6fe..b496a70a6fe 100644
--- a/src/test/run-pass/numbers-arithmetic/int.rs
+++ b/src/test/ui/numbers-arithmetic/int.rs
diff --git a/src/test/run-pass/numbers-arithmetic/integer-literal-radix.rs b/src/test/ui/numbers-arithmetic/integer-literal-radix.rs
index 8f61ea17a12..8f61ea17a12 100644
--- a/src/test/run-pass/numbers-arithmetic/integer-literal-radix.rs
+++ b/src/test/ui/numbers-arithmetic/integer-literal-radix.rs
diff --git a/src/test/run-pass/numbers-arithmetic/integer-literal-suffix-inference-2.rs b/src/test/ui/numbers-arithmetic/integer-literal-suffix-inference-2.rs
index 80248dc223d..80248dc223d 100644
--- a/src/test/run-pass/numbers-arithmetic/integer-literal-suffix-inference-2.rs
+++ b/src/test/ui/numbers-arithmetic/integer-literal-suffix-inference-2.rs
diff --git a/src/test/run-pass/numbers-arithmetic/integer-literal-suffix-inference-3.rs b/src/test/ui/numbers-arithmetic/integer-literal-suffix-inference-3.rs
index bec718a3c6a..bec718a3c6a 100644
--- a/src/test/run-pass/numbers-arithmetic/integer-literal-suffix-inference-3.rs
+++ b/src/test/ui/numbers-arithmetic/integer-literal-suffix-inference-3.rs
diff --git a/src/test/run-pass/numbers-arithmetic/integer-literal-suffix-inference.rs b/src/test/ui/numbers-arithmetic/integer-literal-suffix-inference.rs
index d177ced1a69..d177ced1a69 100644
--- a/src/test/run-pass/numbers-arithmetic/integer-literal-suffix-inference.rs
+++ b/src/test/ui/numbers-arithmetic/integer-literal-suffix-inference.rs
diff --git a/src/test/run-pass/numbers-arithmetic/next-power-of-two-overflow-debug.rs b/src/test/ui/numbers-arithmetic/next-power-of-two-overflow-debug.rs
index e9927304f23..e9927304f23 100644
--- a/src/test/run-pass/numbers-arithmetic/next-power-of-two-overflow-debug.rs
+++ b/src/test/ui/numbers-arithmetic/next-power-of-two-overflow-debug.rs
diff --git a/src/test/run-pass/numbers-arithmetic/next-power-of-two-overflow-ndebug.rs b/src/test/ui/numbers-arithmetic/next-power-of-two-overflow-ndebug.rs
index 982cd97c50a..982cd97c50a 100644
--- a/src/test/run-pass/numbers-arithmetic/next-power-of-two-overflow-ndebug.rs
+++ b/src/test/ui/numbers-arithmetic/next-power-of-two-overflow-ndebug.rs
diff --git a/src/test/run-pass/numbers-arithmetic/num-wrapping.rs b/src/test/ui/numbers-arithmetic/num-wrapping.rs
index 9a01549ecd2..9a01549ecd2 100644
--- a/src/test/run-pass/numbers-arithmetic/num-wrapping.rs
+++ b/src/test/ui/numbers-arithmetic/num-wrapping.rs
diff --git a/src/test/run-pass/numbers-arithmetic/numeric-method-autoexport.rs b/src/test/ui/numbers-arithmetic/numeric-method-autoexport.rs
index 5798c2591a0..5798c2591a0 100644
--- a/src/test/run-pass/numbers-arithmetic/numeric-method-autoexport.rs
+++ b/src/test/ui/numbers-arithmetic/numeric-method-autoexport.rs
diff --git a/src/test/run-pass/numbers-arithmetic/promoted_overflow_opt.rs b/src/test/ui/numbers-arithmetic/promoted_overflow_opt.rs
index a3b8ff58a73..a3b8ff58a73 100644
--- a/src/test/run-pass/numbers-arithmetic/promoted_overflow_opt.rs
+++ b/src/test/ui/numbers-arithmetic/promoted_overflow_opt.rs
diff --git a/src/test/run-pass/numbers-arithmetic/saturating-float-casts.rs b/src/test/ui/numbers-arithmetic/saturating-float-casts.rs
index f13964fb386..f13964fb386 100644
--- a/src/test/run-pass/numbers-arithmetic/saturating-float-casts.rs
+++ b/src/test/ui/numbers-arithmetic/saturating-float-casts.rs
diff --git a/src/test/run-pass/numbers-arithmetic/shift-near-oflo.rs b/src/test/ui/numbers-arithmetic/shift-near-oflo.rs
index 939eb974612..939eb974612 100644
--- a/src/test/run-pass/numbers-arithmetic/shift-near-oflo.rs
+++ b/src/test/ui/numbers-arithmetic/shift-near-oflo.rs
diff --git a/src/test/run-pass/numbers-arithmetic/shift-various-types.rs b/src/test/ui/numbers-arithmetic/shift-various-types.rs
index 473bda3d76e..473bda3d76e 100644
--- a/src/test/run-pass/numbers-arithmetic/shift-various-types.rs
+++ b/src/test/ui/numbers-arithmetic/shift-various-types.rs
diff --git a/src/test/run-pass/numbers-arithmetic/shift.rs b/src/test/ui/numbers-arithmetic/shift.rs
index 2fc77928ef1..2fc77928ef1 100644
--- a/src/test/run-pass/numbers-arithmetic/shift.rs
+++ b/src/test/ui/numbers-arithmetic/shift.rs
diff --git a/src/test/run-pass/numbers-arithmetic/signed-shift-const-eval.rs b/src/test/ui/numbers-arithmetic/signed-shift-const-eval.rs
index 6d0462b460e..6d0462b460e 100644
--- a/src/test/run-pass/numbers-arithmetic/signed-shift-const-eval.rs
+++ b/src/test/ui/numbers-arithmetic/signed-shift-const-eval.rs
diff --git a/src/test/run-pass/numbers-arithmetic/u128-as-f32.rs b/src/test/ui/numbers-arithmetic/u128-as-f32.rs
index bef7deb6276..bef7deb6276 100644
--- a/src/test/run-pass/numbers-arithmetic/u128-as-f32.rs
+++ b/src/test/ui/numbers-arithmetic/u128-as-f32.rs
diff --git a/src/test/run-pass/numbers-arithmetic/u128.rs b/src/test/ui/numbers-arithmetic/u128.rs
index 93940716323..93940716323 100644
--- a/src/test/run-pass/numbers-arithmetic/u128.rs
+++ b/src/test/ui/numbers-arithmetic/u128.rs
diff --git a/src/test/run-pass/numbers-arithmetic/u32-decr.rs b/src/test/ui/numbers-arithmetic/u32-decr.rs
index d9e09781877..d9e09781877 100644
--- a/src/test/run-pass/numbers-arithmetic/u32-decr.rs
+++ b/src/test/ui/numbers-arithmetic/u32-decr.rs
diff --git a/src/test/run-pass/numbers-arithmetic/u8-incr-decr.rs b/src/test/ui/numbers-arithmetic/u8-incr-decr.rs
index b16ec011d06..b16ec011d06 100644
--- a/src/test/run-pass/numbers-arithmetic/u8-incr-decr.rs
+++ b/src/test/ui/numbers-arithmetic/u8-incr-decr.rs
diff --git a/src/test/run-pass/numbers-arithmetic/u8-incr.rs b/src/test/ui/numbers-arithmetic/u8-incr.rs
index 5242acf5b98..5242acf5b98 100644
--- a/src/test/run-pass/numbers-arithmetic/u8-incr.rs
+++ b/src/test/ui/numbers-arithmetic/u8-incr.rs
diff --git a/src/test/run-pass/numbers-arithmetic/uint.rs b/src/test/ui/numbers-arithmetic/uint.rs
index d219eae8f33..d219eae8f33 100644
--- a/src/test/run-pass/numbers-arithmetic/uint.rs
+++ b/src/test/ui/numbers-arithmetic/uint.rs
diff --git a/src/test/run-pass/object-lifetime-default-default-to-static.rs b/src/test/ui/object-lifetime-default-default-to-static.rs
index cd61dea0378..467767ae59d 100644
--- a/src/test/run-pass/object-lifetime-default-default-to-static.rs
+++ b/src/test/ui/object-lifetime-default-default-to-static.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that `Box<Test>` is equivalent to `Box<Test+'static>`, both in
 // fields and fn arguments.
 
diff --git a/src/test/run-pass/object-lifetime-default-from-rptr-box.rs b/src/test/ui/object-lifetime-default-from-rptr-box.rs
index 9212f2802c0..8ac45b3db71 100644
--- a/src/test/run-pass/object-lifetime-default-from-rptr-box.rs
+++ b/src/test/ui/object-lifetime-default-from-rptr-box.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that the lifetime from the enclosing `&` is "inherited"
 // through the `Box` struct.
 
diff --git a/src/test/run-pass/object-lifetime-default-from-rptr-mut.rs b/src/test/ui/object-lifetime-default-from-rptr-mut.rs
index 061f3a116fc..a09fc03ab9b 100644
--- a/src/test/run-pass/object-lifetime-default-from-rptr-mut.rs
+++ b/src/test/ui/object-lifetime-default-from-rptr-mut.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that the lifetime of the enclosing `&` is used for the object
 // lifetime bound.
 
diff --git a/src/test/run-pass/object-lifetime-default-from-rptr.rs b/src/test/ui/object-lifetime-default-from-rptr.rs
index cfa4af0d7a5..5093b1c27d0 100644
--- a/src/test/run-pass/object-lifetime-default-from-rptr.rs
+++ b/src/test/ui/object-lifetime-default-from-rptr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that the lifetime of the enclosing `&` is used for the object
 // lifetime bound.
 
diff --git a/src/test/run-pass/object-method-numbering.rs b/src/test/ui/object-method-numbering.rs
index 7f24ab2cbb5..bf80a80f406 100644
--- a/src/test/run-pass/object-method-numbering.rs
+++ b/src/test/ui/object-method-numbering.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test for using an object with an associated type binding as the
 // instantiation for a generic type with a bound.
 
diff --git a/src/test/run-pass/objects-coerce-freeze-borrored.rs b/src/test/ui/objects-coerce-freeze-borrored.rs
index 47196f108c0..704d77480b8 100644
--- a/src/test/run-pass/objects-coerce-freeze-borrored.rs
+++ b/src/test/ui/objects-coerce-freeze-borrored.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that we can coerce an `@Object` to an `&Object`
 
 
diff --git a/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs b/src/test/ui/objects-owned-object-borrowed-method-headerless.rs
index 58327237494..9b88d8ea7bc 100644
--- a/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs
+++ b/src/test/ui/objects-owned-object-borrowed-method-headerless.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test invoked `&self` methods on owned objects where the values
 // closed over do not contain managed values, and thus the boxes do
 // not have headers.
diff --git a/src/test/run-pass/objects-owned-object-owned-method.rs b/src/test/ui/objects-owned-object-owned-method.rs
index 69984fbb62f..4b7b68f2217 100644
--- a/src/test/run-pass/objects-owned-object-owned-method.rs
+++ b/src/test/ui/objects-owned-object-owned-method.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test invoked `&self` methods on owned objects where the values
 // closed over contain managed values. This implies that the boxes
 // will have headers that must be skipped over.
diff --git a/src/test/run-pass/once-move-out-on-heap.rs b/src/test/ui/once-move-out-on-heap.rs
index 46e663417cf..4e2e400cec0 100644
--- a/src/test/run-pass/once-move-out-on-heap.rs
+++ b/src/test/ui/once-move-out-on-heap.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Testing guarantees provided by once functions.
 
 
diff --git a/src/test/run-pass/one-tuple.rs b/src/test/ui/one-tuple.rs
index fa54f952938..00fbadce1ac 100644
--- a/src/test/run-pass/one-tuple.rs
+++ b/src/test/ui/one-tuple.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Why one-tuples? Because macros.
 
 
diff --git a/src/test/run-pass/op-assign-builtins-by-ref.rs b/src/test/ui/op-assign-builtins-by-ref.rs
index 8e0353e4849..96853854d6c 100644
--- a/src/test/run-pass/op-assign-builtins-by-ref.rs
+++ b/src/test/ui/op-assign-builtins-by-ref.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn main() {
     // test compound assignment operators with ref as right-hand side,
     // for each operator, with various types as operands.
diff --git a/src/test/run-pass/opeq.rs b/src/test/ui/opeq.rs
index ea6c7647bb5..9737be97fa3 100644
--- a/src/test/run-pass/opeq.rs
+++ b/src/test/ui/opeq.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let mut x: isize = 1;
     x *= 2;
diff --git a/src/test/run-pass/operator-associativity.rs b/src/test/ui/operator-associativity.rs
index 69e3f699e9c..4f40c80bc4c 100644
--- a/src/test/run-pass/operator-associativity.rs
+++ b/src/test/ui/operator-associativity.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Testcase for issue #130, operator associativity.
 
 pub fn main() { assert_eq!(3 * 5 / 2, 7); }
diff --git a/src/test/run-pass/operator-multidispatch.rs b/src/test/ui/operator-multidispatch.rs
index cc546c903b7..0d1dcfd8bdd 100644
--- a/src/test/run-pass/operator-multidispatch.rs
+++ b/src/test/ui/operator-multidispatch.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that we can overload the `+` operator for points so that two
 // points can be added, and a point can be added to an integer.
 
diff --git a/src/test/run-pass/operator-overloading.rs b/src/test/ui/operator-overloading.rs
index 026e2536cef..6b3abcbc76c 100644
--- a/src/test/run-pass/operator-overloading.rs
+++ b/src/test/ui/operator-overloading.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 use std::cmp;
 use std::ops;
diff --git a/src/test/run-pass/optimization-fuel-0.rs b/src/test/ui/optimization-fuel-0.rs
index 77f21b3fcc0..f86972b7348 100644
--- a/src/test/run-pass/optimization-fuel-0.rs
+++ b/src/test/ui/optimization-fuel-0.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![crate_name="foo"]
 
 use std::mem::size_of;
diff --git a/src/test/run-pass/optimization-fuel-0.stderr b/src/test/ui/optimization-fuel-0.stderr
index 3ad405b2b50..3ad405b2b50 100644
--- a/src/test/run-pass/optimization-fuel-0.stderr
+++ b/src/test/ui/optimization-fuel-0.stderr
diff --git a/src/test/run-pass/optimization-fuel-1.rs b/src/test/ui/optimization-fuel-1.rs
index 58778cac50d..98283066361 100644
--- a/src/test/run-pass/optimization-fuel-1.rs
+++ b/src/test/ui/optimization-fuel-1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![crate_name="foo"]
 
 use std::mem::size_of;
diff --git a/src/test/run-pass/optimization-fuel-1.stderr b/src/test/ui/optimization-fuel-1.stderr
index 197e45219c3..197e45219c3 100644
--- a/src/test/run-pass/optimization-fuel-1.stderr
+++ b/src/test/ui/optimization-fuel-1.stderr
diff --git a/src/test/run-pass/option-ext.rs b/src/test/ui/option-ext.rs
index 0b21b8e5b5a..76d0cf43984 100644
--- a/src/test/run-pass/option-ext.rs
+++ b/src/test/ui/option-ext.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let thing = "{{ f }}";
     let f = thing.find("{{");
diff --git a/src/test/run-pass/option-unwrap.rs b/src/test/ui/option-unwrap.rs
index 6ad65c99247..173f803ee24 100644
--- a/src/test/run-pass/option-unwrap.rs
+++ b/src/test/ui/option-unwrap.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 use std::cell::Cell;
 
diff --git a/src/test/run-pass/out-of-stack.rs b/src/test/ui/out-of-stack.rs
index f03935e3d27..5e9265be4b9 100644
--- a/src/test/run-pass/out-of-stack.rs
+++ b/src/test/ui/out-of-stack.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(unconditional_recursion)]
 // ignore-android: FIXME (#20004)
diff --git a/src/test/run-pass/out-pointer-aliasing.rs b/src/test/ui/out-pointer-aliasing.rs
index 48fa9020b93..b28a0910179 100644
--- a/src/test/run-pass/out-pointer-aliasing.rs
+++ b/src/test/ui/out-pointer-aliasing.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #[derive(Copy, Clone)]
 pub struct Foo {
     f1: isize,
diff --git a/src/test/run-pass/output-slot-variants.rs b/src/test/ui/output-slot-variants.rs
index f3cc2e99e0f..af4caf75669 100644
--- a/src/test/run-pass/output-slot-variants.rs
+++ b/src/test/ui/output-slot-variants.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_assignments)]
 #![allow(unknown_lints)]
diff --git a/src/test/run-pass/over-constrained-vregs.rs b/src/test/ui/over-constrained-vregs.rs
index 6d1b2d55e55..cc808147600 100644
--- a/src/test/run-pass/over-constrained-vregs.rs
+++ b/src/test/ui/over-constrained-vregs.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 // Regression test for issue #152.
 pub fn main() {
diff --git a/src/test/run-pass/overlap-doesnt-conflict-with-specialization.rs b/src/test/ui/overlap-doesnt-conflict-with-specialization.rs
index ddad0f59699..3d4069f368d 100644
--- a/src/test/run-pass/overlap-doesnt-conflict-with-specialization.rs
+++ b/src/test/ui/overlap-doesnt-conflict-with-specialization.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(overlapping_marker_traits)]
 #![feature(specialization)]
 
diff --git a/src/test/run-pass/overlap-permitted-for-annotated-marker-traits.rs b/src/test/ui/overlap-permitted-for-annotated-marker-traits.rs
index 53c5cfc8138..38331390237 100644
--- a/src/test/run-pass/overlap-permitted-for-annotated-marker-traits.rs
+++ b/src/test/ui/overlap-permitted-for-annotated-marker-traits.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests for RFC 1268: we allow overlapping impls of marker traits,
 // that is, traits with #[marker]. In this case, a type `T` is
 // `MyMarker` if it is either `Debug` or `Display`.
diff --git a/src/test/run-pass/overloaded/auxiliary/overloaded_autoderef_xc.rs b/src/test/ui/overloaded/auxiliary/overloaded_autoderef_xc.rs
index 112455f91f9..112455f91f9 100644
--- a/src/test/run-pass/overloaded/auxiliary/overloaded_autoderef_xc.rs
+++ b/src/test/ui/overloaded/auxiliary/overloaded_autoderef_xc.rs
diff --git a/src/test/run-pass/overloaded/overloaded-autoderef-count.rs b/src/test/ui/overloaded/overloaded-autoderef-count.rs
index d58deda09f7..d58deda09f7 100644
--- a/src/test/run-pass/overloaded/overloaded-autoderef-count.rs
+++ b/src/test/ui/overloaded/overloaded-autoderef-count.rs
diff --git a/src/test/run-pass/overloaded/overloaded-autoderef-indexing.rs b/src/test/ui/overloaded/overloaded-autoderef-indexing.rs
index 1c8c7cca93c..1c8c7cca93c 100644
--- a/src/test/run-pass/overloaded/overloaded-autoderef-indexing.rs
+++ b/src/test/ui/overloaded/overloaded-autoderef-indexing.rs
diff --git a/src/test/run-pass/overloaded/overloaded-autoderef-order.rs b/src/test/ui/overloaded/overloaded-autoderef-order.rs
index 1ae16d2a7fc..1ae16d2a7fc 100644
--- a/src/test/run-pass/overloaded/overloaded-autoderef-order.rs
+++ b/src/test/ui/overloaded/overloaded-autoderef-order.rs
diff --git a/src/test/run-pass/overloaded/overloaded-autoderef-vtable.rs b/src/test/ui/overloaded/overloaded-autoderef-vtable.rs
index f8e6d12088f..f8e6d12088f 100644
--- a/src/test/run-pass/overloaded/overloaded-autoderef-vtable.rs
+++ b/src/test/ui/overloaded/overloaded-autoderef-vtable.rs
diff --git a/src/test/run-pass/overloaded/overloaded-autoderef-xcrate.rs b/src/test/ui/overloaded/overloaded-autoderef-xcrate.rs
index d065e825cc3..d065e825cc3 100644
--- a/src/test/run-pass/overloaded/overloaded-autoderef-xcrate.rs
+++ b/src/test/ui/overloaded/overloaded-autoderef-xcrate.rs
diff --git a/src/test/run-pass/overloaded/overloaded-autoderef.rs b/src/test/ui/overloaded/overloaded-autoderef.rs
index e850633e34f..e850633e34f 100644
--- a/src/test/run-pass/overloaded/overloaded-autoderef.rs
+++ b/src/test/ui/overloaded/overloaded-autoderef.rs
diff --git a/src/test/run-pass/overloaded/overloaded-calls-object-one-arg.rs b/src/test/ui/overloaded/overloaded-calls-object-one-arg.rs
index 1afab9a1ffb..1afab9a1ffb 100644
--- a/src/test/run-pass/overloaded/overloaded-calls-object-one-arg.rs
+++ b/src/test/ui/overloaded/overloaded-calls-object-one-arg.rs
diff --git a/src/test/run-pass/overloaded/overloaded-calls-object-two-args.rs b/src/test/ui/overloaded/overloaded-calls-object-two-args.rs
index 38087bc8710..38087bc8710 100644
--- a/src/test/run-pass/overloaded/overloaded-calls-object-two-args.rs
+++ b/src/test/ui/overloaded/overloaded-calls-object-two-args.rs
diff --git a/src/test/run-pass/overloaded/overloaded-calls-object-zero-args.rs b/src/test/ui/overloaded/overloaded-calls-object-zero-args.rs
index 9a7bfaa9bf4..9a7bfaa9bf4 100644
--- a/src/test/run-pass/overloaded/overloaded-calls-object-zero-args.rs
+++ b/src/test/ui/overloaded/overloaded-calls-object-zero-args.rs
diff --git a/src/test/run-pass/overloaded/overloaded-calls-param-vtables.rs b/src/test/ui/overloaded/overloaded-calls-param-vtables.rs
index fde1ad20f7d..fde1ad20f7d 100644
--- a/src/test/run-pass/overloaded/overloaded-calls-param-vtables.rs
+++ b/src/test/ui/overloaded/overloaded-calls-param-vtables.rs
diff --git a/src/test/run-pass/overloaded/overloaded-calls-simple.rs b/src/test/ui/overloaded/overloaded-calls-simple.rs
index 41318360799..41318360799 100644
--- a/src/test/run-pass/overloaded/overloaded-calls-simple.rs
+++ b/src/test/ui/overloaded/overloaded-calls-simple.rs
diff --git a/src/test/run-pass/overloaded/overloaded-calls-zero-args.rs b/src/test/ui/overloaded/overloaded-calls-zero-args.rs
index 69ca88619b8..69ca88619b8 100644
--- a/src/test/run-pass/overloaded/overloaded-calls-zero-args.rs
+++ b/src/test/ui/overloaded/overloaded-calls-zero-args.rs
diff --git a/src/test/run-pass/overloaded/overloaded-deref-count.rs b/src/test/ui/overloaded/overloaded-deref-count.rs
index e2f1e10b5c8..e2f1e10b5c8 100644
--- a/src/test/run-pass/overloaded/overloaded-deref-count.rs
+++ b/src/test/ui/overloaded/overloaded-deref-count.rs
diff --git a/src/test/run-pass/overloaded/overloaded-deref.rs b/src/test/ui/overloaded/overloaded-deref.rs
index 73d8232a322..73d8232a322 100644
--- a/src/test/run-pass/overloaded/overloaded-deref.rs
+++ b/src/test/ui/overloaded/overloaded-deref.rs
diff --git a/src/test/run-pass/overloaded/overloaded-index-assoc-list.rs b/src/test/ui/overloaded/overloaded-index-assoc-list.rs
index eb027afeacd..eb027afeacd 100644
--- a/src/test/run-pass/overloaded/overloaded-index-assoc-list.rs
+++ b/src/test/ui/overloaded/overloaded-index-assoc-list.rs
diff --git a/src/test/run-pass/overloaded/overloaded-index-autoderef.rs b/src/test/ui/overloaded/overloaded-index-autoderef.rs
index 6996ee32933..6996ee32933 100644
--- a/src/test/run-pass/overloaded/overloaded-index-autoderef.rs
+++ b/src/test/ui/overloaded/overloaded-index-autoderef.rs
diff --git a/src/test/run-pass/overloaded/overloaded-index-in-field.rs b/src/test/ui/overloaded/overloaded-index-in-field.rs
index 8a1fa7deb99..8a1fa7deb99 100644
--- a/src/test/run-pass/overloaded/overloaded-index-in-field.rs
+++ b/src/test/ui/overloaded/overloaded-index-in-field.rs
diff --git a/src/test/run-pass/overloaded/overloaded-index.rs b/src/test/ui/overloaded/overloaded-index.rs
index 5ad6d2e7004..5ad6d2e7004 100644
--- a/src/test/run-pass/overloaded/overloaded-index.rs
+++ b/src/test/ui/overloaded/overloaded-index.rs
diff --git a/src/test/run-pass/overloaded/overloaded_deref_with_ref_pattern.rs b/src/test/ui/overloaded/overloaded_deref_with_ref_pattern.rs
index c87ba6a023b..c87ba6a023b 100644
--- a/src/test/run-pass/overloaded/overloaded_deref_with_ref_pattern.rs
+++ b/src/test/ui/overloaded/overloaded_deref_with_ref_pattern.rs
diff --git a/src/test/run-pass/overloaded/overloaded_deref_with_ref_pattern_issue15609.rs b/src/test/ui/overloaded/overloaded_deref_with_ref_pattern_issue15609.rs
index 61edd2ace3a..61edd2ace3a 100644
--- a/src/test/run-pass/overloaded/overloaded_deref_with_ref_pattern_issue15609.rs
+++ b/src/test/ui/overloaded/overloaded_deref_with_ref_pattern_issue15609.rs
diff --git a/src/test/run-pass/owned-implies-static.rs b/src/test/ui/owned-implies-static.rs
index 7101726ab6a..2efa8cc02f4 100644
--- a/src/test/run-pass/owned-implies-static.rs
+++ b/src/test/ui/owned-implies-static.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 fn f<T: 'static>(_x: T) {}
diff --git a/src/test/run-pass/packed/auxiliary/packed.rs b/src/test/ui/packed/auxiliary/packed.rs
index cba166facf4..cba166facf4 100644
--- a/src/test/run-pass/packed/auxiliary/packed.rs
+++ b/src/test/ui/packed/auxiliary/packed.rs
diff --git a/src/test/run-pass/packed/packed-struct-borrow-element.rs b/src/test/ui/packed/packed-struct-borrow-element.rs
index 6ac42ed0d47..6ac42ed0d47 100644
--- a/src/test/run-pass/packed/packed-struct-borrow-element.rs
+++ b/src/test/ui/packed/packed-struct-borrow-element.rs
diff --git a/src/test/run-pass/packed/packed-struct-drop-aligned.rs b/src/test/ui/packed/packed-struct-drop-aligned.rs
index fab3bbedac6..fab3bbedac6 100644
--- a/src/test/run-pass/packed/packed-struct-drop-aligned.rs
+++ b/src/test/ui/packed/packed-struct-drop-aligned.rs
diff --git a/src/test/run-pass/packed/packed-struct-generic-layout.rs b/src/test/ui/packed/packed-struct-generic-layout.rs
index e064eede4ce..e064eede4ce 100644
--- a/src/test/run-pass/packed/packed-struct-generic-layout.rs
+++ b/src/test/ui/packed/packed-struct-generic-layout.rs
diff --git a/src/test/run-pass/packed/packed-struct-generic-size.rs b/src/test/ui/packed/packed-struct-generic-size.rs
index 7c93e46c30c..7c93e46c30c 100644
--- a/src/test/run-pass/packed/packed-struct-generic-size.rs
+++ b/src/test/ui/packed/packed-struct-generic-size.rs
diff --git a/src/test/run-pass/packed/packed-struct-layout.rs b/src/test/ui/packed/packed-struct-layout.rs
index d49c222e648..d49c222e648 100644
--- a/src/test/run-pass/packed/packed-struct-layout.rs
+++ b/src/test/ui/packed/packed-struct-layout.rs
diff --git a/src/test/run-pass/packed/packed-struct-match.rs b/src/test/ui/packed/packed-struct-match.rs
index 9a572ced717..9a572ced717 100644
--- a/src/test/run-pass/packed/packed-struct-match.rs
+++ b/src/test/ui/packed/packed-struct-match.rs
diff --git a/src/test/run-pass/packed/packed-struct-optimized-enum.rs b/src/test/ui/packed/packed-struct-optimized-enum.rs
index 7ce62464ef0..7ce62464ef0 100644
--- a/src/test/run-pass/packed/packed-struct-optimized-enum.rs
+++ b/src/test/ui/packed/packed-struct-optimized-enum.rs
diff --git a/src/test/run-pass/packed/packed-struct-size-xc.rs b/src/test/ui/packed/packed-struct-size-xc.rs
index 46112d51d83..46112d51d83 100644
--- a/src/test/run-pass/packed/packed-struct-size-xc.rs
+++ b/src/test/ui/packed/packed-struct-size-xc.rs
diff --git a/src/test/run-pass/packed/packed-struct-size.rs b/src/test/ui/packed/packed-struct-size.rs
index c832c7cfad5..c832c7cfad5 100644
--- a/src/test/run-pass/packed/packed-struct-size.rs
+++ b/src/test/ui/packed/packed-struct-size.rs
diff --git a/src/test/run-pass/packed/packed-struct-vec.rs b/src/test/ui/packed/packed-struct-vec.rs
index 18676cfc22e..18676cfc22e 100644
--- a/src/test/run-pass/packed/packed-struct-vec.rs
+++ b/src/test/ui/packed/packed-struct-vec.rs
diff --git a/src/test/run-pass/packed/packed-tuple-struct-layout.rs b/src/test/ui/packed/packed-tuple-struct-layout.rs
index b88637fbe56..b88637fbe56 100644
--- a/src/test/run-pass/packed/packed-tuple-struct-layout.rs
+++ b/src/test/ui/packed/packed-tuple-struct-layout.rs
diff --git a/src/test/run-pass/packed/packed-tuple-struct-size.rs b/src/test/ui/packed/packed-tuple-struct-size.rs
index f7a3c903fca..f7a3c903fca 100644
--- a/src/test/run-pass/packed/packed-tuple-struct-size.rs
+++ b/src/test/ui/packed/packed-tuple-struct-size.rs
diff --git a/src/test/run-pass/packed/packed-with-inference-vars-issue-61402.rs b/src/test/ui/packed/packed-with-inference-vars-issue-61402.rs
index 6028b8f5ab4..659864c1d9b 100644
--- a/src/test/run-pass/packed/packed-with-inference-vars-issue-61402.rs
+++ b/src/test/ui/packed/packed-with-inference-vars-issue-61402.rs
@@ -1,3 +1,4 @@
+// run-pass
 // If a struct is packed and its last field has drop glue, then that
 // field needs to be Sized (to allow it to be destroyed out-of-place).
 //
diff --git a/src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs b/src/test/ui/panic-runtime/abort-link-to-unwinding-crates.rs
index 9c099911eab..9c099911eab 100644
--- a/src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs
+++ b/src/test/ui/panic-runtime/abort-link-to-unwinding-crates.rs
diff --git a/src/test/run-pass/panic-runtime/abort.rs b/src/test/ui/panic-runtime/abort.rs
index f625fe35d72..f625fe35d72 100644
--- a/src/test/run-pass/panic-runtime/abort.rs
+++ b/src/test/ui/panic-runtime/abort.rs
diff --git a/src/test/run-pass/panic-runtime/auxiliary/exit-success-if-unwind.rs b/src/test/ui/panic-runtime/auxiliary/exit-success-if-unwind.rs
index c0e05740542..c0e05740542 100644
--- a/src/test/run-pass/panic-runtime/auxiliary/exit-success-if-unwind.rs
+++ b/src/test/ui/panic-runtime/auxiliary/exit-success-if-unwind.rs
diff --git a/src/test/run-pass/panic-runtime/link-to-abort.rs b/src/test/ui/panic-runtime/link-to-abort.rs
index 422206c574d..422206c574d 100644
--- a/src/test/run-pass/panic-runtime/link-to-abort.rs
+++ b/src/test/ui/panic-runtime/link-to-abort.rs
diff --git a/src/test/run-pass/panic-runtime/link-to-unwind.rs b/src/test/ui/panic-runtime/link-to-unwind.rs
index 59036ca99bd..59036ca99bd 100644
--- a/src/test/run-pass/panic-runtime/link-to-unwind.rs
+++ b/src/test/ui/panic-runtime/link-to-unwind.rs
diff --git a/src/test/run-pass/panic-runtime/lto-abort.rs b/src/test/ui/panic-runtime/lto-abort.rs
index 8fff71a629a..8fff71a629a 100644
--- a/src/test/run-pass/panic-runtime/lto-abort.rs
+++ b/src/test/ui/panic-runtime/lto-abort.rs
diff --git a/src/test/run-pass/panic-runtime/lto-unwind.rs b/src/test/ui/panic-runtime/lto-unwind.rs
index 94a0b596e4a..94a0b596e4a 100644
--- a/src/test/run-pass/panic-runtime/lto-unwind.rs
+++ b/src/test/ui/panic-runtime/lto-unwind.rs
diff --git a/src/test/run-pass/panic-uninitialized-zeroed.rs b/src/test/ui/panic-uninitialized-zeroed.rs
index 5026ad1ccd4..0c97babd51c 100644
--- a/src/test/run-pass/panic-uninitialized-zeroed.rs
+++ b/src/test/ui/panic-uninitialized-zeroed.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare always compiled as panic=abort right now and this requires unwinding
 // This test checks that instantiating an uninhabited type via `mem::{uninitialized,zeroed}` results
 // in a runtime panic.
diff --git a/src/test/run-pass/panics/panic-handler-chain.rs b/src/test/ui/panics/panic-handler-chain.rs
index 93044b5cb25..93044b5cb25 100644
--- a/src/test/run-pass/panics/panic-handler-chain.rs
+++ b/src/test/ui/panics/panic-handler-chain.rs
diff --git a/src/test/run-pass/panics/panic-handler-flail-wildly.rs b/src/test/ui/panics/panic-handler-flail-wildly.rs
index 6badd203842..6badd203842 100644
--- a/src/test/run-pass/panics/panic-handler-flail-wildly.rs
+++ b/src/test/ui/panics/panic-handler-flail-wildly.rs
diff --git a/src/test/run-pass/panics/panic-handler-set-twice.rs b/src/test/ui/panics/panic-handler-set-twice.rs
index 0312ed221ca..0312ed221ca 100644
--- a/src/test/run-pass/panics/panic-handler-set-twice.rs
+++ b/src/test/ui/panics/panic-handler-set-twice.rs
diff --git a/src/test/run-pass/panics/panic-in-dtor-drops-fields.rs b/src/test/ui/panics/panic-in-dtor-drops-fields.rs
index caddd942dc0..caddd942dc0 100644
--- a/src/test/run-pass/panics/panic-in-dtor-drops-fields.rs
+++ b/src/test/ui/panics/panic-in-dtor-drops-fields.rs
diff --git a/src/test/run-pass/panics/panic-recover-propagate.rs b/src/test/ui/panics/panic-recover-propagate.rs
index 7969336ca74..7969336ca74 100644
--- a/src/test/run-pass/panics/panic-recover-propagate.rs
+++ b/src/test/ui/panics/panic-recover-propagate.rs
diff --git a/src/test/run-pass/panics/panic-safe.rs b/src/test/ui/panics/panic-safe.rs
index 9867cc56406..9867cc56406 100644
--- a/src/test/run-pass/panics/panic-safe.rs
+++ b/src/test/ui/panics/panic-safe.rs
diff --git a/src/test/run-pass/paren-free.rs b/src/test/ui/paren-free.rs
index 1f05ee0ed22..8e8bb8800ec 100644
--- a/src/test/run-pass/paren-free.rs
+++ b/src/test/ui/paren-free.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let x = true;
     if x { let mut i = 10; while i > 0 { i -= 1; } }
diff --git a/src/test/run-pass/parse-assoc-type-lt.rs b/src/test/ui/parse-assoc-type-lt.rs
index e6b07c583fb..d3fe6079a5d 100644
--- a/src/test/run-pass/parse-assoc-type-lt.rs
+++ b/src/test/ui/parse-assoc-type-lt.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 trait Foo {
diff --git a/src/test/run-pass/parse-panic.rs b/src/test/ui/parse-panic.rs
index a08cd106ec1..aeb2ba4faa5 100644
--- a/src/test/run-pass/parse-panic.rs
+++ b/src/test/ui/parse-panic.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unreachable_code)]
 
diff --git a/src/test/run-pass/parser-unicode-whitespace.rs b/src/test/ui/parser-unicode-whitespace.rs
index 26e79b06172..2d1fa7dc42e 100644
--- a/src/test/run-pass/parser-unicode-whitespace.rs
+++ b/src/test/ui/parser-unicode-whitespace.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Beware editing: it has numerous whitespace characters which are important.
 // It contains one ranges from the 'PATTERN_WHITE_SPACE' property outlined in
 // http://unicode.org/Public/UNIDATA/PropList.txt
diff --git a/src/test/run-pass/path.rs b/src/test/ui/path.rs
index 7a9b04c0704..4c137de82d0 100644
--- a/src/test/run-pass/path.rs
+++ b/src/test/ui/path.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 mod foo {
diff --git a/src/test/run-pass/paths-containing-nul.rs b/src/test/ui/paths-containing-nul.rs
index 64ee7319fdd..c9bf710b8e7 100644
--- a/src/test/run-pass/paths-containing-nul.rs
+++ b/src/test/ui/paths-containing-nul.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(deprecated)]
 // ignore-cloudabi no files or I/O
 // ignore-wasm32-bare no files or I/O
diff --git a/src/test/run-pass/print-stdout-eprint-stderr.rs b/src/test/ui/print-stdout-eprint-stderr.rs
index 65130a1a9f2..70c083e0800 100644
--- a/src/test/run-pass/print-stdout-eprint-stderr.rs
+++ b/src/test/ui/print-stdout-eprint-stderr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi spawning processes is not supported
 // ignore-emscripten spawning processes is not supported
 // ignore-sgx no processes
diff --git a/src/test/run-pass/privacy/auxiliary/priv-impl-prim-ty.rs b/src/test/ui/privacy/auxiliary/priv-impl-prim-ty.rs
index 8ccbd3f12bf..8ccbd3f12bf 100644
--- a/src/test/run-pass/privacy/auxiliary/priv-impl-prim-ty.rs
+++ b/src/test/ui/privacy/auxiliary/priv-impl-prim-ty.rs
diff --git a/src/test/run-pass/privacy/auxiliary/privacy_reexport.rs b/src/test/ui/privacy/auxiliary/privacy_reexport.rs
index 6b72dbc9233..6b72dbc9233 100644
--- a/src/test/run-pass/privacy/auxiliary/privacy_reexport.rs
+++ b/src/test/ui/privacy/auxiliary/privacy_reexport.rs
diff --git a/src/test/run-pass/privacy/auxiliary/pub_use_mods_xcrate.rs b/src/test/ui/privacy/auxiliary/pub_use_mods_xcrate.rs
index 74d3504d5be..74d3504d5be 100644
--- a/src/test/run-pass/privacy/auxiliary/pub_use_mods_xcrate.rs
+++ b/src/test/ui/privacy/auxiliary/pub_use_mods_xcrate.rs
diff --git a/src/test/run-pass/privacy/auxiliary/pub_use_xcrate1.rs b/src/test/ui/privacy/auxiliary/pub_use_xcrate1.rs
index 772c9627a71..772c9627a71 100644
--- a/src/test/run-pass/privacy/auxiliary/pub_use_xcrate1.rs
+++ b/src/test/ui/privacy/auxiliary/pub_use_xcrate1.rs
diff --git a/src/test/run-pass/privacy/auxiliary/pub_use_xcrate2.rs b/src/test/ui/privacy/auxiliary/pub_use_xcrate2.rs
index 20d7066d36d..20d7066d36d 100644
--- a/src/test/run-pass/privacy/auxiliary/pub_use_xcrate2.rs
+++ b/src/test/ui/privacy/auxiliary/pub_use_xcrate2.rs
diff --git a/src/test/run-pass/privacy/priv-impl-prim-ty.rs b/src/test/ui/privacy/priv-impl-prim-ty.rs
index 5d6a6b64ed3..5d6a6b64ed3 100644
--- a/src/test/run-pass/privacy/priv-impl-prim-ty.rs
+++ b/src/test/ui/privacy/priv-impl-prim-ty.rs
diff --git a/src/test/run-pass/privacy/privacy-ns.rs b/src/test/ui/privacy/privacy-ns.rs
index c32e3f17880..c32e3f17880 100644
--- a/src/test/run-pass/privacy/privacy-ns.rs
+++ b/src/test/ui/privacy/privacy-ns.rs
diff --git a/src/test/run-pass/privacy/privacy-reexport.rs b/src/test/ui/privacy/privacy-reexport.rs
index b3ec3af04ac..b3ec3af04ac 100644
--- a/src/test/run-pass/privacy/privacy-reexport.rs
+++ b/src/test/ui/privacy/privacy-reexport.rs
diff --git a/src/test/run-pass/privacy/privacy1.rs b/src/test/ui/privacy/privacy1-rpass.rs
index 4e54780dad2..4e54780dad2 100644
--- a/src/test/run-pass/privacy/privacy1.rs
+++ b/src/test/ui/privacy/privacy1-rpass.rs
diff --git a/src/test/run-pass/privacy/private-class-field.rs b/src/test/ui/privacy/private-class-field.rs
index 98e32ee0745..98e32ee0745 100644
--- a/src/test/run-pass/privacy/private-class-field.rs
+++ b/src/test/ui/privacy/private-class-field.rs
diff --git a/src/test/run-pass/privacy/private-method.rs b/src/test/ui/privacy/private-method-rpass.rs
index 726944fb251..726944fb251 100644
--- a/src/test/run-pass/privacy/private-method.rs
+++ b/src/test/ui/privacy/private-method-rpass.rs
diff --git a/src/test/run-pass/privacy/pub-extern-privacy.rs b/src/test/ui/privacy/pub-extern-privacy.rs
index 832acfbadcb..832acfbadcb 100644
--- a/src/test/run-pass/privacy/pub-extern-privacy.rs
+++ b/src/test/ui/privacy/pub-extern-privacy.rs
diff --git a/src/test/run-pass/privacy/pub-use-xcrate.rs b/src/test/ui/privacy/pub-use-xcrate.rs
index e8a6e8cf182..e8a6e8cf182 100644
--- a/src/test/run-pass/privacy/pub-use-xcrate.rs
+++ b/src/test/ui/privacy/pub-use-xcrate.rs
diff --git a/src/test/run-pass/privacy/pub_use_mods_xcrate_exe.rs b/src/test/ui/privacy/pub_use_mods_xcrate_exe.rs
index f163619e7cb..f163619e7cb 100644
--- a/src/test/run-pass/privacy/pub_use_mods_xcrate_exe.rs
+++ b/src/test/ui/privacy/pub_use_mods_xcrate_exe.rs
diff --git a/src/test/run-pass/proc-macro/add-impl.rs b/src/test/ui/proc-macro/add-impl.rs
index 239074b4e42..ff2897a5e86 100644
--- a/src/test/run-pass/proc-macro/add-impl.rs
+++ b/src/test/ui/proc-macro/add-impl.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:add-impl.rs
 
 #[macro_use]
diff --git a/src/test/run-pass/proc-macro/append-impl.rs b/src/test/ui/proc-macro/append-impl.rs
index a49fd827801..a4938401348 100644
--- a/src/test/run-pass/proc-macro/append-impl.rs
+++ b/src/test/ui/proc-macro/append-impl.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:append-impl.rs
 
 #![allow(warnings)]
diff --git a/src/test/run-pass/proc-macro/attr-args.rs b/src/test/ui/proc-macro/attr-args.rs
index 6ff6ccacf7c..764f507abfc 100644
--- a/src/test/run-pass/proc-macro/attr-args.rs
+++ b/src/test/ui/proc-macro/attr-args.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:attr-args.rs
 
 #![allow(warnings)]
diff --git a/src/test/run-pass/proc-macro/attr-cfg.rs b/src/test/ui/proc-macro/attr-cfg.rs
index 7816576eb5c..2aed9e2e814 100644
--- a/src/test/run-pass/proc-macro/attr-cfg.rs
+++ b/src/test/ui/proc-macro/attr-cfg.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:attr-cfg.rs
 // revisions: foo bar
 
diff --git a/src/test/run-pass/proc-macro/attr-on-trait.rs b/src/test/ui/proc-macro/attr-on-trait.rs
index 4a8fac41101..e0edee630a4 100644
--- a/src/test/run-pass/proc-macro/attr-on-trait.rs
+++ b/src/test/ui/proc-macro/attr-on-trait.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:attr-on-trait.rs
 
 extern crate attr_on_trait;
diff --git a/src/test/run-pass/proc-macro/attr-stmt-expr.rs b/src/test/ui/proc-macro/attr-stmt-expr-rpass.rs
index 3f10754985b..16b8fabfc3f 100644
--- a/src/test/run-pass/proc-macro/attr-stmt-expr.rs
+++ b/src/test/ui/proc-macro/attr-stmt-expr-rpass.rs
@@ -1,8 +1,9 @@
-// aux-build:attr-stmt-expr.rs
+// run-pass
+// aux-build:attr-stmt-expr-rpass.rs
 
 #![feature(stmt_expr_attributes, proc_macro_hygiene)]
 
-extern crate attr_stmt_expr;
+extern crate attr_stmt_expr_rpass as attr_stmt_expr;
 use attr_stmt_expr::{expect_let, expect_print_stmt, expect_expr, expect_print_expr,
                      no_output, noop};
 
diff --git a/src/test/run-pass/proc-macro/auxiliary/add-impl.rs b/src/test/ui/proc-macro/auxiliary/add-impl.rs
index 741e64875b6..741e64875b6 100644
--- a/src/test/run-pass/proc-macro/auxiliary/add-impl.rs
+++ b/src/test/ui/proc-macro/auxiliary/add-impl.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/append-impl.rs b/src/test/ui/proc-macro/auxiliary/append-impl.rs
index b032b133759..b032b133759 100644
--- a/src/test/run-pass/proc-macro/auxiliary/append-impl.rs
+++ b/src/test/ui/proc-macro/auxiliary/append-impl.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/attr-args.rs b/src/test/ui/proc-macro/auxiliary/attr-args.rs
index 8dd2a5ac786..8dd2a5ac786 100644
--- a/src/test/run-pass/proc-macro/auxiliary/attr-args.rs
+++ b/src/test/ui/proc-macro/auxiliary/attr-args.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/attr-cfg.rs b/src/test/ui/proc-macro/auxiliary/attr-cfg.rs
index f50e18d7be3..f50e18d7be3 100644
--- a/src/test/run-pass/proc-macro/auxiliary/attr-cfg.rs
+++ b/src/test/ui/proc-macro/auxiliary/attr-cfg.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/attr-on-trait.rs b/src/test/ui/proc-macro/auxiliary/attr-on-trait.rs
index d89aaac59f6..d89aaac59f6 100644
--- a/src/test/run-pass/proc-macro/auxiliary/attr-on-trait.rs
+++ b/src/test/ui/proc-macro/auxiliary/attr-on-trait.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/attr-stmt-expr.rs b/src/test/ui/proc-macro/auxiliary/attr-stmt-expr-rpass.rs
index d81e16d9d29..d81e16d9d29 100644
--- a/src/test/run-pass/proc-macro/auxiliary/attr-stmt-expr.rs
+++ b/src/test/ui/proc-macro/auxiliary/attr-stmt-expr-rpass.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/bang-macro.rs b/src/test/ui/proc-macro/auxiliary/bang-macro.rs
index ff000228218..ff000228218 100644
--- a/src/test/run-pass/proc-macro/auxiliary/bang-macro.rs
+++ b/src/test/ui/proc-macro/auxiliary/bang-macro.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/call-site.rs b/src/test/ui/proc-macro/auxiliary/call-site.rs
index e64a5a3438a..e64a5a3438a 100644
--- a/src/test/run-pass/proc-macro/auxiliary/call-site.rs
+++ b/src/test/ui/proc-macro/auxiliary/call-site.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/count_compound_ops.rs b/src/test/ui/proc-macro/auxiliary/count_compound_ops.rs
index e09622e48bf..e09622e48bf 100644
--- a/src/test/run-pass/proc-macro/auxiliary/count_compound_ops.rs
+++ b/src/test/ui/proc-macro/auxiliary/count_compound_ops.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/custom-attr-only-one-derive.rs b/src/test/ui/proc-macro/auxiliary/custom-attr-only-one-derive.rs
index 41f73f5963a..41f73f5963a 100644
--- a/src/test/run-pass/proc-macro/auxiliary/custom-attr-only-one-derive.rs
+++ b/src/test/ui/proc-macro/auxiliary/custom-attr-only-one-derive.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-a.rs b/src/test/ui/proc-macro/auxiliary/derive-a.rs
index cd2be5fd84d..cd2be5fd84d 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-a.rs
+++ b/src/test/ui/proc-macro/auxiliary/derive-a.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-atob.rs b/src/test/ui/proc-macro/auxiliary/derive-atob.rs
index e78e5bb8f4c..e78e5bb8f4c 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-atob.rs
+++ b/src/test/ui/proc-macro/auxiliary/derive-atob.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-attr-cfg.rs b/src/test/ui/proc-macro/auxiliary/derive-attr-cfg.rs
index e7e9634e0bd..e7e9634e0bd 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-attr-cfg.rs
+++ b/src/test/ui/proc-macro/auxiliary/derive-attr-cfg.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-b.rs b/src/test/ui/proc-macro/auxiliary/derive-b-rpass.rs
index 3e6af67a9f4..3e6af67a9f4 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-b.rs
+++ b/src/test/ui/proc-macro/auxiliary/derive-b-rpass.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-ctod.rs b/src/test/ui/proc-macro/auxiliary/derive-ctod.rs
index dbf44ed1b05..dbf44ed1b05 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-ctod.rs
+++ b/src/test/ui/proc-macro/auxiliary/derive-ctod.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-nothing.rs b/src/test/ui/proc-macro/auxiliary/derive-nothing.rs
index b6d1e133af7..b6d1e133af7 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-nothing.rs
+++ b/src/test/ui/proc-macro/auxiliary/derive-nothing.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-same-struct.rs b/src/test/ui/proc-macro/auxiliary/derive-same-struct.rs
index ce7a50d2381..ce7a50d2381 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-same-struct.rs
+++ b/src/test/ui/proc-macro/auxiliary/derive-same-struct.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-two-attrs.rs b/src/test/ui/proc-macro/auxiliary/derive-two-attrs.rs
index a6f0eec126a..a6f0eec126a 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-two-attrs.rs
+++ b/src/test/ui/proc-macro/auxiliary/derive-two-attrs.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/derive-union.rs b/src/test/ui/proc-macro/auxiliary/derive-union.rs
index d950e1e773c..d950e1e773c 100644
--- a/src/test/run-pass/proc-macro/auxiliary/derive-union.rs
+++ b/src/test/ui/proc-macro/auxiliary/derive-union.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/double.rs b/src/test/ui/proc-macro/auxiliary/double.rs
index 3a2e8d04c36..3a2e8d04c36 100644
--- a/src/test/run-pass/proc-macro/auxiliary/double.rs
+++ b/src/test/ui/proc-macro/auxiliary/double.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/empty-crate.rs b/src/test/ui/proc-macro/auxiliary/empty-crate.rs
index 1cf7534b289..1cf7534b289 100644
--- a/src/test/run-pass/proc-macro/auxiliary/empty-crate.rs
+++ b/src/test/ui/proc-macro/auxiliary/empty-crate.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/expand-with-a-macro.rs b/src/test/ui/proc-macro/auxiliary/expand-with-a-macro.rs
index 5155a4b8558..5155a4b8558 100644
--- a/src/test/run-pass/proc-macro/auxiliary/expand-with-a-macro.rs
+++ b/src/test/ui/proc-macro/auxiliary/expand-with-a-macro.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/external-crate-var.rs b/src/test/ui/proc-macro/auxiliary/external-crate-var.rs
index 4319e921225..4319e921225 100644
--- a/src/test/run-pass/proc-macro/auxiliary/external-crate-var.rs
+++ b/src/test/ui/proc-macro/auxiliary/external-crate-var.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/gen-lifetime-token.rs b/src/test/ui/proc-macro/auxiliary/gen-lifetime-token.rs
index d1a1c584f8b..d1a1c584f8b 100644
--- a/src/test/run-pass/proc-macro/auxiliary/gen-lifetime-token.rs
+++ b/src/test/ui/proc-macro/auxiliary/gen-lifetime-token.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/hygiene_example.rs b/src/test/ui/proc-macro/auxiliary/hygiene_example.rs
index f7e7e0b5751..f7e7e0b5751 100644
--- a/src/test/run-pass/proc-macro/auxiliary/hygiene_example.rs
+++ b/src/test/ui/proc-macro/auxiliary/hygiene_example.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/hygiene_example_codegen.rs b/src/test/ui/proc-macro/auxiliary/hygiene_example_codegen.rs
index 5e50a6e916f..5e50a6e916f 100644
--- a/src/test/run-pass/proc-macro/auxiliary/hygiene_example_codegen.rs
+++ b/src/test/ui/proc-macro/auxiliary/hygiene_example_codegen.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/issue-39889.rs b/src/test/ui/proc-macro/auxiliary/issue-39889.rs
index e7af66da797..e7af66da797 100644
--- a/src/test/run-pass/proc-macro/auxiliary/issue-39889.rs
+++ b/src/test/ui/proc-macro/auxiliary/issue-39889.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/issue-42708.rs b/src/test/ui/proc-macro/auxiliary/issue-42708.rs
index dae05204b8b..dae05204b8b 100644
--- a/src/test/run-pass/proc-macro/auxiliary/issue-42708.rs
+++ b/src/test/ui/proc-macro/auxiliary/issue-42708.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/issue-50061.rs b/src/test/ui/proc-macro/auxiliary/issue-50061.rs
index f5fe8cabbce..f5fe8cabbce 100644
--- a/src/test/run-pass/proc-macro/auxiliary/issue-50061.rs
+++ b/src/test/ui/proc-macro/auxiliary/issue-50061.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/lifetimes.rs b/src/test/ui/proc-macro/auxiliary/lifetimes-rpass.rs
index 4e5d22e6e3e..4e5d22e6e3e 100644
--- a/src/test/run-pass/proc-macro/auxiliary/lifetimes.rs
+++ b/src/test/ui/proc-macro/auxiliary/lifetimes-rpass.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/modify-ast.rs b/src/test/ui/proc-macro/auxiliary/modify-ast.rs
index cc582c1522c..cc582c1522c 100644
--- a/src/test/run-pass/proc-macro/auxiliary/modify-ast.rs
+++ b/src/test/ui/proc-macro/auxiliary/modify-ast.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/negative-token.rs b/src/test/ui/proc-macro/auxiliary/negative-token.rs
index 8b89f2e3731..8b89f2e3731 100644
--- a/src/test/run-pass/proc-macro/auxiliary/negative-token.rs
+++ b/src/test/ui/proc-macro/auxiliary/negative-token.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/not-joint.rs b/src/test/ui/proc-macro/auxiliary/not-joint.rs
index e6c09f7628e..e6c09f7628e 100644
--- a/src/test/run-pass/proc-macro/auxiliary/not-joint.rs
+++ b/src/test/ui/proc-macro/auxiliary/not-joint.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/span-api-tests.rs b/src/test/ui/proc-macro/auxiliary/span-api-tests.rs
index ad1e770a4dc..ad1e770a4dc 100644
--- a/src/test/run-pass/proc-macro/auxiliary/span-api-tests.rs
+++ b/src/test/ui/proc-macro/auxiliary/span-api-tests.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/span-test-macros.rs b/src/test/ui/proc-macro/auxiliary/span-test-macros.rs
index 9a78f0a8955..9a78f0a8955 100644
--- a/src/test/run-pass/proc-macro/auxiliary/span-test-macros.rs
+++ b/src/test/ui/proc-macro/auxiliary/span-test-macros.rs
diff --git a/src/test/run-pass/proc-macro/auxiliary/test-macros.rs b/src/test/ui/proc-macro/auxiliary/test-macros-rpass.rs
index 15fe3804f9b..15fe3804f9b 100644
--- a/src/test/run-pass/proc-macro/auxiliary/test-macros.rs
+++ b/src/test/ui/proc-macro/auxiliary/test-macros-rpass.rs
diff --git a/src/test/run-pass/proc-macro/bang-macro.rs b/src/test/ui/proc-macro/bang-macro.rs
index 6f04bb10b90..7073c71538c 100644
--- a/src/test/run-pass/proc-macro/bang-macro.rs
+++ b/src/test/ui/proc-macro/bang-macro.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:bang-macro.rs
 
 #![feature(proc_macro_hygiene)]
diff --git a/src/test/run-pass/proc-macro/call-site.rs b/src/test/ui/proc-macro/call-site.rs
index f31b418e3b2..096d0ec533a 100644
--- a/src/test/run-pass/proc-macro/call-site.rs
+++ b/src/test/ui/proc-macro/call-site.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 #![allow(unused_imports)]
 // aux-build:call-site.rs
diff --git a/src/test/run-pass/proc-macro/count_compound_ops.rs b/src/test/ui/proc-macro/count_compound_ops.rs
index f42d82ce046..966ab616cdf 100644
--- a/src/test/run-pass/proc-macro/count_compound_ops.rs
+++ b/src/test/ui/proc-macro/count_compound_ops.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:count_compound_ops.rs
 
 #![feature(proc_macro_hygiene)]
diff --git a/src/test/run-pass/proc-macro/crate-var.rs b/src/test/ui/proc-macro/crate-var.rs
index 4d551f65cd0..c0518e4b08c 100644
--- a/src/test/run-pass/proc-macro/crate-var.rs
+++ b/src/test/ui/proc-macro/crate-var.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:double.rs
 // aux-build:external-crate-var.rs
 
diff --git a/src/test/run-pass/proc-macro/custom-attr-only-one-derive.rs b/src/test/ui/proc-macro/custom-attr-only-one-derive.rs
index 993d3315596..2cd5b487301 100644
--- a/src/test/run-pass/proc-macro/custom-attr-only-one-derive.rs
+++ b/src/test/ui/proc-macro/custom-attr-only-one-derive.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:custom-attr-only-one-derive.rs
 
 #![feature(rust_2018_preview)]
diff --git a/src/test/run-pass/proc-macro/derive-attr-cfg.rs b/src/test/ui/proc-macro/derive-attr-cfg.rs
index c23ab9fb683..3947746286d 100644
--- a/src/test/run-pass/proc-macro/derive-attr-cfg.rs
+++ b/src/test/ui/proc-macro/derive-attr-cfg.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // aux-build:derive-attr-cfg.rs
 
diff --git a/src/test/run-pass/proc-macro/derive-b.rs b/src/test/ui/proc-macro/derive-b.rs
index da67534364b..a026c2bd77a 100644
--- a/src/test/run-pass/proc-macro/derive-b.rs
+++ b/src/test/ui/proc-macro/derive-b.rs
@@ -1,6 +1,7 @@
-// aux-build:derive-b.rs
+// run-pass
+// aux-build:derive-b-rpass.rs
 
-extern crate derive_b;
+extern crate derive_b_rpass as derive_b;
 
 #[derive(Debug, PartialEq, derive_b::B, Eq, Copy, Clone)]
 #[cfg_attr(all(), B[arbitrary tokens])]
diff --git a/src/test/run-pass/proc-macro/derive-same-struct.rs b/src/test/ui/proc-macro/derive-same-struct.rs
index 18401525087..528b0f22a81 100644
--- a/src/test/run-pass/proc-macro/derive-same-struct.rs
+++ b/src/test/ui/proc-macro/derive-same-struct.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(path_statements)]
 #![allow(dead_code)]
 // aux-build:derive-same-struct.rs
diff --git a/src/test/run-pass/proc-macro/derive-same-struct.stdout b/src/test/ui/proc-macro/derive-same-struct.stdout
index 77605de5e33..77605de5e33 100644
--- a/src/test/run-pass/proc-macro/derive-same-struct.stdout
+++ b/src/test/ui/proc-macro/derive-same-struct.stdout
diff --git a/src/test/run-pass/proc-macro/derive-test.rs b/src/test/ui/proc-macro/derive-test.rs
index edb0201ba77..b81e38432e8 100644
--- a/src/test/run-pass/proc-macro/derive-test.rs
+++ b/src/test/ui/proc-macro/derive-test.rs
@@ -1,3 +1,4 @@
+// run-pass
 // no-prefer-dynamic
 // compile-flags: --test
 
diff --git a/src/test/run-pass/proc-macro/derive-two-attrs.rs b/src/test/ui/proc-macro/derive-two-attrs.rs
index a93ba8184f7..08225b8e3f2 100644
--- a/src/test/run-pass/proc-macro/derive-two-attrs.rs
+++ b/src/test/ui/proc-macro/derive-two-attrs.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // aux-build:derive-two-attrs.rs
 
diff --git a/src/test/run-pass/proc-macro/derive-union.rs b/src/test/ui/proc-macro/derive-union.rs
index 6e8b1b726e4..e83eee0936a 100644
--- a/src/test/run-pass/proc-macro/derive-union.rs
+++ b/src/test/ui/proc-macro/derive-union.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 // aux-build:derive-union.rs
 
diff --git a/src/test/run-pass/proc-macro/empty-crate.rs b/src/test/ui/proc-macro/empty-crate.rs
index 84104a3f5cf..3e54c9feebc 100644
--- a/src/test/run-pass/proc-macro/empty-crate.rs
+++ b/src/test/ui/proc-macro/empty-crate.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 // aux-build:empty-crate.rs
 
diff --git a/src/test/run-pass/proc-macro/expand-with-a-macro.rs b/src/test/ui/proc-macro/expand-with-a-macro.rs
index 097520b993a..418178d0f0e 100644
--- a/src/test/run-pass/proc-macro/expand-with-a-macro.rs
+++ b/src/test/ui/proc-macro/expand-with-a-macro.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:expand-with-a-macro.rs
 
 // ignore-wasm32-bare compiled with panic=abort by default
diff --git a/src/test/run-pass/proc-macro/gen-lifetime-token.rs b/src/test/ui/proc-macro/gen-lifetime-token.rs
index 1659b87440b..588bd2b76c1 100644
--- a/src/test/run-pass/proc-macro/gen-lifetime-token.rs
+++ b/src/test/ui/proc-macro/gen-lifetime-token.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:gen-lifetime-token.rs
 
 extern crate gen_lifetime_token as bar;
diff --git a/src/test/run-pass/proc-macro/hygiene_example.rs b/src/test/ui/proc-macro/hygiene_example.rs
index 3e5bab6bb13..56ea9daacc3 100644
--- a/src/test/run-pass/proc-macro/hygiene_example.rs
+++ b/src/test/ui/proc-macro/hygiene_example.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_macros)]
 // aux-build:hygiene_example_codegen.rs
 // aux-build:hygiene_example.rs
diff --git a/src/test/run-pass/proc-macro/issue-39889.rs b/src/test/ui/proc-macro/issue-39889.rs
index 91c8d48b871..ada125a215a 100644
--- a/src/test/run-pass/proc-macro/issue-39889.rs
+++ b/src/test/ui/proc-macro/issue-39889.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // aux-build:issue-39889.rs
 
diff --git a/src/test/run-pass/proc-macro/issue-42708.rs b/src/test/ui/proc-macro/issue-42708.rs
index 466021c16e8..e8f445aaaf7 100644
--- a/src/test/run-pass/proc-macro/issue-42708.rs
+++ b/src/test/ui/proc-macro/issue-42708.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:issue-42708.rs
 
 #![feature(decl_macro)]
diff --git a/src/test/run-pass/proc-macro/issue-50061.rs b/src/test/ui/proc-macro/issue-50061.rs
index b0dad493ebc..01c6b80b46c 100644
--- a/src/test/run-pass/proc-macro/issue-50061.rs
+++ b/src/test/ui/proc-macro/issue-50061.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(path_statements)]
 // aux-build:issue-50061.rs
 
diff --git a/src/test/run-pass/proc-macro/lifetimes.rs b/src/test/ui/proc-macro/lifetimes-rpass.rs
index e462a53ec28..a1d33ddca70 100644
--- a/src/test/run-pass/proc-macro/lifetimes.rs
+++ b/src/test/ui/proc-macro/lifetimes-rpass.rs
@@ -1,7 +1,9 @@
+// run-pass
+
 #![allow(unused_variables)]
-// aux-build:lifetimes.rs
+// aux-build:lifetimes-rpass.rs
 
-extern crate lifetimes;
+extern crate lifetimes_rpass as lifetimes;
 use lifetimes::*;
 
 lifetimes_bang! {
diff --git a/src/test/run-pass/proc-macro/load-two.rs b/src/test/ui/proc-macro/load-two.rs
index 24585e1e067..5ce0e65452e 100644
--- a/src/test/run-pass/proc-macro/load-two.rs
+++ b/src/test/ui/proc-macro/load-two.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(path_statements)]
 #![allow(dead_code)]
 // aux-build:derive-atob.rs
diff --git a/src/test/run-pass/proc-macro/macros-in-extern.rs b/src/test/ui/proc-macro/macros-in-extern-rpass.rs
index 99e3f7d14fd..a30a287a101 100644
--- a/src/test/run-pass/proc-macro/macros-in-extern.rs
+++ b/src/test/ui/proc-macro/macros-in-extern-rpass.rs
@@ -1,9 +1,10 @@
-// aux-build:test-macros.rs
+// run-pass
+// aux-build:test-macros-rpass.rs
 // ignore-wasm32
 
 #![feature(macros_in_extern)]
 
-extern crate test_macros;
+extern crate test_macros_rpass as test_macros;
 
 use test_macros::{nop_attr, no_output, emit_input};
 
diff --git a/src/test/run-pass/proc-macro/modify-ast.rs b/src/test/ui/proc-macro/modify-ast.rs
index a96c61f1cb8..ea9bf837c24 100644
--- a/src/test/run-pass/proc-macro/modify-ast.rs
+++ b/src/test/ui/proc-macro/modify-ast.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:modify-ast.rs
 
 extern crate modify_ast;
diff --git a/src/test/run-pass/proc-macro/negative-token.rs b/src/test/ui/proc-macro/negative-token.rs
index 751d1a43a0a..3d018fe60a1 100644
--- a/src/test/run-pass/proc-macro/negative-token.rs
+++ b/src/test/ui/proc-macro/negative-token.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:negative-token.rs
 
 #![feature(proc_macro_hygiene)]
diff --git a/src/test/run-pass/proc-macro/not-joint.rs b/src/test/ui/proc-macro/not-joint.rs
index b360e4e1bb2..30da2811ed4 100644
--- a/src/test/run-pass/proc-macro/not-joint.rs
+++ b/src/test/ui/proc-macro/not-joint.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:not-joint.rs
 
 extern crate not_joint as bar;
diff --git a/src/test/run-pass/proc-macro/smoke.rs b/src/test/ui/proc-macro/smoke.rs
index 26fbce3ebf1..04625559b91 100644
--- a/src/test/run-pass/proc-macro/smoke.rs
+++ b/src/test/ui/proc-macro/smoke.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(path_statements)]
 // aux-build:derive-a.rs
diff --git a/src/test/run-pass/proc-macro/span-api-tests.rs b/src/test/ui/proc-macro/span-api-tests.rs
index 9b977b8fa75..3667e14c9e0 100644
--- a/src/test/run-pass/proc-macro/span-api-tests.rs
+++ b/src/test/ui/proc-macro/span-api-tests.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:span-api-tests.rs
 // aux-build:span-test-macros.rs
 
diff --git a/src/test/run-pass/proc-macro/struct-field-macro.rs b/src/test/ui/proc-macro/struct-field-macro.rs
index 58663cc6c37..460f4d9f726 100644
--- a/src/test/run-pass/proc-macro/struct-field-macro.rs
+++ b/src/test/ui/proc-macro/struct-field-macro.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // aux-build:derive-nothing.rs
 
diff --git a/src/test/run-pass/proc_macro.rs b/src/test/ui/proc_macro.rs
index afdf2b8baa1..7ff94649003 100644
--- a/src/test/run-pass/proc_macro.rs
+++ b/src/test/ui/proc_macro.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:proc_macro_def.rs
 // ignore-cross-compile
 
diff --git a/src/test/run-pass/process/process-envs.rs b/src/test/ui/process/process-envs.rs
index a7779c55f1f..a7779c55f1f 100644
--- a/src/test/run-pass/process/process-envs.rs
+++ b/src/test/ui/process/process-envs.rs
diff --git a/src/test/run-pass/process/process-exit.rs b/src/test/ui/process/process-exit.rs
index da3b4ca85c2..da3b4ca85c2 100644
--- a/src/test/run-pass/process/process-exit.rs
+++ b/src/test/ui/process/process-exit.rs
diff --git a/src/test/run-pass/process/process-remove-from-env.rs b/src/test/ui/process/process-remove-from-env.rs
index 32cbb6ac85a..32cbb6ac85a 100644
--- a/src/test/run-pass/process/process-remove-from-env.rs
+++ b/src/test/ui/process/process-remove-from-env.rs
diff --git a/src/test/run-pass/process/process-sigpipe.rs b/src/test/ui/process/process-sigpipe.rs
index bf589096006..bf589096006 100644
--- a/src/test/run-pass/process/process-sigpipe.rs
+++ b/src/test/ui/process/process-sigpipe.rs
diff --git a/src/test/run-pass/process/process-spawn-nonexistent.rs b/src/test/ui/process/process-spawn-nonexistent.rs
index 182cf1748fe..182cf1748fe 100644
--- a/src/test/run-pass/process/process-spawn-nonexistent.rs
+++ b/src/test/ui/process/process-spawn-nonexistent.rs
diff --git a/src/test/run-pass/process/process-spawn-with-unicode-params.rs b/src/test/ui/process/process-spawn-with-unicode-params.rs
index edd3cb26ec3..edd3cb26ec3 100644
--- a/src/test/run-pass/process/process-spawn-with-unicode-params.rs
+++ b/src/test/ui/process/process-spawn-with-unicode-params.rs
diff --git a/src/test/run-pass/process/process-status-inherits-stdin.rs b/src/test/ui/process/process-status-inherits-stdin.rs
index f9b2da7e401..f9b2da7e401 100644
--- a/src/test/run-pass/process/process-status-inherits-stdin.rs
+++ b/src/test/ui/process/process-status-inherits-stdin.rs
diff --git a/src/test/run-pass/project-cache-issue-31849.rs b/src/test/ui/project-cache-issue-31849.rs
index 4920678af1a..07fb6abaeac 100644
--- a/src/test/run-pass/project-cache-issue-31849.rs
+++ b/src/test/ui/project-cache-issue-31849.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Regression test for #31849: the problem here was actually a performance
 // cliff, but I'm adding the test for reference.
 
diff --git a/src/test/run-pass/project-cache-issue-37154.rs b/src/test/ui/project-cache-issue-37154.rs
index 8b07b9c98ad..b10239c22d1 100644
--- a/src/test/run-pass/project-cache-issue-37154.rs
+++ b/src/test/ui/project-cache-issue-37154.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Regression test for #37154: the problem here was that the cache
 // results in a false error because it was caching placeholder results
diff --git a/src/test/run-pass/project-defer-unification.rs b/src/test/ui/project-defer-unification.rs
index 548c4d29cbb..547ff45c229 100644
--- a/src/test/run-pass/project-defer-unification.rs
+++ b/src/test/ui/project-defer-unification.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_variables)]
 #![allow(unreachable_code)]
diff --git a/src/test/run-pass/ptr-coercion.rs b/src/test/ui/ptr-coercion-rpass.rs
index 0dd2b5467d9..1c3ce33039e 100644
--- a/src/test/run-pass/ptr-coercion.rs
+++ b/src/test/ui/ptr-coercion-rpass.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 // Test coercions between pointers which don't do anything fancy like unsizing.
 
diff --git a/src/test/run-pass/pure-sum.rs b/src/test/ui/pure-sum.rs
index d000c8488a6..2ff6f935a03 100644
--- a/src/test/run-pass/pure-sum.rs
+++ b/src/test/ui/pure-sum.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Check that functions can modify local state.
 
diff --git a/src/test/run-pass/purity-infer.rs b/src/test/ui/purity-infer.rs
index 3b2b4186019..dc0eb89bfa2 100644
--- a/src/test/run-pass/purity-infer.rs
+++ b/src/test/ui/purity-infer.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn something<F>(f: F) where F: FnOnce() { f(); }
 pub fn main() {
     something(|| println!("hi!") );
diff --git a/src/test/run-pass/range-type-infer.rs b/src/test/ui/range-type-infer.rs
index 777286d8558..f07c041717f 100644
--- a/src/test/run-pass/range-type-infer.rs
+++ b/src/test/ui/range-type-infer.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 // Make sure the type inference for the new range expression work as
 // good as the old one. Check out issue #21672, #21595 and #21649 for
diff --git a/src/test/run-pass/range.rs b/src/test/ui/range.rs
index a3667d87613..82983e37ea1 100644
--- a/src/test/run-pass/range.rs
+++ b/src/test/ui/range.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_comparisons)]
 #![allow(dead_code)]
 #![allow(unused_mut)]
diff --git a/src/test/run-pass/range_inclusive.rs b/src/test/ui/range_inclusive.rs
index 31c3c394034..68d9bf7d26b 100644
--- a/src/test/run-pass/range_inclusive.rs
+++ b/src/test/ui/range_inclusive.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test inclusive range syntax.
 
 #![feature(range_is_empty)]
diff --git a/src/test/run-pass/range_inclusive_gate.rs b/src/test/ui/range_inclusive_gate.rs
index d4d830ef223..e26e31b44a0 100644
--- a/src/test/run-pass/range_inclusive_gate.rs
+++ b/src/test/ui/range_inclusive_gate.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_comparisons)]
 // Test that you only need the syntax gate if you don't mention the structs.
 // (Obsoleted since both features are stabilized)
diff --git a/src/test/run-pass/ranges-precedence.rs b/src/test/ui/ranges-precedence.rs
index 86862993d4d..db241ed0ccd 100644
--- a/src/test/run-pass/ranges-precedence.rs
+++ b/src/test/ui/ranges-precedence.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that the precedence of ranges is correct
 
 
diff --git a/src/test/run-pass/raw-fat-ptr.rs b/src/test/ui/raw-fat-ptr.rs
index 511a35b25a3..9f50659ed60 100644
--- a/src/test/run-pass/raw-fat-ptr.rs
+++ b/src/test/ui/raw-fat-ptr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // check raw fat pointer ops
 
 use std::mem;
diff --git a/src/test/run-pass/raw-str.rs b/src/test/ui/raw-str.rs
index 8861ec3f85a..0916dddbb7b 100644
--- a/src/test/run-pass/raw-str.rs
+++ b/src/test/ui/raw-str.rs
Binary files differdiff --git a/src/test/run-pass/rcvr-borrowed-to-region.rs b/src/test/ui/rcvr-borrowed-to-region.rs
index b1b25358978..37113bc0a05 100644
--- a/src/test/run-pass/rcvr-borrowed-to-region.rs
+++ b/src/test/ui/rcvr-borrowed-to-region.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![feature(box_syntax)]
 
diff --git a/src/test/run-pass/reachable-unnameable-items.rs b/src/test/ui/reachable-unnameable-items.rs
index a7454047406..f1e53a0d8b4 100644
--- a/src/test/run-pass/reachable-unnameable-items.rs
+++ b/src/test/ui/reachable-unnameable-items.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare compiled with panic=abort by default
 // aux-build:reachable-unnameable-items.rs
 
diff --git a/src/test/run-pass/reachable-unnameable-type-alias.rs b/src/test/ui/reachable-unnameable-type-alias.rs
index a632ce186e1..461355f87cf 100644
--- a/src/test/run-pass/reachable-unnameable-type-alias.rs
+++ b/src/test/ui/reachable-unnameable-type-alias.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(staged_api)]
 #![stable(feature = "a", since = "b")]
 
diff --git a/src/test/run-pass/readalias.rs b/src/test/ui/readalias.rs
index 444d4471233..a6bf61803cf 100644
--- a/src/test/run-pass/readalias.rs
+++ b/src/test/ui/readalias.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 
diff --git a/src/test/run-pass/realloc-16687.rs b/src/test/ui/realloc-16687.rs
index e283d5b6de1..69292d241c3 100644
--- a/src/test/run-pass/realloc-16687.rs
+++ b/src/test/ui/realloc-16687.rs
@@ -1,3 +1,4 @@
+// run-pass
 // alloc::heap::reallocate test.
 //
 // Ideally this would be revised to use no_std, but for now it serves
diff --git a/src/test/run-pass/reexport-should-still-link.rs b/src/test/ui/reexport-should-still-link.rs
index 733f8f9c1f3..913da56a184 100644
--- a/src/test/run-pass/reexport-should-still-link.rs
+++ b/src/test/ui/reexport-should-still-link.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:reexport-should-still-link.rs
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/reexport-star.rs b/src/test/ui/reexport-star.rs
index ae48f97a9dd..639ab1a0f3a 100644
--- a/src/test/run-pass/reexport-star.rs
+++ b/src/test/ui/reexport-star.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 mod a {
diff --git a/src/test/run-pass/reexport-test-harness-main.rs b/src/test/ui/reexport-test-harness-main.rs
index 5171c1c1739..2582975e219 100644
--- a/src/test/run-pass/reexport-test-harness-main.rs
+++ b/src/test/ui/reexport-test-harness-main.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags:--test
 
 #![reexport_test_harness_main = "test_main"]
diff --git a/src/test/run-pass/refer-to-other-statics-by-value.rs b/src/test/ui/refer-to-other-statics-by-value.rs
index e08700c57c0..90f1980f858 100644
--- a/src/test/run-pass/refer-to-other-statics-by-value.rs
+++ b/src/test/ui/refer-to-other-statics-by-value.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 static A: usize = 42;
 static B: usize = A;
 
diff --git a/src/test/run-pass/regions/regions-addr-of-interior-of-unique-box.rs b/src/test/ui/regions/regions-addr-of-interior-of-unique-box.rs
index 4221ebfdffb..4221ebfdffb 100644
--- a/src/test/run-pass/regions/regions-addr-of-interior-of-unique-box.rs
+++ b/src/test/ui/regions/regions-addr-of-interior-of-unique-box.rs
diff --git a/src/test/run-pass/regions/regions-addr-of-ret.rs b/src/test/ui/regions/regions-addr-of-ret.rs
index e5dcd6db033..e5dcd6db033 100644
--- a/src/test/run-pass/regions/regions-addr-of-ret.rs
+++ b/src/test/ui/regions/regions-addr-of-ret.rs
diff --git a/src/test/run-pass/regions/regions-assoc-type-region-bound.rs b/src/test/ui/regions/regions-assoc-type-region-bound.rs
index cbb7d1726d9..cbb7d1726d9 100644
--- a/src/test/run-pass/regions/regions-assoc-type-region-bound.rs
+++ b/src/test/ui/regions/regions-assoc-type-region-bound.rs
diff --git a/src/test/run-pass/regions/regions-assoc-type-static-bound.rs b/src/test/ui/regions/regions-assoc-type-static-bound.rs
index 1458787ea65..1458787ea65 100644
--- a/src/test/run-pass/regions/regions-assoc-type-static-bound.rs
+++ b/src/test/ui/regions/regions-assoc-type-static-bound.rs
diff --git a/src/test/run-pass/regions/regions-borrow-at.rs b/src/test/ui/regions/regions-borrow-at.rs
index 355e8c91455..355e8c91455 100644
--- a/src/test/run-pass/regions/regions-borrow-at.rs
+++ b/src/test/ui/regions/regions-borrow-at.rs
diff --git a/src/test/run-pass/regions/regions-borrow-evec-fixed.rs b/src/test/ui/regions/regions-borrow-evec-fixed.rs
index ed828312b46..ed828312b46 100644
--- a/src/test/run-pass/regions/regions-borrow-evec-fixed.rs
+++ b/src/test/ui/regions/regions-borrow-evec-fixed.rs
diff --git a/src/test/run-pass/regions/regions-borrow-evec-uniq.rs b/src/test/ui/regions/regions-borrow-evec-uniq.rs
index bbf7ba79e2a..bbf7ba79e2a 100644
--- a/src/test/run-pass/regions/regions-borrow-evec-uniq.rs
+++ b/src/test/ui/regions/regions-borrow-evec-uniq.rs
diff --git a/src/test/run-pass/regions/regions-borrow-uniq.rs b/src/test/ui/regions/regions-borrow-uniq.rs
index 3bf049c1511..3bf049c1511 100644
--- a/src/test/run-pass/regions/regions-borrow-uniq.rs
+++ b/src/test/ui/regions/regions-borrow-uniq.rs
diff --git a/src/test/run-pass/regions/regions-bot.rs b/src/test/ui/regions/regions-bot.rs
index 58016293640..58016293640 100644
--- a/src/test/run-pass/regions/regions-bot.rs
+++ b/src/test/ui/regions/regions-bot.rs
diff --git a/src/test/run-pass/regions/regions-bound-lists-feature-gate-2.rs b/src/test/ui/regions/regions-bound-lists-feature-gate-2.rs
index 2c750379933..2c750379933 100644
--- a/src/test/run-pass/regions/regions-bound-lists-feature-gate-2.rs
+++ b/src/test/ui/regions/regions-bound-lists-feature-gate-2.rs
diff --git a/src/test/run-pass/regions/regions-bound-lists-feature-gate.rs b/src/test/ui/regions/regions-bound-lists-feature-gate.rs
index 3815498f86f..3815498f86f 100644
--- a/src/test/run-pass/regions/regions-bound-lists-feature-gate.rs
+++ b/src/test/ui/regions/regions-bound-lists-feature-gate.rs
diff --git a/src/test/run-pass/regions/regions-close-over-type-parameter-successfully.rs b/src/test/ui/regions/regions-close-over-type-parameter-successfully.rs
index 4b47ed8c6ae..4b47ed8c6ae 100644
--- a/src/test/run-pass/regions/regions-close-over-type-parameter-successfully.rs
+++ b/src/test/ui/regions/regions-close-over-type-parameter-successfully.rs
diff --git a/src/test/run-pass/regions/regions-copy-closure.rs b/src/test/ui/regions/regions-copy-closure.rs
index 43640079777..43640079777 100644
--- a/src/test/run-pass/regions/regions-copy-closure.rs
+++ b/src/test/ui/regions/regions-copy-closure.rs
diff --git a/src/test/run-pass/regions/regions-creating-enums2.rs b/src/test/ui/regions/regions-creating-enums2.rs
index 7b16fb1a8e0..7b16fb1a8e0 100644
--- a/src/test/run-pass/regions/regions-creating-enums2.rs
+++ b/src/test/ui/regions/regions-creating-enums2.rs
diff --git a/src/test/run-pass/regions/regions-creating-enums5.rs b/src/test/ui/regions/regions-creating-enums5.rs
index ad3d9748bf0..ad3d9748bf0 100644
--- a/src/test/run-pass/regions/regions-creating-enums5.rs
+++ b/src/test/ui/regions/regions-creating-enums5.rs
diff --git a/src/test/run-pass/regions/regions-debruijn-of-object.rs b/src/test/ui/regions/regions-debruijn-of-object.rs
index 0b5510489fb..0b5510489fb 100644
--- a/src/test/run-pass/regions/regions-debruijn-of-object.rs
+++ b/src/test/ui/regions/regions-debruijn-of-object.rs
diff --git a/src/test/run-pass/regions/regions-dependent-addr-of.rs b/src/test/ui/regions/regions-dependent-addr-of.rs
index 0a7e6625c73..0a7e6625c73 100644
--- a/src/test/run-pass/regions/regions-dependent-addr-of.rs
+++ b/src/test/ui/regions/regions-dependent-addr-of.rs
diff --git a/src/test/run-pass/regions/regions-dependent-autofn.rs b/src/test/ui/regions/regions-dependent-autofn.rs
index 246dbb5563c..246dbb5563c 100644
--- a/src/test/run-pass/regions/regions-dependent-autofn.rs
+++ b/src/test/ui/regions/regions-dependent-autofn.rs
diff --git a/src/test/run-pass/regions/regions-dependent-autoslice.rs b/src/test/ui/regions/regions-dependent-autoslice.rs
index 4c5b35ec455..4c5b35ec455 100644
--- a/src/test/run-pass/regions/regions-dependent-autoslice.rs
+++ b/src/test/ui/regions/regions-dependent-autoslice.rs
diff --git a/src/test/run-pass/regions/regions-dependent-let-ref.rs b/src/test/ui/regions/regions-dependent-let-ref.rs
index 94e3df4b3f1..94e3df4b3f1 100644
--- a/src/test/run-pass/regions/regions-dependent-let-ref.rs
+++ b/src/test/ui/regions/regions-dependent-let-ref.rs
diff --git a/src/test/run-pass/regions/regions-early-bound-lifetime-in-assoc-fn.rs b/src/test/ui/regions/regions-early-bound-lifetime-in-assoc-fn.rs
index fe50a7dd1be..fe50a7dd1be 100644
--- a/src/test/run-pass/regions/regions-early-bound-lifetime-in-assoc-fn.rs
+++ b/src/test/ui/regions/regions-early-bound-lifetime-in-assoc-fn.rs
diff --git a/src/test/run-pass/regions/regions-early-bound-trait-param.rs b/src/test/ui/regions/regions-early-bound-trait-param.rs
index cc2bde78d85..cc2bde78d85 100644
--- a/src/test/run-pass/regions/regions-early-bound-trait-param.rs
+++ b/src/test/ui/regions/regions-early-bound-trait-param.rs
diff --git a/src/test/run-pass/regions/regions-early-bound-used-in-bound-method.rs b/src/test/ui/regions/regions-early-bound-used-in-bound-method.rs
index a778dae1ed3..a778dae1ed3 100644
--- a/src/test/run-pass/regions/regions-early-bound-used-in-bound-method.rs
+++ b/src/test/ui/regions/regions-early-bound-used-in-bound-method.rs
diff --git a/src/test/run-pass/regions/regions-early-bound-used-in-bound.rs b/src/test/ui/regions/regions-early-bound-used-in-bound.rs
index 6ccc99e845d..6ccc99e845d 100644
--- a/src/test/run-pass/regions/regions-early-bound-used-in-bound.rs
+++ b/src/test/ui/regions/regions-early-bound-used-in-bound.rs
diff --git a/src/test/run-pass/regions/regions-early-bound-used-in-type-param.rs b/src/test/ui/regions/regions-early-bound-used-in-type-param.rs
index d58c17ad9c8..d58c17ad9c8 100644
--- a/src/test/run-pass/regions/regions-early-bound-used-in-type-param.rs
+++ b/src/test/ui/regions/regions-early-bound-used-in-type-param.rs
diff --git a/src/test/run-pass/regions/regions-escape-into-other-fn.rs b/src/test/ui/regions/regions-escape-into-other-fn.rs
index fd4690463e6..fd4690463e6 100644
--- a/src/test/run-pass/regions/regions-escape-into-other-fn.rs
+++ b/src/test/ui/regions/regions-escape-into-other-fn.rs
diff --git a/src/test/run-pass/regions/regions-expl-self.rs b/src/test/ui/regions/regions-expl-self.rs
index f7315d628a5..f7315d628a5 100644
--- a/src/test/run-pass/regions/regions-expl-self.rs
+++ b/src/test/ui/regions/regions-expl-self.rs
diff --git a/src/test/run-pass/regions/regions-fn-subtyping-2.rs b/src/test/ui/regions/regions-fn-subtyping-2.rs
index 83949ddba3d..83949ddba3d 100644
--- a/src/test/run-pass/regions/regions-fn-subtyping-2.rs
+++ b/src/test/ui/regions/regions-fn-subtyping-2.rs
diff --git a/src/test/run-pass/regions/regions-fn-subtyping.rs b/src/test/ui/regions/regions-fn-subtyping.rs
index 9570359c69e..9570359c69e 100644
--- a/src/test/run-pass/regions/regions-fn-subtyping.rs
+++ b/src/test/ui/regions/regions-fn-subtyping.rs
diff --git a/src/test/run-pass/regions/regions-free-region-outlives-static-outlives-free-region.rs b/src/test/ui/regions/regions-free-region-outlives-static-outlives-free-region.rs
index f464cab7554..f464cab7554 100644
--- a/src/test/run-pass/regions/regions-free-region-outlives-static-outlives-free-region.rs
+++ b/src/test/ui/regions/regions-free-region-outlives-static-outlives-free-region.rs
diff --git a/src/test/run-pass/regions/regions-infer-borrow-scope-addr-of.rs b/src/test/ui/regions/regions-infer-borrow-scope-addr-of.rs
index 5d8ad932ed6..5d8ad932ed6 100644
--- a/src/test/run-pass/regions/regions-infer-borrow-scope-addr-of.rs
+++ b/src/test/ui/regions/regions-infer-borrow-scope-addr-of.rs
diff --git a/src/test/run-pass/regions/regions-infer-borrow-scope-view.rs b/src/test/ui/regions/regions-infer-borrow-scope-view.rs
index 349b5204434..349b5204434 100644
--- a/src/test/run-pass/regions/regions-infer-borrow-scope-view.rs
+++ b/src/test/ui/regions/regions-infer-borrow-scope-view.rs
diff --git a/src/test/run-pass/regions/regions-infer-borrow-scope-within-loop-ok.rs b/src/test/ui/regions/regions-infer-borrow-scope-within-loop-ok.rs
index f0ecc5de545..f0ecc5de545 100644
--- a/src/test/run-pass/regions/regions-infer-borrow-scope-within-loop-ok.rs
+++ b/src/test/ui/regions/regions-infer-borrow-scope-within-loop-ok.rs
diff --git a/src/test/run-pass/regions/regions-infer-borrow-scope.rs b/src/test/ui/regions/regions-infer-borrow-scope.rs
index 453973d9c58..453973d9c58 100644
--- a/src/test/run-pass/regions/regions-infer-borrow-scope.rs
+++ b/src/test/ui/regions/regions-infer-borrow-scope.rs
diff --git a/src/test/run-pass/regions/regions-infer-call-2.rs b/src/test/ui/regions/regions-infer-call-2.rs
index a288d2e4d6e..a288d2e4d6e 100644
--- a/src/test/run-pass/regions/regions-infer-call-2.rs
+++ b/src/test/ui/regions/regions-infer-call-2.rs
diff --git a/src/test/run-pass/regions/regions-infer-call.rs b/src/test/ui/regions/regions-infer-call.rs
index 248f9e923d3..248f9e923d3 100644
--- a/src/test/run-pass/regions/regions-infer-call.rs
+++ b/src/test/ui/regions/regions-infer-call.rs
diff --git a/src/test/run-pass/regions/regions-infer-contravariance-due-to-ret.rs b/src/test/ui/regions/regions-infer-contravariance-due-to-ret.rs
index fbd89501559..fbd89501559 100644
--- a/src/test/run-pass/regions/regions-infer-contravariance-due-to-ret.rs
+++ b/src/test/ui/regions/regions-infer-contravariance-due-to-ret.rs
diff --git a/src/test/run-pass/regions/regions-infer-reborrow-ref-mut-recurse.rs b/src/test/ui/regions/regions-infer-reborrow-ref-mut-recurse.rs
index 31a48b4adcf..31a48b4adcf 100644
--- a/src/test/run-pass/regions/regions-infer-reborrow-ref-mut-recurse.rs
+++ b/src/test/ui/regions/regions-infer-reborrow-ref-mut-recurse.rs
diff --git a/src/test/run-pass/regions/regions-infer-region-in-fn-but-not-type.rs b/src/test/ui/regions/regions-infer-region-in-fn-but-not-type.rs
index 6aa5d8217a4..6aa5d8217a4 100644
--- a/src/test/run-pass/regions/regions-infer-region-in-fn-but-not-type.rs
+++ b/src/test/ui/regions/regions-infer-region-in-fn-but-not-type.rs
diff --git a/src/test/run-pass/regions/regions-infer-static-from-proc.rs b/src/test/ui/regions/regions-infer-static-from-proc.rs
index 39501e2d697..39501e2d697 100644
--- a/src/test/run-pass/regions/regions-infer-static-from-proc.rs
+++ b/src/test/ui/regions/regions-infer-static-from-proc.rs
diff --git a/src/test/run-pass/regions/regions-issue-21422.rs b/src/test/ui/regions/regions-issue-21422.rs
index 198b7146647..198b7146647 100644
--- a/src/test/run-pass/regions/regions-issue-21422.rs
+++ b/src/test/ui/regions/regions-issue-21422.rs
diff --git a/src/test/run-pass/regions/regions-issue-22246.rs b/src/test/ui/regions/regions-issue-22246.rs
index 0858833678b..0858833678b 100644
--- a/src/test/run-pass/regions/regions-issue-22246.rs
+++ b/src/test/ui/regions/regions-issue-22246.rs
diff --git a/src/test/run-pass/regions/regions-lifetime-nonfree-late-bound.rs b/src/test/ui/regions/regions-lifetime-nonfree-late-bound.rs
index c8106f32c65..c8106f32c65 100644
--- a/src/test/run-pass/regions/regions-lifetime-nonfree-late-bound.rs
+++ b/src/test/ui/regions/regions-lifetime-nonfree-late-bound.rs
diff --git a/src/test/run-pass/regions/regions-lifetime-static-items-enclosing-scopes.rs b/src/test/ui/regions/regions-lifetime-static-items-enclosing-scopes.rs
index b6a89e29ecc..b6a89e29ecc 100644
--- a/src/test/run-pass/regions/regions-lifetime-static-items-enclosing-scopes.rs
+++ b/src/test/ui/regions/regions-lifetime-static-items-enclosing-scopes.rs
diff --git a/src/test/run-pass/regions/regions-link-fn-args.rs b/src/test/ui/regions/regions-link-fn-args.rs
index 231407b226e..231407b226e 100644
--- a/src/test/run-pass/regions/regions-link-fn-args.rs
+++ b/src/test/ui/regions/regions-link-fn-args.rs
diff --git a/src/test/run-pass/regions/regions-lub-ref-ref-rc.rs b/src/test/ui/regions/regions-lub-ref-ref-rc.rs
index 96c71b084b1..96c71b084b1 100644
--- a/src/test/run-pass/regions/regions-lub-ref-ref-rc.rs
+++ b/src/test/ui/regions/regions-lub-ref-ref-rc.rs
diff --git a/src/test/run-pass/regions/regions-mock-codegen.rs b/src/test/ui/regions/regions-mock-codegen.rs
index 521ef3f6a4b..521ef3f6a4b 100644
--- a/src/test/run-pass/regions/regions-mock-codegen.rs
+++ b/src/test/ui/regions/regions-mock-codegen.rs
diff --git a/src/test/run-pass/regions/regions-no-bound-in-argument-cleanup.rs b/src/test/ui/regions/regions-no-bound-in-argument-cleanup.rs
index aafab5d86b8..aafab5d86b8 100644
--- a/src/test/run-pass/regions/regions-no-bound-in-argument-cleanup.rs
+++ b/src/test/ui/regions/regions-no-bound-in-argument-cleanup.rs
diff --git a/src/test/run-pass/regions/regions-no-variance-from-fn-generics.rs b/src/test/ui/regions/regions-no-variance-from-fn-generics.rs
index 76706a82781..76706a82781 100644
--- a/src/test/run-pass/regions/regions-no-variance-from-fn-generics.rs
+++ b/src/test/ui/regions/regions-no-variance-from-fn-generics.rs
diff --git a/src/test/run-pass/regions/regions-nullary-variant.rs b/src/test/ui/regions/regions-nullary-variant.rs
index 82470af82fa..82470af82fa 100644
--- a/src/test/run-pass/regions/regions-nullary-variant.rs
+++ b/src/test/ui/regions/regions-nullary-variant.rs
diff --git a/src/test/run-pass/regions/regions-params.rs b/src/test/ui/regions/regions-params.rs
index 04f3b8eaf57..04f3b8eaf57 100644
--- a/src/test/run-pass/regions/regions-params.rs
+++ b/src/test/ui/regions/regions-params.rs
diff --git a/src/test/run-pass/regions/regions-reassign-let-bound-pointer.rs b/src/test/ui/regions/regions-reassign-let-bound-pointer.rs
index 948b11e0f30..948b11e0f30 100644
--- a/src/test/run-pass/regions/regions-reassign-let-bound-pointer.rs
+++ b/src/test/ui/regions/regions-reassign-let-bound-pointer.rs
diff --git a/src/test/run-pass/regions/regions-reassign-match-bound-pointer.rs b/src/test/ui/regions/regions-reassign-match-bound-pointer.rs
index ca52659c4db..ca52659c4db 100644
--- a/src/test/run-pass/regions/regions-reassign-match-bound-pointer.rs
+++ b/src/test/ui/regions/regions-reassign-match-bound-pointer.rs
diff --git a/src/test/run-pass/regions/regions-refcell.rs b/src/test/ui/regions/regions-refcell.rs
index 39ad0c53f1e..39ad0c53f1e 100644
--- a/src/test/run-pass/regions/regions-refcell.rs
+++ b/src/test/ui/regions/regions-refcell.rs
diff --git a/src/test/run-pass/regions/regions-relate-bound-regions-on-closures-to-inference-variables.rs b/src/test/ui/regions/regions-relate-bound-regions-on-closures-to-inference-variables.rs
index aec05161c1a..aec05161c1a 100644
--- a/src/test/run-pass/regions/regions-relate-bound-regions-on-closures-to-inference-variables.rs
+++ b/src/test/ui/regions/regions-relate-bound-regions-on-closures-to-inference-variables.rs
diff --git a/src/test/run-pass/regions/regions-return-interior-of-option.rs b/src/test/ui/regions/regions-return-interior-of-option.rs
index 2dc91ec84f5..2dc91ec84f5 100644
--- a/src/test/run-pass/regions/regions-return-interior-of-option.rs
+++ b/src/test/ui/regions/regions-return-interior-of-option.rs
diff --git a/src/test/run-pass/regions/regions-scope-chain-example.rs b/src/test/ui/regions/regions-scope-chain-example.rs
index 2beb20add32..2beb20add32 100644
--- a/src/test/run-pass/regions/regions-scope-chain-example.rs
+++ b/src/test/ui/regions/regions-scope-chain-example.rs
diff --git a/src/test/run-pass/regions/regions-self-impls.rs b/src/test/ui/regions/regions-self-impls.rs
index 80b88568e42..80b88568e42 100644
--- a/src/test/run-pass/regions/regions-self-impls.rs
+++ b/src/test/ui/regions/regions-self-impls.rs
diff --git a/src/test/run-pass/regions/regions-self-in-enums.rs b/src/test/ui/regions/regions-self-in-enums.rs
index c2e4b2ff10d..c2e4b2ff10d 100644
--- a/src/test/run-pass/regions/regions-self-in-enums.rs
+++ b/src/test/ui/regions/regions-self-in-enums.rs
diff --git a/src/test/run-pass/regions/regions-simple.rs b/src/test/ui/regions/regions-simple.rs
index fff1b47f53f..fff1b47f53f 100644
--- a/src/test/run-pass/regions/regions-simple.rs
+++ b/src/test/ui/regions/regions-simple.rs
diff --git a/src/test/run-pass/regions/regions-static-bound.rs b/src/test/ui/regions/regions-static-bound-rpass.rs
index c91c6f87493..c91c6f87493 100644
--- a/src/test/run-pass/regions/regions-static-bound.rs
+++ b/src/test/ui/regions/regions-static-bound-rpass.rs
diff --git a/src/test/run-pass/regions/regions-static-closure.rs b/src/test/ui/regions/regions-static-closure.rs
index 09cd5622032..09cd5622032 100644
--- a/src/test/run-pass/regions/regions-static-closure.rs
+++ b/src/test/ui/regions/regions-static-closure.rs
diff --git a/src/test/run-pass/regions/regions-trait-object-1.rs b/src/test/ui/regions/regions-trait-object-1.rs
index 679bf4dd811..679bf4dd811 100644
--- a/src/test/run-pass/regions/regions-trait-object-1.rs
+++ b/src/test/ui/regions/regions-trait-object-1.rs
diff --git a/src/test/run-pass/regions/regions-variance-contravariant-use-contravariant.rs b/src/test/ui/regions/regions-variance-contravariant-use-contravariant.rs
index f10d5a25f16..f10d5a25f16 100644
--- a/src/test/run-pass/regions/regions-variance-contravariant-use-contravariant.rs
+++ b/src/test/ui/regions/regions-variance-contravariant-use-contravariant.rs
diff --git a/src/test/run-pass/regions/regions-variance-covariant-use-covariant.rs b/src/test/ui/regions/regions-variance-covariant-use-covariant.rs
index 9316aa15d32..9316aa15d32 100644
--- a/src/test/run-pass/regions/regions-variance-covariant-use-covariant.rs
+++ b/src/test/ui/regions/regions-variance-covariant-use-covariant.rs
diff --git a/src/test/run-pass/repeat-expr-in-static.rs b/src/test/ui/repeat-expr-in-static.rs
index 928509e1bd6..0b895379330 100644
--- a/src/test/run-pass/repeat-expr-in-static.rs
+++ b/src/test/ui/repeat-expr-in-static.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 static FOO: [isize; 4] = [32; 4];
 static BAR: [isize; 4] = [32, 32, 32, 32];
 
diff --git a/src/test/run-pass/repr_c_int_align.rs b/src/test/ui/repr_c_int_align.rs
index 9bb08cb6c64..fdd14fc2dbe 100644
--- a/src/test/run-pass/repr_c_int_align.rs
+++ b/src/test/ui/repr_c_int_align.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -O
 
 #![allow(dead_code)]
diff --git a/src/test/run-pass/resolve-issue-2428.rs b/src/test/ui/resolve-issue-2428.rs
index 7e730f6156c..5f3473e9feb 100644
--- a/src/test/run-pass/resolve-issue-2428.rs
+++ b/src/test/ui/resolve-issue-2428.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(non_upper_case_globals)]
 
diff --git a/src/test/run-pass/resolve-pseudo-shadowing.rs b/src/test/ui/resolve-pseudo-shadowing.rs
index 1a8ce9682ec..85c684ca032 100644
--- a/src/test/run-pass/resolve-pseudo-shadowing.rs
+++ b/src/test/ui/resolve-pseudo-shadowing.rs
@@ -1,3 +1,4 @@
+// run-pass
 // check that type parameters can't "shadow" qualified paths.
 
 fn check<Clone>(_c: Clone) {
diff --git a/src/test/run-pass/resource-assign-is-not-copy.rs b/src/test/ui/resource-assign-is-not-copy.rs
index c26473da5e0..c1de139a9a9 100644
--- a/src/test/run-pass/resource-assign-is-not-copy.rs
+++ b/src/test/ui/resource-assign-is-not-copy.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 use std::cell::Cell;
 
diff --git a/src/test/run-pass/resource-destruct.rs b/src/test/ui/resource-destruct.rs
index 066ce46f0b2..c4756a21a00 100644
--- a/src/test/run-pass/resource-destruct.rs
+++ b/src/test/ui/resource-destruct.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 use std::cell::Cell;
 
diff --git a/src/test/run-pass/result-opt-conversions.rs b/src/test/ui/result-opt-conversions.rs
index 14b562160df..57f258aab65 100644
--- a/src/test/run-pass/result-opt-conversions.rs
+++ b/src/test/ui/result-opt-conversions.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #[derive(Copy, Clone, Debug, PartialEq)]
 struct BadNumErr;
 
diff --git a/src/test/run-pass/ret-bang.rs b/src/test/ui/ret-bang.rs
index eb69ee6f886..6618992e036 100644
--- a/src/test/run-pass/ret-bang.rs
+++ b/src/test/ui/ret-bang.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn my_err(s: String) -> ! { println!("{}", s); panic!(); }
 
 fn okay(i: usize) -> isize {
diff --git a/src/test/run-pass/ret-none.rs b/src/test/ui/ret-none.rs
index f23461faaf4..d595506e336 100644
--- a/src/test/run-pass/ret-none.rs
+++ b/src/test/ui/ret-none.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/return-nil.rs b/src/test/ui/return-nil.rs
index f24df197234..fd5203ff0ed 100644
--- a/src/test/run-pass/return-nil.rs
+++ b/src/test/ui/return-nil.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 fn f() { let x: () = (); return x; }
diff --git a/src/test/run-pass/rfcs/rfc-1014-2.rs b/src/test/ui/rfcs/rfc-1014-2.rs
index 5be092204d7..5be092204d7 100644
--- a/src/test/run-pass/rfcs/rfc-1014-2.rs
+++ b/src/test/ui/rfcs/rfc-1014-2.rs
diff --git a/src/test/run-pass/rfcs/rfc-1014.rs b/src/test/ui/rfcs/rfc-1014.rs
index 41a036958bf..41a036958bf 100644
--- a/src/test/run-pass/rfcs/rfc-1014.rs
+++ b/src/test/ui/rfcs/rfc-1014.rs
diff --git a/src/test/run-pass/rfcs/rfc-1789-as-cell/from-mut.rs b/src/test/ui/rfcs/rfc-1789-as-cell/from-mut.rs
index ea3ad7aed49..ea3ad7aed49 100644
--- a/src/test/run-pass/rfcs/rfc-1789-as-cell/from-mut.rs
+++ b/src/test/ui/rfcs/rfc-1789-as-cell/from-mut.rs
diff --git a/src/test/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
index e98582cbce3..e98582cbce3 100644
--- a/src/test/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
+++ b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
diff --git a/src/test/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-empty.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-empty.rs
index bac695d4e79..bac695d4e79 100644
--- a/src/test/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-empty.rs
+++ b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-empty.rs
diff --git a/src/test/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-exitcode.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-exitcode.rs
index 9c2270bf827..9c2270bf827 100644
--- a/src/test/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-exitcode.rs
+++ b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-exitcode.rs
diff --git a/src/test/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs
index 79cfba011c0..79cfba011c0 100644
--- a/src/test/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs
+++ b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs
diff --git a/src/test/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs
index b0e932e1fe0..b0e932e1fe0 100644
--- a/src/test/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs
+++ b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs
diff --git a/src/test/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-result.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result.rs
index 30f36c24489..30f36c24489 100644
--- a/src/test/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-result.rs
+++ b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-result.rs
diff --git a/src/test/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-str.rs b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str.rs
index f0591c38c00..f0591c38c00 100644
--- a/src/test/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-str.rs
+++ b/src/test/ui/rfcs/rfc-1937-termination-trait/termination-trait-for-str.rs
diff --git a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/box.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/box.rs
index b3be41599a5..b3be41599a5 100644
--- a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/box.rs
+++ b/src/test/ui/rfcs/rfc-2005-default-binding-mode/box.rs
diff --git a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/constref.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/constref.rs
index d5bca6a2474..d5bca6a2474 100644
--- a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/constref.rs
+++ b/src/test/ui/rfcs/rfc-2005-default-binding-mode/constref.rs
diff --git a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/enum.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/enum.rs
index 52fbb90ed54..52fbb90ed54 100644
--- a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/enum.rs
+++ b/src/test/ui/rfcs/rfc-2005-default-binding-mode/enum.rs
diff --git a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/for.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/for.rs
index a5a24a80634..a5a24a80634 100644
--- a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/for.rs
+++ b/src/test/ui/rfcs/rfc-2005-default-binding-mode/for.rs
diff --git a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/general.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/general.rs
index 0207f607be8..0207f607be8 100644
--- a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/general.rs
+++ b/src/test/ui/rfcs/rfc-2005-default-binding-mode/general.rs
diff --git a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/lit.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/lit.rs
index 9379753598e..9379753598e 100644
--- a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/lit.rs
+++ b/src/test/ui/rfcs/rfc-2005-default-binding-mode/lit.rs
diff --git a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/range.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/range.rs
index 580e67513b3..580e67513b3 100644
--- a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/range.rs
+++ b/src/test/ui/rfcs/rfc-2005-default-binding-mode/range.rs
diff --git a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/ref-region.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/ref-region.rs
index b74e45c9328..b74e45c9328 100644
--- a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/ref-region.rs
+++ b/src/test/ui/rfcs/rfc-2005-default-binding-mode/ref-region.rs
diff --git a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/reset-mode.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/reset-mode.rs
index 3b9d07610d2..3b9d07610d2 100644
--- a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/reset-mode.rs
+++ b/src/test/ui/rfcs/rfc-2005-default-binding-mode/reset-mode.rs
diff --git a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/slice.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/slice.rs
index 939a3c4a1fd..939a3c4a1fd 100644
--- a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/slice.rs
+++ b/src/test/ui/rfcs/rfc-2005-default-binding-mode/slice.rs
diff --git a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/struct.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/struct.rs
index 5a00e5b6823..5a00e5b6823 100644
--- a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/struct.rs
+++ b/src/test/ui/rfcs/rfc-2005-default-binding-mode/struct.rs
diff --git a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/tuple-struct.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/tuple-struct.rs
index 0cf9ba1b4ca..0cf9ba1b4ca 100644
--- a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/tuple-struct.rs
+++ b/src/test/ui/rfcs/rfc-2005-default-binding-mode/tuple-struct.rs
diff --git a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/tuple.rs b/src/test/ui/rfcs/rfc-2005-default-binding-mode/tuple.rs
index 4c22aa2d718..4c22aa2d718 100644
--- a/src/test/run-pass/rfcs/rfc-2005-default-binding-mode/tuple.rs
+++ b/src/test/ui/rfcs/rfc-2005-default-binding-mode/tuple.rs
diff --git a/src/test/run-pass/rfcs/rfc-2151-raw-identifiers/attr.rs b/src/test/ui/rfcs/rfc-2151-raw-identifiers/attr.rs
index 2fe1e05e509..2fe1e05e509 100644
--- a/src/test/run-pass/rfcs/rfc-2151-raw-identifiers/attr.rs
+++ b/src/test/ui/rfcs/rfc-2151-raw-identifiers/attr.rs
diff --git a/src/test/run-pass/rfcs/rfc-2151-raw-identifiers/basic.rs b/src/test/ui/rfcs/rfc-2151-raw-identifiers/basic.rs
index f2fe59668da..f2fe59668da 100644
--- a/src/test/run-pass/rfcs/rfc-2151-raw-identifiers/basic.rs
+++ b/src/test/ui/rfcs/rfc-2151-raw-identifiers/basic.rs
diff --git a/src/test/run-pass/rfcs/rfc-2151-raw-identifiers/items.rs b/src/test/ui/rfcs/rfc-2151-raw-identifiers/items.rs
index 4665225178c..4665225178c 100644
--- a/src/test/run-pass/rfcs/rfc-2151-raw-identifiers/items.rs
+++ b/src/test/ui/rfcs/rfc-2151-raw-identifiers/items.rs
diff --git a/src/test/run-pass/rfcs/rfc-2151-raw-identifiers/macros.rs b/src/test/ui/rfcs/rfc-2151-raw-identifiers/macros.rs
index 0ab7e17f87b..0ab7e17f87b 100644
--- a/src/test/run-pass/rfcs/rfc-2151-raw-identifiers/macros.rs
+++ b/src/test/ui/rfcs/rfc-2151-raw-identifiers/macros.rs
diff --git a/src/test/run-pass/rfcs/rfc-2175-or-if-while-let/basic.rs b/src/test/ui/rfcs/rfc-2175-or-if-while-let/basic.rs
index 22f04c58f3b..22f04c58f3b 100644
--- a/src/test/run-pass/rfcs/rfc-2175-or-if-while-let/basic.rs
+++ b/src/test/ui/rfcs/rfc-2175-or-if-while-let/basic.rs
diff --git a/src/test/run-pass/rfcs/rfc-2302-self-struct-ctor.rs b/src/test/ui/rfcs/rfc-2302-self-struct-ctor.rs
index 1ec20c50034..1ec20c50034 100644
--- a/src/test/run-pass/rfcs/rfc-2302-self-struct-ctor.rs
+++ b/src/test/ui/rfcs/rfc-2302-self-struct-ctor.rs
diff --git a/src/test/run-pass/rfcs/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs b/src/test/ui/rfcs/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs
index 6d7bca4da24..6d7bca4da24 100644
--- a/src/test/run-pass/rfcs/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs
+++ b/src/test/ui/rfcs/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs
diff --git a/src/test/run-pass/rfcs/rfc1445/eq-allows-match-on-ty-in-macro.rs b/src/test/ui/rfcs/rfc1445/eq-allows-match-on-ty-in-macro.rs
index 17174e22c74..17174e22c74 100644
--- a/src/test/run-pass/rfcs/rfc1445/eq-allows-match-on-ty-in-macro.rs
+++ b/src/test/ui/rfcs/rfc1445/eq-allows-match-on-ty-in-macro.rs
diff --git a/src/test/run-pass/rfcs/rfc1445/eq-allows-match.rs b/src/test/ui/rfcs/rfc1445/eq-allows-match.rs
index 405a69c94bf..405a69c94bf 100644
--- a/src/test/run-pass/rfcs/rfc1445/eq-allows-match.rs
+++ b/src/test/ui/rfcs/rfc1445/eq-allows-match.rs
diff --git a/src/test/run-pass/rfcs/rfc1623.rs b/src/test/ui/rfcs/rfc1623.rs
index adaf25c6bbf..adaf25c6bbf 100644
--- a/src/test/run-pass/rfcs/rfc1623.rs
+++ b/src/test/ui/rfcs/rfc1623.rs
diff --git a/src/test/run-pass/rfcs/rfc1717/auxiliary/clibrary.rs b/src/test/ui/rfcs/rfc1717/auxiliary/clibrary.rs
index c1c5b70bc04..c1c5b70bc04 100644
--- a/src/test/run-pass/rfcs/rfc1717/auxiliary/clibrary.rs
+++ b/src/test/ui/rfcs/rfc1717/auxiliary/clibrary.rs
diff --git a/src/test/run-pass/rfcs/rfc1717/library-override.rs b/src/test/ui/rfcs/rfc1717/library-override.rs
index 014ccac31b7..014ccac31b7 100644
--- a/src/test/run-pass/rfcs/rfc1717/library-override.rs
+++ b/src/test/ui/rfcs/rfc1717/library-override.rs
diff --git a/src/test/run-pass/rfcs/rfc1857-drop-order.rs b/src/test/ui/rfcs/rfc1857-drop-order.rs
index 7923aa7c0e2..7923aa7c0e2 100644
--- a/src/test/run-pass/rfcs/rfc1857-drop-order.rs
+++ b/src/test/ui/rfcs/rfc1857-drop-order.rs
diff --git a/src/test/run-pass/rmeta.rs b/src/test/ui/rmeta-rpass.rs
index cbbdd78dc20..5a63b5b8598 100644
--- a/src/test/run-pass/rmeta.rs
+++ b/src/test/ui/rmeta-rpass.rs
@@ -1,8 +1,9 @@
+// run-pass
 // Test that using rlibs and rmeta dep crates work together. Specifically, that
 // there can be both an rmeta and an rlib file and rustc will prefer the rlib.
 
 // aux-build:rmeta-rmeta.rs
-// aux-build:rmeta-rlib.rs
+// aux-build:rmeta-rlib-rpass.rs
 
 extern crate rmeta_aux;
 use rmeta_aux::Foo;
diff --git a/src/test/run-pass/running-with-no-runtime.rs b/src/test/ui/running-with-no-runtime.rs
index ab1bf3a5b91..3fc631be60e 100644
--- a/src/test/run-pass/running-with-no-runtime.rs
+++ b/src/test/ui/running-with-no-runtime.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi spawning processes is not supported
 // ignore-emscripten spawning processes is not supported
 // ignore-sgx no processes
diff --git a/src/test/run-pass/rustc-rust-log.rs b/src/test/ui/rustc-rust-log.rs
index b6642572418..1c4252b23ea 100644
--- a/src/test/run-pass/rustc-rust-log.rs
+++ b/src/test/ui/rustc-rust-log.rs
@@ -1,3 +1,4 @@
+// run-pass
 // This test is just checking that we won't ICE if logging is turned
 // on; don't bother trying to compare that (copious) output. (Note
 // also that this test potentially silly, since we do not build+test
diff --git a/src/test/run-pass/rvalue-static-promotion.rs b/src/test/ui/rvalue-static-promotion.rs
index 0066217774d..2d7e4ab3989 100644
--- a/src/test/run-pass/rvalue-static-promotion.rs
+++ b/src/test/ui/rvalue-static-promotion.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::cell::Cell;
 
 const NONE_CELL_STRING: Option<Cell<String>> = None;
diff --git a/src/test/run-pass/segfault-no-out-of-stack.rs b/src/test/ui/segfault-no-out-of-stack.rs
index e90efface68..626de4ed5b6 100644
--- a/src/test/run-pass/segfault-no-out-of-stack.rs
+++ b/src/test/ui/segfault-no-out-of-stack.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 // ignore-cloudabi can't run commands
 // ignore-emscripten can't run commands
diff --git a/src/test/run-pass/semistatement-in-lambda.rs b/src/test/ui/semistatement-in-lambda.rs
index f00fbc363d4..ebd55e0ba02 100644
--- a/src/test/run-pass/semistatement-in-lambda.rs
+++ b/src/test/ui/semistatement-in-lambda.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 
 pub fn main() {
diff --git a/src/test/run-pass/sepcomp/auxiliary/sepcomp-extern-lib.rs b/src/test/ui/sepcomp/auxiliary/sepcomp-extern-lib.rs
index 73fb5e8f3c4..73fb5e8f3c4 100644
--- a/src/test/run-pass/sepcomp/auxiliary/sepcomp-extern-lib.rs
+++ b/src/test/ui/sepcomp/auxiliary/sepcomp-extern-lib.rs
diff --git a/src/test/run-pass/sepcomp/auxiliary/sepcomp_cci_lib.rs b/src/test/ui/sepcomp/auxiliary/sepcomp_cci_lib.rs
index 64e34a56da4..64e34a56da4 100644
--- a/src/test/run-pass/sepcomp/auxiliary/sepcomp_cci_lib.rs
+++ b/src/test/ui/sepcomp/auxiliary/sepcomp_cci_lib.rs
diff --git a/src/test/run-pass/sepcomp/auxiliary/sepcomp_lib.rs b/src/test/ui/sepcomp/auxiliary/sepcomp_lib.rs
index 1536228c265..1536228c265 100644
--- a/src/test/run-pass/sepcomp/auxiliary/sepcomp_lib.rs
+++ b/src/test/ui/sepcomp/auxiliary/sepcomp_lib.rs
diff --git a/src/test/run-pass/sepcomp/sepcomp-cci.rs b/src/test/ui/sepcomp/sepcomp-cci.rs
index 02bbab30e9c..02bbab30e9c 100644
--- a/src/test/run-pass/sepcomp/sepcomp-cci.rs
+++ b/src/test/ui/sepcomp/sepcomp-cci.rs
diff --git a/src/test/run-pass/sepcomp/sepcomp-extern.rs b/src/test/ui/sepcomp/sepcomp-extern.rs
index c4ccf23c47a..c4ccf23c47a 100644
--- a/src/test/run-pass/sepcomp/sepcomp-extern.rs
+++ b/src/test/ui/sepcomp/sepcomp-extern.rs
diff --git a/src/test/run-pass/sepcomp/sepcomp-fns-backwards.rs b/src/test/ui/sepcomp/sepcomp-fns-backwards.rs
index f56769e2b8c..f56769e2b8c 100644
--- a/src/test/run-pass/sepcomp/sepcomp-fns-backwards.rs
+++ b/src/test/ui/sepcomp/sepcomp-fns-backwards.rs
diff --git a/src/test/run-pass/sepcomp/sepcomp-fns.rs b/src/test/ui/sepcomp/sepcomp-fns.rs
index a432c89606e..a432c89606e 100644
--- a/src/test/run-pass/sepcomp/sepcomp-fns.rs
+++ b/src/test/ui/sepcomp/sepcomp-fns.rs
diff --git a/src/test/run-pass/sepcomp/sepcomp-lib-lto.rs b/src/test/ui/sepcomp/sepcomp-lib-lto.rs
index 164ae79c254..164ae79c254 100644
--- a/src/test/run-pass/sepcomp/sepcomp-lib-lto.rs
+++ b/src/test/ui/sepcomp/sepcomp-lib-lto.rs
diff --git a/src/test/run-pass/sepcomp/sepcomp-lib.rs b/src/test/ui/sepcomp/sepcomp-lib.rs
index 728dc078b7e..728dc078b7e 100644
--- a/src/test/run-pass/sepcomp/sepcomp-lib.rs
+++ b/src/test/ui/sepcomp/sepcomp-lib.rs
diff --git a/src/test/run-pass/sepcomp/sepcomp-statics.rs b/src/test/ui/sepcomp/sepcomp-statics.rs
index 5457c8a0ae9..5457c8a0ae9 100644
--- a/src/test/run-pass/sepcomp/sepcomp-statics.rs
+++ b/src/test/ui/sepcomp/sepcomp-statics.rs
diff --git a/src/test/run-pass/sepcomp/sepcomp-unwind.rs b/src/test/ui/sepcomp/sepcomp-unwind.rs
index 50a4e043943..50a4e043943 100644
--- a/src/test/run-pass/sepcomp/sepcomp-unwind.rs
+++ b/src/test/ui/sepcomp/sepcomp-unwind.rs
diff --git a/src/test/run-pass/seq-compare.rs b/src/test/ui/seq-compare.rs
index cb90e3be0ac..4078326b559 100644
--- a/src/test/run-pass/seq-compare.rs
+++ b/src/test/ui/seq-compare.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     assert!(("hello".to_string() < "hellr".to_string()));
     assert!(("hello ".to_string() > "hello".to_string()));
diff --git a/src/test/run-pass/shadow.rs b/src/test/ui/shadow.rs
index 03338d79da8..2495c8f47e7 100644
--- a/src/test/run-pass/shadow.rs
+++ b/src/test/ui/shadow.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 fn foo(c: Vec<isize> ) {
diff --git a/src/test/run-pass/shadowed-use-visibility.rs b/src/test/ui/shadowed-use-visibility.rs
index 83f9c0bedc6..350fbfeaeb5 100644
--- a/src/test/run-pass/shadowed-use-visibility.rs
+++ b/src/test/ui/shadowed-use-visibility.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 mod foo {
     pub fn f() {}
diff --git a/src/test/run-pass/shebang.rs b/src/test/ui/shebang.rs
index a5fbda1c1ea..3d3ba468be9 100644
--- a/src/test/run-pass/shebang.rs
+++ b/src/test/ui/shebang.rs
@@ -1,5 +1,5 @@
 #!/usr/bin/env rustx
-// http://rust-lang.org/COPYRIGHT.
-//
+
+// run-pass
 
 pub fn main() { println!("Hello World"); }
diff --git a/src/test/run-pass/signal-alternate-stack-cleanup.rs b/src/test/ui/signal-alternate-stack-cleanup.rs
index 6f2fa2a370d..787ff51799a 100644
--- a/src/test/run-pass/signal-alternate-stack-cleanup.rs
+++ b/src/test/ui/signal-alternate-stack-cleanup.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Previously memory for alternate signal stack have been unmapped during
 // main thread exit while still being in use by signal handlers. This test
 // triggers this situation by sending signal from atexit handler.
diff --git a/src/test/run-pass/signal-exit-status.rs b/src/test/ui/signal-exit-status.rs
index c22c0352286..bd34a218160 100644
--- a/src/test/run-pass/signal-exit-status.rs
+++ b/src/test/ui/signal-exit-status.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 // ignore-sgx no processes
diff --git a/src/test/run-pass/sigpipe-should-be-ignored.rs b/src/test/ui/sigpipe-should-be-ignored.rs
index 6c5bbd45a3c..f472029b820 100644
--- a/src/test/run-pass/sigpipe-should-be-ignored.rs
+++ b/src/test/ui/sigpipe-should-be-ignored.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 // Be sure that when a SIGPIPE would have been received that the entire process
 // doesn't die in a ball of fire, but rather it's gracefully handled.
diff --git a/src/test/run-pass/simd/simd-generics.rs b/src/test/ui/simd/simd-generics.rs
index ab6caee9d7b..ab6caee9d7b 100644
--- a/src/test/run-pass/simd/simd-generics.rs
+++ b/src/test/ui/simd/simd-generics.rs
diff --git a/src/test/run-pass/simd/simd-intrinsic-float-math.rs b/src/test/ui/simd/simd-intrinsic-float-math.rs
index 220a59535ca..220a59535ca 100644
--- a/src/test/run-pass/simd/simd-intrinsic-float-math.rs
+++ b/src/test/ui/simd/simd-intrinsic-float-math.rs
diff --git a/src/test/run-pass/simd/simd-intrinsic-float-minmax.rs b/src/test/ui/simd/simd-intrinsic-float-minmax.rs
index 350bc434935..350bc434935 100644
--- a/src/test/run-pass/simd/simd-intrinsic-float-minmax.rs
+++ b/src/test/ui/simd/simd-intrinsic-float-minmax.rs
diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-arithmetic-saturating.rs b/src/test/ui/simd/simd-intrinsic-generic-arithmetic-saturating.rs
index b2ddcf023eb..b2ddcf023eb 100644
--- a/src/test/run-pass/simd/simd-intrinsic-generic-arithmetic-saturating.rs
+++ b/src/test/ui/simd/simd-intrinsic-generic-arithmetic-saturating.rs
diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-arithmetic.rs b/src/test/ui/simd/simd-intrinsic-generic-arithmetic.rs
index b67c0ad1eb2..b67c0ad1eb2 100644
--- a/src/test/run-pass/simd/simd-intrinsic-generic-arithmetic.rs
+++ b/src/test/ui/simd/simd-intrinsic-generic-arithmetic.rs
diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs b/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs
index b28f742a92e..b28f742a92e 100644
--- a/src/test/run-pass/simd/simd-intrinsic-generic-bitmask.rs
+++ b/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs
diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-cast.rs b/src/test/ui/simd/simd-intrinsic-generic-cast.rs
index 15f232e2c0f..15f232e2c0f 100644
--- a/src/test/run-pass/simd/simd-intrinsic-generic-cast.rs
+++ b/src/test/ui/simd/simd-intrinsic-generic-cast.rs
diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-comparison.rs b/src/test/ui/simd/simd-intrinsic-generic-comparison.rs
index 2b593e1c9b8..2b593e1c9b8 100644
--- a/src/test/run-pass/simd/simd-intrinsic-generic-comparison.rs
+++ b/src/test/ui/simd/simd-intrinsic-generic-comparison.rs
diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-elements.rs b/src/test/ui/simd/simd-intrinsic-generic-elements.rs
index ea3d4b18944..ea3d4b18944 100644
--- a/src/test/run-pass/simd/simd-intrinsic-generic-elements.rs
+++ b/src/test/ui/simd/simd-intrinsic-generic-elements.rs
diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-gather.rs b/src/test/ui/simd/simd-intrinsic-generic-gather.rs
index 805caebe5b1..805caebe5b1 100644
--- a/src/test/run-pass/simd/simd-intrinsic-generic-gather.rs
+++ b/src/test/ui/simd/simd-intrinsic-generic-gather.rs
diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-reduction.rs b/src/test/ui/simd/simd-intrinsic-generic-reduction.rs
index 4195444a73f..4195444a73f 100644
--- a/src/test/run-pass/simd/simd-intrinsic-generic-reduction.rs
+++ b/src/test/ui/simd/simd-intrinsic-generic-reduction.rs
diff --git a/src/test/run-pass/simd/simd-intrinsic-generic-select.rs b/src/test/ui/simd/simd-intrinsic-generic-select.rs
index 22bda4fc9d9..22bda4fc9d9 100644
--- a/src/test/run-pass/simd/simd-intrinsic-generic-select.rs
+++ b/src/test/ui/simd/simd-intrinsic-generic-select.rs
diff --git a/src/test/run-pass/simd/simd-size-align.rs b/src/test/ui/simd/simd-size-align.rs
index 556013788c3..556013788c3 100644
--- a/src/test/run-pass/simd/simd-size-align.rs
+++ b/src/test/ui/simd/simd-size-align.rs
diff --git a/src/test/run-pass/simd/simd-target-feature-mixup.rs b/src/test/ui/simd/simd-target-feature-mixup.rs
index 6d7688191b7..6d7688191b7 100644
--- a/src/test/run-pass/simd/simd-target-feature-mixup.rs
+++ b/src/test/ui/simd/simd-target-feature-mixup.rs
diff --git a/src/test/run-pass/simd/simd-type.rs b/src/test/ui/simd/simd-type.rs
index e7b9bfe32f8..e7b9bfe32f8 100644
--- a/src/test/run-pass/simd/simd-type.rs
+++ b/src/test/ui/simd/simd-type.rs
diff --git a/src/test/run-pass/simple-infer.rs b/src/test/ui/simple-infer.rs
index 020c9c26512..561e4fdec7c 100644
--- a/src/test/run-pass/simple-infer.rs
+++ b/src/test/ui/simple-infer.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_mut)]
 
 
diff --git a/src/test/run-pass/simple_global_asm.rs b/src/test/ui/simple_global_asm.rs
index c6ede34b299..d95fefebc0f 100644
--- a/src/test/run-pass/simple_global_asm.rs
+++ b/src/test/ui/simple_global_asm.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(global_asm)]
 #![feature(naked_functions)]
 #![allow(dead_code)]
diff --git a/src/test/run-pass/size-and-align.rs b/src/test/ui/size-and-align.rs
index fb7ba68ffe7..a32b5de7292 100644
--- a/src/test/run-pass/size-and-align.rs
+++ b/src/test/ui/size-and-align.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 enum clam<T> { a(T, isize), b, }
 
diff --git a/src/test/run-pass/sized-borrowed-pointer.rs b/src/test/ui/sized-borrowed-pointer.rs
index e5d55761539..319b8026954 100644
--- a/src/test/run-pass/sized-borrowed-pointer.rs
+++ b/src/test/ui/sized-borrowed-pointer.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Possibly-dynamic size of typaram should be cleared at pointer boundary.
 
diff --git a/src/test/run-pass/sized-owned-pointer.rs b/src/test/ui/sized-owned-pointer.rs
index 8dd3227ba88..2abf0a1e0c2 100644
--- a/src/test/run-pass/sized-owned-pointer.rs
+++ b/src/test/ui/sized-owned-pointer.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Possibly-dynamic size of typaram should be cleared at pointer boundary.
 
diff --git a/src/test/run-pass/sleep.rs b/src/test/ui/sleep.rs
index 7128b3cc7c3..757578b8475 100644
--- a/src/test/run-pass/sleep.rs
+++ b/src/test/ui/sleep.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-emscripten no threads support
 // ignore-sgx no thread sleep support
 
diff --git a/src/test/run-pass/slowparse-bstring.rs b/src/test/ui/slowparse-bstring.rs
index ee6be75be22..f3a6a668372 100644
--- a/src/test/run-pass/slowparse-bstring.rs
+++ b/src/test/ui/slowparse-bstring.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-tidy-linelength
 
 // Issue #16624
diff --git a/src/test/run-pass/slowparse-string.rs b/src/test/ui/slowparse-string.rs
index a2bf26f1e27..6ebc61dae78 100644
--- a/src/test/run-pass/slowparse-string.rs
+++ b/src/test/ui/slowparse-string.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-tidy-linelength
 
 // Issue #16624
diff --git a/src/test/run-pass/specialization/README.md b/src/test/ui/specialization/README-rpass.md
index 1373a2cf81b..1373a2cf81b 100644
--- a/src/test/run-pass/specialization/README.md
+++ b/src/test/ui/specialization/README-rpass.md
diff --git a/src/test/run-pass/specialization/assoc-ty-graph-cycle.rs b/src/test/ui/specialization/assoc-ty-graph-cycle.rs
index 54d51492ab3..54d51492ab3 100644
--- a/src/test/run-pass/specialization/assoc-ty-graph-cycle.rs
+++ b/src/test/ui/specialization/assoc-ty-graph-cycle.rs
diff --git a/src/test/run-pass/specialization/auxiliary/cross_crates_defaults.rs b/src/test/ui/specialization/auxiliary/cross_crates_defaults.rs
index 5cf975b5752..5cf975b5752 100644
--- a/src/test/run-pass/specialization/auxiliary/cross_crates_defaults.rs
+++ b/src/test/ui/specialization/auxiliary/cross_crates_defaults.rs
diff --git a/src/test/run-pass/specialization/auxiliary/go_trait.rs b/src/test/ui/specialization/auxiliary/go_trait.rs
index aa0ec22896d..aa0ec22896d 100644
--- a/src/test/run-pass/specialization/auxiliary/go_trait.rs
+++ b/src/test/ui/specialization/auxiliary/go_trait.rs
diff --git a/src/test/run-pass/specialization/auxiliary/specialization_cross_crate.rs b/src/test/ui/specialization/auxiliary/specialization_cross_crate.rs
index 8caa8524fb9..8caa8524fb9 100644
--- a/src/test/run-pass/specialization/auxiliary/specialization_cross_crate.rs
+++ b/src/test/ui/specialization/auxiliary/specialization_cross_crate.rs
diff --git a/src/test/run-pass/specialization/cross-crate-defaults.rs b/src/test/ui/specialization/cross-crate-defaults.rs
index 79cb6594397..79cb6594397 100644
--- a/src/test/run-pass/specialization/cross-crate-defaults.rs
+++ b/src/test/ui/specialization/cross-crate-defaults.rs
diff --git a/src/test/run-pass/specialization/defaultimpl/allowed-cross-crate.rs b/src/test/ui/specialization/defaultimpl/allowed-cross-crate.rs
index 15550bcce2a..15550bcce2a 100644
--- a/src/test/run-pass/specialization/defaultimpl/allowed-cross-crate.rs
+++ b/src/test/ui/specialization/defaultimpl/allowed-cross-crate.rs
diff --git a/src/test/run-pass/specialization/defaultimpl/auxiliary/go_trait.rs b/src/test/ui/specialization/defaultimpl/auxiliary/go_trait.rs
index c065593b432..c065593b432 100644
--- a/src/test/run-pass/specialization/defaultimpl/auxiliary/go_trait.rs
+++ b/src/test/ui/specialization/defaultimpl/auxiliary/go_trait.rs
diff --git a/src/test/run-pass/specialization/defaultimpl/out-of-order.rs b/src/test/ui/specialization/defaultimpl/out-of-order.rs
index f9c73a19cfa..f9c73a19cfa 100644
--- a/src/test/run-pass/specialization/defaultimpl/out-of-order.rs
+++ b/src/test/ui/specialization/defaultimpl/out-of-order.rs
diff --git a/src/test/run-pass/specialization/defaultimpl/overlap-projection.rs b/src/test/ui/specialization/defaultimpl/overlap-projection.rs
index ed38bb3fc3a..ed38bb3fc3a 100644
--- a/src/test/run-pass/specialization/defaultimpl/overlap-projection.rs
+++ b/src/test/ui/specialization/defaultimpl/overlap-projection.rs
diff --git a/src/test/run-pass/specialization/defaultimpl/projection.rs b/src/test/ui/specialization/defaultimpl/projection.rs
index 897a7aade2f..897a7aade2f 100644
--- a/src/test/run-pass/specialization/defaultimpl/projection.rs
+++ b/src/test/ui/specialization/defaultimpl/projection.rs
diff --git a/src/test/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs b/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented-rpass.rs
index 2b8ca6bb1dd..2b8ca6bb1dd 100644
--- a/src/test/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs
+++ b/src/test/ui/specialization/defaultimpl/specialization-trait-item-not-implemented-rpass.rs
diff --git a/src/test/run-pass/specialization/issue-50452.rs b/src/test/ui/specialization/issue-50452.rs
index 93f081d9558..93f081d9558 100644
--- a/src/test/run-pass/specialization/issue-50452.rs
+++ b/src/test/ui/specialization/issue-50452.rs
diff --git a/src/test/run-pass/specialization/specialization-allowed-cross-crate.rs b/src/test/ui/specialization/specialization-allowed-cross-crate.rs
index 15550bcce2a..15550bcce2a 100644
--- a/src/test/run-pass/specialization/specialization-allowed-cross-crate.rs
+++ b/src/test/ui/specialization/specialization-allowed-cross-crate.rs
diff --git a/src/test/run-pass/specialization/specialization-assoc-fns.rs b/src/test/ui/specialization/specialization-assoc-fns.rs
index b6a7a48972a..b6a7a48972a 100644
--- a/src/test/run-pass/specialization/specialization-assoc-fns.rs
+++ b/src/test/ui/specialization/specialization-assoc-fns.rs
diff --git a/src/test/run-pass/specialization/specialization-basics.rs b/src/test/ui/specialization/specialization-basics.rs
index 6c359e51bc2..6c359e51bc2 100644
--- a/src/test/run-pass/specialization/specialization-basics.rs
+++ b/src/test/ui/specialization/specialization-basics.rs
diff --git a/src/test/run-pass/specialization/specialization-cross-crate-no-gate.rs b/src/test/ui/specialization/specialization-cross-crate-no-gate.rs
index f744b16de7a..f744b16de7a 100644
--- a/src/test/run-pass/specialization/specialization-cross-crate-no-gate.rs
+++ b/src/test/ui/specialization/specialization-cross-crate-no-gate.rs
diff --git a/src/test/run-pass/specialization/specialization-cross-crate.rs b/src/test/ui/specialization/specialization-cross-crate.rs
index fa63c866329..fa63c866329 100644
--- a/src/test/run-pass/specialization/specialization-cross-crate.rs
+++ b/src/test/ui/specialization/specialization-cross-crate.rs
diff --git a/src/test/run-pass/specialization/specialization-default-methods.rs b/src/test/ui/specialization/specialization-default-methods.rs
index 5d65a0457e7..5d65a0457e7 100644
--- a/src/test/run-pass/specialization/specialization-default-methods.rs
+++ b/src/test/ui/specialization/specialization-default-methods.rs
diff --git a/src/test/run-pass/specialization/specialization-on-projection.rs b/src/test/ui/specialization/specialization-on-projection.rs
index 5606eaea307..5606eaea307 100644
--- a/src/test/run-pass/specialization/specialization-on-projection.rs
+++ b/src/test/ui/specialization/specialization-on-projection.rs
diff --git a/src/test/run-pass/specialization/specialization-out-of-order.rs b/src/test/ui/specialization/specialization-out-of-order.rs
index 94e764f7636..94e764f7636 100644
--- a/src/test/run-pass/specialization/specialization-out-of-order.rs
+++ b/src/test/ui/specialization/specialization-out-of-order.rs
diff --git a/src/test/run-pass/specialization/specialization-overlap-projection.rs b/src/test/ui/specialization/specialization-overlap-projection.rs
index 00b83c7e7a1..00b83c7e7a1 100644
--- a/src/test/run-pass/specialization/specialization-overlap-projection.rs
+++ b/src/test/ui/specialization/specialization-overlap-projection.rs
diff --git a/src/test/run-pass/specialization/specialization-projection-alias.rs b/src/test/ui/specialization/specialization-projection-alias.rs
index 0081ed455c9..0081ed455c9 100644
--- a/src/test/run-pass/specialization/specialization-projection-alias.rs
+++ b/src/test/ui/specialization/specialization-projection-alias.rs
diff --git a/src/test/run-pass/specialization/specialization-projection.rs b/src/test/ui/specialization/specialization-projection.rs
index 86cdccf131e..86cdccf131e 100644
--- a/src/test/run-pass/specialization/specialization-projection.rs
+++ b/src/test/ui/specialization/specialization-projection.rs
diff --git a/src/test/run-pass/specialization/specialization-super-traits.rs b/src/test/ui/specialization/specialization-super-traits.rs
index a0f71d87693..a0f71d87693 100644
--- a/src/test/run-pass/specialization/specialization-super-traits.rs
+++ b/src/test/ui/specialization/specialization-super-traits.rs
diff --git a/src/test/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs b/src/test/ui/specialization/specialization-translate-projections-with-lifetimes.rs
index 2e32e3ff02d..2e32e3ff02d 100644
--- a/src/test/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs
+++ b/src/test/ui/specialization/specialization-translate-projections-with-lifetimes.rs
diff --git a/src/test/run-pass/specialization/specialization-translate-projections-with-params.rs b/src/test/ui/specialization/specialization-translate-projections-with-params.rs
index bdc6501df44..bdc6501df44 100644
--- a/src/test/run-pass/specialization/specialization-translate-projections-with-params.rs
+++ b/src/test/ui/specialization/specialization-translate-projections-with-params.rs
diff --git a/src/test/run-pass/specialization/specialization-translate-projections.rs b/src/test/ui/specialization/specialization-translate-projections.rs
index fcccb67902e..fcccb67902e 100644
--- a/src/test/run-pass/specialization/specialization-translate-projections.rs
+++ b/src/test/ui/specialization/specialization-translate-projections.rs
diff --git a/src/test/run-pass/sse2.rs b/src/test/ui/sse2.rs
index c58bf4520c1..74f112464c7 100644
--- a/src/test/run-pass/sse2.rs
+++ b/src/test/ui/sse2.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi no std::env
 
 #![allow(stable_features)]
diff --git a/src/test/run-pass/stable-addr-of.rs b/src/test/ui/stable-addr-of.rs
index 2a256bbfa39..99839166e30 100644
--- a/src/test/run-pass/stable-addr-of.rs
+++ b/src/test/ui/stable-addr-of.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Issue #2040
 
 
diff --git a/src/test/run-pass/stack-probes-lto.rs b/src/test/ui/stack-probes-lto.rs
index 1274f032a3e..9018ff4bfc2 100644
--- a/src/test/run-pass/stack-probes-lto.rs
+++ b/src/test/ui/stack-probes-lto.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-arm
 // ignore-aarch64
 // ignore-mips
diff --git a/src/test/run-pass/stack-probes.rs b/src/test/ui/stack-probes.rs
index 773d0ace90e..1ab1d6df66d 100644
--- a/src/test/run-pass/stack-probes.rs
+++ b/src/test/ui/stack-probes.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-arm
 // ignore-aarch64
 // ignore-mips
diff --git a/src/test/run-pass/statics/auxiliary/static-function-pointer-aux.rs b/src/test/ui/statics/auxiliary/static-function-pointer-aux.rs
index 4dfc25764a4..4dfc25764a4 100644
--- a/src/test/run-pass/statics/auxiliary/static-function-pointer-aux.rs
+++ b/src/test/ui/statics/auxiliary/static-function-pointer-aux.rs
diff --git a/src/test/run-pass/statics/auxiliary/static-methods-crate.rs b/src/test/ui/statics/auxiliary/static-methods-crate.rs
index 7ff3bc0dd2a..7ff3bc0dd2a 100644
--- a/src/test/run-pass/statics/auxiliary/static-methods-crate.rs
+++ b/src/test/ui/statics/auxiliary/static-methods-crate.rs
diff --git a/src/test/run-pass/statics/auxiliary/static_fn_inline_xc_aux.rs b/src/test/ui/statics/auxiliary/static_fn_inline_xc_aux.rs
index 8d0f7f61ced..8d0f7f61ced 100644
--- a/src/test/run-pass/statics/auxiliary/static_fn_inline_xc_aux.rs
+++ b/src/test/ui/statics/auxiliary/static_fn_inline_xc_aux.rs
diff --git a/src/test/run-pass/statics/auxiliary/static_fn_trait_xc_aux.rs b/src/test/ui/statics/auxiliary/static_fn_trait_xc_aux.rs
index b8aed2c5f54..b8aed2c5f54 100644
--- a/src/test/run-pass/statics/auxiliary/static_fn_trait_xc_aux.rs
+++ b/src/test/ui/statics/auxiliary/static_fn_trait_xc_aux.rs
diff --git a/src/test/run-pass/statics/auxiliary/static_mut_xc.rs b/src/test/ui/statics/auxiliary/static_mut_xc.rs
index 264a2243adc..264a2243adc 100644
--- a/src/test/run-pass/statics/auxiliary/static_mut_xc.rs
+++ b/src/test/ui/statics/auxiliary/static_mut_xc.rs
diff --git a/src/test/run-pass/statics/static-fn-inline-xc.rs b/src/test/ui/statics/static-fn-inline-xc.rs
index a400b9c8d56..a400b9c8d56 100644
--- a/src/test/run-pass/statics/static-fn-inline-xc.rs
+++ b/src/test/ui/statics/static-fn-inline-xc.rs
diff --git a/src/test/run-pass/statics/static-fn-trait-xc.rs b/src/test/ui/statics/static-fn-trait-xc.rs
index 1d3126128c9..1d3126128c9 100644
--- a/src/test/run-pass/statics/static-fn-trait-xc.rs
+++ b/src/test/ui/statics/static-fn-trait-xc.rs
diff --git a/src/test/run-pass/statics/static-function-pointer-xc.rs b/src/test/ui/statics/static-function-pointer-xc.rs
index 2d063a751ca..2d063a751ca 100644
--- a/src/test/run-pass/statics/static-function-pointer-xc.rs
+++ b/src/test/ui/statics/static-function-pointer-xc.rs
diff --git a/src/test/run-pass/statics/static-function-pointer.rs b/src/test/ui/statics/static-function-pointer.rs
index 6c52dfecdec..6c52dfecdec 100644
--- a/src/test/run-pass/statics/static-function-pointer.rs
+++ b/src/test/ui/statics/static-function-pointer.rs
diff --git a/src/test/run-pass/statics/static-impl.rs b/src/test/ui/statics/static-impl.rs
index e7bdb38ee62..e7bdb38ee62 100644
--- a/src/test/run-pass/statics/static-impl.rs
+++ b/src/test/ui/statics/static-impl.rs
diff --git a/src/test/run-pass/statics/static-method-in-trait-with-tps-intracrate.rs b/src/test/ui/statics/static-method-in-trait-with-tps-intracrate.rs
index cd3ccfee06f..cd3ccfee06f 100644
--- a/src/test/run-pass/statics/static-method-in-trait-with-tps-intracrate.rs
+++ b/src/test/ui/statics/static-method-in-trait-with-tps-intracrate.rs
diff --git a/src/test/run-pass/statics/static-method-xcrate.rs b/src/test/ui/statics/static-method-xcrate.rs
index 1d1cb381095..1d1cb381095 100644
--- a/src/test/run-pass/statics/static-method-xcrate.rs
+++ b/src/test/ui/statics/static-method-xcrate.rs
diff --git a/src/test/run-pass/statics/static-methods-in-traits.rs b/src/test/ui/statics/static-methods-in-traits.rs
index ff76d4e4a20..ff76d4e4a20 100644
--- a/src/test/run-pass/statics/static-methods-in-traits.rs
+++ b/src/test/ui/statics/static-methods-in-traits.rs
diff --git a/src/test/run-pass/statics/static-methods-in-traits2.rs b/src/test/ui/statics/static-methods-in-traits2.rs
index 2c43ff6a788..2c43ff6a788 100644
--- a/src/test/run-pass/statics/static-methods-in-traits2.rs
+++ b/src/test/ui/statics/static-methods-in-traits2.rs
diff --git a/src/test/run-pass/statics/static-mut-foreign.rs b/src/test/ui/statics/static-mut-foreign.rs
index 5d6fa416b98..5d6fa416b98 100644
--- a/src/test/run-pass/statics/static-mut-foreign.rs
+++ b/src/test/ui/statics/static-mut-foreign.rs
diff --git a/src/test/run-pass/statics/static-mut-xc.rs b/src/test/ui/statics/static-mut-xc.rs
index 1d172d26a59..1d172d26a59 100644
--- a/src/test/run-pass/statics/static-mut-xc.rs
+++ b/src/test/ui/statics/static-mut-xc.rs
diff --git a/src/test/run-pass/statics/static-recursive.rs b/src/test/ui/statics/static-recursive.rs
index 95dadc81f81..95dadc81f81 100644
--- a/src/test/run-pass/statics/static-recursive.rs
+++ b/src/test/ui/statics/static-recursive.rs
diff --git a/src/test/run-pass/stdio-is-blocking.rs b/src/test/ui/stdio-is-blocking.rs
index 1824162b8ba..e96406e46b5 100644
--- a/src/test/run-pass/stdio-is-blocking.rs
+++ b/src/test/ui/stdio-is-blocking.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 // ignore-sgx no processes
diff --git a/src/test/run-pass/str-concat.rs b/src/test/ui/str-concat.rs
index a0392f479c8..fa2fc97d7b8 100644
--- a/src/test/run-pass/str-concat.rs
+++ b/src/test/ui/str-concat.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let a: String = "hello".to_string();
     let b: String = "world".to_string();
diff --git a/src/test/run-pass/str-multiline.rs b/src/test/ui/str-multiline.rs
index faf992fabf1..2b2e001d8bb 100644
--- a/src/test/run-pass/str-multiline.rs
+++ b/src/test/ui/str-multiline.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let a: String = "this \
 is a test".to_string();
diff --git a/src/test/run-pass/string-box-error.rs b/src/test/ui/string-box-error.rs
index 944157d0b20..11a5bd07c3b 100644
--- a/src/test/run-pass/string-box-error.rs
+++ b/src/test/ui/string-box-error.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Ensure that both `Box<dyn Error + Send + Sync>` and `Box<dyn Error>` can be
 // obtained from `String`.
 
diff --git a/src/test/run-pass/string-escapes.rs b/src/test/ui/string-escapes.rs
index 6013173f313..cee5e27786c 100644
--- a/src/test/run-pass/string-escapes.rs
+++ b/src/test/ui/string-escapes.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn main() {
     let x = "\\\\\
     ";
diff --git a/src/test/run-pass/struct-ctor-mangling.rs b/src/test/ui/struct-ctor-mangling.rs
index 5f5ee7cfe44..f242cb8457f 100644
--- a/src/test/run-pass/struct-ctor-mangling.rs
+++ b/src/test/ui/struct-ctor-mangling.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn size_of_val<T>(_: &T) -> usize {
     std::mem::size_of::<T>()
 }
diff --git a/src/test/run-pass/structs-enums/align-enum.rs b/src/test/ui/structs-enums/align-enum.rs
index fa872caa3b4..fa872caa3b4 100644
--- a/src/test/run-pass/structs-enums/align-enum.rs
+++ b/src/test/ui/structs-enums/align-enum.rs
diff --git a/src/test/run-pass/structs-enums/align-struct.rs b/src/test/ui/structs-enums/align-struct.rs
index 27ef990aa90..27ef990aa90 100644
--- a/src/test/run-pass/structs-enums/align-struct.rs
+++ b/src/test/ui/structs-enums/align-struct.rs
diff --git a/src/test/run-pass/structs-enums/auxiliary/cci_class.rs b/src/test/ui/structs-enums/auxiliary/cci_class.rs
index de2945d7460..de2945d7460 100644
--- a/src/test/run-pass/structs-enums/auxiliary/cci_class.rs
+++ b/src/test/ui/structs-enums/auxiliary/cci_class.rs
diff --git a/src/test/run-pass/structs-enums/auxiliary/cci_class_2.rs b/src/test/ui/structs-enums/auxiliary/cci_class_2.rs
index c3de3150e69..c3de3150e69 100644
--- a/src/test/run-pass/structs-enums/auxiliary/cci_class_2.rs
+++ b/src/test/ui/structs-enums/auxiliary/cci_class_2.rs
diff --git a/src/test/run-pass/structs-enums/auxiliary/cci_class_3.rs b/src/test/ui/structs-enums/auxiliary/cci_class_3.rs
index fb7fad0b5a2..fb7fad0b5a2 100644
--- a/src/test/run-pass/structs-enums/auxiliary/cci_class_3.rs
+++ b/src/test/ui/structs-enums/auxiliary/cci_class_3.rs
diff --git a/src/test/run-pass/structs-enums/auxiliary/cci_class_4.rs b/src/test/ui/structs-enums/auxiliary/cci_class_4.rs
index 85aa3bc8c0d..85aa3bc8c0d 100644
--- a/src/test/run-pass/structs-enums/auxiliary/cci_class_4.rs
+++ b/src/test/ui/structs-enums/auxiliary/cci_class_4.rs
diff --git a/src/test/run-pass/structs-enums/auxiliary/cci_class_6.rs b/src/test/ui/structs-enums/auxiliary/cci_class_6.rs
index 35f93d0c6c8..35f93d0c6c8 100644
--- a/src/test/run-pass/structs-enums/auxiliary/cci_class_6.rs
+++ b/src/test/ui/structs-enums/auxiliary/cci_class_6.rs
diff --git a/src/test/run-pass/structs-enums/auxiliary/cci_class_cast.rs b/src/test/ui/structs-enums/auxiliary/cci_class_cast.rs
index dfc3c56ddee..dfc3c56ddee 100644
--- a/src/test/run-pass/structs-enums/auxiliary/cci_class_cast.rs
+++ b/src/test/ui/structs-enums/auxiliary/cci_class_cast.rs
diff --git a/src/test/run-pass/structs-enums/auxiliary/cci_class_trait.rs b/src/test/ui/structs-enums/auxiliary/cci_class_trait.rs
index 2d02b591c55..2d02b591c55 100644
--- a/src/test/run-pass/structs-enums/auxiliary/cci_class_trait.rs
+++ b/src/test/ui/structs-enums/auxiliary/cci_class_trait.rs
diff --git a/src/test/run-pass/structs-enums/auxiliary/empty-struct.rs b/src/test/ui/structs-enums/auxiliary/empty-struct.rs
index 93275e7143e..93275e7143e 100644
--- a/src/test/run-pass/structs-enums/auxiliary/empty-struct.rs
+++ b/src/test/ui/structs-enums/auxiliary/empty-struct.rs
diff --git a/src/test/run-pass/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs b/src/test/ui/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs
index 55e6b34aca7..55e6b34aca7 100644
--- a/src/test/run-pass/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs
+++ b/src/test/ui/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs
diff --git a/src/test/run-pass/structs-enums/auxiliary/namespaced_enums.rs b/src/test/ui/structs-enums/auxiliary/namespaced_enums.rs
index d3548c76cf2..d3548c76cf2 100644
--- a/src/test/run-pass/structs-enums/auxiliary/namespaced_enums.rs
+++ b/src/test/ui/structs-enums/auxiliary/namespaced_enums.rs
diff --git a/src/test/run-pass/structs-enums/auxiliary/newtype_struct_xc.rs b/src/test/ui/structs-enums/auxiliary/newtype_struct_xc.rs
index 9d1e0742e3c..9d1e0742e3c 100644
--- a/src/test/run-pass/structs-enums/auxiliary/newtype_struct_xc.rs
+++ b/src/test/ui/structs-enums/auxiliary/newtype_struct_xc.rs
diff --git a/src/test/run-pass/structs-enums/auxiliary/struct_destructuring_cross_crate.rs b/src/test/ui/structs-enums/auxiliary/struct_destructuring_cross_crate.rs
index 3665ae7e8d3..3665ae7e8d3 100644
--- a/src/test/run-pass/structs-enums/auxiliary/struct_destructuring_cross_crate.rs
+++ b/src/test/ui/structs-enums/auxiliary/struct_destructuring_cross_crate.rs
diff --git a/src/test/run-pass/structs-enums/auxiliary/struct_variant_xc_aux.rs b/src/test/ui/structs-enums/auxiliary/struct_variant_xc_aux.rs
index e919df611cf..e919df611cf 100644
--- a/src/test/run-pass/structs-enums/auxiliary/struct_variant_xc_aux.rs
+++ b/src/test/ui/structs-enums/auxiliary/struct_variant_xc_aux.rs
diff --git a/src/test/run-pass/structs-enums/auxiliary/xcrate_struct_aliases.rs b/src/test/ui/structs-enums/auxiliary/xcrate_struct_aliases.rs
index bc8879aa37e..bc8879aa37e 100644
--- a/src/test/run-pass/structs-enums/auxiliary/xcrate_struct_aliases.rs
+++ b/src/test/ui/structs-enums/auxiliary/xcrate_struct_aliases.rs
diff --git a/src/test/run-pass/structs-enums/borrow-tuple-fields.rs b/src/test/ui/structs-enums/borrow-tuple-fields.rs
index b1d8f91646b..b1d8f91646b 100644
--- a/src/test/run-pass/structs-enums/borrow-tuple-fields.rs
+++ b/src/test/ui/structs-enums/borrow-tuple-fields.rs
diff --git a/src/test/run-pass/structs-enums/class-cast-to-trait-cross-crate-2.rs b/src/test/ui/structs-enums/class-cast-to-trait-cross-crate-2.rs
index bf1ba8a643f..bf1ba8a643f 100644
--- a/src/test/run-pass/structs-enums/class-cast-to-trait-cross-crate-2.rs
+++ b/src/test/ui/structs-enums/class-cast-to-trait-cross-crate-2.rs
diff --git a/src/test/run-pass/structs-enums/class-cast-to-trait-multiple-types.rs b/src/test/ui/structs-enums/class-cast-to-trait-multiple-types.rs
index 55975cbdb53..55975cbdb53 100644
--- a/src/test/run-pass/structs-enums/class-cast-to-trait-multiple-types.rs
+++ b/src/test/ui/structs-enums/class-cast-to-trait-multiple-types.rs
diff --git a/src/test/run-pass/structs-enums/class-cast-to-trait.rs b/src/test/ui/structs-enums/class-cast-to-trait.rs
index 1019bb30015..1019bb30015 100644
--- a/src/test/run-pass/structs-enums/class-cast-to-trait.rs
+++ b/src/test/ui/structs-enums/class-cast-to-trait.rs
diff --git a/src/test/run-pass/structs-enums/class-dtor.rs b/src/test/ui/structs-enums/class-dtor.rs
index ee1cac03c81..ee1cac03c81 100644
--- a/src/test/run-pass/structs-enums/class-dtor.rs
+++ b/src/test/ui/structs-enums/class-dtor.rs
diff --git a/src/test/run-pass/structs-enums/class-exports.rs b/src/test/ui/structs-enums/class-exports.rs
index ee20887cbfb..ee20887cbfb 100644
--- a/src/test/run-pass/structs-enums/class-exports.rs
+++ b/src/test/ui/structs-enums/class-exports.rs
diff --git a/src/test/run-pass/structs-enums/class-impl-very-parameterized-trait.rs b/src/test/ui/structs-enums/class-impl-very-parameterized-trait.rs
index 5e7830296da..5e7830296da 100644
--- a/src/test/run-pass/structs-enums/class-impl-very-parameterized-trait.rs
+++ b/src/test/ui/structs-enums/class-impl-very-parameterized-trait.rs
diff --git a/src/test/run-pass/structs-enums/class-implement-trait-cross-crate.rs b/src/test/ui/structs-enums/class-implement-trait-cross-crate.rs
index 31b79517566..31b79517566 100644
--- a/src/test/run-pass/structs-enums/class-implement-trait-cross-crate.rs
+++ b/src/test/ui/structs-enums/class-implement-trait-cross-crate.rs
diff --git a/src/test/run-pass/structs-enums/class-implement-traits.rs b/src/test/ui/structs-enums/class-implement-traits.rs
index c9e98e21b9e..c9e98e21b9e 100644
--- a/src/test/run-pass/structs-enums/class-implement-traits.rs
+++ b/src/test/ui/structs-enums/class-implement-traits.rs
diff --git a/src/test/run-pass/structs-enums/class-method-cross-crate.rs b/src/test/ui/structs-enums/class-method-cross-crate.rs
index 519f0685fdf..519f0685fdf 100644
--- a/src/test/run-pass/structs-enums/class-method-cross-crate.rs
+++ b/src/test/ui/structs-enums/class-method-cross-crate.rs
diff --git a/src/test/run-pass/structs-enums/class-methods-cross-crate.rs b/src/test/ui/structs-enums/class-methods-cross-crate.rs
index c342af31351..c342af31351 100644
--- a/src/test/run-pass/structs-enums/class-methods-cross-crate.rs
+++ b/src/test/ui/structs-enums/class-methods-cross-crate.rs
diff --git a/src/test/run-pass/structs-enums/class-methods.rs b/src/test/ui/structs-enums/class-methods.rs
index 83f4a5fd39e..83f4a5fd39e 100644
--- a/src/test/run-pass/structs-enums/class-methods.rs
+++ b/src/test/ui/structs-enums/class-methods.rs
diff --git a/src/test/run-pass/structs-enums/class-poly-methods-cross-crate.rs b/src/test/ui/structs-enums/class-poly-methods-cross-crate.rs
index 0307ba78d02..0307ba78d02 100644
--- a/src/test/run-pass/structs-enums/class-poly-methods-cross-crate.rs
+++ b/src/test/ui/structs-enums/class-poly-methods-cross-crate.rs
diff --git a/src/test/run-pass/structs-enums/class-poly-methods.rs b/src/test/ui/structs-enums/class-poly-methods.rs
index da2870b58a4..da2870b58a4 100644
--- a/src/test/run-pass/structs-enums/class-poly-methods.rs
+++ b/src/test/ui/structs-enums/class-poly-methods.rs
diff --git a/src/test/run-pass/structs-enums/class-separate-impl.rs b/src/test/ui/structs-enums/class-separate-impl.rs
index 947690b51f4..947690b51f4 100644
--- a/src/test/run-pass/structs-enums/class-separate-impl.rs
+++ b/src/test/ui/structs-enums/class-separate-impl.rs
diff --git a/src/test/run-pass/structs-enums/class-str-field.rs b/src/test/ui/structs-enums/class-str-field.rs
index a3dc66aab12..a3dc66aab12 100644
--- a/src/test/run-pass/structs-enums/class-str-field.rs
+++ b/src/test/ui/structs-enums/class-str-field.rs
diff --git a/src/test/run-pass/structs-enums/class-typarams.rs b/src/test/ui/structs-enums/class-typarams.rs
index 4b2d4b12ec9..4b2d4b12ec9 100644
--- a/src/test/run-pass/structs-enums/class-typarams.rs
+++ b/src/test/ui/structs-enums/class-typarams.rs
diff --git a/src/test/run-pass/structs-enums/classes-cross-crate.rs b/src/test/ui/structs-enums/classes-cross-crate.rs
index ca362c7a7d8..ca362c7a7d8 100644
--- a/src/test/run-pass/structs-enums/classes-cross-crate.rs
+++ b/src/test/ui/structs-enums/classes-cross-crate.rs
diff --git a/src/test/run-pass/structs-enums/classes-self-referential.rs b/src/test/ui/structs-enums/classes-self-referential.rs
index 27d6ebf2c2a..27d6ebf2c2a 100644
--- a/src/test/run-pass/structs-enums/classes-self-referential.rs
+++ b/src/test/ui/structs-enums/classes-self-referential.rs
diff --git a/src/test/run-pass/structs-enums/classes-simple-cross-crate.rs b/src/test/ui/structs-enums/classes-simple-cross-crate.rs
index 6ff0970c0f0..6ff0970c0f0 100644
--- a/src/test/run-pass/structs-enums/classes-simple-cross-crate.rs
+++ b/src/test/ui/structs-enums/classes-simple-cross-crate.rs
diff --git a/src/test/run-pass/structs-enums/classes-simple-method.rs b/src/test/ui/structs-enums/classes-simple-method.rs
index f3d98337dba..f3d98337dba 100644
--- a/src/test/run-pass/structs-enums/classes-simple-method.rs
+++ b/src/test/ui/structs-enums/classes-simple-method.rs
diff --git a/src/test/run-pass/structs-enums/classes-simple.rs b/src/test/ui/structs-enums/classes-simple.rs
index 568fbb29f0d..568fbb29f0d 100644
--- a/src/test/run-pass/structs-enums/classes-simple.rs
+++ b/src/test/ui/structs-enums/classes-simple.rs
diff --git a/src/test/run-pass/structs-enums/classes.rs b/src/test/ui/structs-enums/classes.rs
index 51d84b9091d..51d84b9091d 100644
--- a/src/test/run-pass/structs-enums/classes.rs
+++ b/src/test/ui/structs-enums/classes.rs
diff --git a/src/test/run-pass/structs-enums/codegen-tag-static-padding.rs b/src/test/ui/structs-enums/codegen-tag-static-padding.rs
index 8aa087c018b..8aa087c018b 100644
--- a/src/test/run-pass/structs-enums/codegen-tag-static-padding.rs
+++ b/src/test/ui/structs-enums/codegen-tag-static-padding.rs
diff --git a/src/test/run-pass/structs-enums/compare-generic-enums.rs b/src/test/ui/structs-enums/compare-generic-enums.rs
index 84f953b1f8e..84f953b1f8e 100644
--- a/src/test/run-pass/structs-enums/compare-generic-enums.rs
+++ b/src/test/ui/structs-enums/compare-generic-enums.rs
diff --git a/src/test/run-pass/structs-enums/discrim-explicit-23030.rs b/src/test/ui/structs-enums/discrim-explicit-23030.rs
index 211ca7e4e8f..211ca7e4e8f 100644
--- a/src/test/run-pass/structs-enums/discrim-explicit-23030.rs
+++ b/src/test/ui/structs-enums/discrim-explicit-23030.rs
diff --git a/src/test/run-pass/structs-enums/empty-struct-braces.rs b/src/test/ui/structs-enums/empty-struct-braces.rs
index 0663687c958..0663687c958 100644
--- a/src/test/run-pass/structs-enums/empty-struct-braces.rs
+++ b/src/test/ui/structs-enums/empty-struct-braces.rs
diff --git a/src/test/run-pass/structs-enums/empty-tag.rs b/src/test/ui/structs-enums/empty-tag.rs
index 56a438200c0..56a438200c0 100644
--- a/src/test/run-pass/structs-enums/empty-tag.rs
+++ b/src/test/ui/structs-enums/empty-tag.rs
diff --git a/src/test/run-pass/structs-enums/enum-alignment.rs b/src/test/ui/structs-enums/enum-alignment.rs
index 108dfe2e62d..108dfe2e62d 100644
--- a/src/test/run-pass/structs-enums/enum-alignment.rs
+++ b/src/test/ui/structs-enums/enum-alignment.rs
diff --git a/src/test/run-pass/structs-enums/enum-clike-ffi-as-int.rs b/src/test/ui/structs-enums/enum-clike-ffi-as-int.rs
index e2b2b43dee3..e2b2b43dee3 100644
--- a/src/test/run-pass/structs-enums/enum-clike-ffi-as-int.rs
+++ b/src/test/ui/structs-enums/enum-clike-ffi-as-int.rs
diff --git a/src/test/run-pass/structs-enums/enum-discr.rs b/src/test/ui/structs-enums/enum-discr.rs
index bdd6df82d0f..bdd6df82d0f 100644
--- a/src/test/run-pass/structs-enums/enum-discr.rs
+++ b/src/test/ui/structs-enums/enum-discr.rs
diff --git a/src/test/run-pass/structs-enums/enum-discrim-autosizing.rs b/src/test/ui/structs-enums/enum-discrim-autosizing.rs
index f68fdda6053..f68fdda6053 100644
--- a/src/test/run-pass/structs-enums/enum-discrim-autosizing.rs
+++ b/src/test/ui/structs-enums/enum-discrim-autosizing.rs
diff --git a/src/test/run-pass/structs-enums/enum-discrim-manual-sizing.rs b/src/test/ui/structs-enums/enum-discrim-manual-sizing.rs
index c8b362c9917..c8b362c9917 100644
--- a/src/test/run-pass/structs-enums/enum-discrim-manual-sizing.rs
+++ b/src/test/ui/structs-enums/enum-discrim-manual-sizing.rs
diff --git a/src/test/run-pass/structs-enums/enum-discrim-range-overflow.rs b/src/test/ui/structs-enums/enum-discrim-range-overflow.rs
index 9c4c61e684b..9c4c61e684b 100644
--- a/src/test/run-pass/structs-enums/enum-discrim-range-overflow.rs
+++ b/src/test/ui/structs-enums/enum-discrim-range-overflow.rs
diff --git a/src/test/run-pass/structs-enums/enum-discrim-width-stuff.rs b/src/test/ui/structs-enums/enum-discrim-width-stuff.rs
index f278ae2d0a8..f278ae2d0a8 100644
--- a/src/test/run-pass/structs-enums/enum-discrim-width-stuff.rs
+++ b/src/test/ui/structs-enums/enum-discrim-width-stuff.rs
diff --git a/src/test/run-pass/structs-enums/enum-disr-val-pretty.rs b/src/test/ui/structs-enums/enum-disr-val-pretty.rs
index ef1333e0eeb..ef1333e0eeb 100644
--- a/src/test/run-pass/structs-enums/enum-disr-val-pretty.rs
+++ b/src/test/ui/structs-enums/enum-disr-val-pretty.rs
diff --git a/src/test/run-pass/structs-enums/enum-export-inheritance.rs b/src/test/ui/structs-enums/enum-export-inheritance.rs
index 6a36a004a7c..6a36a004a7c 100644
--- a/src/test/run-pass/structs-enums/enum-export-inheritance.rs
+++ b/src/test/ui/structs-enums/enum-export-inheritance.rs
diff --git a/src/test/run-pass/structs-enums/enum-layout-optimization.rs b/src/test/ui/structs-enums/enum-layout-optimization.rs
index 05d297906c3..05d297906c3 100644
--- a/src/test/run-pass/structs-enums/enum-layout-optimization.rs
+++ b/src/test/ui/structs-enums/enum-layout-optimization.rs
diff --git a/src/test/run-pass/structs-enums/enum-non-c-like-repr-c-and-int.rs b/src/test/ui/structs-enums/enum-non-c-like-repr-c-and-int.rs
index 78d8e5e3a5d..78d8e5e3a5d 100644
--- a/src/test/run-pass/structs-enums/enum-non-c-like-repr-c-and-int.rs
+++ b/src/test/ui/structs-enums/enum-non-c-like-repr-c-and-int.rs
diff --git a/src/test/run-pass/structs-enums/enum-non-c-like-repr-c.rs b/src/test/ui/structs-enums/enum-non-c-like-repr-c.rs
index 1209533efda..1209533efda 100644
--- a/src/test/run-pass/structs-enums/enum-non-c-like-repr-c.rs
+++ b/src/test/ui/structs-enums/enum-non-c-like-repr-c.rs
diff --git a/src/test/run-pass/structs-enums/enum-non-c-like-repr-int.rs b/src/test/ui/structs-enums/enum-non-c-like-repr-int.rs
index 5dd9c1863d6..5dd9c1863d6 100644
--- a/src/test/run-pass/structs-enums/enum-non-c-like-repr-int.rs
+++ b/src/test/ui/structs-enums/enum-non-c-like-repr-int.rs
diff --git a/src/test/run-pass/structs-enums/enum-null-pointer-opt.rs b/src/test/ui/structs-enums/enum-null-pointer-opt.rs
index 32fdbf620a9..32fdbf620a9 100644
--- a/src/test/run-pass/structs-enums/enum-null-pointer-opt.rs
+++ b/src/test/ui/structs-enums/enum-null-pointer-opt.rs
diff --git a/src/test/run-pass/structs-enums/enum-nullable-const-null-with-fields.rs b/src/test/ui/structs-enums/enum-nullable-const-null-with-fields.rs
index ae267e7988e..ae267e7988e 100644
--- a/src/test/run-pass/structs-enums/enum-nullable-const-null-with-fields.rs
+++ b/src/test/ui/structs-enums/enum-nullable-const-null-with-fields.rs
diff --git a/src/test/run-pass/structs-enums/enum-nullable-simplifycfg-misopt.rs b/src/test/ui/structs-enums/enum-nullable-simplifycfg-misopt.rs
index 77419e1132d..77419e1132d 100644
--- a/src/test/run-pass/structs-enums/enum-nullable-simplifycfg-misopt.rs
+++ b/src/test/ui/structs-enums/enum-nullable-simplifycfg-misopt.rs
diff --git a/src/test/run-pass/structs-enums/enum-univariant-repr.rs b/src/test/ui/structs-enums/enum-univariant-repr.rs
index 1e0f6788778..1e0f6788778 100644
--- a/src/test/run-pass/structs-enums/enum-univariant-repr.rs
+++ b/src/test/ui/structs-enums/enum-univariant-repr.rs
diff --git a/src/test/run-pass/structs-enums/enum-variants.rs b/src/test/ui/structs-enums/enum-variants.rs
index 9ac5aae726a..9ac5aae726a 100644
--- a/src/test/run-pass/structs-enums/enum-variants.rs
+++ b/src/test/ui/structs-enums/enum-variants.rs
diff --git a/src/test/run-pass/structs-enums/enum-vec-initializer.rs b/src/test/ui/structs-enums/enum-vec-initializer.rs
index 42ee8ba971e..42ee8ba971e 100644
--- a/src/test/run-pass/structs-enums/enum-vec-initializer.rs
+++ b/src/test/ui/structs-enums/enum-vec-initializer.rs
diff --git a/src/test/run-pass/structs-enums/export-abstract-tag.rs b/src/test/ui/structs-enums/export-abstract-tag.rs
index 76ac73321d3..76ac73321d3 100644
--- a/src/test/run-pass/structs-enums/export-abstract-tag.rs
+++ b/src/test/ui/structs-enums/export-abstract-tag.rs
diff --git a/src/test/run-pass/structs-enums/export-tag-variant.rs b/src/test/ui/structs-enums/export-tag-variant.rs
index 52e0aba0979..52e0aba0979 100644
--- a/src/test/run-pass/structs-enums/export-tag-variant.rs
+++ b/src/test/ui/structs-enums/export-tag-variant.rs
diff --git a/src/test/run-pass/structs-enums/expr-if-struct.rs b/src/test/ui/structs-enums/expr-if-struct.rs
index e62d47c6f5d..e62d47c6f5d 100644
--- a/src/test/run-pass/structs-enums/expr-if-struct.rs
+++ b/src/test/ui/structs-enums/expr-if-struct.rs
diff --git a/src/test/run-pass/structs-enums/expr-match-struct.rs b/src/test/ui/structs-enums/expr-match-struct.rs
index f0e8d897274..f0e8d897274 100644
--- a/src/test/run-pass/structs-enums/expr-match-struct.rs
+++ b/src/test/ui/structs-enums/expr-match-struct.rs
diff --git a/src/test/run-pass/structs-enums/field-destruction-order.rs b/src/test/ui/structs-enums/field-destruction-order.rs
index a75a742d90f..a75a742d90f 100644
--- a/src/test/run-pass/structs-enums/field-destruction-order.rs
+++ b/src/test/ui/structs-enums/field-destruction-order.rs
diff --git a/src/test/run-pass/structs-enums/foreign-struct.rs b/src/test/ui/structs-enums/foreign-struct.rs
index ce02c8fb5c3..ce02c8fb5c3 100644
--- a/src/test/run-pass/structs-enums/foreign-struct.rs
+++ b/src/test/ui/structs-enums/foreign-struct.rs
diff --git a/src/test/run-pass/structs-enums/functional-struct-upd.rs b/src/test/ui/structs-enums/functional-struct-upd.rs
index 51c6b6d7e4f..51c6b6d7e4f 100644
--- a/src/test/run-pass/structs-enums/functional-struct-upd.rs
+++ b/src/test/ui/structs-enums/functional-struct-upd.rs
diff --git a/src/test/run-pass/structs-enums/ivec-tag.rs b/src/test/ui/structs-enums/ivec-tag.rs
index c39368a2bb8..c39368a2bb8 100644
--- a/src/test/run-pass/structs-enums/ivec-tag.rs
+++ b/src/test/ui/structs-enums/ivec-tag.rs
diff --git a/src/test/run-pass/structs-enums/module-qualified-struct-destructure.rs b/src/test/ui/structs-enums/module-qualified-struct-destructure.rs
index 57be37cdf2b..57be37cdf2b 100644
--- a/src/test/run-pass/structs-enums/module-qualified-struct-destructure.rs
+++ b/src/test/ui/structs-enums/module-qualified-struct-destructure.rs
diff --git a/src/test/run-pass/structs-enums/namespaced-enum-emulate-flat-xc.rs b/src/test/ui/structs-enums/namespaced-enum-emulate-flat-xc.rs
index 30cf645821d..30cf645821d 100644
--- a/src/test/run-pass/structs-enums/namespaced-enum-emulate-flat-xc.rs
+++ b/src/test/ui/structs-enums/namespaced-enum-emulate-flat-xc.rs
diff --git a/src/test/run-pass/structs-enums/namespaced-enum-emulate-flat.rs b/src/test/ui/structs-enums/namespaced-enum-emulate-flat.rs
index f6c395059ed..f6c395059ed 100644
--- a/src/test/run-pass/structs-enums/namespaced-enum-emulate-flat.rs
+++ b/src/test/ui/structs-enums/namespaced-enum-emulate-flat.rs
diff --git a/src/test/run-pass/structs-enums/namespaced-enum-glob-import-xcrate.rs b/src/test/ui/structs-enums/namespaced-enum-glob-import-xcrate.rs
index d2ccadea007..d2ccadea007 100644
--- a/src/test/run-pass/structs-enums/namespaced-enum-glob-import-xcrate.rs
+++ b/src/test/ui/structs-enums/namespaced-enum-glob-import-xcrate.rs
diff --git a/src/test/run-pass/structs-enums/namespaced-enum-glob-import.rs b/src/test/ui/structs-enums/namespaced-enum-glob-import.rs
index f36ac69dc08..f36ac69dc08 100644
--- a/src/test/run-pass/structs-enums/namespaced-enum-glob-import.rs
+++ b/src/test/ui/structs-enums/namespaced-enum-glob-import.rs
diff --git a/src/test/run-pass/structs-enums/namespaced-enums-xcrate.rs b/src/test/ui/structs-enums/namespaced-enums-xcrate.rs
index 5e10c3ec1d0..5e10c3ec1d0 100644
--- a/src/test/run-pass/structs-enums/namespaced-enums-xcrate.rs
+++ b/src/test/ui/structs-enums/namespaced-enums-xcrate.rs
diff --git a/src/test/run-pass/structs-enums/namespaced-enums.rs b/src/test/ui/structs-enums/namespaced-enums.rs
index 6a2602501a5..6a2602501a5 100644
--- a/src/test/run-pass/structs-enums/namespaced-enums.rs
+++ b/src/test/ui/structs-enums/namespaced-enums.rs
diff --git a/src/test/run-pass/structs-enums/nested-enum-same-names.rs b/src/test/ui/structs-enums/nested-enum-same-names.rs
index dece3dcd54b..dece3dcd54b 100644
--- a/src/test/run-pass/structs-enums/nested-enum-same-names.rs
+++ b/src/test/ui/structs-enums/nested-enum-same-names.rs
diff --git a/src/test/run-pass/structs-enums/newtype-struct-drop-run.rs b/src/test/ui/structs-enums/newtype-struct-drop-run.rs
index 0754f318701..0754f318701 100644
--- a/src/test/run-pass/structs-enums/newtype-struct-drop-run.rs
+++ b/src/test/ui/structs-enums/newtype-struct-drop-run.rs
diff --git a/src/test/run-pass/structs-enums/newtype-struct-with-dtor.rs b/src/test/ui/structs-enums/newtype-struct-with-dtor.rs
index f73b492dfcf..f73b492dfcf 100644
--- a/src/test/run-pass/structs-enums/newtype-struct-with-dtor.rs
+++ b/src/test/ui/structs-enums/newtype-struct-with-dtor.rs
diff --git a/src/test/run-pass/structs-enums/newtype-struct-xc-2.rs b/src/test/ui/structs-enums/newtype-struct-xc-2.rs
index 40837321be2..40837321be2 100644
--- a/src/test/run-pass/structs-enums/newtype-struct-xc-2.rs
+++ b/src/test/ui/structs-enums/newtype-struct-xc-2.rs
diff --git a/src/test/run-pass/structs-enums/newtype-struct-xc.rs b/src/test/ui/structs-enums/newtype-struct-xc.rs
index 0c6466d97fc..0c6466d97fc 100644
--- a/src/test/run-pass/structs-enums/newtype-struct-xc.rs
+++ b/src/test/ui/structs-enums/newtype-struct-xc.rs
diff --git a/src/test/run-pass/structs-enums/nonzero-enum.rs b/src/test/ui/structs-enums/nonzero-enum.rs
index 15b571be563..15b571be563 100644
--- a/src/test/run-pass/structs-enums/nonzero-enum.rs
+++ b/src/test/ui/structs-enums/nonzero-enum.rs
diff --git a/src/test/run-pass/structs-enums/numeric-fields.rs b/src/test/ui/structs-enums/numeric-fields.rs
index 6ff3afc3870..6ff3afc3870 100644
--- a/src/test/run-pass/structs-enums/numeric-fields.rs
+++ b/src/test/ui/structs-enums/numeric-fields.rs
diff --git a/src/test/run-pass/structs-enums/object-lifetime-default-from-ref-struct.rs b/src/test/ui/structs-enums/object-lifetime-default-from-ref-struct.rs
index e1a865fa503..e1a865fa503 100644
--- a/src/test/run-pass/structs-enums/object-lifetime-default-from-ref-struct.rs
+++ b/src/test/ui/structs-enums/object-lifetime-default-from-ref-struct.rs
diff --git a/src/test/run-pass/structs-enums/object-lifetime-default-from-rptr-struct.rs b/src/test/ui/structs-enums/object-lifetime-default-from-rptr-struct.rs
index 1fc52ead48e..1fc52ead48e 100644
--- a/src/test/run-pass/structs-enums/object-lifetime-default-from-rptr-struct.rs
+++ b/src/test/ui/structs-enums/object-lifetime-default-from-rptr-struct.rs
diff --git a/src/test/run-pass/structs-enums/rec-align-u32.rs b/src/test/ui/structs-enums/rec-align-u32.rs
index 889294daa34..889294daa34 100644
--- a/src/test/run-pass/structs-enums/rec-align-u32.rs
+++ b/src/test/ui/structs-enums/rec-align-u32.rs
diff --git a/src/test/run-pass/structs-enums/rec-align-u64.rs b/src/test/ui/structs-enums/rec-align-u64.rs
index c4e9e9ea5ee..c4e9e9ea5ee 100644
--- a/src/test/run-pass/structs-enums/rec-align-u64.rs
+++ b/src/test/ui/structs-enums/rec-align-u64.rs
diff --git a/src/test/run-pass/structs-enums/rec-auto.rs b/src/test/ui/structs-enums/rec-auto.rs
index c2ef13ede4c..c2ef13ede4c 100644
--- a/src/test/run-pass/structs-enums/rec-auto.rs
+++ b/src/test/ui/structs-enums/rec-auto.rs
diff --git a/src/test/run-pass/structs-enums/rec-extend.rs b/src/test/ui/structs-enums/rec-extend.rs
index 4c91cd1850e..4c91cd1850e 100644
--- a/src/test/run-pass/structs-enums/rec-extend.rs
+++ b/src/test/ui/structs-enums/rec-extend.rs
diff --git a/src/test/run-pass/structs-enums/rec-tup.rs b/src/test/ui/structs-enums/rec-tup.rs
index b85d28fdf03..b85d28fdf03 100644
--- a/src/test/run-pass/structs-enums/rec-tup.rs
+++ b/src/test/ui/structs-enums/rec-tup.rs
diff --git a/src/test/run-pass/structs-enums/rec.rs b/src/test/ui/structs-enums/rec.rs
index 82c84ebd6ff..82c84ebd6ff 100644
--- a/src/test/run-pass/structs-enums/rec.rs
+++ b/src/test/ui/structs-enums/rec.rs
diff --git a/src/test/run-pass/structs-enums/record-pat.rs b/src/test/ui/structs-enums/record-pat.rs
index 1acaf2a32c2..1acaf2a32c2 100644
--- a/src/test/run-pass/structs-enums/record-pat.rs
+++ b/src/test/ui/structs-enums/record-pat.rs
diff --git a/src/test/run-pass/structs-enums/resource-in-struct.rs b/src/test/ui/structs-enums/resource-in-struct.rs
index 35a4b14bc3f..35a4b14bc3f 100644
--- a/src/test/run-pass/structs-enums/resource-in-struct.rs
+++ b/src/test/ui/structs-enums/resource-in-struct.rs
diff --git a/src/test/run-pass/structs-enums/simple-generic-tag.rs b/src/test/ui/structs-enums/simple-generic-tag.rs
index dbd2834d468..dbd2834d468 100644
--- a/src/test/run-pass/structs-enums/simple-generic-tag.rs
+++ b/src/test/ui/structs-enums/simple-generic-tag.rs
diff --git a/src/test/run-pass/structs-enums/simple-match-generic-tag.rs b/src/test/ui/structs-enums/simple-match-generic-tag.rs
index 762fd49ad24..762fd49ad24 100644
--- a/src/test/run-pass/structs-enums/simple-match-generic-tag.rs
+++ b/src/test/ui/structs-enums/simple-match-generic-tag.rs
diff --git a/src/test/run-pass/structs-enums/small-enum-range-edge.rs b/src/test/ui/structs-enums/small-enum-range-edge.rs
index 30612947963..30612947963 100644
--- a/src/test/run-pass/structs-enums/small-enum-range-edge.rs
+++ b/src/test/ui/structs-enums/small-enum-range-edge.rs
diff --git a/src/test/run-pass/structs-enums/small-enums-with-fields.rs b/src/test/ui/structs-enums/small-enums-with-fields.rs
index 565ec1bd45d..565ec1bd45d 100644
--- a/src/test/run-pass/structs-enums/small-enums-with-fields.rs
+++ b/src/test/ui/structs-enums/small-enums-with-fields.rs
diff --git a/src/test/run-pass/structs-enums/struct-aliases-xcrate.rs b/src/test/ui/structs-enums/struct-aliases-xcrate.rs
index ffe7b22f809..ffe7b22f809 100644
--- a/src/test/run-pass/structs-enums/struct-aliases-xcrate.rs
+++ b/src/test/ui/structs-enums/struct-aliases-xcrate.rs
diff --git a/src/test/run-pass/structs-enums/struct-aliases.rs b/src/test/ui/structs-enums/struct-aliases.rs
index b7aeed7bc39..b7aeed7bc39 100644
--- a/src/test/run-pass/structs-enums/struct-aliases.rs
+++ b/src/test/ui/structs-enums/struct-aliases.rs
diff --git a/src/test/run-pass/structs-enums/struct-destructuring-cross-crate.rs b/src/test/ui/structs-enums/struct-destructuring-cross-crate.rs
index 19e0a0bbdd2..19e0a0bbdd2 100644
--- a/src/test/run-pass/structs-enums/struct-destructuring-cross-crate.rs
+++ b/src/test/ui/structs-enums/struct-destructuring-cross-crate.rs
diff --git a/src/test/run-pass/structs-enums/struct-field-shorthand.rs b/src/test/ui/structs-enums/struct-field-shorthand.rs
index ed650c68364..ed650c68364 100644
--- a/src/test/run-pass/structs-enums/struct-field-shorthand.rs
+++ b/src/test/ui/structs-enums/struct-field-shorthand.rs
diff --git a/src/test/run-pass/structs-enums/struct-like-variant-construct.rs b/src/test/ui/structs-enums/struct-like-variant-construct.rs
index 60fc7ce394c..60fc7ce394c 100644
--- a/src/test/run-pass/structs-enums/struct-like-variant-construct.rs
+++ b/src/test/ui/structs-enums/struct-like-variant-construct.rs
diff --git a/src/test/run-pass/structs-enums/struct-like-variant-match.rs b/src/test/ui/structs-enums/struct-like-variant-match.rs
index ade1a697037..ade1a697037 100644
--- a/src/test/run-pass/structs-enums/struct-like-variant-match.rs
+++ b/src/test/ui/structs-enums/struct-like-variant-match.rs
diff --git a/src/test/run-pass/structs-enums/struct-lit-functional-no-fields.rs b/src/test/ui/structs-enums/struct-lit-functional-no-fields.rs
index f19604e951c..f19604e951c 100644
--- a/src/test/run-pass/structs-enums/struct-lit-functional-no-fields.rs
+++ b/src/test/ui/structs-enums/struct-lit-functional-no-fields.rs
diff --git a/src/test/run-pass/structs-enums/struct-literal-dtor.rs b/src/test/ui/structs-enums/struct-literal-dtor.rs
index 6d1b1dfb9b6..6d1b1dfb9b6 100644
--- a/src/test/run-pass/structs-enums/struct-literal-dtor.rs
+++ b/src/test/ui/structs-enums/struct-literal-dtor.rs
diff --git a/src/test/run-pass/structs-enums/struct-new-as-field-name.rs b/src/test/ui/structs-enums/struct-new-as-field-name.rs
index 641fc3c5867..641fc3c5867 100644
--- a/src/test/run-pass/structs-enums/struct-new-as-field-name.rs
+++ b/src/test/ui/structs-enums/struct-new-as-field-name.rs
diff --git a/src/test/run-pass/structs-enums/struct-order-of-eval-1.rs b/src/test/ui/structs-enums/struct-order-of-eval-1.rs
index f3fe9953856..f3fe9953856 100644
--- a/src/test/run-pass/structs-enums/struct-order-of-eval-1.rs
+++ b/src/test/ui/structs-enums/struct-order-of-eval-1.rs
diff --git a/src/test/run-pass/structs-enums/struct-order-of-eval-2.rs b/src/test/ui/structs-enums/struct-order-of-eval-2.rs
index a4e0edc97c6..a4e0edc97c6 100644
--- a/src/test/run-pass/structs-enums/struct-order-of-eval-2.rs
+++ b/src/test/ui/structs-enums/struct-order-of-eval-2.rs
diff --git a/src/test/run-pass/structs-enums/struct-order-of-eval-3.rs b/src/test/ui/structs-enums/struct-order-of-eval-3.rs
index 60887f8d05a..60887f8d05a 100644
--- a/src/test/run-pass/structs-enums/struct-order-of-eval-3.rs
+++ b/src/test/ui/structs-enums/struct-order-of-eval-3.rs
diff --git a/src/test/run-pass/structs-enums/struct-order-of-eval-4.rs b/src/test/ui/structs-enums/struct-order-of-eval-4.rs
index 547df631846..547df631846 100644
--- a/src/test/run-pass/structs-enums/struct-order-of-eval-4.rs
+++ b/src/test/ui/structs-enums/struct-order-of-eval-4.rs
diff --git a/src/test/run-pass/structs-enums/struct-partial-move-1.rs b/src/test/ui/structs-enums/struct-partial-move-1.rs
index c1570159388..c1570159388 100644
--- a/src/test/run-pass/structs-enums/struct-partial-move-1.rs
+++ b/src/test/ui/structs-enums/struct-partial-move-1.rs
diff --git a/src/test/run-pass/structs-enums/struct-partial-move-2.rs b/src/test/ui/structs-enums/struct-partial-move-2.rs
index 4315e5c29f3..4315e5c29f3 100644
--- a/src/test/run-pass/structs-enums/struct-partial-move-2.rs
+++ b/src/test/ui/structs-enums/struct-partial-move-2.rs
diff --git a/src/test/run-pass/structs-enums/struct-path-associated-type.rs b/src/test/ui/structs-enums/struct-path-associated-type.rs
index 2235dfe4b84..2235dfe4b84 100644
--- a/src/test/run-pass/structs-enums/struct-path-associated-type.rs
+++ b/src/test/ui/structs-enums/struct-path-associated-type.rs
diff --git a/src/test/run-pass/structs-enums/struct-path-self.rs b/src/test/ui/structs-enums/struct-path-self.rs
index e7a59858f57..e7a59858f57 100644
--- a/src/test/run-pass/structs-enums/struct-path-self.rs
+++ b/src/test/ui/structs-enums/struct-path-self.rs
diff --git a/src/test/run-pass/structs-enums/struct-pattern-matching.rs b/src/test/ui/structs-enums/struct-pattern-matching.rs
index 89361bf2455..89361bf2455 100644
--- a/src/test/run-pass/structs-enums/struct-pattern-matching.rs
+++ b/src/test/ui/structs-enums/struct-pattern-matching.rs
diff --git a/src/test/run-pass/structs-enums/struct-return.rs b/src/test/ui/structs-enums/struct-return.rs
index 5930fc4acbb..5930fc4acbb 100644
--- a/src/test/run-pass/structs-enums/struct-return.rs
+++ b/src/test/ui/structs-enums/struct-return.rs
diff --git a/src/test/run-pass/structs-enums/struct-variant-field-visibility.rs b/src/test/ui/structs-enums/struct-variant-field-visibility.rs
index 7896c829a6e..7896c829a6e 100644
--- a/src/test/run-pass/structs-enums/struct-variant-field-visibility.rs
+++ b/src/test/ui/structs-enums/struct-variant-field-visibility.rs
diff --git a/src/test/run-pass/structs-enums/struct_variant_xc.rs b/src/test/ui/structs-enums/struct_variant_xc.rs
index 9c8d1a69a3e..9c8d1a69a3e 100644
--- a/src/test/run-pass/structs-enums/struct_variant_xc.rs
+++ b/src/test/ui/structs-enums/struct_variant_xc.rs
diff --git a/src/test/run-pass/structs-enums/struct_variant_xc_match.rs b/src/test/ui/structs-enums/struct_variant_xc_match.rs
index 5358d13faa9..5358d13faa9 100644
--- a/src/test/run-pass/structs-enums/struct_variant_xc_match.rs
+++ b/src/test/ui/structs-enums/struct_variant_xc_match.rs
diff --git a/src/test/run-pass/structs-enums/tag-align-dyn-u64.rs b/src/test/ui/structs-enums/tag-align-dyn-u64.rs
index 3f7a5e3e511..3f7a5e3e511 100644
--- a/src/test/run-pass/structs-enums/tag-align-dyn-u64.rs
+++ b/src/test/ui/structs-enums/tag-align-dyn-u64.rs
diff --git a/src/test/run-pass/structs-enums/tag-align-dyn-variants.rs b/src/test/ui/structs-enums/tag-align-dyn-variants.rs
index 4d075b04c97..4d075b04c97 100644
--- a/src/test/run-pass/structs-enums/tag-align-dyn-variants.rs
+++ b/src/test/ui/structs-enums/tag-align-dyn-variants.rs
diff --git a/src/test/run-pass/structs-enums/tag-align-shape.rs b/src/test/ui/structs-enums/tag-align-shape.rs
index 87282ddbcca..87282ddbcca 100644
--- a/src/test/run-pass/structs-enums/tag-align-shape.rs
+++ b/src/test/ui/structs-enums/tag-align-shape.rs
diff --git a/src/test/run-pass/structs-enums/tag-align-u64.rs b/src/test/ui/structs-enums/tag-align-u64.rs
index 684b27cd030..684b27cd030 100644
--- a/src/test/run-pass/structs-enums/tag-align-u64.rs
+++ b/src/test/ui/structs-enums/tag-align-u64.rs
diff --git a/src/test/run-pass/structs-enums/tag-disr-val-shape.rs b/src/test/ui/structs-enums/tag-disr-val-shape.rs
index 51052626c30..51052626c30 100644
--- a/src/test/run-pass/structs-enums/tag-disr-val-shape.rs
+++ b/src/test/ui/structs-enums/tag-disr-val-shape.rs
diff --git a/src/test/run-pass/structs-enums/tag-exports.rs b/src/test/ui/structs-enums/tag-exports.rs
index 1bcb7d35da3..1bcb7d35da3 100644
--- a/src/test/run-pass/structs-enums/tag-exports.rs
+++ b/src/test/ui/structs-enums/tag-exports.rs
diff --git a/src/test/run-pass/structs-enums/tag-in-block.rs b/src/test/ui/structs-enums/tag-in-block.rs
index 03d4dd9b0ab..03d4dd9b0ab 100644
--- a/src/test/run-pass/structs-enums/tag-in-block.rs
+++ b/src/test/ui/structs-enums/tag-in-block.rs
diff --git a/src/test/run-pass/structs-enums/tag-variant-disr-type-mismatch.rs b/src/test/ui/structs-enums/tag-variant-disr-type-mismatch.rs
index 3f59db38310..3f59db38310 100644
--- a/src/test/run-pass/structs-enums/tag-variant-disr-type-mismatch.rs
+++ b/src/test/ui/structs-enums/tag-variant-disr-type-mismatch.rs
diff --git a/src/test/run-pass/structs-enums/tag-variant-disr-val.rs b/src/test/ui/structs-enums/tag-variant-disr-val.rs
index 297d85c5886..297d85c5886 100644
--- a/src/test/run-pass/structs-enums/tag-variant-disr-val.rs
+++ b/src/test/ui/structs-enums/tag-variant-disr-val.rs
diff --git a/src/test/run-pass/structs-enums/tag.rs b/src/test/ui/structs-enums/tag.rs
index 5fcd64b7cd1..5fcd64b7cd1 100644
--- a/src/test/run-pass/structs-enums/tag.rs
+++ b/src/test/ui/structs-enums/tag.rs
diff --git a/src/test/run-pass/structs-enums/tuple-struct-construct.rs b/src/test/ui/structs-enums/tuple-struct-construct.rs
index 972fc9dc04a..972fc9dc04a 100644
--- a/src/test/run-pass/structs-enums/tuple-struct-construct.rs
+++ b/src/test/ui/structs-enums/tuple-struct-construct.rs
diff --git a/src/test/run-pass/structs-enums/tuple-struct-constructor-pointer.rs b/src/test/ui/structs-enums/tuple-struct-constructor-pointer.rs
index 23f06516323..23f06516323 100644
--- a/src/test/run-pass/structs-enums/tuple-struct-constructor-pointer.rs
+++ b/src/test/ui/structs-enums/tuple-struct-constructor-pointer.rs
diff --git a/src/test/run-pass/structs-enums/tuple-struct-destructuring.rs b/src/test/ui/structs-enums/tuple-struct-destructuring.rs
index dff87ead033..dff87ead033 100644
--- a/src/test/run-pass/structs-enums/tuple-struct-destructuring.rs
+++ b/src/test/ui/structs-enums/tuple-struct-destructuring.rs
diff --git a/src/test/run-pass/structs-enums/tuple-struct-matching.rs b/src/test/ui/structs-enums/tuple-struct-matching.rs
index 432be1d1f7a..432be1d1f7a 100644
--- a/src/test/run-pass/structs-enums/tuple-struct-matching.rs
+++ b/src/test/ui/structs-enums/tuple-struct-matching.rs
diff --git a/src/test/run-pass/structs-enums/tuple-struct-trivial.rs b/src/test/ui/structs-enums/tuple-struct-trivial.rs
index c8651fd29de..c8651fd29de 100644
--- a/src/test/run-pass/structs-enums/tuple-struct-trivial.rs
+++ b/src/test/ui/structs-enums/tuple-struct-trivial.rs
diff --git a/src/test/run-pass/structs-enums/uninstantiable-struct.rs b/src/test/ui/structs-enums/uninstantiable-struct.rs
index b1ef525614e..b1ef525614e 100644
--- a/src/test/run-pass/structs-enums/uninstantiable-struct.rs
+++ b/src/test/ui/structs-enums/uninstantiable-struct.rs
diff --git a/src/test/run-pass/structs-enums/unit-like-struct-drop-run.rs b/src/test/ui/structs-enums/unit-like-struct-drop-run.rs
index 980fd97e2c6..980fd97e2c6 100644
--- a/src/test/run-pass/structs-enums/unit-like-struct-drop-run.rs
+++ b/src/test/ui/structs-enums/unit-like-struct-drop-run.rs
diff --git a/src/test/run-pass/structs-enums/unit-like-struct.rs b/src/test/ui/structs-enums/unit-like-struct.rs
index 636ec992667..636ec992667 100644
--- a/src/test/run-pass/structs-enums/unit-like-struct.rs
+++ b/src/test/ui/structs-enums/unit-like-struct.rs
diff --git a/src/test/run-pass/structs-enums/variant-structs-trivial.rs b/src/test/ui/structs-enums/variant-structs-trivial.rs
index 31fa610a69d..31fa610a69d 100644
--- a/src/test/run-pass/structs-enums/variant-structs-trivial.rs
+++ b/src/test/ui/structs-enums/variant-structs-trivial.rs
diff --git a/src/test/run-pass/structured-compare.rs b/src/test/ui/structured-compare.rs
index 56acc6bd7d4..63d30c4da89 100644
--- a/src/test/run-pass/structured-compare.rs
+++ b/src/test/ui/structured-compare.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 
 
diff --git a/src/test/run-pass/super-fast-paren-parsing.rs b/src/test/ui/super-fast-paren-parsing.rs
index c86f2b8f9c3..60c8db53a8c 100644
--- a/src/test/run-pass/super-fast-paren-parsing.rs
+++ b/src/test/ui/super-fast-paren-parsing.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_upper_case_globals)]
 #![allow(dead_code)]
 // exec-env:RUST_MIN_STACK=16000000
diff --git a/src/test/run-pass/super.rs b/src/test/ui/super.rs
index e378aac8be4..86c720288c3 100644
--- a/src/test/run-pass/super.rs
+++ b/src/test/ui/super.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/supported-cast.rs b/src/test/ui/supported-cast.rs
index 9d875c59d87..ff41ce6c79a 100644
--- a/src/test/run-pass/supported-cast.rs
+++ b/src/test/ui/supported-cast.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
   let f = 1_usize as *const String;
   println!("{:?}", f as isize);
diff --git a/src/test/run-pass/svh-add-nothing.rs b/src/test/ui/svh-add-nothing.rs
index b673fa55e38..d7d037f0b32 100644
--- a/src/test/run-pass/svh-add-nothing.rs
+++ b/src/test/ui/svh-add-nothing.rs
@@ -1,3 +1,4 @@
+// run-pass
 // note that these aux-build directives must be in this order
 // aux-build:svh-a-base.rs
 // aux-build:svh-b.rs
diff --git a/src/test/run-pass/swap-1.rs b/src/test/ui/swap-1.rs
index 55f9c1b6fa2..d87114748dd 100644
--- a/src/test/run-pass/swap-1.rs
+++ b/src/test/ui/swap-1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::mem::swap;
 
 pub fn main() {
diff --git a/src/test/run-pass/swap-2.rs b/src/test/ui/swap-2.rs
index 42b17ef8b78..c8f298ec0e5 100644
--- a/src/test/run-pass/swap-2.rs
+++ b/src/test/ui/swap-2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::mem::swap;
 
 pub fn main() {
diff --git a/src/test/run-pass/swap-overlapping.rs b/src/test/ui/swap-overlapping.rs
index 31fd9ce7d1a..85b357e0c02 100644
--- a/src/test/run-pass/swap-overlapping.rs
+++ b/src/test/ui/swap-overlapping.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // Issue #5041 - avoid overlapping memcpy when src and dest of a swap are the same
 
diff --git a/src/test/run-pass/tail-call-arg-leak.rs b/src/test/ui/tail-call-arg-leak.rs
index 53ec5ea7ff7..a60944b632d 100644
--- a/src/test/run-pass/tail-call-arg-leak.rs
+++ b/src/test/ui/tail-call-arg-leak.rs
@@ -1,3 +1,4 @@
+// run-pass
 // use of tail calls causes arg slot leaks, issue #160.
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/tail-cps.rs b/src/test/ui/tail-cps.rs
index c945f3de0ca..f186683ea66 100644
--- a/src/test/run-pass/tail-cps.rs
+++ b/src/test/ui/tail-cps.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn checktrue(rs: bool) -> bool { assert!((rs)); return true; }
 
 pub fn main() { let k = checktrue; evenk(42, k); oddk(45, k); }
diff --git a/src/test/run-pass/tail-direct.rs b/src/test/ui/tail-direct.rs
index 47847ee6db9..c67c5b7a555 100644
--- a/src/test/run-pass/tail-direct.rs
+++ b/src/test/ui/tail-direct.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() { assert!((even(42))); assert!((odd(45))); }
 
 fn even(n: isize) -> bool { if n == 0 { return true; } else { return odd(n - 1); } }
diff --git a/src/test/run-pass/tcp-stress.rs b/src/test/ui/tcp-stress.rs
index 391cbbdd42d..1f1948fa8fa 100644
--- a/src/test/run-pass/tcp-stress.rs
+++ b/src/test/ui/tcp-stress.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-android needs extra network permissions
 // ignore-cloudabi no global network namespace access
 // ignore-emscripten no threads or sockets support
diff --git a/src/test/run-pass/terminate-in-initializer.rs b/src/test/ui/terminate-in-initializer.rs
index cd9d0931606..c9cb932e62a 100644
--- a/src/test/run-pass/terminate-in-initializer.rs
+++ b/src/test/ui/terminate-in-initializer.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-emscripten no threads support
 
 // Issue #787
diff --git a/src/test/run-pass/test-allow-dead-extern-static-no-warning.rs b/src/test/ui/test-allow-dead-extern-static-no-warning.rs
index aa95f55e88e..2583e431ec1 100644
--- a/src/test/run-pass/test-allow-dead-extern-static-no-warning.rs
+++ b/src/test/ui/test-allow-dead-extern-static-no-warning.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: --test
 
 #![deny(dead_code)]
diff --git a/src/test/run-pass/test-allow-fail-attr.rs b/src/test/ui/test-allow-fail-attr.rs
index 0c3c2a42488..1a478460efc 100644
--- a/src/test/run-pass/test-allow-fail-attr.rs
+++ b/src/test/ui/test-allow-fail-attr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare compiled with panic=abort by default
 // compile-flags: --test
 #![feature(allow_fail)]
diff --git a/src/test/run-pass/test-fn-signature-verification-for-explicit-return-type.rs b/src/test/ui/test-fn-signature-verification-for-explicit-return-type.rs
index a9d09d0398d..ff62d84925f 100644
--- a/src/test/run-pass/test-fn-signature-verification-for-explicit-return-type.rs
+++ b/src/test/ui/test-fn-signature-verification-for-explicit-return-type.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(test)]
 
 // compile-flags: --test
diff --git a/src/test/run-pass/test-main-not-dead-attr.rs b/src/test/ui/test-main-not-dead-attr.rs
index fb596dade8f..628b1896ace 100644
--- a/src/test/run-pass/test-main-not-dead-attr.rs
+++ b/src/test/ui/test-main-not-dead-attr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: --test
 
 #![feature(main)]
diff --git a/src/test/run-pass/test-main-not-dead.rs b/src/test/ui/test-main-not-dead.rs
index 97ab2e30831..30a9c85e3d2 100644
--- a/src/test/run-pass/test-main-not-dead.rs
+++ b/src/test/ui/test-main-not-dead.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: --test
 
 #![deny(dead_code)]
diff --git a/src/test/run-pass/test-runner-hides-buried-main.rs b/src/test/ui/test-runner-hides-buried-main.rs
index 4295f8bbf4c..917c09801e1 100644
--- a/src/test/run-pass/test-runner-hides-buried-main.rs
+++ b/src/test/ui/test-runner-hides-buried-main.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: --test
 
 #![feature(main)]
diff --git a/src/test/run-pass/test-runner-hides-main.rs b/src/test/ui/test-runner-hides-main.rs
index 664d9153caf..0de1d64f0fc 100644
--- a/src/test/run-pass/test-runner-hides-main.rs
+++ b/src/test/ui/test-runner-hides-main.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags:--test
 // Building as a test runner means that a synthetic main will be run,
 // not ours
diff --git a/src/test/run-pass/test-runner-hides-start.rs b/src/test/ui/test-runner-hides-start.rs
index 2634df10f26..56212bb6f4b 100644
--- a/src/test/run-pass/test-runner-hides-start.rs
+++ b/src/test/ui/test-runner-hides-start.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: --test
 
 #![feature(start)]
diff --git a/src/test/run-pass/test-should-fail-good-message.rs b/src/test/ui/test-should-fail-good-message.rs
index d7d9c6c1edc..9fa759f9eb4 100644
--- a/src/test/run-pass/test-should-fail-good-message.rs
+++ b/src/test/ui/test-should-fail-good-message.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare compiled with panic=abort by default
 // compile-flags: --test
 #[test]
diff --git a/src/test/run-pass/test-vs-cfg-test.rs b/src/test/ui/test-vs-cfg-test.rs
index 75f4d0c8db2..cd1cd33c284 100644
--- a/src/test/run-pass/test-vs-cfg-test.rs
+++ b/src/test/ui/test-vs-cfg-test.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: --cfg test
 
 // Make sure `--cfg test` does not inject test harness
diff --git a/src/test/run-pass/thin-lto-global-allocator.rs b/src/test/ui/thin-lto-global-allocator.rs
index 18869cf66da..e00c5caf97c 100644
--- a/src/test/run-pass/thin-lto-global-allocator.rs
+++ b/src/test/ui/thin-lto-global-allocator.rs
@@ -1,3 +1,4 @@
+// run-pass
 // compile-flags: -Z thinlto -C codegen-units=2
 
 #[global_allocator]
diff --git a/src/test/run-pass/thinlto/all-crates.rs b/src/test/ui/thinlto/all-crates.rs
index e910b2a9f96..e910b2a9f96 100644
--- a/src/test/run-pass/thinlto/all-crates.rs
+++ b/src/test/ui/thinlto/all-crates.rs
diff --git a/src/test/run-pass/thinlto/auxiliary/dylib.rs b/src/test/ui/thinlto/auxiliary/dylib.rs
index e8b7f8f9f47..e8b7f8f9f47 100644
--- a/src/test/run-pass/thinlto/auxiliary/dylib.rs
+++ b/src/test/ui/thinlto/auxiliary/dylib.rs
diff --git a/src/test/run-pass/thinlto/auxiliary/msvc-imp-present.rs b/src/test/ui/thinlto/auxiliary/msvc-imp-present.rs
index 933af050a6a..933af050a6a 100644
--- a/src/test/run-pass/thinlto/auxiliary/msvc-imp-present.rs
+++ b/src/test/ui/thinlto/auxiliary/msvc-imp-present.rs
diff --git a/src/test/run-pass/thinlto/auxiliary/thin-lto-inlines-aux.rs b/src/test/ui/thinlto/auxiliary/thin-lto-inlines-aux.rs
index 5fd3f1996dd..5fd3f1996dd 100644
--- a/src/test/run-pass/thinlto/auxiliary/thin-lto-inlines-aux.rs
+++ b/src/test/ui/thinlto/auxiliary/thin-lto-inlines-aux.rs
diff --git a/src/test/run-pass/thinlto/dylib-works.rs b/src/test/ui/thinlto/dylib-works.rs
index 9e0782b590e..9e0782b590e 100644
--- a/src/test/run-pass/thinlto/dylib-works.rs
+++ b/src/test/ui/thinlto/dylib-works.rs
diff --git a/src/test/run-pass/thinlto/msvc-imp-present.rs b/src/test/ui/thinlto/msvc-imp-present.rs
index 5498afb2937..5498afb2937 100644
--- a/src/test/run-pass/thinlto/msvc-imp-present.rs
+++ b/src/test/ui/thinlto/msvc-imp-present.rs
diff --git a/src/test/run-pass/thinlto/thin-lto-inlines.rs b/src/test/ui/thinlto/thin-lto-inlines.rs
index dca7918077e..dca7918077e 100644
--- a/src/test/run-pass/thinlto/thin-lto-inlines.rs
+++ b/src/test/ui/thinlto/thin-lto-inlines.rs
diff --git a/src/test/run-pass/thinlto/thin-lto-inlines2.rs b/src/test/ui/thinlto/thin-lto-inlines2.rs
index 1eb29657c70..1eb29657c70 100644
--- a/src/test/run-pass/thinlto/thin-lto-inlines2.rs
+++ b/src/test/ui/thinlto/thin-lto-inlines2.rs
diff --git a/src/test/run-pass/thinlto/weak-works.rs b/src/test/ui/thinlto/weak-works.rs
index 163a3870248..163a3870248 100644
--- a/src/test/run-pass/thinlto/weak-works.rs
+++ b/src/test/ui/thinlto/weak-works.rs
diff --git a/src/test/run-pass/thread-local-not-in-prelude.rs b/src/test/ui/thread-local-not-in-prelude.rs
index 6825b0338f9..03974982625 100644
--- a/src/test/run-pass/thread-local-not-in-prelude.rs
+++ b/src/test/ui/thread-local-not-in-prelude.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![no_std]
 
 extern crate std;
diff --git a/src/test/run-pass/threads-sendsync/auxiliary/thread-local-extern-static.rs b/src/test/ui/threads-sendsync/auxiliary/thread-local-extern-static.rs
index b237b1c480e..b237b1c480e 100644
--- a/src/test/run-pass/threads-sendsync/auxiliary/thread-local-extern-static.rs
+++ b/src/test/ui/threads-sendsync/auxiliary/thread-local-extern-static.rs
diff --git a/src/test/run-pass/threads-sendsync/comm.rs b/src/test/ui/threads-sendsync/comm.rs
index aa86e174d44..aa86e174d44 100644
--- a/src/test/run-pass/threads-sendsync/comm.rs
+++ b/src/test/ui/threads-sendsync/comm.rs
diff --git a/src/test/run-pass/threads-sendsync/send-is-not-static-par-for.rs b/src/test/ui/threads-sendsync/send-is-not-static-par-for.rs
index dbe46555101..dbe46555101 100644
--- a/src/test/run-pass/threads-sendsync/send-is-not-static-par-for.rs
+++ b/src/test/ui/threads-sendsync/send-is-not-static-par-for.rs
diff --git a/src/test/run-pass/threads-sendsync/send-resource.rs b/src/test/ui/threads-sendsync/send-resource.rs
index 023a84d6b6e..023a84d6b6e 100644
--- a/src/test/run-pass/threads-sendsync/send-resource.rs
+++ b/src/test/ui/threads-sendsync/send-resource.rs
diff --git a/src/test/run-pass/threads-sendsync/send-type-inference.rs b/src/test/ui/threads-sendsync/send-type-inference.rs
index 0d9af7512b4..0d9af7512b4 100644
--- a/src/test/run-pass/threads-sendsync/send-type-inference.rs
+++ b/src/test/ui/threads-sendsync/send-type-inference.rs
diff --git a/src/test/run-pass/threads-sendsync/send_str_hashmap.rs b/src/test/ui/threads-sendsync/send_str_hashmap.rs
index 7d4cca8ad74..7d4cca8ad74 100644
--- a/src/test/run-pass/threads-sendsync/send_str_hashmap.rs
+++ b/src/test/ui/threads-sendsync/send_str_hashmap.rs
diff --git a/src/test/run-pass/threads-sendsync/send_str_treemap.rs b/src/test/ui/threads-sendsync/send_str_treemap.rs
index 4d463174590..4d463174590 100644
--- a/src/test/run-pass/threads-sendsync/send_str_treemap.rs
+++ b/src/test/ui/threads-sendsync/send_str_treemap.rs
diff --git a/src/test/run-pass/threads-sendsync/sendable-class.rs b/src/test/ui/threads-sendsync/sendable-class.rs
index 7facf245bde..7facf245bde 100644
--- a/src/test/run-pass/threads-sendsync/sendable-class.rs
+++ b/src/test/ui/threads-sendsync/sendable-class.rs
diff --git a/src/test/run-pass/threads-sendsync/sendfn-is-a-block.rs b/src/test/ui/threads-sendsync/sendfn-is-a-block.rs
index 62807d8941a..62807d8941a 100644
--- a/src/test/run-pass/threads-sendsync/sendfn-is-a-block.rs
+++ b/src/test/ui/threads-sendsync/sendfn-is-a-block.rs
diff --git a/src/test/run-pass/threads-sendsync/sendfn-spawn-with-fn-arg.rs b/src/test/ui/threads-sendsync/sendfn-spawn-with-fn-arg.rs
index 8c40b2a5f11..8c40b2a5f11 100644
--- a/src/test/run-pass/threads-sendsync/sendfn-spawn-with-fn-arg.rs
+++ b/src/test/ui/threads-sendsync/sendfn-spawn-with-fn-arg.rs
diff --git a/src/test/run-pass/threads-sendsync/spawn-fn.rs b/src/test/ui/threads-sendsync/spawn-fn.rs
index 1243bb2579f..1243bb2579f 100644
--- a/src/test/run-pass/threads-sendsync/spawn-fn.rs
+++ b/src/test/ui/threads-sendsync/spawn-fn.rs
diff --git a/src/test/run-pass/threads-sendsync/spawn-types.rs b/src/test/ui/threads-sendsync/spawn-types.rs
index 1bead6e1bb1..1bead6e1bb1 100644
--- a/src/test/run-pass/threads-sendsync/spawn-types.rs
+++ b/src/test/ui/threads-sendsync/spawn-types.rs
diff --git a/src/test/run-pass/threads-sendsync/spawn.rs b/src/test/ui/threads-sendsync/spawn.rs
index b1dcc9417fb..b1dcc9417fb 100644
--- a/src/test/run-pass/threads-sendsync/spawn.rs
+++ b/src/test/ui/threads-sendsync/spawn.rs
diff --git a/src/test/run-pass/threads-sendsync/spawn2.rs b/src/test/ui/threads-sendsync/spawn2.rs
index 83e066aef96..83e066aef96 100644
--- a/src/test/run-pass/threads-sendsync/spawn2.rs
+++ b/src/test/ui/threads-sendsync/spawn2.rs
diff --git a/src/test/run-pass/threads-sendsync/spawning-with-debug.rs b/src/test/ui/threads-sendsync/spawning-with-debug.rs
index 388d62aa710..388d62aa710 100644
--- a/src/test/run-pass/threads-sendsync/spawning-with-debug.rs
+++ b/src/test/ui/threads-sendsync/spawning-with-debug.rs
diff --git a/src/test/run-pass/threads-sendsync/std-sync-right-kind-impls.rs b/src/test/ui/threads-sendsync/std-sync-right-kind-impls.rs
index bc64c816243..bc64c816243 100644
--- a/src/test/run-pass/threads-sendsync/std-sync-right-kind-impls.rs
+++ b/src/test/ui/threads-sendsync/std-sync-right-kind-impls.rs
diff --git a/src/test/run-pass/threads-sendsync/sync-send-atomics.rs b/src/test/ui/threads-sendsync/sync-send-atomics.rs
index 0466f4f0e9d..0466f4f0e9d 100644
--- a/src/test/run-pass/threads-sendsync/sync-send-atomics.rs
+++ b/src/test/ui/threads-sendsync/sync-send-atomics.rs
diff --git a/src/test/run-pass/threads-sendsync/sync-send-in-std.rs b/src/test/ui/threads-sendsync/sync-send-in-std.rs
index 15e10dc250f..15e10dc250f 100644
--- a/src/test/run-pass/threads-sendsync/sync-send-in-std.rs
+++ b/src/test/ui/threads-sendsync/sync-send-in-std.rs
diff --git a/src/test/run-pass/threads-sendsync/sync-send-iterators-in-libcollections.rs b/src/test/ui/threads-sendsync/sync-send-iterators-in-libcollections.rs
index fd53bb607f7..fd53bb607f7 100644
--- a/src/test/run-pass/threads-sendsync/sync-send-iterators-in-libcollections.rs
+++ b/src/test/ui/threads-sendsync/sync-send-iterators-in-libcollections.rs
diff --git a/src/test/run-pass/threads-sendsync/sync-send-iterators-in-libcore.rs b/src/test/ui/threads-sendsync/sync-send-iterators-in-libcore.rs
index 44beb9dc1e5..44beb9dc1e5 100644
--- a/src/test/run-pass/threads-sendsync/sync-send-iterators-in-libcore.rs
+++ b/src/test/ui/threads-sendsync/sync-send-iterators-in-libcore.rs
diff --git a/src/test/run-pass/threads-sendsync/task-comm-0.rs b/src/test/ui/threads-sendsync/task-comm-0.rs
index 2b9a50e4d41..2b9a50e4d41 100644
--- a/src/test/run-pass/threads-sendsync/task-comm-0.rs
+++ b/src/test/ui/threads-sendsync/task-comm-0.rs
diff --git a/src/test/run-pass/threads-sendsync/task-comm-1.rs b/src/test/ui/threads-sendsync/task-comm-1.rs
index 68ca62909bf..68ca62909bf 100644
--- a/src/test/run-pass/threads-sendsync/task-comm-1.rs
+++ b/src/test/ui/threads-sendsync/task-comm-1.rs
diff --git a/src/test/run-pass/threads-sendsync/task-comm-10.rs b/src/test/ui/threads-sendsync/task-comm-10.rs
index 4cac0dc90cf..4cac0dc90cf 100644
--- a/src/test/run-pass/threads-sendsync/task-comm-10.rs
+++ b/src/test/ui/threads-sendsync/task-comm-10.rs
diff --git a/src/test/run-pass/threads-sendsync/task-comm-11.rs b/src/test/ui/threads-sendsync/task-comm-11.rs
index 8541e143fb9..8541e143fb9 100644
--- a/src/test/run-pass/threads-sendsync/task-comm-11.rs
+++ b/src/test/ui/threads-sendsync/task-comm-11.rs
diff --git a/src/test/run-pass/threads-sendsync/task-comm-12.rs b/src/test/ui/threads-sendsync/task-comm-12.rs
index 613a5cee58b..613a5cee58b 100644
--- a/src/test/run-pass/threads-sendsync/task-comm-12.rs
+++ b/src/test/ui/threads-sendsync/task-comm-12.rs
diff --git a/src/test/run-pass/threads-sendsync/task-comm-13.rs b/src/test/ui/threads-sendsync/task-comm-13.rs
index 327eaaf8fa1..327eaaf8fa1 100644
--- a/src/test/run-pass/threads-sendsync/task-comm-13.rs
+++ b/src/test/ui/threads-sendsync/task-comm-13.rs
diff --git a/src/test/run-pass/threads-sendsync/task-comm-14.rs b/src/test/ui/threads-sendsync/task-comm-14.rs
index 88d6b090268..88d6b090268 100644
--- a/src/test/run-pass/threads-sendsync/task-comm-14.rs
+++ b/src/test/ui/threads-sendsync/task-comm-14.rs
diff --git a/src/test/run-pass/threads-sendsync/task-comm-15.rs b/src/test/ui/threads-sendsync/task-comm-15.rs
index adb14abdce9..adb14abdce9 100644
--- a/src/test/run-pass/threads-sendsync/task-comm-15.rs
+++ b/src/test/ui/threads-sendsync/task-comm-15.rs
diff --git a/src/test/run-pass/threads-sendsync/task-comm-16.rs b/src/test/ui/threads-sendsync/task-comm-16.rs
index d808fd9aceb..d808fd9aceb 100644
--- a/src/test/run-pass/threads-sendsync/task-comm-16.rs
+++ b/src/test/ui/threads-sendsync/task-comm-16.rs
diff --git a/src/test/run-pass/threads-sendsync/task-comm-17.rs b/src/test/ui/threads-sendsync/task-comm-17.rs
index 72249787093..72249787093 100644
--- a/src/test/run-pass/threads-sendsync/task-comm-17.rs
+++ b/src/test/ui/threads-sendsync/task-comm-17.rs
diff --git a/src/test/run-pass/threads-sendsync/task-comm-3.rs b/src/test/ui/threads-sendsync/task-comm-3.rs
index 570ae0a82ff..570ae0a82ff 100644
--- a/src/test/run-pass/threads-sendsync/task-comm-3.rs
+++ b/src/test/ui/threads-sendsync/task-comm-3.rs
diff --git a/src/test/run-pass/threads-sendsync/task-comm-4.rs b/src/test/ui/threads-sendsync/task-comm-4.rs
index b259d69d15d..b259d69d15d 100644
--- a/src/test/run-pass/threads-sendsync/task-comm-4.rs
+++ b/src/test/ui/threads-sendsync/task-comm-4.rs
diff --git a/src/test/run-pass/threads-sendsync/task-comm-5.rs b/src/test/ui/threads-sendsync/task-comm-5.rs
index cdedf034ac3..cdedf034ac3 100644
--- a/src/test/run-pass/threads-sendsync/task-comm-5.rs
+++ b/src/test/ui/threads-sendsync/task-comm-5.rs
diff --git a/src/test/run-pass/threads-sendsync/task-comm-6.rs b/src/test/ui/threads-sendsync/task-comm-6.rs
index 990205ad334..990205ad334 100644
--- a/src/test/run-pass/threads-sendsync/task-comm-6.rs
+++ b/src/test/ui/threads-sendsync/task-comm-6.rs
diff --git a/src/test/run-pass/threads-sendsync/task-comm-7.rs b/src/test/ui/threads-sendsync/task-comm-7.rs
index 0b9673e0033..0b9673e0033 100644
--- a/src/test/run-pass/threads-sendsync/task-comm-7.rs
+++ b/src/test/ui/threads-sendsync/task-comm-7.rs
diff --git a/src/test/run-pass/threads-sendsync/task-comm-9.rs b/src/test/ui/threads-sendsync/task-comm-9.rs
index 5ed33012100..5ed33012100 100644
--- a/src/test/run-pass/threads-sendsync/task-comm-9.rs
+++ b/src/test/ui/threads-sendsync/task-comm-9.rs
diff --git a/src/test/run-pass/threads-sendsync/task-comm-chan-nil.rs b/src/test/ui/threads-sendsync/task-comm-chan-nil.rs
index a93ddff43dc..a93ddff43dc 100644
--- a/src/test/run-pass/threads-sendsync/task-comm-chan-nil.rs
+++ b/src/test/ui/threads-sendsync/task-comm-chan-nil.rs
diff --git a/src/test/run-pass/threads-sendsync/task-life-0.rs b/src/test/ui/threads-sendsync/task-life-0.rs
index 785cff9a0f3..785cff9a0f3 100644
--- a/src/test/run-pass/threads-sendsync/task-life-0.rs
+++ b/src/test/ui/threads-sendsync/task-life-0.rs
diff --git a/src/test/run-pass/threads-sendsync/task-spawn-move-and-copy.rs b/src/test/ui/threads-sendsync/task-spawn-move-and-copy.rs
index 458f5653885..458f5653885 100644
--- a/src/test/run-pass/threads-sendsync/task-spawn-move-and-copy.rs
+++ b/src/test/ui/threads-sendsync/task-spawn-move-and-copy.rs
diff --git a/src/test/run-pass/threads-sendsync/task-stderr.rs b/src/test/ui/threads-sendsync/task-stderr.rs
index d474084bf20..d474084bf20 100644
--- a/src/test/run-pass/threads-sendsync/task-stderr.rs
+++ b/src/test/ui/threads-sendsync/task-stderr.rs
diff --git a/src/test/run-pass/threads-sendsync/thread-local-extern-static.rs b/src/test/ui/threads-sendsync/thread-local-extern-static.rs
index e10f5174b12..e10f5174b12 100644
--- a/src/test/run-pass/threads-sendsync/thread-local-extern-static.rs
+++ b/src/test/ui/threads-sendsync/thread-local-extern-static.rs
diff --git a/src/test/run-pass/threads-sendsync/thread-local-syntax.rs b/src/test/ui/threads-sendsync/thread-local-syntax.rs
index 2f4805e4731..2f4805e4731 100644
--- a/src/test/run-pass/threads-sendsync/thread-local-syntax.rs
+++ b/src/test/ui/threads-sendsync/thread-local-syntax.rs
diff --git a/src/test/run-pass/threads-sendsync/threads.rs b/src/test/ui/threads-sendsync/threads.rs
index e3da83aa12b..e3da83aa12b 100644
--- a/src/test/run-pass/threads-sendsync/threads.rs
+++ b/src/test/ui/threads-sendsync/threads.rs
diff --git a/src/test/run-pass/threads-sendsync/tls-dtors-are-run-in-a-static-binary.rs b/src/test/ui/threads-sendsync/tls-dtors-are-run-in-a-static-binary.rs
index 8baef433410..8baef433410 100644
--- a/src/test/run-pass/threads-sendsync/tls-dtors-are-run-in-a-static-binary.rs
+++ b/src/test/ui/threads-sendsync/tls-dtors-are-run-in-a-static-binary.rs
diff --git a/src/test/run-pass/threads-sendsync/tls-init-on-init.rs b/src/test/ui/threads-sendsync/tls-init-on-init.rs
index 193c1815105..193c1815105 100644
--- a/src/test/run-pass/threads-sendsync/tls-init-on-init.rs
+++ b/src/test/ui/threads-sendsync/tls-init-on-init.rs
diff --git a/src/test/run-pass/threads-sendsync/tls-try-with.rs b/src/test/ui/threads-sendsync/tls-try-with.rs
index f36ab4e4f9c..f36ab4e4f9c 100644
--- a/src/test/run-pass/threads-sendsync/tls-try-with.rs
+++ b/src/test/ui/threads-sendsync/tls-try-with.rs
diff --git a/src/test/run-pass/tool_attributes.rs b/src/test/ui/tool_attributes.rs
index 506c11011a6..be4a10c0ee9 100644
--- a/src/test/run-pass/tool_attributes.rs
+++ b/src/test/ui/tool_attributes.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Scoped attributes should not trigger an unused attributes lint.
 
 #![deny(unused_attributes)]
diff --git a/src/test/run-pass/tool_lints.rs b/src/test/ui/tool_lints-rpass.rs
index bf848b8ebe0..e467d34376f 100644
--- a/src/test/run-pass/tool_lints.rs
+++ b/src/test/ui/tool_lints-rpass.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![deny(unknown_lints)]
 
 #[allow(clippy::almost_swapped)]
diff --git a/src/test/run-pass/tool_lints_2018_preview.rs b/src/test/ui/tool_lints_2018_preview.rs
index be6d1991374..190f0b99dc8 100644
--- a/src/test/run-pass/tool_lints_2018_preview.rs
+++ b/src/test/ui/tool_lints_2018_preview.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(rust_2018_preview)]
 #![deny(unknown_lints)]
 
diff --git a/src/test/run-pass/trailing-comma.rs b/src/test/ui/trailing-comma.rs
index 197af295a42..f34e6b7606d 100644
--- a/src/test/run-pass/trailing-comma.rs
+++ b/src/test/ui/trailing-comma.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(slice_patterns)]
diff --git a/src/test/run-pass/traits/anon-trait-static-method.rs b/src/test/ui/traits/anon-trait-static-method.rs
index ede01afae02..ede01afae02 100644
--- a/src/test/run-pass/traits/anon-trait-static-method.rs
+++ b/src/test/ui/traits/anon-trait-static-method.rs
diff --git a/src/test/run-pass/traits/anon_trait_static_method_exe.rs b/src/test/ui/traits/anon_trait_static_method_exe.rs
index b4930295499..b4930295499 100644
--- a/src/test/run-pass/traits/anon_trait_static_method_exe.rs
+++ b/src/test/ui/traits/anon_trait_static_method_exe.rs
diff --git a/src/test/run-pass/traits/assignability-trait.rs b/src/test/ui/traits/assignability-trait.rs
index a8547c1d271..a8547c1d271 100644
--- a/src/test/run-pass/traits/assignability-trait.rs
+++ b/src/test/ui/traits/assignability-trait.rs
diff --git a/src/test/run-pass/traits/astconv-cycle-between-trait-and-type.rs b/src/test/ui/traits/astconv-cycle-between-trait-and-type.rs
index cc8f9dc5190..cc8f9dc5190 100644
--- a/src/test/run-pass/traits/astconv-cycle-between-trait-and-type.rs
+++ b/src/test/ui/traits/astconv-cycle-between-trait-and-type.rs
diff --git a/src/test/run-pass/traits/augmented-assignments-trait.rs b/src/test/ui/traits/augmented-assignments-trait.rs
index 8c418daffdf..8c418daffdf 100644
--- a/src/test/run-pass/traits/augmented-assignments-trait.rs
+++ b/src/test/ui/traits/augmented-assignments-trait.rs
diff --git a/src/test/run-pass/traits/auto-traits.rs b/src/test/ui/traits/auto-traits.rs
index c495b97b25b..c495b97b25b 100644
--- a/src/test/run-pass/traits/auto-traits.rs
+++ b/src/test/ui/traits/auto-traits.rs
diff --git a/src/test/run-pass/traits/auxiliary/anon_trait_static_method_lib.rs b/src/test/ui/traits/auxiliary/anon_trait_static_method_lib.rs
index dceec7e3ec1..dceec7e3ec1 100644
--- a/src/test/run-pass/traits/auxiliary/anon_trait_static_method_lib.rs
+++ b/src/test/ui/traits/auxiliary/anon_trait_static_method_lib.rs
diff --git a/src/test/run-pass/traits/auxiliary/go_trait.rs b/src/test/ui/traits/auxiliary/go_trait.rs
index aa0ec22896d..aa0ec22896d 100644
--- a/src/test/run-pass/traits/auxiliary/go_trait.rs
+++ b/src/test/ui/traits/auxiliary/go_trait.rs
diff --git a/src/test/run-pass/traits/auxiliary/trait_alias.rs b/src/test/ui/traits/auxiliary/trait_alias.rs
index 9e412215512..9e412215512 100644
--- a/src/test/run-pass/traits/auxiliary/trait_alias.rs
+++ b/src/test/ui/traits/auxiliary/trait_alias.rs
diff --git a/src/test/run-pass/traits/auxiliary/trait_default_method_xc_aux.rs b/src/test/ui/traits/auxiliary/trait_default_method_xc_aux.rs
index 0fb26af80c7..0fb26af80c7 100644
--- a/src/test/run-pass/traits/auxiliary/trait_default_method_xc_aux.rs
+++ b/src/test/ui/traits/auxiliary/trait_default_method_xc_aux.rs
diff --git a/src/test/run-pass/traits/auxiliary/trait_default_method_xc_aux_2.rs b/src/test/ui/traits/auxiliary/trait_default_method_xc_aux_2.rs
index 15480132a23..15480132a23 100644
--- a/src/test/run-pass/traits/auxiliary/trait_default_method_xc_aux_2.rs
+++ b/src/test/ui/traits/auxiliary/trait_default_method_xc_aux_2.rs
diff --git a/src/test/run-pass/traits/auxiliary/trait_inheritance_auto_xc_2_aux.rs b/src/test/ui/traits/auxiliary/trait_inheritance_auto_xc_2_aux.rs
index e9327676dc6..e9327676dc6 100644
--- a/src/test/run-pass/traits/auxiliary/trait_inheritance_auto_xc_2_aux.rs
+++ b/src/test/ui/traits/auxiliary/trait_inheritance_auto_xc_2_aux.rs
diff --git a/src/test/run-pass/traits/auxiliary/trait_inheritance_auto_xc_aux.rs b/src/test/ui/traits/auxiliary/trait_inheritance_auto_xc_aux.rs
index 9af26cb2e2b..9af26cb2e2b 100644
--- a/src/test/run-pass/traits/auxiliary/trait_inheritance_auto_xc_aux.rs
+++ b/src/test/ui/traits/auxiliary/trait_inheritance_auto_xc_aux.rs
diff --git a/src/test/run-pass/traits/auxiliary/trait_inheritance_overloading_xc.rs b/src/test/ui/traits/auxiliary/trait_inheritance_overloading_xc.rs
index a2570441226..a2570441226 100644
--- a/src/test/run-pass/traits/auxiliary/trait_inheritance_overloading_xc.rs
+++ b/src/test/ui/traits/auxiliary/trait_inheritance_overloading_xc.rs
diff --git a/src/test/run-pass/traits/auxiliary/trait_xc_call_aux.rs b/src/test/ui/traits/auxiliary/trait_xc_call_aux.rs
index b76c52e62a9..b76c52e62a9 100644
--- a/src/test/run-pass/traits/auxiliary/trait_xc_call_aux.rs
+++ b/src/test/ui/traits/auxiliary/trait_xc_call_aux.rs
diff --git a/src/test/run-pass/traits/auxiliary/traitimpl.rs b/src/test/ui/traits/auxiliary/traitimpl.rs
index fda5314cdbf..fda5314cdbf 100644
--- a/src/test/run-pass/traits/auxiliary/traitimpl.rs
+++ b/src/test/ui/traits/auxiliary/traitimpl.rs
diff --git a/src/test/run-pass/traits/cycle-trait-type-trait.rs b/src/test/ui/traits/cycle-trait-type-trait.rs
index c62d01403c7..c62d01403c7 100644
--- a/src/test/run-pass/traits/cycle-trait-type-trait.rs
+++ b/src/test/ui/traits/cycle-trait-type-trait.rs
diff --git a/src/test/run-pass/traits/default-method-supertrait-vtable.rs b/src/test/ui/traits/default-method-supertrait-vtable.rs
index 939ad51355e..939ad51355e 100644
--- a/src/test/run-pass/traits/default-method-supertrait-vtable.rs
+++ b/src/test/ui/traits/default-method-supertrait-vtable.rs
diff --git a/src/test/run-pass/traits/dyn-trait.rs b/src/test/ui/traits/dyn-trait.rs
index e1c1a8de55a..e1c1a8de55a 100644
--- a/src/test/run-pass/traits/dyn-trait.rs
+++ b/src/test/ui/traits/dyn-trait.rs
diff --git a/src/test/run-pass/traits/fmt-pointer-trait.rs b/src/test/ui/traits/fmt-pointer-trait.rs
index b7876b9bd51..b7876b9bd51 100644
--- a/src/test/run-pass/traits/fmt-pointer-trait.rs
+++ b/src/test/ui/traits/fmt-pointer-trait.rs
diff --git a/src/test/run-pass/traits/impl-implicit-trait.rs b/src/test/ui/traits/impl-implicit-trait.rs
index fac2bcce248..fac2bcce248 100644
--- a/src/test/run-pass/traits/impl-implicit-trait.rs
+++ b/src/test/ui/traits/impl-implicit-trait.rs
diff --git a/src/test/run-pass/traits/impl-inherent-prefer-over-trait.rs b/src/test/ui/traits/impl-inherent-prefer-over-trait.rs
index 82760788897..82760788897 100644
--- a/src/test/run-pass/traits/impl-inherent-prefer-over-trait.rs
+++ b/src/test/ui/traits/impl-inherent-prefer-over-trait.rs
diff --git a/src/test/run-pass/traits/infer-from-object-trait-issue-26952.rs b/src/test/ui/traits/infer-from-object-trait-issue-26952.rs
index ed258dbb24c..ed258dbb24c 100644
--- a/src/test/run-pass/traits/infer-from-object-trait-issue-26952.rs
+++ b/src/test/ui/traits/infer-from-object-trait-issue-26952.rs
diff --git a/src/test/run-pass/traits/inherent-trait-method-order.rs b/src/test/ui/traits/inherent-trait-method-order.rs
index f632ae8a9ac..f632ae8a9ac 100644
--- a/src/test/run-pass/traits/inherent-trait-method-order.rs
+++ b/src/test/ui/traits/inherent-trait-method-order.rs
diff --git a/src/test/run-pass/traits/kindck-owned-trait-contains-1.rs b/src/test/ui/traits/kindck-owned-trait-contains-1.rs
index 23b91f924b5..23b91f924b5 100644
--- a/src/test/run-pass/traits/kindck-owned-trait-contains-1.rs
+++ b/src/test/ui/traits/kindck-owned-trait-contains-1.rs
diff --git a/src/test/run-pass/traits/multiple-trait-bounds.rs b/src/test/ui/traits/multiple-trait-bounds.rs
index 868b334070b..868b334070b 100644
--- a/src/test/run-pass/traits/multiple-trait-bounds.rs
+++ b/src/test/ui/traits/multiple-trait-bounds.rs
diff --git a/src/test/run-pass/traits/object-one-type-two-traits.rs b/src/test/ui/traits/object-one-type-two-traits.rs
index b92a2ab7b4b..b92a2ab7b4b 100644
--- a/src/test/run-pass/traits/object-one-type-two-traits.rs
+++ b/src/test/ui/traits/object-one-type-two-traits.rs
diff --git a/src/test/run-pass/traits/overlap-permitted-for-marker-traits-neg.rs b/src/test/ui/traits/overlap-permitted-for-marker-traits-neg.rs
index bc8dc8dbd05..bc8dc8dbd05 100644
--- a/src/test/run-pass/traits/overlap-permitted-for-marker-traits-neg.rs
+++ b/src/test/ui/traits/overlap-permitted-for-marker-traits-neg.rs
diff --git a/src/test/run-pass/traits/overlap-permitted-for-marker-traits.rs b/src/test/ui/traits/overlap-permitted-for-marker-traits.rs
index 59ec9d5689d..59ec9d5689d 100644
--- a/src/test/run-pass/traits/overlap-permitted-for-marker-traits.rs
+++ b/src/test/ui/traits/overlap-permitted-for-marker-traits.rs
diff --git a/src/test/run-pass/traits/parameterized-trait-with-bounds.rs b/src/test/ui/traits/parameterized-trait-with-bounds.rs
index 832d4f6c89f..832d4f6c89f 100644
--- a/src/test/run-pass/traits/parameterized-trait-with-bounds.rs
+++ b/src/test/ui/traits/parameterized-trait-with-bounds.rs
diff --git a/src/test/run-pass/traits/principal-less-trait-objects.rs b/src/test/ui/traits/principal-less-trait-objects.rs
index 0984362993c..82624650a54 100644
--- a/src/test/run-pass/traits/principal-less-trait-objects.rs
+++ b/src/test/ui/traits/principal-less-trait-objects.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Check that trait-objects without a principal codegen properly.
 
 use std::sync::atomic::{AtomicUsize, Ordering};
diff --git a/src/test/run-pass/traits/supertrait-default-generics.rs b/src/test/ui/traits/supertrait-default-generics.rs
index e862c0e976b..e862c0e976b 100644
--- a/src/test/run-pass/traits/supertrait-default-generics.rs
+++ b/src/test/ui/traits/supertrait-default-generics.rs
diff --git a/src/test/run-pass/traits/syntax-trait-polarity.rs b/src/test/ui/traits/syntax-trait-polarity.rs
index c6524f5c8e7..c6524f5c8e7 100644
--- a/src/test/run-pass/traits/syntax-trait-polarity.rs
+++ b/src/test/ui/traits/syntax-trait-polarity.rs
diff --git a/src/test/run-pass/traits/trait-alias-import-cross-crate.rs b/src/test/ui/traits/trait-alias-import-cross-crate.rs
index 975542ab49b..975542ab49b 100644
--- a/src/test/run-pass/traits/trait-alias-import-cross-crate.rs
+++ b/src/test/ui/traits/trait-alias-import-cross-crate.rs
diff --git a/src/test/run-pass/traits/trait-alias-import.rs b/src/test/ui/traits/trait-alias-import.rs
index 7d63320b9aa..802a8f15698 100644
--- a/src/test/run-pass/traits/trait-alias-import.rs
+++ b/src/test/ui/traits/trait-alias-import.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(trait_alias)]
 
 mod inner {
diff --git a/src/test/run-pass/traits/trait-bounds-basic.rs b/src/test/ui/traits/trait-bounds-basic.rs
index 8c8a7eb7d9d..8c8a7eb7d9d 100644
--- a/src/test/run-pass/traits/trait-bounds-basic.rs
+++ b/src/test/ui/traits/trait-bounds-basic.rs
diff --git a/src/test/run-pass/traits/trait-bounds-impl-comparison-duplicates.rs b/src/test/ui/traits/trait-bounds-impl-comparison-duplicates.rs
index de6c2afa2bb..de6c2afa2bb 100644
--- a/src/test/run-pass/traits/trait-bounds-impl-comparison-duplicates.rs
+++ b/src/test/ui/traits/trait-bounds-impl-comparison-duplicates.rs
diff --git a/src/test/run-pass/traits/trait-bounds-in-arc.rs b/src/test/ui/traits/trait-bounds-in-arc.rs
index a45d834297e..a45d834297e 100644
--- a/src/test/run-pass/traits/trait-bounds-in-arc.rs
+++ b/src/test/ui/traits/trait-bounds-in-arc.rs
diff --git a/src/test/run-pass/traits/trait-bounds-on-structs-and-enums.rs b/src/test/ui/traits/trait-bounds-on-structs-and-enums-rpass.rs
index 4dc4fecc91f..4dc4fecc91f 100644
--- a/src/test/run-pass/traits/trait-bounds-on-structs-and-enums.rs
+++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums-rpass.rs
diff --git a/src/test/run-pass/traits/trait-bounds-recursion.rs b/src/test/ui/traits/trait-bounds-recursion.rs
index 0023ff654e8..0023ff654e8 100644
--- a/src/test/run-pass/traits/trait-bounds-recursion.rs
+++ b/src/test/ui/traits/trait-bounds-recursion.rs
diff --git a/src/test/run-pass/traits/trait-bounds.rs b/src/test/ui/traits/trait-bounds.rs
index 18382bb59a4..18382bb59a4 100644
--- a/src/test/run-pass/traits/trait-bounds.rs
+++ b/src/test/ui/traits/trait-bounds.rs
diff --git a/src/test/run-pass/traits/trait-cache-issue-18209.rs b/src/test/ui/traits/trait-cache-issue-18209.rs
index 15676e4554a..15676e4554a 100644
--- a/src/test/run-pass/traits/trait-cache-issue-18209.rs
+++ b/src/test/ui/traits/trait-cache-issue-18209.rs
diff --git a/src/test/run-pass/traits/trait-coercion-generic.rs b/src/test/ui/traits/trait-coercion-generic.rs
index bf4dda49519..bf4dda49519 100644
--- a/src/test/run-pass/traits/trait-coercion-generic.rs
+++ b/src/test/ui/traits/trait-coercion-generic.rs
diff --git a/src/test/run-pass/traits/trait-coercion.rs b/src/test/ui/traits/trait-coercion.rs
index cba33af1f1a..cba33af1f1a 100644
--- a/src/test/run-pass/traits/trait-coercion.rs
+++ b/src/test/ui/traits/trait-coercion.rs
diff --git a/src/test/run-pass/traits/trait-composition-trivial.rs b/src/test/ui/traits/trait-composition-trivial.rs
index 90e5dcd68e8..90e5dcd68e8 100644
--- a/src/test/run-pass/traits/trait-composition-trivial.rs
+++ b/src/test/ui/traits/trait-composition-trivial.rs
diff --git a/src/test/run-pass/traits/trait-copy-guessing.rs b/src/test/ui/traits/trait-copy-guessing.rs
index f031dd9ca48..f031dd9ca48 100644
--- a/src/test/run-pass/traits/trait-copy-guessing.rs
+++ b/src/test/ui/traits/trait-copy-guessing.rs
diff --git a/src/test/run-pass/traits/trait-default-method-bound-subst.rs b/src/test/ui/traits/trait-default-method-bound-subst.rs
index 6a5d5c8ba2d..6a5d5c8ba2d 100644
--- a/src/test/run-pass/traits/trait-default-method-bound-subst.rs
+++ b/src/test/ui/traits/trait-default-method-bound-subst.rs
diff --git a/src/test/run-pass/traits/trait-default-method-bound-subst2.rs b/src/test/ui/traits/trait-default-method-bound-subst2.rs
index 78eabba2d23..78eabba2d23 100644
--- a/src/test/run-pass/traits/trait-default-method-bound-subst2.rs
+++ b/src/test/ui/traits/trait-default-method-bound-subst2.rs
diff --git a/src/test/run-pass/traits/trait-default-method-bound-subst3.rs b/src/test/ui/traits/trait-default-method-bound-subst3.rs
index dd39dec4b63..dd39dec4b63 100644
--- a/src/test/run-pass/traits/trait-default-method-bound-subst3.rs
+++ b/src/test/ui/traits/trait-default-method-bound-subst3.rs
diff --git a/src/test/run-pass/traits/trait-default-method-bound-subst4.rs b/src/test/ui/traits/trait-default-method-bound-subst4.rs
index ef133064582..ef133064582 100644
--- a/src/test/run-pass/traits/trait-default-method-bound-subst4.rs
+++ b/src/test/ui/traits/trait-default-method-bound-subst4.rs
diff --git a/src/test/run-pass/traits/trait-default-method-bound.rs b/src/test/ui/traits/trait-default-method-bound.rs
index 0855a9db851..0855a9db851 100644
--- a/src/test/run-pass/traits/trait-default-method-bound.rs
+++ b/src/test/ui/traits/trait-default-method-bound.rs
diff --git a/src/test/run-pass/traits/trait-default-method-xc-2.rs b/src/test/ui/traits/trait-default-method-xc-2.rs
index 5fa1a6cba72..5fa1a6cba72 100644
--- a/src/test/run-pass/traits/trait-default-method-xc-2.rs
+++ b/src/test/ui/traits/trait-default-method-xc-2.rs
diff --git a/src/test/run-pass/traits/trait-default-method-xc.rs b/src/test/ui/traits/trait-default-method-xc.rs
index 3c20a649613..3c20a649613 100644
--- a/src/test/run-pass/traits/trait-default-method-xc.rs
+++ b/src/test/ui/traits/trait-default-method-xc.rs
diff --git a/src/test/run-pass/traits/trait-false-ambiguity-where-clause-builtin-bound.rs b/src/test/ui/traits/trait-false-ambiguity-where-clause-builtin-bound.rs
index 3413db6a684..3413db6a684 100644
--- a/src/test/run-pass/traits/trait-false-ambiguity-where-clause-builtin-bound.rs
+++ b/src/test/ui/traits/trait-false-ambiguity-where-clause-builtin-bound.rs
diff --git a/src/test/run-pass/traits/trait-generic.rs b/src/test/ui/traits/trait-generic.rs
index 80efe1c9375..80efe1c9375 100644
--- a/src/test/run-pass/traits/trait-generic.rs
+++ b/src/test/ui/traits/trait-generic.rs
diff --git a/src/test/run-pass/traits/trait-impl-2.rs b/src/test/ui/traits/trait-impl-2.rs
index 804ffec12c2..804ffec12c2 100644
--- a/src/test/run-pass/traits/trait-impl-2.rs
+++ b/src/test/ui/traits/trait-impl-2.rs
diff --git a/src/test/run-pass/traits/trait-impl.rs b/src/test/ui/traits/trait-impl.rs
index 14796ce19c8..14796ce19c8 100644
--- a/src/test/run-pass/traits/trait-impl.rs
+++ b/src/test/ui/traits/trait-impl.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-auto-xc-2.rs b/src/test/ui/traits/trait-inheritance-auto-xc-2.rs
index 62c3ce8030c..62c3ce8030c 100644
--- a/src/test/run-pass/traits/trait-inheritance-auto-xc-2.rs
+++ b/src/test/ui/traits/trait-inheritance-auto-xc-2.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-auto-xc.rs b/src/test/ui/traits/trait-inheritance-auto-xc.rs
index e8e651091ad..e8e651091ad 100644
--- a/src/test/run-pass/traits/trait-inheritance-auto-xc.rs
+++ b/src/test/ui/traits/trait-inheritance-auto-xc.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-auto.rs b/src/test/ui/traits/trait-inheritance-auto.rs
index 0be67a55eba..0be67a55eba 100644
--- a/src/test/run-pass/traits/trait-inheritance-auto.rs
+++ b/src/test/ui/traits/trait-inheritance-auto.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-call-bound-inherited.rs b/src/test/ui/traits/trait-inheritance-call-bound-inherited.rs
index 37c2ff63c6a..37c2ff63c6a 100644
--- a/src/test/run-pass/traits/trait-inheritance-call-bound-inherited.rs
+++ b/src/test/ui/traits/trait-inheritance-call-bound-inherited.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-call-bound-inherited2.rs b/src/test/ui/traits/trait-inheritance-call-bound-inherited2.rs
index 8576d29f251..8576d29f251 100644
--- a/src/test/run-pass/traits/trait-inheritance-call-bound-inherited2.rs
+++ b/src/test/ui/traits/trait-inheritance-call-bound-inherited2.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-cast-without-call-to-supertrait.rs b/src/test/ui/traits/trait-inheritance-cast-without-call-to-supertrait.rs
index 25159c1adb6..25159c1adb6 100644
--- a/src/test/run-pass/traits/trait-inheritance-cast-without-call-to-supertrait.rs
+++ b/src/test/ui/traits/trait-inheritance-cast-without-call-to-supertrait.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-cast.rs b/src/test/ui/traits/trait-inheritance-cast.rs
index 9070b9d1f56..9070b9d1f56 100644
--- a/src/test/run-pass/traits/trait-inheritance-cast.rs
+++ b/src/test/ui/traits/trait-inheritance-cast.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-cross-trait-call-xc.rs b/src/test/ui/traits/trait-inheritance-cross-trait-call-xc.rs
index dbefb22cb72..dbefb22cb72 100644
--- a/src/test/run-pass/traits/trait-inheritance-cross-trait-call-xc.rs
+++ b/src/test/ui/traits/trait-inheritance-cross-trait-call-xc.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-cross-trait-call.rs b/src/test/ui/traits/trait-inheritance-cross-trait-call.rs
index 512c928ca8f..512c928ca8f 100644
--- a/src/test/run-pass/traits/trait-inheritance-cross-trait-call.rs
+++ b/src/test/ui/traits/trait-inheritance-cross-trait-call.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-diamond.rs b/src/test/ui/traits/trait-inheritance-diamond.rs
index 32ad0fb4d41..32ad0fb4d41 100644
--- a/src/test/run-pass/traits/trait-inheritance-diamond.rs
+++ b/src/test/ui/traits/trait-inheritance-diamond.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-multiple-inheritors.rs b/src/test/ui/traits/trait-inheritance-multiple-inheritors.rs
index 77ecbd8eb17..77ecbd8eb17 100644
--- a/src/test/run-pass/traits/trait-inheritance-multiple-inheritors.rs
+++ b/src/test/ui/traits/trait-inheritance-multiple-inheritors.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-multiple-params.rs b/src/test/ui/traits/trait-inheritance-multiple-params.rs
index 8ff5ba54185..8ff5ba54185 100644
--- a/src/test/run-pass/traits/trait-inheritance-multiple-params.rs
+++ b/src/test/ui/traits/trait-inheritance-multiple-params.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-num.rs b/src/test/ui/traits/trait-inheritance-num.rs
index 3d63d78cabb..3d63d78cabb 100644
--- a/src/test/run-pass/traits/trait-inheritance-num.rs
+++ b/src/test/ui/traits/trait-inheritance-num.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-num0.rs b/src/test/ui/traits/trait-inheritance-num0.rs
index cee52542d38..cee52542d38 100644
--- a/src/test/run-pass/traits/trait-inheritance-num0.rs
+++ b/src/test/ui/traits/trait-inheritance-num0.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-num1.rs b/src/test/ui/traits/trait-inheritance-num1.rs
index 663dd3a5eaf..663dd3a5eaf 100644
--- a/src/test/run-pass/traits/trait-inheritance-num1.rs
+++ b/src/test/ui/traits/trait-inheritance-num1.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-num2.rs b/src/test/ui/traits/trait-inheritance-num2.rs
index b713c66a37c..b713c66a37c 100644
--- a/src/test/run-pass/traits/trait-inheritance-num2.rs
+++ b/src/test/ui/traits/trait-inheritance-num2.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-num3.rs b/src/test/ui/traits/trait-inheritance-num3.rs
index c40be6f8354..c40be6f8354 100644
--- a/src/test/run-pass/traits/trait-inheritance-num3.rs
+++ b/src/test/ui/traits/trait-inheritance-num3.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-num5.rs b/src/test/ui/traits/trait-inheritance-num5.rs
index f478618f7b5..f478618f7b5 100644
--- a/src/test/run-pass/traits/trait-inheritance-num5.rs
+++ b/src/test/ui/traits/trait-inheritance-num5.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-overloading-simple.rs b/src/test/ui/traits/trait-inheritance-overloading-simple.rs
index c306aa2cda0..c306aa2cda0 100644
--- a/src/test/run-pass/traits/trait-inheritance-overloading-simple.rs
+++ b/src/test/ui/traits/trait-inheritance-overloading-simple.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-overloading-xc-exe.rs b/src/test/ui/traits/trait-inheritance-overloading-xc-exe.rs
index 2a9acfdd04a..2a9acfdd04a 100644
--- a/src/test/run-pass/traits/trait-inheritance-overloading-xc-exe.rs
+++ b/src/test/ui/traits/trait-inheritance-overloading-xc-exe.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-overloading.rs b/src/test/ui/traits/trait-inheritance-overloading.rs
index 083643e821f..083643e821f 100644
--- a/src/test/run-pass/traits/trait-inheritance-overloading.rs
+++ b/src/test/ui/traits/trait-inheritance-overloading.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-self-in-supertype.rs b/src/test/ui/traits/trait-inheritance-self-in-supertype.rs
index e8a2bd791a5..e8a2bd791a5 100644
--- a/src/test/run-pass/traits/trait-inheritance-self-in-supertype.rs
+++ b/src/test/ui/traits/trait-inheritance-self-in-supertype.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-self.rs b/src/test/ui/traits/trait-inheritance-self.rs
index 5f2559f48eb..5f2559f48eb 100644
--- a/src/test/run-pass/traits/trait-inheritance-self.rs
+++ b/src/test/ui/traits/trait-inheritance-self.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-simple.rs b/src/test/ui/traits/trait-inheritance-simple.rs
index ca3a284e597..ca3a284e597 100644
--- a/src/test/run-pass/traits/trait-inheritance-simple.rs
+++ b/src/test/ui/traits/trait-inheritance-simple.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-static.rs b/src/test/ui/traits/trait-inheritance-static.rs
index 16218fbd236..16218fbd236 100644
--- a/src/test/run-pass/traits/trait-inheritance-static.rs
+++ b/src/test/ui/traits/trait-inheritance-static.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-static2.rs b/src/test/ui/traits/trait-inheritance-static2.rs
index bc78e1e2328..bc78e1e2328 100644
--- a/src/test/run-pass/traits/trait-inheritance-static2.rs
+++ b/src/test/ui/traits/trait-inheritance-static2.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-subst.rs b/src/test/ui/traits/trait-inheritance-subst.rs
index b2b6503666e..b2b6503666e 100644
--- a/src/test/run-pass/traits/trait-inheritance-subst.rs
+++ b/src/test/ui/traits/trait-inheritance-subst.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-subst2.rs b/src/test/ui/traits/trait-inheritance-subst2.rs
index ccc9628c777..ccc9628c777 100644
--- a/src/test/run-pass/traits/trait-inheritance-subst2.rs
+++ b/src/test/ui/traits/trait-inheritance-subst2.rs
diff --git a/src/test/run-pass/traits/trait-inheritance-visibility.rs b/src/test/ui/traits/trait-inheritance-visibility.rs
index 6ad86492674..6ad86492674 100644
--- a/src/test/run-pass/traits/trait-inheritance-visibility.rs
+++ b/src/test/ui/traits/trait-inheritance-visibility.rs
diff --git a/src/test/run-pass/traits/trait-inheritance2.rs b/src/test/ui/traits/trait-inheritance2.rs
index 5bfa60b1aec..5bfa60b1aec 100644
--- a/src/test/run-pass/traits/trait-inheritance2.rs
+++ b/src/test/ui/traits/trait-inheritance2.rs
diff --git a/src/test/run-pass/traits/trait-item-inside-macro.rs b/src/test/ui/traits/trait-item-inside-macro.rs
index 54bf872d028..54bf872d028 100644
--- a/src/test/run-pass/traits/trait-item-inside-macro.rs
+++ b/src/test/ui/traits/trait-item-inside-macro.rs
diff --git a/src/test/run-pass/traits/trait-object-auto-dedup.rs b/src/test/ui/traits/trait-object-auto-dedup.rs
index 39d25eb7fe0..39d25eb7fe0 100644
--- a/src/test/run-pass/traits/trait-object-auto-dedup.rs
+++ b/src/test/ui/traits/trait-object-auto-dedup.rs
diff --git a/src/test/run-pass/traits/trait-object-exclusion.rs b/src/test/ui/traits/trait-object-exclusion.rs
index 0b8b0e2f5ef..0b8b0e2f5ef 100644
--- a/src/test/run-pass/traits/trait-object-exclusion.rs
+++ b/src/test/ui/traits/trait-object-exclusion.rs
diff --git a/src/test/run-pass/traits/trait-object-generics.rs b/src/test/ui/traits/trait-object-generics.rs
index c18754302b7..c18754302b7 100644
--- a/src/test/run-pass/traits/trait-object-generics.rs
+++ b/src/test/ui/traits/trait-object-generics.rs
diff --git a/src/test/run-pass/traits/trait-object-lifetime-first.rs b/src/test/ui/traits/trait-object-lifetime-first.rs
index 33757cb7c0a..33757cb7c0a 100644
--- a/src/test/run-pass/traits/trait-object-lifetime-first.rs
+++ b/src/test/ui/traits/trait-object-lifetime-first.rs
diff --git a/src/test/run-pass/traits/trait-object-with-lifetime-bound.rs b/src/test/ui/traits/trait-object-with-lifetime-bound.rs
index 05aab5e3b08..05aab5e3b08 100644
--- a/src/test/run-pass/traits/trait-object-with-lifetime-bound.rs
+++ b/src/test/ui/traits/trait-object-with-lifetime-bound.rs
diff --git a/src/test/run-pass/traits/trait-region-pointer-simple.rs b/src/test/ui/traits/trait-region-pointer-simple.rs
index 0456ca93115..0456ca93115 100644
--- a/src/test/run-pass/traits/trait-region-pointer-simple.rs
+++ b/src/test/ui/traits/trait-region-pointer-simple.rs
diff --git a/src/test/run-pass/traits/trait-safety-ok-cc.rs b/src/test/ui/traits/trait-safety-ok-cc.rs
index 099ba80e5b5..099ba80e5b5 100644
--- a/src/test/run-pass/traits/trait-safety-ok-cc.rs
+++ b/src/test/ui/traits/trait-safety-ok-cc.rs
diff --git a/src/test/run-pass/traits/trait-safety-ok.rs b/src/test/ui/traits/trait-safety-ok.rs
index d456a78b64d..d456a78b64d 100644
--- a/src/test/run-pass/traits/trait-safety-ok.rs
+++ b/src/test/ui/traits/trait-safety-ok.rs
diff --git a/src/test/run-pass/traits/trait-static-method-overwriting.rs b/src/test/ui/traits/trait-static-method-overwriting.rs
index f669ffae6bb..f669ffae6bb 100644
--- a/src/test/run-pass/traits/trait-static-method-overwriting.rs
+++ b/src/test/ui/traits/trait-static-method-overwriting.rs
diff --git a/src/test/run-pass/traits/trait-to-str.rs b/src/test/ui/traits/trait-to-str.rs
index 9670edbfa2b..9670edbfa2b 100644
--- a/src/test/run-pass/traits/trait-to-str.rs
+++ b/src/test/ui/traits/trait-to-str.rs
diff --git a/src/test/run-pass/traits/trait-where-clause-vs-impl.rs b/src/test/ui/traits/trait-where-clause-vs-impl.rs
index 7cfee27efb3..7cfee27efb3 100644
--- a/src/test/run-pass/traits/trait-where-clause-vs-impl.rs
+++ b/src/test/ui/traits/trait-where-clause-vs-impl.rs
diff --git a/src/test/run-pass/traits/trait-with-bounds-default.rs b/src/test/ui/traits/trait-with-bounds-default.rs
index 31f73d79cc7..31f73d79cc7 100644
--- a/src/test/run-pass/traits/trait-with-bounds-default.rs
+++ b/src/test/ui/traits/trait-with-bounds-default.rs
diff --git a/src/test/run-pass/traits/traits-assoc-type-in-supertrait.rs b/src/test/ui/traits/traits-assoc-type-in-supertrait.rs
index 7d6a754cc5a..7d6a754cc5a 100644
--- a/src/test/run-pass/traits/traits-assoc-type-in-supertrait.rs
+++ b/src/test/ui/traits/traits-assoc-type-in-supertrait.rs
diff --git a/src/test/run-pass/traits/traits-conditional-dispatch.rs b/src/test/ui/traits/traits-conditional-dispatch.rs
index a9c194486fe..a9c194486fe 100644
--- a/src/test/run-pass/traits/traits-conditional-dispatch.rs
+++ b/src/test/ui/traits/traits-conditional-dispatch.rs
diff --git a/src/test/run-pass/traits/traits-conditional-model-fn.rs b/src/test/ui/traits/traits-conditional-model-fn.rs
index 27ce6d93a81..27ce6d93a81 100644
--- a/src/test/run-pass/traits/traits-conditional-model-fn.rs
+++ b/src/test/ui/traits/traits-conditional-model-fn.rs
diff --git a/src/test/run-pass/traits/traits-default-method-macro.rs b/src/test/ui/traits/traits-default-method-macro.rs
index 2b50ee9b422..2b50ee9b422 100644
--- a/src/test/run-pass/traits/traits-default-method-macro.rs
+++ b/src/test/ui/traits/traits-default-method-macro.rs
diff --git a/src/test/run-pass/traits/traits-default-method-mut.rs b/src/test/ui/traits/traits-default-method-mut.rs
index 5f8e983b09c..5f8e983b09c 100644
--- a/src/test/run-pass/traits/traits-default-method-mut.rs
+++ b/src/test/ui/traits/traits-default-method-mut.rs
diff --git a/src/test/run-pass/traits/traits-default-method-self.rs b/src/test/ui/traits/traits-default-method-self.rs
index cdf4d1e148c..cdf4d1e148c 100644
--- a/src/test/run-pass/traits/traits-default-method-self.rs
+++ b/src/test/ui/traits/traits-default-method-self.rs
diff --git a/src/test/run-pass/traits/traits-default-method-trivial.rs b/src/test/ui/traits/traits-default-method-trivial.rs
index dc41938ec89..dc41938ec89 100644
--- a/src/test/run-pass/traits/traits-default-method-trivial.rs
+++ b/src/test/ui/traits/traits-default-method-trivial.rs
diff --git a/src/test/run-pass/traits/traits-elaborate-type-region.rs b/src/test/ui/traits/traits-elaborate-type-region.rs
index 03aef0184ba..03aef0184ba 100644
--- a/src/test/run-pass/traits/traits-elaborate-type-region.rs
+++ b/src/test/ui/traits/traits-elaborate-type-region.rs
diff --git a/src/test/run-pass/traits/traits-impl-object-overlap-issue-23853.rs b/src/test/ui/traits/traits-impl-object-overlap-issue-23853.rs
index e490967b690..e490967b690 100644
--- a/src/test/run-pass/traits/traits-impl-object-overlap-issue-23853.rs
+++ b/src/test/ui/traits/traits-impl-object-overlap-issue-23853.rs
diff --git a/src/test/run-pass/traits/traits-issue-22019.rs b/src/test/ui/traits/traits-issue-22019.rs
index 1a887f0f39f..1a887f0f39f 100644
--- a/src/test/run-pass/traits/traits-issue-22019.rs
+++ b/src/test/ui/traits/traits-issue-22019.rs
diff --git a/src/test/run-pass/traits/traits-issue-22110.rs b/src/test/ui/traits/traits-issue-22110.rs
index bdbfee799f1..bdbfee799f1 100644
--- a/src/test/run-pass/traits/traits-issue-22110.rs
+++ b/src/test/ui/traits/traits-issue-22110.rs
diff --git a/src/test/run-pass/traits/traits-issue-22655.rs b/src/test/ui/traits/traits-issue-22655.rs
index bc08ca0a2ba..bc08ca0a2ba 100644
--- a/src/test/run-pass/traits/traits-issue-22655.rs
+++ b/src/test/ui/traits/traits-issue-22655.rs
diff --git a/src/test/run-pass/traits/traits-issue-23003.rs b/src/test/ui/traits/traits-issue-23003.rs
index 24c2b2ad660..24c2b2ad660 100644
--- a/src/test/run-pass/traits/traits-issue-23003.rs
+++ b/src/test/ui/traits/traits-issue-23003.rs
diff --git a/src/test/run-pass/traits/traits-issue-26339.rs b/src/test/ui/traits/traits-issue-26339.rs
index bedd87cc4cc..bedd87cc4cc 100644
--- a/src/test/run-pass/traits/traits-issue-26339.rs
+++ b/src/test/ui/traits/traits-issue-26339.rs
diff --git a/src/test/run-pass/traits/traits-multidispatch-infer-convert-target.rs b/src/test/ui/traits/traits-multidispatch-infer-convert-target.rs
index 626e1ae71bc..626e1ae71bc 100644
--- a/src/test/run-pass/traits/traits-multidispatch-infer-convert-target.rs
+++ b/src/test/ui/traits/traits-multidispatch-infer-convert-target.rs
diff --git a/src/test/run-pass/traits/traits-negative-impls.rs b/src/test/ui/traits/traits-negative-impls-rpass.rs
index 8664b6a6a6e..8664b6a6a6e 100644
--- a/src/test/run-pass/traits/traits-negative-impls.rs
+++ b/src/test/ui/traits/traits-negative-impls-rpass.rs
diff --git a/src/test/run-pass/traits/traits-repeated-supertrait.rs b/src/test/ui/traits/traits-repeated-supertrait.rs
index 391d19c4385..391d19c4385 100644
--- a/src/test/run-pass/traits/traits-repeated-supertrait.rs
+++ b/src/test/ui/traits/traits-repeated-supertrait.rs
diff --git a/src/test/run-pass/traits/ufcs-trait-object.rs b/src/test/ui/traits/ufcs-trait-object.rs
index 700488c22d6..700488c22d6 100644
--- a/src/test/run-pass/traits/ufcs-trait-object.rs
+++ b/src/test/ui/traits/ufcs-trait-object.rs
diff --git a/src/test/run-pass/traits/use-trait-before-def.rs b/src/test/ui/traits/use-trait-before-def.rs
index 1ee2b941909..1ee2b941909 100644
--- a/src/test/run-pass/traits/use-trait-before-def.rs
+++ b/src/test/ui/traits/use-trait-before-def.rs
diff --git a/src/test/run-pass/transmute-non-immediate-to-immediate.rs b/src/test/ui/transmute-non-immediate-to-immediate.rs
index 2119c8336f4..cf77c113f4c 100644
--- a/src/test/run-pass/transmute-non-immediate-to-immediate.rs
+++ b/src/test/ui/transmute-non-immediate-to-immediate.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Issue #7988
 // Transmuting non-immediate type to immediate type
 
diff --git a/src/test/run-pass/transmute-specialization.rs b/src/test/ui/transmute-specialization.rs
index e2b110db636..002fba9ce81 100644
--- a/src/test/run-pass/transmute-specialization.rs
+++ b/src/test/ui/transmute-specialization.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(specialization)]
 
 trait Specializable { type Output; }
diff --git a/src/test/run-pass/trivial-message.rs b/src/test/ui/trivial-message.rs
index dae07068276..5831e867be5 100644
--- a/src/test/run-pass/trivial-message.rs
+++ b/src/test/ui/trivial-message.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 /*
   This is about the simplest program that can successfully send a
diff --git a/src/test/run-pass/trivial_casts.rs b/src/test/ui/trivial_casts-rpass.rs
index f06b0708290..8e49468bf0c 100644
--- a/src/test/run-pass/trivial_casts.rs
+++ b/src/test/ui/trivial_casts-rpass.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that all coercions can actually be done using casts (modulo the lints).
 
 #![allow(trivial_casts, trivial_numeric_casts)]
diff --git a/src/test/run-pass/try-block.rs b/src/test/ui/try-block.rs
index dff186cfd07..c29ccc70427 100644
--- a/src/test/run-pass/try-block.rs
+++ b/src/test/ui/try-block.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 // compile-flags: --edition 2018
diff --git a/src/test/run-pass/try-from-int-error-partial-eq.rs b/src/test/ui/try-from-int-error-partial-eq.rs
index e9b53f2d1c8..6ee4a4cf319 100644
--- a/src/test/run-pass/try-from-int-error-partial-eq.rs
+++ b/src/test/ui/try-from-int-error-partial-eq.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 
 use std::convert::TryFrom;
diff --git a/src/test/run-pass/try-is-identifier-edition2015.rs b/src/test/ui/try-is-identifier-edition2015.rs
index b9807a7072d..dfb05599be6 100644
--- a/src/test/run-pass/try-is-identifier-edition2015.rs
+++ b/src/test/ui/try-is-identifier-edition2015.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 // compile-flags: --edition 2015
 
diff --git a/src/test/run-pass/try-operator-custom.rs b/src/test/ui/try-operator-custom.rs
index 008cab00ea2..9993061ea61 100644
--- a/src/test/run-pass/try-operator-custom.rs
+++ b/src/test/ui/try-operator-custom.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(try_trait)]
 
 use std::ops::Try;
diff --git a/src/test/run-pass/try-operator-hygiene.rs b/src/test/ui/try-operator-hygiene.rs
index 5f0f9a932cd..0b24b4305ac 100644
--- a/src/test/run-pass/try-operator-hygiene.rs
+++ b/src/test/ui/try-operator-hygiene.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_upper_case_globals)]
 #![allow(dead_code)]
 // `expr?` expands to:
diff --git a/src/test/run-pass/try-operator.rs b/src/test/ui/try-operator.rs
index 8e7a7b5dfc6..9118e8e7134 100644
--- a/src/test/run-pass/try-operator.rs
+++ b/src/test/ui/try-operator.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // ignore-cloudabi no std::fs
 
diff --git a/src/test/run-pass/try-wait.rs b/src/test/ui/try-wait.rs
index 97caddde412..d8a07c55cf2 100644
--- a/src/test/run-pass/try-wait.rs
+++ b/src/test/ui/try-wait.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
diff --git a/src/test/run-pass/try_from.rs b/src/test/ui/try_from.rs
index 98344491aec..50451576f9c 100644
--- a/src/test/run-pass/try_from.rs
+++ b/src/test/ui/try_from.rs
@@ -1,3 +1,4 @@
+// run-pass
 // This test relies on `TryFrom` being blanket impl for all `T: Into`
 // and `TryInto` being blanket impl for all `U: TryFrom`
 
diff --git a/src/test/run-pass/tup.rs b/src/test/ui/tup.rs
index 47ea0e1c0da..160477b0b0a 100644
--- a/src/test/run-pass/tup.rs
+++ b/src/test/ui/tup.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 
 type point = (isize, isize);
diff --git a/src/test/run-pass/tuple-index-fat-types.rs b/src/test/ui/tuple-index-fat-types.rs
index ee224cc84bf..5dda1ed975c 100644
--- a/src/test/run-pass/tuple-index-fat-types.rs
+++ b/src/test/ui/tuple-index-fat-types.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 struct Foo<'a>(&'a [isize]);
 
 fn main() {
diff --git a/src/test/run-pass/tuple-index.rs b/src/test/ui/tuple-index.rs
index e68fa1caa55..3e1d92b42aa 100644
--- a/src/test/run-pass/tuple-index.rs
+++ b/src/test/ui/tuple-index.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 struct Point(isize, isize);
 
 fn main() {
diff --git a/src/test/run-pass/tydesc-name.rs b/src/test/ui/tydesc-name.rs
index d9d947bd4c0..c432e5b5481 100644
--- a/src/test/run-pass/tydesc-name.rs
+++ b/src/test/ui/tydesc-name.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 use std::any::type_name;
diff --git a/src/test/run-pass/type-ascription.rs b/src/test/ui/type-ascription.rs
index 7e5231b7e06..7adb074428c 100644
--- a/src/test/run-pass/type-ascription.rs
+++ b/src/test/ui/type-ascription.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_variables)]
 // Type ascription doesn't lead to unsoundness
diff --git a/src/test/run-pass/type-id-higher-rank-2.rs b/src/test/ui/type-id-higher-rank-2.rs
index 469bc8ed7e1..5391c849dad 100644
--- a/src/test/run-pass/type-id-higher-rank-2.rs
+++ b/src/test/ui/type-id-higher-rank-2.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that we can't ignore lifetimes by going through Any.
 
 use std::any::Any;
diff --git a/src/test/run-pass/type-id-higher-rank.rs b/src/test/ui/type-id-higher-rank.rs
index b98dff0d72b..355d1109941 100644
--- a/src/test/run-pass/type-id-higher-rank.rs
+++ b/src/test/ui/type-id-higher-rank.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test that type IDs correctly account for higher-rank lifetimes
 // Also acts as a regression test for an ICE (issue #19791)
 
diff --git a/src/test/run-pass/type-in-nested-module.rs b/src/test/ui/type-in-nested-module.rs
index 077a28436df..8a92f065f1b 100644
--- a/src/test/run-pass/type-in-nested-module.rs
+++ b/src/test/ui/type-in-nested-module.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/type-infer-generalize-ty-var.rs b/src/test/ui/type-infer-generalize-ty-var.rs
index 6298156452e..a3d6916cbf7 100644
--- a/src/test/run-pass/type-infer-generalize-ty-var.rs
+++ b/src/test/ui/type-infer-generalize-ty-var.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_upper_case_globals)]
 #![allow(dead_code)]
 #![allow(unused_assignments)]
diff --git a/src/test/run-pass/type-namespace.rs b/src/test/ui/type-namespace.rs
index 587a302ad5f..3cc0bc447a5 100644
--- a/src/test/run-pass/type-namespace.rs
+++ b/src/test/ui/type-namespace.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 struct A { a: isize }
 
 fn a(a: A) -> isize { return a.a; }
diff --git a/src/test/run-pass/type-param-constraints.rs b/src/test/ui/type-param-constraints.rs
index 81945628996..4b42fddaf5c 100644
--- a/src/test/run-pass/type-param-constraints.rs
+++ b/src/test/ui/type-param-constraints.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/type-param.rs b/src/test/ui/type-param.rs
index bfce3f32879..f5ac19cf73a 100644
--- a/src/test/run-pass/type-param.rs
+++ b/src/test/ui/type-param.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/type-params-in-for-each.rs b/src/test/ui/type-params-in-for-each.rs
index 509843c6b92..be4a0185eda 100644
--- a/src/test/run-pass/type-params-in-for-each.rs
+++ b/src/test/ui/type-params-in-for-each.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/type-ptr.rs b/src/test/ui/type-ptr.rs
index 57c229a2175..7c2438d38bd 100644
--- a/src/test/run-pass/type-ptr.rs
+++ b/src/test/ui/type-ptr.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/type-sizes.rs b/src/test/ui/type-sizes.rs
index db9705058da..27433fd770b 100644
--- a/src/test/run-pass/type-sizes.rs
+++ b/src/test/ui/type-sizes.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(dead_code)]
 #![feature(never_type)]
diff --git a/src/test/run-pass/type-use-i1-versus-i8.rs b/src/test/ui/type-use-i1-versus-i8.rs
index dc029e4569e..7315cd2feea 100644
--- a/src/test/run-pass/type-use-i1-versus-i8.rs
+++ b/src/test/ui/type-use-i1-versus-i8.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 use std::ptr;
diff --git a/src/test/run-pass/typeck-closure-to-unsafe-fn-ptr.rs b/src/test/ui/typeck-closure-to-unsafe-fn-ptr.rs
index fe15b912d60..2530a1e966d 100644
--- a/src/test/run-pass/typeck-closure-to-unsafe-fn-ptr.rs
+++ b/src/test/ui/typeck-closure-to-unsafe-fn-ptr.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 unsafe fn call_unsafe(func: unsafe fn() -> ()) -> () {
     func()
 }
diff --git a/src/test/run-pass/typeck-fn-to-unsafe-fn-ptr.rs b/src/test/ui/typeck-fn-to-unsafe-fn-ptr.rs
index 101f9756c85..1e954f56909 100644
--- a/src/test/run-pass/typeck-fn-to-unsafe-fn-ptr.rs
+++ b/src/test/ui/typeck-fn-to-unsafe-fn-ptr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // This tests reification from safe function to `unsafe fn` pointer
 
 fn do_nothing() -> () {}
diff --git a/src/test/run-pass/typeck_type_placeholder_1.rs b/src/test/ui/typeck_type_placeholder_1.rs
index 6a3657e4aef..ea7aa5285b0 100644
--- a/src/test/run-pass/typeck_type_placeholder_1.rs
+++ b/src/test/ui/typeck_type_placeholder_1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // This test checks that the `_` type placeholder works
 // correctly for enabling type inference.
diff --git a/src/test/run-pass/typeclasses-eq-example-static.rs b/src/test/ui/typeclasses-eq-example-static.rs
index 60c886ba386..282d51a93df 100644
--- a/src/test/run-pass/typeclasses-eq-example-static.rs
+++ b/src/test/ui/typeclasses-eq-example-static.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 #![allow(dead_code)]
diff --git a/src/test/run-pass/typeclasses-eq-example.rs b/src/test/ui/typeclasses-eq-example.rs
index 06bec5385eb..8d1d22eb823 100644
--- a/src/test/run-pass/typeclasses-eq-example.rs
+++ b/src/test/ui/typeclasses-eq-example.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 #![allow(dead_code)]
diff --git a/src/test/run-pass/typeid-intrinsic.rs b/src/test/ui/typeid-intrinsic.rs
index 0c7abc086fc..c2611158e65 100644
--- a/src/test/run-pass/typeid-intrinsic.rs
+++ b/src/test/ui/typeid-intrinsic.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(deprecated)]
 // aux-build:typeid-intrinsic-aux1.rs
 // aux-build:typeid-intrinsic-aux2.rs
diff --git a/src/test/run-pass/typestate-cfg-nesting.rs b/src/test/ui/typestate-cfg-nesting.rs
index 994c7d51692..5718e0efd18 100644
--- a/src/test/run-pass/typestate-cfg-nesting.rs
+++ b/src/test/ui/typestate-cfg-nesting.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_assignments)]
 #![allow(unknown_lints)]
diff --git a/src/test/run-pass/typestate-multi-decl.rs b/src/test/ui/typestate-multi-decl.rs
index bc8d9c10de1..9f941620559 100644
--- a/src/test/run-pass/typestate-multi-decl.rs
+++ b/src/test/ui/typestate-multi-decl.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let (x, y) = (10, 20);
     let z = x + y;
diff --git a/src/test/run-pass/ufcs-polymorphic-paths.rs b/src/test/ui/ufcs-polymorphic-paths.rs
index e136bb23bcd..a14ebd6a41f 100644
--- a/src/test/run-pass/ufcs-polymorphic-paths.rs
+++ b/src/test/ui/ufcs-polymorphic-paths.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::borrow::{Cow, ToOwned};
 use std::default::Default;
 use std::iter::FromIterator;
diff --git a/src/test/run-pass/ufcs-type-params.rs b/src/test/ui/ufcs-type-params.rs
index 2bb15b91760..eee2b55b2a0 100644
--- a/src/test/run-pass/ufcs-type-params.rs
+++ b/src/test/ui/ufcs-type-params.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 trait Foo<T> {
diff --git a/src/test/run-pass/unary-minus-suffix-inference.rs b/src/test/ui/unary-minus-suffix-inference.rs
index e5579c20a14..a4d0a849484 100644
--- a/src/test/run-pass/unary-minus-suffix-inference.rs
+++ b/src/test/ui/unary-minus-suffix-inference.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let a = 1;
     let a_neg: i8 = -a;
diff --git a/src/test/run-pass/unboxed-closures/auxiliary/unboxed-closures-cross-crate.rs b/src/test/ui/unboxed-closures/auxiliary/unboxed-closures-cross-crate.rs
index ac0a74eebd5..ac0a74eebd5 100644
--- a/src/test/run-pass/unboxed-closures/auxiliary/unboxed-closures-cross-crate.rs
+++ b/src/test/ui/unboxed-closures/auxiliary/unboxed-closures-cross-crate.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-all-traits.rs b/src/test/ui/unboxed-closures/unboxed-closures-all-traits.rs
index dfccb02009e..dfccb02009e 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-all-traits.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-all-traits.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-blanket-fn-mut.rs b/src/test/ui/unboxed-closures/unboxed-closures-blanket-fn-mut.rs
index a1001673506..a1001673506 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-blanket-fn-mut.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-blanket-fn-mut.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-blanket-fn.rs b/src/test/ui/unboxed-closures/unboxed-closures-blanket-fn.rs
index ca1d31ca544..ca1d31ca544 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-blanket-fn.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-blanket-fn.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-boxed.rs b/src/test/ui/unboxed-closures/unboxed-closures-boxed.rs
index b2596e49aa7..b2596e49aa7 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-boxed.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-boxed.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-by-ref.rs b/src/test/ui/unboxed-closures/unboxed-closures-by-ref.rs
index cf4d4d3e136..cf4d4d3e136 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-by-ref.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-by-ref.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-call-fn-autoderef.rs b/src/test/ui/unboxed-closures/unboxed-closures-call-fn-autoderef.rs
index e23a75ab334..e23a75ab334 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-call-fn-autoderef.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-call-fn-autoderef.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-call-sugar-autoderef.rs b/src/test/ui/unboxed-closures/unboxed-closures-call-sugar-autoderef.rs
index 9b8a3f4098c..9b8a3f4098c 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-call-sugar-autoderef.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-call-sugar-autoderef.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-call-sugar-object-autoderef.rs b/src/test/ui/unboxed-closures/unboxed-closures-call-sugar-object-autoderef.rs
index d47ceea0f4f..d47ceea0f4f 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-call-sugar-object-autoderef.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-call-sugar-object-autoderef.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-call-sugar-object.rs b/src/test/ui/unboxed-closures/unboxed-closures-call-sugar-object.rs
index f77733d106d..f77733d106d 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-call-sugar-object.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-call-sugar-object.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-counter-not-moved.rs b/src/test/ui/unboxed-closures/unboxed-closures-counter-not-moved.rs
index fb24df3c24e..fb24df3c24e 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-counter-not-moved.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-counter-not-moved.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-cross-crate.rs b/src/test/ui/unboxed-closures/unboxed-closures-cross-crate.rs
index 39cc260726d..39cc260726d 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-cross-crate.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-cross-crate.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-direct-sugary-call.rs b/src/test/ui/unboxed-closures/unboxed-closures-direct-sugary-call.rs
index 1c5e74e593c..1c5e74e593c 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-direct-sugary-call.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-direct-sugary-call.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-drop.rs b/src/test/ui/unboxed-closures/unboxed-closures-drop.rs
index ba3c61ca22b..ba3c61ca22b 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-drop.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-drop.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-extern-fn-hr.rs b/src/test/ui/unboxed-closures/unboxed-closures-extern-fn-hr.rs
index 3ee1aeb109b..3ee1aeb109b 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-extern-fn-hr.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-extern-fn-hr.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-extern-fn.rs b/src/test/ui/unboxed-closures/unboxed-closures-extern-fn.rs
index 677cd259a4e..677cd259a4e 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-extern-fn.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-extern-fn.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-fn-as-fnmut-and-fnonce.rs b/src/test/ui/unboxed-closures/unboxed-closures-fn-as-fnmut-and-fnonce.rs
index 851f3d2fe9b..851f3d2fe9b 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-fn-as-fnmut-and-fnonce.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-fn-as-fnmut-and-fnonce.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-fnmut-as-fnonce.rs b/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fnonce.rs
index bd577f7c479..bd577f7c479 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-fnmut-as-fnonce.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fnonce.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-generic.rs b/src/test/ui/unboxed-closures/unboxed-closures-generic.rs
index 740b8b2a72f..740b8b2a72f 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-generic.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-generic.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-bound.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-bound.rs
index e0c9105760d..e0c9105760d 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-bound.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-bound.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-object-type.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-object-type.rs
index d2eaee30410..d2eaee30410 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-object-type.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-object-type.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs
index c3abdd8aab0..c3abdd8aab0 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-explicit-call-early.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-explicit-call-early.rs
index 9135c82b4fd..9135c82b4fd 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-explicit-call-early.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-explicit-call-early.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut.rs
index 73f488a4fbb..73f488a4fbb 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-fnmut-move.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move.rs
index 7ac1ae30f77..7ac1ae30f77 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-fnmut-move.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut-move.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-fnmut.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut.rs
index 0fbb504c2ba..0fbb504c2ba 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-fnmut.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnmut.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-fnonce-move.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move.rs
index 6381386c4cc..6381386c4cc 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-fnonce-move.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce-move.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-fnonce.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce.rs
index 3c8ea7d8510..3c8ea7d8510 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-fnonce.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-fnonce.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-kind.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-kind.rs
index fc01bd9b6d9..fc01bd9b6d9 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-kind.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-kind.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-recursive-fn.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-recursive-fn.rs
index 86834f49407..86834f49407 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-recursive-fn.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-recursive-fn.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-upvar.rs b/src/test/ui/unboxed-closures/unboxed-closures-infer-upvar.rs
index 6a5e5b9c224..6a5e5b9c224 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-infer-upvar.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-infer-upvar.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-manual-impl.rs b/src/test/ui/unboxed-closures/unboxed-closures-manual-impl.rs
index df60b42ab12..df60b42ab12 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-manual-impl.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-manual-impl.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-monomorphization.rs b/src/test/ui/unboxed-closures/unboxed-closures-monomorphization.rs
index 2df360d4a30..2df360d4a30 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-monomorphization.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-monomorphization.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-move-from-projection-issue-30046.rs b/src/test/ui/unboxed-closures/unboxed-closures-move-from-projection-issue-30046.rs
index 4388e6bcf77..4388e6bcf77 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-move-from-projection-issue-30046.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-move-from-projection-issue-30046.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-move-mutable.rs b/src/test/ui/unboxed-closures/unboxed-closures-move-mutable.rs
index 9b519e63a95..9b519e63a95 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-move-mutable.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-move-mutable.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-move-some-upvars-in-by-ref-closure.rs b/src/test/ui/unboxed-closures/unboxed-closures-move-some-upvars-in-by-ref-closure.rs
index 2d219643f3e..2d219643f3e 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-move-some-upvars-in-by-ref-closure.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-move-some-upvars-in-by-ref-closure.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-prelude.rs b/src/test/ui/unboxed-closures/unboxed-closures-prelude.rs
index 89a273b7a43..89a273b7a43 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-prelude.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-prelude.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-simple.rs b/src/test/ui/unboxed-closures/unboxed-closures-simple.rs
index 1449554024c..1449554024c 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-simple.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-simple.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-single-word-env.rs b/src/test/ui/unboxed-closures/unboxed-closures-single-word-env.rs
index 8ada7494e02..8ada7494e02 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-single-word-env.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-single-word-env.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-static-call-fn-once.rs b/src/test/ui/unboxed-closures/unboxed-closures-static-call-fn-once.rs
index 054f284ea2a..054f284ea2a 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-static-call-fn-once.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-static-call-fn-once.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-sugar-object.rs b/src/test/ui/unboxed-closures/unboxed-closures-sugar-object.rs
index 1ca25517c3c..1ca25517c3c 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-sugar-object.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-sugar-object.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-unique-type-id.rs b/src/test/ui/unboxed-closures/unboxed-closures-unique-type-id.rs
index f86499e2e3f..f86499e2e3f 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-unique-type-id.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-unique-type-id.rs
diff --git a/src/test/run-pass/unboxed-closures/unboxed-closures-zero-args.rs b/src/test/ui/unboxed-closures/unboxed-closures-zero-args.rs
index 6f41c35584e..6f41c35584e 100644
--- a/src/test/run-pass/unboxed-closures/unboxed-closures-zero-args.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-zero-args.rs
diff --git a/src/test/run-pass/underscore-lifetimes.rs b/src/test/ui/underscore-lifetimes.rs
index 3d0660554e8..a1593880d84 100644
--- a/src/test/run-pass/underscore-lifetimes.rs
+++ b/src/test/ui/underscore-lifetimes.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 struct Foo<'a>(&'a u8);
 
diff --git a/src/test/run-pass/underscore-method-after-integer.rs b/src/test/ui/underscore-method-after-integer.rs
index f9c06d1e4f1..7fb8607f97d 100644
--- a/src/test/run-pass/underscore-method-after-integer.rs
+++ b/src/test/ui/underscore-method-after-integer.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 trait Tr : Sized {
     fn _method_on_numbers(self) {}
 }
diff --git a/src/test/run-pass/uniform-paths/auxiliary/issue-53691.rs b/src/test/ui/uniform-paths/auxiliary/issue-53691.rs
index a4653317860..a4653317860 100644
--- a/src/test/run-pass/uniform-paths/auxiliary/issue-53691.rs
+++ b/src/test/ui/uniform-paths/auxiliary/issue-53691.rs
diff --git a/src/test/run-pass/uniform-paths/basic-nested.rs b/src/test/ui/uniform-paths/basic-nested.rs
index e4e8b32c70e..e4e8b32c70e 100644
--- a/src/test/run-pass/uniform-paths/basic-nested.rs
+++ b/src/test/ui/uniform-paths/basic-nested.rs
diff --git a/src/test/run-pass/uniform-paths/basic.rs b/src/test/ui/uniform-paths/basic.rs
index 4e2e2dedef6..4e2e2dedef6 100644
--- a/src/test/run-pass/uniform-paths/basic.rs
+++ b/src/test/ui/uniform-paths/basic.rs
diff --git a/src/test/run-pass/uniform-paths/issue-53691.rs b/src/test/ui/uniform-paths/issue-53691.rs
index 73e5fbf4238..5c5ca5b70bb 100644
--- a/src/test/run-pass/uniform-paths/issue-53691.rs
+++ b/src/test/ui/uniform-paths/issue-53691.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:issue-53691.rs
 
 extern crate issue_53691;
diff --git a/src/test/run-pass/uniform-paths/macros-nested.rs b/src/test/ui/uniform-paths/macros-nested.rs
index a62a28bb94d..a62a28bb94d 100644
--- a/src/test/run-pass/uniform-paths/macros-nested.rs
+++ b/src/test/ui/uniform-paths/macros-nested.rs
diff --git a/src/test/run-pass/uniform-paths/macros.rs b/src/test/ui/uniform-paths/macros.rs
index 31b809f0cfd..31b809f0cfd 100644
--- a/src/test/run-pass/uniform-paths/macros.rs
+++ b/src/test/ui/uniform-paths/macros.rs
diff --git a/src/test/run-pass/uniform-paths/same-crate.rs b/src/test/ui/uniform-paths/same-crate.rs
index ce4cc13d9ec..ce4cc13d9ec 100644
--- a/src/test/run-pass/uniform-paths/same-crate.rs
+++ b/src/test/ui/uniform-paths/same-crate.rs
diff --git a/src/test/run-pass/unify-return-ty.rs b/src/test/ui/unify-return-ty.rs
index 3f743a7da40..da1d82e896a 100644
--- a/src/test/run-pass/unify-return-ty.rs
+++ b/src/test/ui/unify-return-ty.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Tests that the tail expr in null() has its type
 // unified with the type *T, and so the type variable
 // in that type gets resolved.
diff --git a/src/test/run-pass/uninit-empty-types.rs b/src/test/ui/uninit-empty-types.rs
index 4bc247a3dca..0d1235776a6 100644
--- a/src/test/run-pass/uninit-empty-types.rs
+++ b/src/test/ui/uninit-empty-types.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test the uninit() construct returning various empty types.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/union/auxiliary/union.rs b/src/test/ui/union/auxiliary/union.rs
index e785e35aeb8..e785e35aeb8 100644
--- a/src/test/run-pass/union/auxiliary/union.rs
+++ b/src/test/ui/union/auxiliary/union.rs
diff --git a/src/test/run-pass/union/union-align.rs b/src/test/ui/union/union-align.rs
index edd83a51169..edd83a51169 100644
--- a/src/test/run-pass/union/union-align.rs
+++ b/src/test/ui/union/union-align.rs
diff --git a/src/test/run-pass/union/union-backcomp.rs b/src/test/ui/union/union-backcomp.rs
index 4efd4c4d3d3..4efd4c4d3d3 100644
--- a/src/test/run-pass/union/union-backcomp.rs
+++ b/src/test/ui/union/union-backcomp.rs
diff --git a/src/test/run-pass/union/union-basic.rs b/src/test/ui/union/union-basic.rs
index 73cc9793f2c..73cc9793f2c 100644
--- a/src/test/run-pass/union/union-basic.rs
+++ b/src/test/ui/union/union-basic.rs
diff --git a/src/test/run-pass/union/union-c-interop.rs b/src/test/ui/union/union-c-interop.rs
index 00f04d5b7ff..00f04d5b7ff 100644
--- a/src/test/run-pass/union/union-c-interop.rs
+++ b/src/test/ui/union/union-c-interop.rs
diff --git a/src/test/run-pass/union/union-const-codegen.rs b/src/test/ui/union/union-const-codegen.rs
index d5b30559595..d5b30559595 100644
--- a/src/test/run-pass/union/union-const-codegen.rs
+++ b/src/test/ui/union/union-const-codegen.rs
diff --git a/src/test/run-pass/union/union-const-eval-field.rs b/src/test/ui/union/union-const-eval-field.rs
index 3b40a21d80d..3b40a21d80d 100644
--- a/src/test/run-pass/union/union-const-eval-field.rs
+++ b/src/test/ui/union/union-const-eval-field.rs
diff --git a/src/test/run-pass/union/union-derive.rs b/src/test/ui/union/union-derive-rpass.rs
index d4b82cdb250..d4b82cdb250 100644
--- a/src/test/run-pass/union/union-derive.rs
+++ b/src/test/ui/union/union-derive-rpass.rs
diff --git a/src/test/run-pass/union/union-drop-assign.rs b/src/test/ui/union/union-drop-assign.rs
index c4349c45464..c4349c45464 100644
--- a/src/test/run-pass/union/union-drop-assign.rs
+++ b/src/test/ui/union/union-drop-assign.rs
diff --git a/src/test/run-pass/union/union-drop.rs b/src/test/ui/union/union-drop.rs
index 2060950dda9..2060950dda9 100644
--- a/src/test/run-pass/union/union-drop.rs
+++ b/src/test/ui/union/union-drop.rs
diff --git a/src/test/run-pass/union/union-generic.rs b/src/test/ui/union/union-generic-rpass.rs
index 6f2caf8dc5b..6f2caf8dc5b 100644
--- a/src/test/run-pass/union/union-generic.rs
+++ b/src/test/ui/union/union-generic-rpass.rs
diff --git a/src/test/run-pass/union/union-inherent-method.rs b/src/test/ui/union/union-inherent-method.rs
index 2e75cce7b10..2e75cce7b10 100644
--- a/src/test/run-pass/union/union-inherent-method.rs
+++ b/src/test/ui/union/union-inherent-method.rs
diff --git a/src/test/run-pass/union/union-macro.rs b/src/test/ui/union/union-macro.rs
index e938cd5a614..e938cd5a614 100644
--- a/src/test/run-pass/union/union-macro.rs
+++ b/src/test/ui/union/union-macro.rs
diff --git a/src/test/run-pass/union/union-nodrop.rs b/src/test/ui/union/union-nodrop.rs
index 4cd64ddb5d6..4cd64ddb5d6 100644
--- a/src/test/run-pass/union/union-nodrop.rs
+++ b/src/test/ui/union/union-nodrop.rs
diff --git a/src/test/run-pass/union/union-nonzero.rs b/src/test/ui/union/union-nonzero.rs
index bd84b46bf3d..bd84b46bf3d 100644
--- a/src/test/run-pass/union/union-nonzero.rs
+++ b/src/test/ui/union/union-nonzero.rs
diff --git a/src/test/run-pass/union/union-overwrite.rs b/src/test/ui/union/union-overwrite.rs
index 64c60604ba9..64c60604ba9 100644
--- a/src/test/run-pass/union/union-overwrite.rs
+++ b/src/test/ui/union/union-overwrite.rs
diff --git a/src/test/run-pass/union/union-packed.rs b/src/test/ui/union/union-packed.rs
index ceb35d94656..ceb35d94656 100644
--- a/src/test/run-pass/union/union-packed.rs
+++ b/src/test/ui/union/union-packed.rs
diff --git a/src/test/run-pass/union/union-pat-refutability.rs b/src/test/ui/union/union-pat-refutability.rs
index ebb06726647..ebb06726647 100644
--- a/src/test/run-pass/union/union-pat-refutability.rs
+++ b/src/test/ui/union/union-pat-refutability.rs
diff --git a/src/test/run-pass/union/union-trait-impl.rs b/src/test/ui/union/union-trait-impl.rs
index 8a7ac817240..8a7ac817240 100644
--- a/src/test/run-pass/union/union-trait-impl.rs
+++ b/src/test/ui/union/union-trait-impl.rs
diff --git a/src/test/run-pass/union/union-transmute.rs b/src/test/ui/union/union-transmute.rs
index ac7dede98a3..ac7dede98a3 100644
--- a/src/test/run-pass/union/union-transmute.rs
+++ b/src/test/ui/union/union-transmute.rs
diff --git a/src/test/run-pass/union/union-with-drop-fields-lint.rs b/src/test/ui/union/union-with-drop-fields-lint-rpass.rs
index 4dbeb7c1e7e..4dbeb7c1e7e 100644
--- a/src/test/run-pass/union/union-with-drop-fields-lint.rs
+++ b/src/test/ui/union/union-with-drop-fields-lint-rpass.rs
diff --git a/src/test/run-pass/unique/unique-assign-copy.rs b/src/test/ui/unique/unique-assign-copy.rs
index 19469810237..19469810237 100644
--- a/src/test/run-pass/unique/unique-assign-copy.rs
+++ b/src/test/ui/unique/unique-assign-copy.rs
diff --git a/src/test/run-pass/unique/unique-assign-drop.rs b/src/test/ui/unique/unique-assign-drop.rs
index 32068e79df4..32068e79df4 100644
--- a/src/test/run-pass/unique/unique-assign-drop.rs
+++ b/src/test/ui/unique/unique-assign-drop.rs
diff --git a/src/test/run-pass/unique/unique-assign-generic.rs b/src/test/ui/unique/unique-assign-generic.rs
index 2d62ce59ad0..2d62ce59ad0 100644
--- a/src/test/run-pass/unique/unique-assign-generic.rs
+++ b/src/test/ui/unique/unique-assign-generic.rs
diff --git a/src/test/run-pass/unique/unique-assign.rs b/src/test/ui/unique/unique-assign.rs
index 5a88df071a0..5a88df071a0 100644
--- a/src/test/run-pass/unique/unique-assign.rs
+++ b/src/test/ui/unique/unique-assign.rs
diff --git a/src/test/run-pass/unique/unique-autoderef-field.rs b/src/test/ui/unique/unique-autoderef-field.rs
index 0360646f133..0360646f133 100644
--- a/src/test/run-pass/unique/unique-autoderef-field.rs
+++ b/src/test/ui/unique/unique-autoderef-field.rs
diff --git a/src/test/run-pass/unique/unique-autoderef-index.rs b/src/test/ui/unique/unique-autoderef-index.rs
index 5a3d17a84ef..5a3d17a84ef 100644
--- a/src/test/run-pass/unique/unique-autoderef-index.rs
+++ b/src/test/ui/unique/unique-autoderef-index.rs
diff --git a/src/test/run-pass/unique/unique-cmp.rs b/src/test/ui/unique/unique-cmp.rs
index 7bbc61d25ac..7bbc61d25ac 100644
--- a/src/test/run-pass/unique/unique-cmp.rs
+++ b/src/test/ui/unique/unique-cmp.rs
diff --git a/src/test/run-pass/unique/unique-containing-tag.rs b/src/test/ui/unique/unique-containing-tag.rs
index f24b3a8645f..f24b3a8645f 100644
--- a/src/test/run-pass/unique/unique-containing-tag.rs
+++ b/src/test/ui/unique/unique-containing-tag.rs
diff --git a/src/test/run-pass/unique/unique-create.rs b/src/test/ui/unique/unique-create.rs
index 3df0f7d55fd..3df0f7d55fd 100644
--- a/src/test/run-pass/unique/unique-create.rs
+++ b/src/test/ui/unique/unique-create.rs
diff --git a/src/test/run-pass/unique/unique-decl-init-copy.rs b/src/test/ui/unique/unique-decl-init-copy.rs
index 6ae95949e84..6ae95949e84 100644
--- a/src/test/run-pass/unique/unique-decl-init-copy.rs
+++ b/src/test/ui/unique/unique-decl-init-copy.rs
diff --git a/src/test/run-pass/unique/unique-decl-init.rs b/src/test/ui/unique/unique-decl-init.rs
index 2c7b9d6054f..2c7b9d6054f 100644
--- a/src/test/run-pass/unique/unique-decl-init.rs
+++ b/src/test/ui/unique/unique-decl-init.rs
diff --git a/src/test/run-pass/unique/unique-decl-move.rs b/src/test/ui/unique/unique-decl-move.rs
index 4a5ee56ea92..4a5ee56ea92 100644
--- a/src/test/run-pass/unique/unique-decl-move.rs
+++ b/src/test/ui/unique/unique-decl-move.rs
diff --git a/src/test/run-pass/unique/unique-decl.rs b/src/test/ui/unique/unique-decl.rs
index 84a1b2a5b83..84a1b2a5b83 100644
--- a/src/test/run-pass/unique/unique-decl.rs
+++ b/src/test/ui/unique/unique-decl.rs
diff --git a/src/test/run-pass/unique/unique-deref.rs b/src/test/ui/unique/unique-deref.rs
index 0c6af0f7f97..0c6af0f7f97 100644
--- a/src/test/run-pass/unique/unique-deref.rs
+++ b/src/test/ui/unique/unique-deref.rs
diff --git a/src/test/run-pass/unique/unique-destructure.rs b/src/test/ui/unique/unique-destructure.rs
index 9b9f95dfbca..9b9f95dfbca 100644
--- a/src/test/run-pass/unique/unique-destructure.rs
+++ b/src/test/ui/unique/unique-destructure.rs
diff --git a/src/test/run-pass/unique/unique-drop-complex.rs b/src/test/ui/unique/unique-drop-complex.rs
index 0b7bda83b3f..0b7bda83b3f 100644
--- a/src/test/run-pass/unique/unique-drop-complex.rs
+++ b/src/test/ui/unique/unique-drop-complex.rs
diff --git a/src/test/run-pass/unique/unique-ffi-symbols.rs b/src/test/ui/unique/unique-ffi-symbols.rs
index b0fe22bc332..b0fe22bc332 100644
--- a/src/test/run-pass/unique/unique-ffi-symbols.rs
+++ b/src/test/ui/unique/unique-ffi-symbols.rs
diff --git a/src/test/run-pass/unique/unique-fn-arg-move.rs b/src/test/ui/unique/unique-fn-arg-move.rs
index ff33839e57e..ff33839e57e 100644
--- a/src/test/run-pass/unique/unique-fn-arg-move.rs
+++ b/src/test/ui/unique/unique-fn-arg-move.rs
diff --git a/src/test/run-pass/unique/unique-fn-arg-mut.rs b/src/test/ui/unique/unique-fn-arg-mut.rs
index e8bb35e4eb0..e8bb35e4eb0 100644
--- a/src/test/run-pass/unique/unique-fn-arg-mut.rs
+++ b/src/test/ui/unique/unique-fn-arg-mut.rs
diff --git a/src/test/run-pass/unique/unique-fn-arg.rs b/src/test/ui/unique/unique-fn-arg.rs
index 75f2a767f59..75f2a767f59 100644
--- a/src/test/run-pass/unique/unique-fn-arg.rs
+++ b/src/test/ui/unique/unique-fn-arg.rs
diff --git a/src/test/run-pass/unique/unique-fn-ret.rs b/src/test/ui/unique/unique-fn-ret.rs
index cd44cfa9836..cd44cfa9836 100644
--- a/src/test/run-pass/unique/unique-fn-ret.rs
+++ b/src/test/ui/unique/unique-fn-ret.rs
diff --git a/src/test/run-pass/unique/unique-generic-assign.rs b/src/test/ui/unique/unique-generic-assign.rs
index 9c4405aa8ac..9c4405aa8ac 100644
--- a/src/test/run-pass/unique/unique-generic-assign.rs
+++ b/src/test/ui/unique/unique-generic-assign.rs
diff --git a/src/test/run-pass/unique/unique-in-tag.rs b/src/test/ui/unique/unique-in-tag.rs
index 8d97ebe6590..8d97ebe6590 100644
--- a/src/test/run-pass/unique/unique-in-tag.rs
+++ b/src/test/ui/unique/unique-in-tag.rs
diff --git a/src/test/run-pass/unique/unique-in-vec-copy.rs b/src/test/ui/unique/unique-in-vec-copy.rs
index 8907a8b20a7..8907a8b20a7 100644
--- a/src/test/run-pass/unique/unique-in-vec-copy.rs
+++ b/src/test/ui/unique/unique-in-vec-copy.rs
diff --git a/src/test/run-pass/unique/unique-in-vec.rs b/src/test/ui/unique/unique-in-vec.rs
index 528ea4fb870..528ea4fb870 100644
--- a/src/test/run-pass/unique/unique-in-vec.rs
+++ b/src/test/ui/unique/unique-in-vec.rs
diff --git a/src/test/run-pass/unique/unique-init.rs b/src/test/ui/unique/unique-init.rs
index c8a150522fd..c8a150522fd 100644
--- a/src/test/run-pass/unique/unique-init.rs
+++ b/src/test/ui/unique/unique-init.rs
diff --git a/src/test/run-pass/unique/unique-kinds.rs b/src/test/ui/unique/unique-kinds.rs
index f369a1e2a19..f369a1e2a19 100644
--- a/src/test/run-pass/unique/unique-kinds.rs
+++ b/src/test/ui/unique/unique-kinds.rs
diff --git a/src/test/run-pass/unique/unique-log.rs b/src/test/ui/unique/unique-log.rs
index 27977717706..27977717706 100644
--- a/src/test/run-pass/unique/unique-log.rs
+++ b/src/test/ui/unique/unique-log.rs
diff --git a/src/test/run-pass/unique/unique-match-discrim.rs b/src/test/ui/unique/unique-match-discrim.rs
index 6e6d7432277..6e6d7432277 100644
--- a/src/test/run-pass/unique/unique-match-discrim.rs
+++ b/src/test/ui/unique/unique-match-discrim.rs
diff --git a/src/test/run-pass/unique/unique-move-drop.rs b/src/test/ui/unique/unique-move-drop.rs
index e1ea58b39ef..e1ea58b39ef 100644
--- a/src/test/run-pass/unique/unique-move-drop.rs
+++ b/src/test/ui/unique/unique-move-drop.rs
diff --git a/src/test/run-pass/unique/unique-move-temp.rs b/src/test/ui/unique/unique-move-temp.rs
index 4f5de50b722..4f5de50b722 100644
--- a/src/test/run-pass/unique/unique-move-temp.rs
+++ b/src/test/ui/unique/unique-move-temp.rs
diff --git a/src/test/run-pass/unique/unique-move.rs b/src/test/ui/unique/unique-move.rs
index 0f6bff1432b..0f6bff1432b 100644
--- a/src/test/run-pass/unique/unique-move.rs
+++ b/src/test/ui/unique/unique-move.rs
diff --git a/src/test/run-pass/unique/unique-mutable.rs b/src/test/ui/unique/unique-mutable.rs
index 176cf33d488..176cf33d488 100644
--- a/src/test/run-pass/unique/unique-mutable.rs
+++ b/src/test/ui/unique/unique-mutable.rs
diff --git a/src/test/run-pass/unique/unique-object-move.rs b/src/test/ui/unique/unique-object-move.rs
index 84e8cdb32b8..84e8cdb32b8 100644
--- a/src/test/run-pass/unique/unique-object-move.rs
+++ b/src/test/ui/unique/unique-object-move.rs
diff --git a/src/test/run-pass/unique/unique-pat-2.rs b/src/test/ui/unique/unique-pat-2.rs
index c18e029b252..c18e029b252 100644
--- a/src/test/run-pass/unique/unique-pat-2.rs
+++ b/src/test/ui/unique/unique-pat-2.rs
diff --git a/src/test/run-pass/unique/unique-pat-3.rs b/src/test/ui/unique/unique-pat-3.rs
index e17b5a3ddb4..e17b5a3ddb4 100644
--- a/src/test/run-pass/unique/unique-pat-3.rs
+++ b/src/test/ui/unique/unique-pat-3.rs
diff --git a/src/test/run-pass/unique/unique-pat.rs b/src/test/ui/unique/unique-pat.rs
index b32195ac274..b32195ac274 100644
--- a/src/test/run-pass/unique/unique-pat.rs
+++ b/src/test/ui/unique/unique-pat.rs
diff --git a/src/test/run-pass/unique/unique-rec.rs b/src/test/ui/unique/unique-rec.rs
index c8bddd246a8..c8bddd246a8 100644
--- a/src/test/run-pass/unique/unique-rec.rs
+++ b/src/test/ui/unique/unique-rec.rs
diff --git a/src/test/run-pass/unique/unique-send-2.rs b/src/test/ui/unique/unique-send-2.rs
index 22f0e6c3a49..22f0e6c3a49 100644
--- a/src/test/run-pass/unique/unique-send-2.rs
+++ b/src/test/ui/unique/unique-send-2.rs
diff --git a/src/test/run-pass/unique/unique-send.rs b/src/test/ui/unique/unique-send.rs
index a5c7561b9ae..a5c7561b9ae 100644
--- a/src/test/run-pass/unique/unique-send.rs
+++ b/src/test/ui/unique/unique-send.rs
diff --git a/src/test/run-pass/unique/unique-swap.rs b/src/test/ui/unique/unique-swap.rs
index 33a6b3b3ed0..33a6b3b3ed0 100644
--- a/src/test/run-pass/unique/unique-swap.rs
+++ b/src/test/ui/unique/unique-swap.rs
diff --git a/src/test/run-pass/unit.rs b/src/test/ui/unit.rs
index e10b2408cb7..4f2dd4194a5 100644
--- a/src/test/run-pass/unit.rs
+++ b/src/test/ui/unit.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_assignments)]
 #![allow(unknown_lints)]
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/unnamed_argument_mode.rs b/src/test/ui/unnamed_argument_mode.rs
index fa817be2704..5b7b4002f47 100644
--- a/src/test/run-pass/unnamed_argument_mode.rs
+++ b/src/test/ui/unnamed_argument_mode.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 fn good(_a: &isize) {
diff --git a/src/test/run-pass/unreachable-code-1.rs b/src/test/ui/unreachable-code-1.rs
index ac41377e056..ee44f399945 100644
--- a/src/test/run-pass/unreachable-code-1.rs
+++ b/src/test/ui/unreachable-code-1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(unreachable_code)]
 
diff --git a/src/test/run-pass/unreachable-code.rs b/src/test/ui/unreachable-code.rs
index ea17be7adee..28b938edc63 100644
--- a/src/test/run-pass/unreachable-code.rs
+++ b/src/test/ui/unreachable-code.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(dead_code)]
 
diff --git a/src/test/run-pass/unsafe-coercion.rs b/src/test/ui/unsafe-coercion.rs
index 0c977c1ef32..2478deeab0d 100644
--- a/src/test/run-pass/unsafe-coercion.rs
+++ b/src/test/ui/unsafe-coercion.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Check that safe fns are not a subtype of unsafe fns.
 
 
diff --git a/src/test/run-pass/unsafe-fn-called-from-unsafe-blk.rs b/src/test/ui/unsafe-fn-called-from-unsafe-blk.rs
index e49b372981b..38271cc3c78 100644
--- a/src/test/run-pass/unsafe-fn-called-from-unsafe-blk.rs
+++ b/src/test/ui/unsafe-fn-called-from-unsafe-blk.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 //
 // See also: compile-fail/unsafe-fn-called-from-safe.rs
diff --git a/src/test/run-pass/unsafe-fn-called-from-unsafe-fn.rs b/src/test/ui/unsafe-fn-called-from-unsafe-fn.rs
index f9414bee298..26acc913e87 100644
--- a/src/test/run-pass/unsafe-fn-called-from-unsafe-fn.rs
+++ b/src/test/ui/unsafe-fn-called-from-unsafe-fn.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 //
 // See also: compile-fail/unsafe-fn-called-from-safe.rs
diff --git a/src/test/run-pass/unsafe-pointer-assignability.rs b/src/test/ui/unsafe-pointer-assignability.rs
index 11e22d7a08a..db822bb6a02 100644
--- a/src/test/run-pass/unsafe-pointer-assignability.rs
+++ b/src/test/ui/unsafe-pointer-assignability.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn f(x: *const isize) {
     unsafe {
         assert_eq!(*x, 3);
diff --git a/src/test/run-pass/unsized-locals/autoderef.rs b/src/test/ui/unsized-locals/autoderef.rs
index 885cd2b8360..7f2d2f9c7ef 100644
--- a/src/test/run-pass/unsized-locals/autoderef.rs
+++ b/src/test/ui/unsized-locals/autoderef.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(unsized_locals)]
 
 pub trait Foo {
diff --git a/src/test/run-pass/unsized-locals/box-fnonce.rs b/src/test/ui/unsized-locals/box-fnonce.rs
index 16bdeae4fad..8b2f9b4c9fc 100644
--- a/src/test/run-pass/unsized-locals/box-fnonce.rs
+++ b/src/test/ui/unsized-locals/box-fnonce.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn call_it<T>(f: Box<dyn FnOnce() -> T>) -> T {
     f()
 }
diff --git a/src/test/run-pass/unsized-locals/by-value-trait-object-safety.rs b/src/test/ui/unsized-locals/by-value-trait-object-safety-rpass.rs
index f19ff5b8de4..b07d1a571b2 100644
--- a/src/test/run-pass/unsized-locals/by-value-trait-object-safety.rs
+++ b/src/test/ui/unsized-locals/by-value-trait-object-safety-rpass.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(unsized_locals)]
 
 pub trait Foo {
diff --git a/src/test/run-pass/unsized-locals/by-value-trait-object-safety-withdefault.rs b/src/test/ui/unsized-locals/by-value-trait-object-safety-withdefault.rs
index e6e363f55a1..8b39a99da58 100644
--- a/src/test/run-pass/unsized-locals/by-value-trait-object-safety-withdefault.rs
+++ b/src/test/ui/unsized-locals/by-value-trait-object-safety-withdefault.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(unsized_locals)]
 
 pub trait Foo {
diff --git a/src/test/run-pass/unsized-locals/reference-unsized-locals.rs b/src/test/ui/unsized-locals/reference-unsized-locals.rs
index 1560d25d4b0..1560d25d4b0 100644
--- a/src/test/run-pass/unsized-locals/reference-unsized-locals.rs
+++ b/src/test/ui/unsized-locals/reference-unsized-locals.rs
diff --git a/src/test/run-pass/unsized-locals/simple-unsized-locals.rs b/src/test/ui/unsized-locals/simple-unsized-locals.rs
index 05955919245..05955919245 100644
--- a/src/test/run-pass/unsized-locals/simple-unsized-locals.rs
+++ b/src/test/ui/unsized-locals/simple-unsized-locals.rs
diff --git a/src/test/run-pass/unsized-locals/unsized-exprs.rs b/src/test/ui/unsized-locals/unsized-exprs-rpass.rs
index bc64fcdec2e..bc64fcdec2e 100644
--- a/src/test/run-pass/unsized-locals/unsized-exprs.rs
+++ b/src/test/ui/unsized-locals/unsized-exprs-rpass.rs
diff --git a/src/test/run-pass/unsized-locals/unsized-parameters.rs b/src/test/ui/unsized-locals/unsized-parameters.rs
index 3624154d5c4..3624154d5c4 100644
--- a/src/test/run-pass/unsized-locals/unsized-parameters.rs
+++ b/src/test/ui/unsized-locals/unsized-parameters.rs
diff --git a/src/test/run-pass/unsized-tuple-impls.rs b/src/test/ui/unsized-tuple-impls.rs
index 17ab317361e..5e385f33bee 100644
--- a/src/test/run-pass/unsized-tuple-impls.rs
+++ b/src/test/ui/unsized-tuple-impls.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(unsized_tuple_coercion)]
 
 use std::collections::HashSet;
diff --git a/src/test/run-pass/unsized.rs b/src/test/ui/unsized.rs
index ad69214db87..54304834d4b 100644
--- a/src/test/run-pass/unsized.rs
+++ b/src/test/ui/unsized.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(type_alias_bounds)]
 #![allow(dead_code)]
 // Test syntax checks for `?Sized` syntax.
diff --git a/src/test/run-pass/unsized2.rs b/src/test/ui/unsized2.rs
index c9a8b2e7c66..be4406399fd 100644
--- a/src/test/run-pass/unsized2.rs
+++ b/src/test/ui/unsized2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unconditional_recursion)]
 #![allow(dead_code)]
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/unsized3.rs b/src/test/ui/unsized3-rpass.rs
index eaa65cf37fa..65efbd6b520 100644
--- a/src/test/run-pass/unsized3.rs
+++ b/src/test/ui/unsized3-rpass.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test structs with always-unsized fields.
 
 
diff --git a/src/test/run-pass/unused-move-capture.rs b/src/test/ui/unused-move-capture.rs
index baba19c08cd..e9d4684736e 100644
--- a/src/test/run-pass/unused-move-capture.rs
+++ b/src/test/ui/unused-move-capture.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unused-move.rs b/src/test/ui/unused-move.rs
index 74632dbc797..37aee22f85d 100644
--- a/src/test/run-pass/unused-move.rs
+++ b/src/test/ui/unused-move.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Issue #3878
 // Issue Name: Unused move causes a crash
 // Abstract: zero-fill to block after drop
diff --git a/src/test/run-pass/unwind-resource.rs b/src/test/ui/unwind-resource.rs
index a55730c55fd..a063bef0822 100644
--- a/src/test/run-pass/unwind-resource.rs
+++ b/src/test/ui/unwind-resource.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 // ignore-emscripten no threads support
 
diff --git a/src/test/run-pass/unwind-unique.rs b/src/test/ui/unwind-unique.rs
index 07613a6dd64..ea3089e747f 100644
--- a/src/test/run-pass/unwind-unique.rs
+++ b/src/test/ui/unwind-unique.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-emscripten no threads support
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/use-crate-name-alias.rs b/src/test/ui/use-crate-name-alias.rs
index 520e72676b0..0920d968585 100644
--- a/src/test/run-pass/use-crate-name-alias.rs
+++ b/src/test/ui/use-crate-name-alias.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Issue #1706
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/use-import-export.rs b/src/test/ui/use-import-export.rs
index bb6a8ee55bf..07a6866ba66 100644
--- a/src/test/run-pass/use-import-export.rs
+++ b/src/test/ui/use-import-export.rs
@@ -1,3 +1,4 @@
+// run-pass
 // pretty-expanded FIXME #23616
 
 mod foo {
diff --git a/src/test/run-pass/use-keyword-2.rs b/src/test/ui/use-keyword-2.rs
index 840c907e234..ebddb5d1a48 100644
--- a/src/test/run-pass/use-keyword-2.rs
+++ b/src/test/ui/use-keyword-2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_variables)]
 pub struct A;
 
diff --git a/src/test/run-pass/use-mod.rs b/src/test/ui/use-mod.rs
index 9af56b71de0..84da2e70878 100644
--- a/src/test/run-pass/use-mod.rs
+++ b/src/test/ui/use-mod.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_imports)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/use-nested-groups.rs b/src/test/ui/use-nested-groups.rs
index 092b4a34e55..5c739709e9e 100644
--- a/src/test/run-pass/use-nested-groups.rs
+++ b/src/test/ui/use-nested-groups.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 mod a {
     pub enum B {}
 
diff --git a/src/test/run-pass/use.rs b/src/test/ui/use.rs
index df37a60e356..1beee4a5143 100644
--- a/src/test/run-pass/use.rs
+++ b/src/test/ui/use.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/use_inline_dtor.rs b/src/test/ui/use_inline_dtor.rs
index 0873d185575..ac916de4646 100644
--- a/src/test/run-pass/use_inline_dtor.rs
+++ b/src/test/ui/use_inline_dtor.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:inline_dtor.rs
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/using-target-feature-unstable.rs b/src/test/ui/using-target-feature-unstable.rs
index 05b1d93a697..c5da45c0854 100644
--- a/src/test/run-pass/using-target-feature-unstable.rs
+++ b/src/test/ui/using-target-feature-unstable.rs
@@ -1,3 +1,4 @@
+// run-pass
 // only-x86_64
 // aux-build:using-target-feature-unstable.rs
 
diff --git a/src/test/run-pass/utf8-bom.rs b/src/test/ui/utf8-bom.rs
index 90874c9b2e3..a3cb0e9a52a 100644
--- a/src/test/run-pass/utf8-bom.rs
+++ b/src/test/ui/utf8-bom.rs
@@ -1,3 +1,4 @@
+// run-pass
 //
 
 // This file has utf-8 BOM, it should be compiled normally without error.
diff --git a/src/test/run-pass/utf8.rs b/src/test/ui/utf8.rs
index b908afbd5b6..75b6ddf7895 100644
--- a/src/test/run-pass/utf8.rs
+++ b/src/test/ui/utf8.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 pub fn main() {
     let yen: char = '¥'; // 0xa5
     let c_cedilla: char = 'ç'; // 0xe7
diff --git a/src/test/run-pass/utf8_chars.rs b/src/test/ui/utf8_chars.rs
index c29d8557b70..d764509813d 100644
--- a/src/test/run-pass/utf8_chars.rs
+++ b/src/test/ui/utf8_chars.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::str;
 
 pub fn main() {
diff --git a/src/test/run-pass/utf8_idents.rs b/src/test/ui/utf8_idents-rpass.rs
index 7323e144f8d..582b67bc299 100644
--- a/src/test/run-pass/utf8_idents.rs
+++ b/src/test/ui/utf8_idents-rpass.rs
@@ -1,3 +1,4 @@
+// run-pass
 //
 #![allow(non_snake_case)]
 
diff --git a/src/test/run-pass/variadic-ffi.rs b/src/test/ui/variadic-ffi.rs
index d6fbb1773b2..3232a11d726 100644
--- a/src/test/run-pass/variadic-ffi.rs
+++ b/src/test/ui/variadic-ffi.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare no libc to test ffi with
 #![feature(c_variadic)]
 
diff --git a/src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs b/src/test/ui/variance-intersection-of-ref-and-opt-ref.rs
index fde151400be..74707a98d32 100644
--- a/src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs
+++ b/src/test/ui/variance-intersection-of-ref-and-opt-ref.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Elaborated version of the opening example from RFC 738. This failed
 // to compile before variance because invariance of `Option` prevented
 // us from approximating the lifetimes of `field1` and `field2` to a
diff --git a/src/test/run-pass/variance-iterators-in-libcore.rs b/src/test/ui/variance-iterators-in-libcore.rs
index 32b56bd0b5a..2ab3a8ab5c1 100644
--- a/src/test/run-pass/variance-iterators-in-libcore.rs
+++ b/src/test/ui/variance-iterators-in-libcore.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(warnings)]
 
 use std::iter::Zip;
diff --git a/src/test/run-pass/volatile-fat-ptr.rs b/src/test/ui/volatile-fat-ptr.rs
index f01263b73a9..f73e7e1c391 100644
--- a/src/test/run-pass/volatile-fat-ptr.rs
+++ b/src/test/ui/volatile-fat-ptr.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(stable_features)]
 #![feature(volatile)]
 use std::ptr::{read_volatile, write_volatile};
diff --git a/src/test/run-pass/wait-forked-but-failed-child.rs b/src/test/ui/wait-forked-but-failed-child.rs
index 1f32bd00a03..434361b40de 100644
--- a/src/test/run-pass/wait-forked-but-failed-child.rs
+++ b/src/test/ui/wait-forked-but-failed-child.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 // ignore-sgx no processes
diff --git a/src/test/run-pass/warn-ctypes-inhibit.rs b/src/test/ui/warn-ctypes-inhibit.rs
index 76b36a12c20..ab9634df65c 100644
--- a/src/test/run-pass/warn-ctypes-inhibit.rs
+++ b/src/test/ui/warn-ctypes-inhibit.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 // compile-flags:-D improper-ctypes
 
diff --git a/src/test/run-pass/weak-lang-item.rs b/src/test/ui/weak-lang-item.rs
index 9a36606a465..a429d8fabc7 100644
--- a/src/test/run-pass/weak-lang-item.rs
+++ b/src/test/ui/weak-lang-item.rs
@@ -1,3 +1,4 @@
+// run-pass
 // aux-build:weak-lang-items.rs
 
 // ignore-emscripten no threads support
diff --git a/src/test/run-pass/weak-new-uninhabited-issue-48493.rs b/src/test/ui/weak-new-uninhabited-issue-48493.rs
index 4f93800b864..644fc8c2483 100644
--- a/src/test/run-pass/weak-new-uninhabited-issue-48493.rs
+++ b/src/test/ui/weak-new-uninhabited-issue-48493.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 fn main() {
     enum Void {}
     std::rc::Weak::<Void>::new();
diff --git a/src/test/run-pass/weird-exit-code.rs b/src/test/ui/weird-exit-code.rs
index 9456cbbe6f7..a067b7b5b1f 100644
--- a/src/test/run-pass/weird-exit-code.rs
+++ b/src/test/ui/weird-exit-code.rs
@@ -1,3 +1,4 @@
+// run-pass
 // On Windows the GetExitCodeProcess API is used to get the exit code of a
 // process, but it's easy to mistake a process exiting with the code 259 as
 // "still running" because this is the value of the STILL_ACTIVE constant. Make
diff --git a/src/test/run-pass/weird-exprs.rs b/src/test/ui/weird-exprs.rs
index 7b2b46c45d2..ca68a5af0dd 100644
--- a/src/test/run-pass/weird-exprs.rs
+++ b/src/test/ui/weird-exprs.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![feature(generators)]
 
 #![allow(non_camel_case_types)]
diff --git a/src/test/run-pass/wf-bound-region-in-object-type.rs b/src/test/ui/wf-bound-region-in-object-type.rs
index 6814e2baab5..7c4dd3ec84f 100644
--- a/src/test/run-pass/wf-bound-region-in-object-type.rs
+++ b/src/test/ui/wf-bound-region-in-object-type.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 #![allow(unused_variables)]
 // Test that the `wf` checker properly handles bound regions in object
diff --git a/src/test/run-pass/where-clauses/auxiliary/where_clauses_xc.rs b/src/test/ui/where-clauses/auxiliary/where_clauses_xc.rs
index 7c8043b2002..7c8043b2002 100644
--- a/src/test/run-pass/where-clauses/auxiliary/where_clauses_xc.rs
+++ b/src/test/ui/where-clauses/auxiliary/where_clauses_xc.rs
diff --git a/src/test/run-pass/where-clauses/where-clause-bounds-inconsistency.rs b/src/test/ui/where-clauses/where-clause-bounds-inconsistency.rs
index cf7d06b6179..cf7d06b6179 100644
--- a/src/test/run-pass/where-clauses/where-clause-bounds-inconsistency.rs
+++ b/src/test/ui/where-clauses/where-clause-bounds-inconsistency.rs
diff --git a/src/test/run-pass/where-clauses/where-clause-early-bound-lifetimes.rs b/src/test/ui/where-clauses/where-clause-early-bound-lifetimes.rs
index 6fc570b9b5b..6fc570b9b5b 100644
--- a/src/test/run-pass/where-clauses/where-clause-early-bound-lifetimes.rs
+++ b/src/test/ui/where-clauses/where-clause-early-bound-lifetimes.rs
diff --git a/src/test/run-pass/where-clauses/where-clause-method-substituion.rs b/src/test/ui/where-clauses/where-clause-method-substituion-rpass.rs
index daa3c8dd8e3..daa3c8dd8e3 100644
--- a/src/test/run-pass/where-clauses/where-clause-method-substituion.rs
+++ b/src/test/ui/where-clauses/where-clause-method-substituion-rpass.rs
diff --git a/src/test/run-pass/where-clauses/where-clause-region-outlives.rs b/src/test/ui/where-clauses/where-clause-region-outlives.rs
index 84925345de1..84925345de1 100644
--- a/src/test/run-pass/where-clauses/where-clause-region-outlives.rs
+++ b/src/test/ui/where-clauses/where-clause-region-outlives.rs
diff --git a/src/test/run-pass/where-clauses/where-clauses-cross-crate.rs b/src/test/ui/where-clauses/where-clauses-cross-crate.rs
index 9edf0bd5b1d..9edf0bd5b1d 100644
--- a/src/test/run-pass/where-clauses/where-clauses-cross-crate.rs
+++ b/src/test/ui/where-clauses/where-clauses-cross-crate.rs
diff --git a/src/test/run-pass/where-clauses/where-clauses-lifetimes.rs b/src/test/ui/where-clauses/where-clauses-lifetimes.rs
index 4bfd9e6590f..4bfd9e6590f 100644
--- a/src/test/run-pass/where-clauses/where-clauses-lifetimes.rs
+++ b/src/test/ui/where-clauses/where-clauses-lifetimes.rs
diff --git a/src/test/run-pass/where-clauses/where-clauses-method.rs b/src/test/ui/where-clauses/where-clauses-method.rs
index feecff43565..feecff43565 100644
--- a/src/test/run-pass/where-clauses/where-clauses-method.rs
+++ b/src/test/ui/where-clauses/where-clauses-method.rs
diff --git a/src/test/run-pass/where-clauses/where-clauses-unboxed-closures.rs b/src/test/ui/where-clauses/where-clauses-unboxed-closures.rs
index 6964cfa2eb0..6964cfa2eb0 100644
--- a/src/test/run-pass/where-clauses/where-clauses-unboxed-closures.rs
+++ b/src/test/ui/where-clauses/where-clauses-unboxed-closures.rs
diff --git a/src/test/run-pass/where-clauses/where-clauses.rs b/src/test/ui/where-clauses/where-clauses.rs
index 905ef7c5e8c..905ef7c5e8c 100644
--- a/src/test/run-pass/where-clauses/where-clauses.rs
+++ b/src/test/ui/where-clauses/where-clauses.rs
diff --git a/src/test/run-pass/wrapping-int-api.rs b/src/test/ui/wrapping-int-api.rs
index fc62caf3b8d..2a5baad8b78 100644
--- a/src/test/run-pass/wrapping-int-api.rs
+++ b/src/test/ui/wrapping-int-api.rs
@@ -1,3 +1,4 @@
+// run-pass
 // Test inherent wrapping_* methods for {i,u}{size,8,16,32,64}.
 
 use std::{i8, i16, i32, i64, isize};
diff --git a/src/test/run-pass/write-fmt-errors.rs b/src/test/ui/write-fmt-errors.rs
index f95bbfd569a..7dd98564425 100644
--- a/src/test/run-pass/write-fmt-errors.rs
+++ b/src/test/ui/write-fmt-errors.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::fmt;
 use std::io::{self, Error, Write, sink};
 
diff --git a/src/test/run-pass/writealias.rs b/src/test/ui/writealias.rs
index f80118e08c9..8ba4b09ae29 100644
--- a/src/test/run-pass/writealias.rs
+++ b/src/test/ui/writealias.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(dead_code)]
 
 use std::sync::Mutex;
diff --git a/src/test/run-pass/wrong-hashset-issue-42918.rs b/src/test/ui/wrong-hashset-issue-42918.rs
index 12b10640c53..ef834d915c9 100644
--- a/src/test/run-pass/wrong-hashset-issue-42918.rs
+++ b/src/test/ui/wrong-hashset-issue-42918.rs
@@ -1,3 +1,4 @@
+// run-pass
 //
 #![allow(dead_code)]
 // compile-flags: -O
diff --git a/src/test/run-pass/x86stdcall.rs b/src/test/ui/x86stdcall.rs
index cd9450a5697..fc67ccdc8c4 100644
--- a/src/test/run-pass/x86stdcall.rs
+++ b/src/test/ui/x86stdcall.rs
@@ -1,3 +1,4 @@
+// run-pass
 // ignore-wasm32-bare no libc to test ffi with
 // ignore-sgx no libc
 // GetLastError doesn't seem to work with stack switching
diff --git a/src/test/run-pass/x86stdcall2.rs b/src/test/ui/x86stdcall2.rs
index 3d008f26ab3..563e3aba632 100644
--- a/src/test/run-pass/x86stdcall2.rs
+++ b/src/test/ui/x86stdcall2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(non_camel_case_types)]
 pub type HANDLE = usize;
 pub type DWORD = u32;
diff --git a/src/test/run-pass/yield.rs b/src/test/ui/yield.rs
index a5fd14bd8fd..e83ba556078 100644
--- a/src/test/run-pass/yield.rs
+++ b/src/test/ui/yield.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(unused_mut)]
 // ignore-emscripten no threads support
diff --git a/src/test/run-pass/yield1.rs b/src/test/ui/yield1.rs
index e7a6190b567..002e590550c 100644
--- a/src/test/run-pass/yield1.rs
+++ b/src/test/ui/yield1.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 #![allow(unused_must_use)]
 #![allow(unused_mut)]
 // ignore-emscripten no threads support
diff --git a/src/test/run-pass/yield2.rs b/src/test/ui/yield2.rs
index c4ccd2d1475..376faab0c48 100644
--- a/src/test/run-pass/yield2.rs
+++ b/src/test/ui/yield2.rs
@@ -1,3 +1,5 @@
+// run-pass
+
 use std::thread;
 
 pub fn main() {
diff --git a/src/test/run-pass/z-crate-attr.rs b/src/test/ui/z-crate-attr.rs
index f0843941309..1021774fc5f 100644
--- a/src/test/run-pass/z-crate-attr.rs
+++ b/src/test/ui/z-crate-attr.rs
@@ -1,3 +1,4 @@
+// run-pass
 // This test checks if an unstable feature is enabled with the -Zcrate-attr=feature(foo) flag. If
 // the exact feature used here is causing problems feel free to replace it with another
 // perma-unstable feature.
diff --git a/src/test/run-pass/zero-sized/zero-size-type-destructors.rs b/src/test/ui/zero-sized/zero-size-type-destructors.rs
index 98b5a439c82..98b5a439c82 100644
--- a/src/test/run-pass/zero-sized/zero-size-type-destructors.rs
+++ b/src/test/ui/zero-sized/zero-size-type-destructors.rs
diff --git a/src/test/run-pass/zero-sized/zero-sized-binary-heap-push.rs b/src/test/ui/zero-sized/zero-sized-binary-heap-push.rs
index 6553c5adbe7..6553c5adbe7 100644
--- a/src/test/run-pass/zero-sized/zero-sized-binary-heap-push.rs
+++ b/src/test/ui/zero-sized/zero-sized-binary-heap-push.rs
diff --git a/src/test/run-pass/zero-sized/zero-sized-btreemap-insert.rs b/src/test/ui/zero-sized/zero-sized-btreemap-insert.rs
index 52edb33d6ad..52edb33d6ad 100644
--- a/src/test/run-pass/zero-sized/zero-sized-btreemap-insert.rs
+++ b/src/test/ui/zero-sized/zero-sized-btreemap-insert.rs
diff --git a/src/test/run-pass/zero-sized/zero-sized-linkedlist-push.rs b/src/test/ui/zero-sized/zero-sized-linkedlist-push.rs
index 03724085f5f..03724085f5f 100644
--- a/src/test/run-pass/zero-sized/zero-sized-linkedlist-push.rs
+++ b/src/test/ui/zero-sized/zero-sized-linkedlist-push.rs
diff --git a/src/test/run-pass/zero-sized/zero-sized-tuple-struct.rs b/src/test/ui/zero-sized/zero-sized-tuple-struct.rs
index 6c438720e5d..6c438720e5d 100644
--- a/src/test/run-pass/zero-sized/zero-sized-tuple-struct.rs
+++ b/src/test/ui/zero-sized/zero-sized-tuple-struct.rs
diff --git a/src/test/run-pass/zero-sized/zero-sized-vec-deque-push.rs b/src/test/ui/zero-sized/zero-sized-vec-deque-push.rs
index c541208703b..c541208703b 100644
--- a/src/test/run-pass/zero-sized/zero-sized-vec-deque-push.rs
+++ b/src/test/ui/zero-sized/zero-sized-vec-deque-push.rs
diff --git a/src/test/run-pass/zero-sized/zero-sized-vec-push.rs b/src/test/ui/zero-sized/zero-sized-vec-push.rs
index 9e9fbc972d5..9e9fbc972d5 100644
--- a/src/test/run-pass/zero-sized/zero-sized-vec-push.rs
+++ b/src/test/ui/zero-sized/zero-sized-vec-push.rs
diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs
index a75d9f0b0bb..66e030e9793 100644
--- a/src/tools/compiletest/src/common.rs
+++ b/src/tools/compiletest/src/common.rs
@@ -12,8 +12,6 @@ use crate::util::PathBufExt;
 pub enum Mode {
     CompileFail,
     RunFail,
-    /// This now behaves like a `ui` test that has an implict `// run-pass`.
-    RunPass,
     RunPassValgrind,
     Pretty,
     DebugInfoCdb,
@@ -33,7 +31,7 @@ pub enum Mode {
 
 impl Mode {
     pub fn disambiguator(self) -> &'static str {
-        // Run-pass and pretty run-pass tests could run concurrently, and if they do,
+        // Pretty-printing tests could run concurrently, and if they do,
         // they need to keep their output segregated. Same is true for debuginfo tests that
         // can be run on cdb, gdb, and lldb.
         match self {
@@ -52,7 +50,6 @@ impl FromStr for Mode {
         match s {
             "compile-fail" => Ok(CompileFail),
             "run-fail" => Ok(RunFail),
-            "run-pass" => Ok(RunPass),
             "run-pass-valgrind" => Ok(RunPassValgrind),
             "pretty" => Ok(Pretty),
             "debuginfo-cdb" => Ok(DebugInfoCdb),
@@ -78,7 +75,6 @@ impl fmt::Display for Mode {
         let s = match *self {
             CompileFail => "compile-fail",
             RunFail => "run-fail",
-            RunPass => "run-pass",
             RunPassValgrind => "run-pass-valgrind",
             Pretty => "pretty",
             DebugInfoCdb => "debuginfo-cdb",
@@ -202,7 +198,7 @@ pub struct Config {
     /// The name of the stage being built (stage1, etc)
     pub stage_id: String,
 
-    /// The test mode, compile-fail, run-fail, run-pass
+    /// The test mode, compile-fail, run-fail, ui
     pub mode: Mode,
 
     /// Run ignored tests
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
index b8008152e2a..040230d0020 100644
--- a/src/tools/compiletest/src/header.rs
+++ b/src/tools/compiletest/src/header.rs
@@ -592,7 +592,7 @@ impl TestProps {
             check_no_run("build-pass");
             Some(PassMode::Build)
         } else if config.parse_name_directive(ln, "run-pass") {
-            if config.mode != Mode::Ui && config.mode != Mode::RunPass /* compatibility */ {
+            if config.mode != Mode::Ui {
                 panic!("`run-pass` header is only supported in UI tests")
             }
             Some(PassMode::Run)
diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
index 597fdf2d95e..31360c000ce 100644
--- a/src/tools/compiletest/src/main.rs
+++ b/src/tools/compiletest/src/main.rs
@@ -125,8 +125,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
             "",
             "mode",
             "which sort of compile tests to run",
-            "(compile-fail|run-fail|run-pass|\
-             run-pass-valgrind|pretty|debug-info|incremental|mir-opt)",
+            "(compile-fail|run-fail|run-pass-valgrind|pretty|debug-info|incremental|mir-opt)",
         )
         .optopt(
             "",
@@ -814,7 +813,7 @@ fn make_test_name(
 ) -> test::TestName {
     // Convert a complete path to something like
     //
-    //    run-pass/foo/bar/baz.rs
+    //    ui/foo/bar/baz.rs
     let path = PathBuf::from(config.src_base.file_name().unwrap())
         .join(&testpaths.relative_dir)
         .join(&testpaths.file.file_name().unwrap());
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index c4710096948..11741132c2e 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -5,7 +5,7 @@ use crate::common::{expected_output_path, UI_EXTENSIONS, UI_FIXED, UI_STDERR, UI
 use crate::common::{output_base_dir, output_base_name, output_testname_unique};
 use crate::common::{Codegen, CodegenUnits, Rustdoc};
 use crate::common::{DebugInfoCdb, DebugInfoGdbLldb, DebugInfoGdb, DebugInfoLldb};
-use crate::common::{CompileFail, Pretty, RunFail, RunPass, RunPassValgrind};
+use crate::common::{CompileFail, Pretty, RunFail, RunPassValgrind};
 use crate::common::{Config, TestPaths};
 use crate::common::{Incremental, MirOpt, RunMake, Ui, JsDocTest, Assembly};
 use diff;
@@ -260,7 +260,7 @@ pub fn compute_stamp_hash(config: &Config) -> String {
         env::var_os("PYTHONPATH").hash(&mut hash);
     }
 
-    if let Ui | RunPass | Incremental | Pretty = config.mode {
+    if let Ui | Incremental | Pretty = config.mode {
         config.force_pass_mode.hash(&mut hash);
     }
 
@@ -306,7 +306,7 @@ impl<'test> TestCx<'test> {
             CodegenUnits => self.run_codegen_units_test(),
             Incremental => self.run_incremental_test(),
             RunMake => self.run_rmake_test(),
-            RunPass | Ui => self.run_ui_test(),
+            Ui => self.run_ui_test(),
             MirOpt => self.run_mir_opt_test(),
             Assembly => self.run_assembly_test(),
             JsDocTest => self.run_js_doc_test(),
@@ -321,7 +321,6 @@ impl<'test> TestCx<'test> {
         let pass_mode = self.pass_mode();
         match self.config.mode {
             Ui => pass_mode == Some(PassMode::Run),
-            RunPass => pass_mode == Some(PassMode::Run) || pass_mode.is_none(),
             mode => panic!("unimplemented for mode {:?}", mode),
         }
     }
@@ -329,7 +328,6 @@ impl<'test> TestCx<'test> {
     fn should_compile_successfully(&self) -> bool {
         match self.config.mode {
             CompileFail => false,
-            RunPass => true,
             JsDocTest => true,
             Ui => self.pass_mode().is_some(),
             Incremental => {
@@ -1527,7 +1525,7 @@ impl<'test> TestCx<'test> {
     fn compile_test(&self) -> ProcRes {
         // Only use `make_exe_name` when the test ends up being executed.
         let will_execute = match self.config.mode {
-            RunPass | Ui => self.should_run_successfully(),
+            Ui => self.should_run_successfully(),
             Incremental => self.revision.unwrap().starts_with("r"),
             RunFail | RunPassValgrind | MirOpt |
             DebugInfoCdb | DebugInfoGdbLldb | DebugInfoGdb | DebugInfoLldb => true,
@@ -1958,7 +1956,7 @@ impl<'test> TestCx<'test> {
                     rustc.arg("-Zui-testing");
                 }
             }
-            RunPass | Ui => {
+            Ui => {
                 if !self
                     .props
                     .compile_flags
@@ -2091,7 +2089,7 @@ impl<'test> TestCx<'test> {
             }
 
             let src = self.config.src_base
-                .parent().unwrap() // chop off `run-pass`
+                .parent().unwrap() // chop off `ui`
                 .parent().unwrap() // chop off `test`
                 .parent().unwrap(); // chop off `src`
             args.push(src.join("src/etc/wasm32-shim.js").display().to_string());
author	bors <bors@rust-lang.org>	2019-07-27 19:27:36 +0000
committer	bors <bors@rust-lang.org>	2019-07-27 19:27:36 +0000
commit	c798dffac9dc8c82374db48f5b474690cc6e9686 (patch)
tree	42d3f81ee0df278440f33b6ac0f6a37dae32fa32
parent	a5e7bb3e2bae3e8d31c10de66e91cdcea42a97df (diff)
parent	f1c8673ae7584e0c1e53c554ba61b7bf831edf90 (diff)
download	rust-c798dffac9dc8c82374db48f5b474690cc6e9686.tar.gz rust-c798dffac9dc8c82374db48f5b474690cc6e9686.zip