Moved issue tests to subdirs and normalised names.

206 files changed, 177 insertions, 188 deletions

diff --git a/src/test/debuginfo/auxiliary/issue13213aux.rs b/src/test/debuginfo/auxiliary/issue-13213-aux.rs
index bde98b44544..bde98b44544 100644
--- a/src/test/debuginfo/auxiliary/issue13213aux.rs
+++ b/src/test/debuginfo/auxiliary/issue-13213-aux.rs
diff --git a/src/test/debuginfo/issue-13213.rs b/src/test/debuginfo/issue-13213.rs
index 898ebe547b3..3c9a365fd4f 100644
--- a/src/test/debuginfo/issue-13213.rs
+++ b/src/test/debuginfo/issue-13213.rs
@@ -1,8 +1,8 @@
 // min-lldb-version: 310
 
-// aux-build:issue13213aux.rs
+// aux-build:issue-13213-aux.rs
 
-extern crate issue13213aux;
+extern crate issue_13213_aux;
 
 // compile-flags:-g
 
@@ -10,6 +10,6 @@ extern crate issue13213aux;
 // statics that are marked with AvailableExternallyLinkage in the importing crate, may actually not
 // be available because they have been optimized out from the exporting crate.
 fn main() {
-    let b: issue13213aux::S = issue13213aux::A;
+    let b: issue_13213_aux::S = issue_13213_aux::A;
     println!("Nothing to do here...");
 }
diff --git a/src/test/incremental/auxiliary/issue_49482_macro_def.rs b/src/test/incremental/auxiliary/issue-49482-macro-def.rs
index bfa7abb1a9d..bfa7abb1a9d 100644
--- a/src/test/incremental/auxiliary/issue_49482_macro_def.rs
+++ b/src/test/incremental/auxiliary/issue-49482-macro-def.rs
diff --git a/src/test/incremental/auxiliary/issue_49482_reexport.rs b/src/test/incremental/auxiliary/issue-49482-reexport.rs
index 39f19e3f15f..39f19e3f15f 100644
--- a/src/test/incremental/auxiliary/issue_49482_reexport.rs
+++ b/src/test/incremental/auxiliary/issue-49482-reexport.rs
diff --git a/src/test/incremental/auxiliary/issue_54059.rs b/src/test/incremental/auxiliary/issue-54059.rs
index fa2814a77f2..fa2814a77f2 100644
--- a/src/test/incremental/auxiliary/issue_54059.rs
+++ b/src/test/incremental/auxiliary/issue-54059.rs
diff --git a/src/test/incremental/issue-49482.rs b/src/test/incremental/issue-49482.rs
index 67d2c3876d7..042ecc0f279 100644
--- a/src/test/incremental/issue-49482.rs
+++ b/src/test/incremental/issue-49482.rs
@@ -1,5 +1,5 @@
-// aux-build:issue_49482_macro_def.rs
-// aux-build:issue_49482_reexport.rs
+// aux-build:issue-49482-macro-def.rs
+// aux-build:issue-49482-reexport.rs
 // revisions: rpass1
 
 extern crate issue_49482_reexport;
diff --git a/src/test/incremental/issue-49595/issue_49595.rs b/src/test/incremental/issue-49595/issue-49595.rs
index ada93f79b26..ada93f79b26 100644
--- a/src/test/incremental/issue-49595/issue_49595.rs
+++ b/src/test/incremental/issue-49595/issue-49595.rs
diff --git a/src/test/incremental/issue-54059.rs b/src/test/incremental/issue-54059.rs
index d78bbccf1bc..0a5a547509f 100644
--- a/src/test/incremental/issue-54059.rs
+++ b/src/test/incremental/issue-54059.rs
@@ -1,4 +1,4 @@
-// aux-build:issue_54059.rs
+// aux-build:issue-54059.rs
 // ignore-wasm32-bare no libc for ffi testing
 // ignore-windows - dealing with weird symbols issues on dylibs isn't worth it
 // revisions: rpass1
diff --git a/src/test/pretty/issue_12590_a.rs b/src/test/pretty/issue-12590-a.rs
index 1ddd3c04263..1a9e85c42d8 100644
--- a/src/test/pretty/issue_12590_a.rs
+++ b/src/test/pretty/issue-12590-a.rs
@@ -2,6 +2,7 @@
 
 // The next line should not be expanded
 
+#[path = "issue-12590-b.rs"]
 mod issue_12590_b;
 
 fn main() { }
diff --git a/src/test/pretty/issue-12590-b.rs b/src/test/pretty/issue-12590-b.rs
new file mode 100644
index 00000000000..b14c7afa221
--- /dev/null
+++ b/src/test/pretty/issue-12590-b.rs
@@ -0,0 +1,5 @@
+// Second part of two-file test
+
+fn b() { }
+
+fn main() { }
diff --git a/src/test/pretty/issue_12590_c.pp b/src/test/pretty/issue-12590-c.pp
index 24182835303..1761c0653ce 100644
--- a/src/test/pretty/issue_12590_c.pp
+++ b/src/test/pretty/issue-12590-c.pp
@@ -6,10 +6,11 @@ use ::std::prelude::v1::*;
 extern crate std;
 // pretty-compare-only
 // pretty-mode:expanded
-// pp-exact:issue_12590_c.pp
+// pp-exact:issue-12590-c.pp
 
 // The next line should be expanded
 
+#[path = "issue-12590-b.rs"]
 mod issue_12590_b {
 
     fn b() { }
diff --git a/src/test/pretty/issue_12590_c.rs b/src/test/pretty/issue-12590-c.rs
index c0da36c2100..2cc444edda3 100644
--- a/src/test/pretty/issue_12590_c.rs
+++ b/src/test/pretty/issue-12590-c.rs
@@ -1,9 +1,10 @@
 // pretty-compare-only
 // pretty-mode:expanded
-// pp-exact:issue_12590_c.pp
+// pp-exact:issue-12590-c.pp
 
 // The next line should be expanded
 
+#[path = "issue-12590-b.rs"]
 mod issue_12590_b;
 
 fn main() { }
diff --git a/src/test/pretty/issue_12590_b.rs b/src/test/pretty/issue_12590_b.rs
deleted file mode 100644
index f188f7bca69..00000000000
--- a/src/test/pretty/issue_12590_b.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-// Second part of two file test
-fn b() { }
-
-fn main() { }
diff --git a/src/test/run-pass-fulldeps/auxiliary/custom_derive_partial_eq.rs b/src/test/run-pass-fulldeps/auxiliary/custom-derive-partial-eq.rs
index 4d6ff47a3ee..4d6ff47a3ee 100644
--- a/src/test/run-pass-fulldeps/auxiliary/custom_derive_partial_eq.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/custom-derive-partial-eq.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin_attr.rs b/src/test/run-pass-fulldeps/auxiliary/custom-derive-plugin-attr.rs
index 699972c9a85..699972c9a85 100644
--- a/src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin_attr.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/custom-derive-plugin-attr.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin.rs b/src/test/run-pass-fulldeps/auxiliary/custom-derive-plugin.rs
index 874a0ec7c13..874a0ec7c13 100644
--- a/src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/custom-derive-plugin.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/issue_24106.rs b/src/test/run-pass-fulldeps/auxiliary/issue-24106.rs
index 2c6a6034806..2c6a6034806 100644
--- a/src/test/run-pass-fulldeps/auxiliary/issue_24106.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/issue-24106.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/lint_for_crate.rs b/src/test/run-pass-fulldeps/auxiliary/lint-for-crate.rs
index f34e10218d4..f34e10218d4 100644
--- a/src/test/run-pass-fulldeps/auxiliary/lint_for_crate.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/lint-for-crate.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/llvm_pass_plugin.rs b/src/test/run-pass-fulldeps/auxiliary/llvm-pass-plugin.rs
index b5307446bca..b5307446bca 100644
--- a/src/test/run-pass-fulldeps/auxiliary/llvm_pass_plugin.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/llvm-pass-plugin.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/macro_crate_test.rs b/src/test/run-pass-fulldeps/auxiliary/macro-crate-test.rs
index a2b1d6976d0..a2b1d6976d0 100644
--- a/src/test/run-pass-fulldeps/auxiliary/macro_crate_test.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/macro-crate-test.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/plugin_args.rs b/src/test/run-pass-fulldeps/auxiliary/plugin-args.rs
index 309acb25184..309acb25184 100644
--- a/src/test/run-pass-fulldeps/auxiliary/plugin_args.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/plugin-args.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/roman_numerals.rs b/src/test/run-pass-fulldeps/auxiliary/roman-numerals.rs
index 216c81ca34c..216c81ca34c 100644
--- a/src/test/run-pass-fulldeps/auxiliary/roman_numerals.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/roman-numerals.rs
diff --git a/src/test/run-pass-fulldeps/auxiliary/syntax_extension_with_dll_deps_1.rs b/src/test/run-pass-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/run-pass-fulldeps/auxiliary/syntax-extension-with-dll-deps-1.rs
diff --git a/src/test/run-pass-fulldeps/custom-derive-partial-eq.rs b/src/test/run-pass-fulldeps/custom-derive-partial-eq.rs
index 21b8ec7be98..ac8fff4f6bf 100644
--- a/src/test/run-pass-fulldeps/custom-derive-partial-eq.rs
+++ b/src/test/run-pass-fulldeps/custom-derive-partial-eq.rs
@@ -1,4 +1,4 @@
-// aux-build:custom_derive_partial_eq.rs
+// aux-build:custom-derive-partial-eq.rs
 // ignore-stage1
 #![feature(plugin)]
 #![plugin(custom_derive_partial_eq)]
diff --git a/src/test/run-pass-fulldeps/derive-totalsum-attr.rs b/src/test/run-pass-fulldeps/derive-totalsum-attr.rs
index 769861e7c94..38eaa71dd6a 100644
--- a/src/test/run-pass-fulldeps/derive-totalsum-attr.rs
+++ b/src/test/run-pass-fulldeps/derive-totalsum-attr.rs
@@ -1,4 +1,4 @@
-// aux-build:custom_derive_plugin_attr.rs
+// aux-build:custom-derive-plugin-attr.rs
 // ignore-stage1
 
 #![feature(plugin, rustc_attrs)]
diff --git a/src/test/run-pass-fulldeps/derive-totalsum.rs b/src/test/run-pass-fulldeps/derive-totalsum.rs
index be26943b6dc..2b0bb51d90a 100644
--- a/src/test/run-pass-fulldeps/derive-totalsum.rs
+++ b/src/test/run-pass-fulldeps/derive-totalsum.rs
@@ -1,4 +1,4 @@
-// aux-build:custom_derive_plugin.rs
+// aux-build:custom-derive-plugin.rs
 // ignore-stage1
 
 #![feature(plugin)]
diff --git a/src/test/run-pass-fulldeps/issue-15778-pass.rs b/src/test/run-pass-fulldeps/issue-15778-pass.rs
index 50e9b14b268..2add3ccbe36 100644
--- a/src/test/run-pass-fulldeps/issue-15778-pass.rs
+++ b/src/test/run-pass-fulldeps/issue-15778-pass.rs
@@ -1,4 +1,4 @@
-// aux-build:lint_for_crate.rs
+// aux-build:lint-for-crate.rs
 // ignore-stage1
 // compile-flags: -D crate-not-okay
 
diff --git a/src/test/run-pass-fulldeps/issue_24106.rs b/src/test/run-pass-fulldeps/issue-24106.rs
index a497d9f33ae..e8e85ff3377 100644
--- a/src/test/run-pass-fulldeps/issue_24106.rs
+++ b/src/test/run-pass-fulldeps/issue-24106.rs
@@ -1,4 +1,4 @@
-// aux-build:issue_24106.rs
+// aux-build:issue-24106.rs
 
 extern crate issue_24106;
 
diff --git a/src/test/run-pass-fulldeps/issue-40663.rs b/src/test/run-pass-fulldeps/issue-40663.rs
index cb01eddd7e4..133f6302bde 100644
--- a/src/test/run-pass-fulldeps/issue-40663.rs
+++ b/src/test/run-pass-fulldeps/issue-40663.rs
@@ -1,5 +1,5 @@
 #![allow(dead_code)]
-// aux-build:custom_derive_plugin.rs
+// aux-build:custom-derive-plugin.rs
 // ignore-stage1
 
 #![feature(plugin)]
diff --git a/src/test/run-pass-fulldeps/llvm-pass-plugin.rs b/src/test/run-pass-fulldeps/llvm-pass-plugin.rs
index 3aad40ecfe8..411631104a4 100644
--- a/src/test/run-pass-fulldeps/llvm-pass-plugin.rs
+++ b/src/test/run-pass-fulldeps/llvm-pass-plugin.rs
@@ -1,4 +1,4 @@
-// aux-build:llvm_pass_plugin.rs
+// aux-build:llvm-pass-plugin.rs
 // ignore-stage1
 
 #![feature(plugin)]
diff --git a/src/test/run-pass-fulldeps/macro-crate-multi-decorator.rs b/src/test/run-pass-fulldeps/macro-crate-multi-decorator.rs
index dcac160c4c9..573bfca3168 100644
--- a/src/test/run-pass-fulldeps/macro-crate-multi-decorator.rs
+++ b/src/test/run-pass-fulldeps/macro-crate-multi-decorator.rs
@@ -2,7 +2,7 @@
 #![allow(dead_code)]
 #![allow(unused_variables)]
 #![allow(unused_imports)]
-// aux-build:macro_crate_test.rs
+// aux-build:macro-crate-test.rs
 // ignore-stage1
 
 #![feature(rustc_attrs)]
diff --git a/src/test/run-pass-fulldeps/plugin-args-1.rs b/src/test/run-pass-fulldeps/plugin-args-1.rs
index 0111af1c768..1bdf004e305 100644
--- a/src/test/run-pass-fulldeps/plugin-args-1.rs
+++ b/src/test/run-pass-fulldeps/plugin-args-1.rs
@@ -1,4 +1,4 @@
-// aux-build:plugin_args.rs
+// aux-build:plugin-args.rs
 // ignore-stage1
 
 #![feature(plugin)]
diff --git a/src/test/run-pass-fulldeps/plugin-args-2.rs b/src/test/run-pass-fulldeps/plugin-args-2.rs
index e4a3dfab566..83091df0582 100644
--- a/src/test/run-pass-fulldeps/plugin-args-2.rs
+++ b/src/test/run-pass-fulldeps/plugin-args-2.rs
@@ -1,4 +1,4 @@
-// aux-build:plugin_args.rs
+// aux-build:plugin-args.rs
 // ignore-stage1
 
 #![feature(plugin)]
diff --git a/src/test/run-pass-fulldeps/plugin-args-3.rs b/src/test/run-pass-fulldeps/plugin-args-3.rs
index 4696233f281..9cd9bee5a0f 100644
--- a/src/test/run-pass-fulldeps/plugin-args-3.rs
+++ b/src/test/run-pass-fulldeps/plugin-args-3.rs
@@ -1,4 +1,4 @@
-// aux-build:plugin_args.rs
+// aux-build:plugin-args.rs
 // ignore-stage1
 
 #![feature(plugin)]
diff --git a/src/test/run-pass-fulldeps/roman-numerals-macro.rs b/src/test/run-pass-fulldeps/roman-numerals-macro.rs
index 59a2d132cdc..49c12e426fe 100644
--- a/src/test/run-pass-fulldeps/roman-numerals-macro.rs
+++ b/src/test/run-pass-fulldeps/roman-numerals-macro.rs
@@ -1,4 +1,4 @@
-// aux-build:roman_numerals.rs
+// aux-build:roman-numerals.rs
 // ignore-stage1
 
 #![feature(plugin)]
diff --git a/src/test/run-pass/auxiliary/rmeta_rlib.rs b/src/test/run-pass/auxiliary/rmeta-rlib.rs
index f5e8c3d2a5c..f5e8c3d2a5c 100644
--- a/src/test/run-pass/auxiliary/rmeta_rlib.rs
+++ b/src/test/run-pass/auxiliary/rmeta-rlib.rs
diff --git a/src/test/run-pass/auxiliary/rmeta_rmeta.rs b/src/test/run-pass/auxiliary/rmeta-rmeta.rs
index 4a6d055a81f..4a6d055a81f 100644
--- a/src/test/run-pass/auxiliary/rmeta_rmeta.rs
+++ b/src/test/run-pass/auxiliary/rmeta-rmeta.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_10031_aux.rs b/src/test/run-pass/issues/auxiliary/issue-10031-aux.rs
index e2abeb99ea8..e2abeb99ea8 100644
--- a/src/test/run-pass/issues/auxiliary/issue_10031_aux.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-10031-aux.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_12612_1.rs b/src/test/run-pass/issues/auxiliary/issue-12612-1.rs
index 01f5a784bb7..01f5a784bb7 100644
--- a/src/test/run-pass/issues/auxiliary/issue_12612_1.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-12612-1.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_12612_2.rs b/src/test/run-pass/issues/auxiliary/issue-12612-2.rs
index 2c724787193..2c724787193 100644
--- a/src/test/run-pass/issues/auxiliary/issue_12612_2.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-12612-2.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue13507.rs b/src/test/run-pass/issues/auxiliary/issue-13507.rs
index c91013043eb..c91013043eb 100644
--- a/src/test/run-pass/issues/auxiliary/issue13507.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-13507.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_19293.rs b/src/test/run-pass/issues/auxiliary/issue-19293.rs
index 31359e86559..31359e86559 100644
--- a/src/test/run-pass/issues/auxiliary/issue_19293.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-19293.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_20389.rs b/src/test/run-pass/issues/auxiliary/issue-20389.rs
index ae6d44eeb77..ae6d44eeb77 100644
--- a/src/test/run-pass/issues/auxiliary/issue_20389.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-20389.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue2170lib.rs b/src/test/run-pass/issues/auxiliary/issue-2170-lib.rs
index a99385a834d..a99385a834d 100644
--- a/src/test/run-pass/issues/auxiliary/issue2170lib.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-2170-lib.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_2316_a.rs b/src/test/run-pass/issues/auxiliary/issue-2316-a.rs
index 418ddc0b069..418ddc0b069 100644
--- a/src/test/run-pass/issues/auxiliary/issue_2316_a.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-2316-a.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_2316_b.rs b/src/test/run-pass/issues/auxiliary/issue-2316-b.rs
index 550c2d6eb22..550c2d6eb22 100644
--- a/src/test/run-pass/issues/auxiliary/issue_2316_b.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-2316-b.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_2472_b.rs b/src/test/run-pass/issues/auxiliary/issue-2472-b.rs
index 0d151520fe0..0d151520fe0 100644
--- a/src/test/run-pass/issues/auxiliary/issue_2472_b.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-2472-b.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_2723_a.rs b/src/test/run-pass/issues/auxiliary/issue-2723-a.rs
index 661b46d829d..661b46d829d 100644
--- a/src/test/run-pass/issues/auxiliary/issue_2723_a.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-2723-a.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_3136_a.rc b/src/test/run-pass/issues/auxiliary/issue-3136-a.rc
index 46da4132b82..cd5fd314505 100644
--- a/src/test/run-pass/issues/auxiliary/issue_3136_a.rc
+++ b/src/test/run-pass/issues/auxiliary/issue-3136-a.rc
@@ -1,3 +1,4 @@
 #![crate_type = "lib"]
 
+#[path = "issue-3136-a.rs"]
 pub mod issue_3136_a;
diff --git a/src/test/run-pass/issues/auxiliary/issue_3136_a.rs b/src/test/run-pass/issues/auxiliary/issue-3136-a.rs
index 9bb546ab393..9bb546ab393 100644
--- a/src/test/run-pass/issues/auxiliary/issue_3136_a.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-3136-a.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue34796aux.rs b/src/test/run-pass/issues/auxiliary/issue-34796-aux.rs
index 09c69b90329..09c69b90329 100644
--- a/src/test/run-pass/issues/auxiliary/issue34796aux.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-34796-aux.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_38190.rs b/src/test/run-pass/issues/auxiliary/issue-38190.rs
index 373e646ba2c..373e646ba2c 100644
--- a/src/test/run-pass/issues/auxiliary/issue_38190.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-38190.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_38226_aux.rs b/src/test/run-pass/issues/auxiliary/issue-38226-aux.rs
index f968017199f..f968017199f 100644
--- a/src/test/run-pass/issues/auxiliary/issue_38226_aux.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-38226-aux.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_38715-modern.rs b/src/test/run-pass/issues/auxiliary/issue-38715-modern.rs
index 15d072957cb..15d072957cb 100644
--- a/src/test/run-pass/issues/auxiliary/issue_38715-modern.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-38715-modern.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_38715.rs b/src/test/run-pass/issues/auxiliary/issue-38715.rs
index 5c15073f5a5..5c15073f5a5 100644
--- a/src/test/run-pass/issues/auxiliary/issue_38715.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-38715.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_3979_traits.rs b/src/test/run-pass/issues/auxiliary/issue-3979-traits.rs
index 5d03a0e9e99..5d03a0e9e99 100644
--- a/src/test/run-pass/issues/auxiliary/issue_3979_traits.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-3979-traits.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_39823.rs b/src/test/run-pass/issues/auxiliary/issue-39823.rs
index 3af9c68f233..3af9c68f233 100644
--- a/src/test/run-pass/issues/auxiliary/issue_39823.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-39823.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_40469.rs b/src/test/run-pass/issues/auxiliary/issue-40469.rs
index 4f2f41f2cde..4f2f41f2cde 100644
--- a/src/test/run-pass/issues/auxiliary/issue_40469.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-40469.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_41053.rs b/src/test/run-pass/issues/auxiliary/issue-41053.rs
index ae73c3e780f..ae73c3e780f 100644
--- a/src/test/run-pass/issues/auxiliary/issue_41053.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-41053.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_42007_s.rs b/src/test/run-pass/issues/auxiliary/issue-42007-s.rs
index 95119a589c9..95119a589c9 100644
--- a/src/test/run-pass/issues/auxiliary/issue_42007_s.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-42007-s.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_8401.rs b/src/test/run-pass/issues/auxiliary/issue-8401.rs
index e35dbbfabfc..e35dbbfabfc 100644
--- a/src/test/run-pass/issues/auxiliary/issue_8401.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-8401.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_9123.rs b/src/test/run-pass/issues/auxiliary/issue-9123.rs
index 60af53359e8..60af53359e8 100644
--- a/src/test/run-pass/issues/auxiliary/issue_9123.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-9123.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_9155.rs b/src/test/run-pass/issues/auxiliary/issue-9155.rs
index 049a96a655a..049a96a655a 100644
--- a/src/test/run-pass/issues/auxiliary/issue_9155.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-9155.rs
diff --git a/src/test/run-pass/issues/auxiliary/issue_9188.rs b/src/test/run-pass/issues/auxiliary/issue-9188.rs
index 3bc5697a1a6..3bc5697a1a6 100644
--- a/src/test/run-pass/issues/auxiliary/issue_9188.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-9188.rs
diff --git a/src/test/run-pass/issues/issue-10031.rs b/src/test/run-pass/issues/issue-10031.rs
index ba1fbac4845..136df05c239 100644
--- a/src/test/run-pass/issues/issue-10031.rs
+++ b/src/test/run-pass/issues/issue-10031.rs
@@ -1,5 +1,5 @@
 // run-pass
-// aux-build:issue_10031_aux.rs
+// aux-build:issue-10031-aux.rs
 // pretty-expanded FIXME #23616
 
 extern crate issue_10031_aux;
diff --git a/src/test/run-pass/issues/issue-12612.rs b/src/test/run-pass/issues/issue-12612.rs
index 158c2aed137..d254f6941a3 100644
--- a/src/test/run-pass/issues/issue-12612.rs
+++ b/src/test/run-pass/issues/issue-12612.rs
@@ -1,7 +1,7 @@
 // run-pass
 #![allow(unused_imports)]
-// aux-build:issue_12612_1.rs
-// aux-build:issue_12612_2.rs
+// aux-build:issue-12612-1.rs
+// aux-build:issue-12612-2.rs
 
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-13507-2.rs b/src/test/run-pass/issues/issue-13507-2.rs
index 4ea95149dc6..ce920a3ccab 100644
--- a/src/test/run-pass/issues/issue-13507-2.rs
+++ b/src/test/run-pass/issues/issue-13507-2.rs
@@ -1,14 +1,14 @@
 // run-pass
 #![allow(unused_imports)]
-// aux-build:issue13507.rs
+// aux-build:issue-13507.rs
 
-extern crate issue13507;
-use issue13507::testtypes;
+extern crate issue_13507;
+use issue_13507::testtypes;
 
 use std::any::TypeId;
 
 pub fn type_ids() -> Vec<TypeId> {
-    use issue13507::testtypes::*;
+    use issue_13507::testtypes::*;
     vec![
         TypeId::of::<FooBool>(),
         TypeId::of::<FooInt>(),
@@ -30,7 +30,7 @@ pub fn type_ids() -> Vec<TypeId> {
 }
 
 pub fn main() {
-    let othercrate = issue13507::testtypes::type_ids();
+    let othercrate = issue_13507::testtypes::type_ids();
     let thiscrate = type_ids();
     assert_eq!(thiscrate, othercrate);
 }
diff --git a/src/test/run-pass/issue-18952.rs b/src/test/run-pass/issues/issue-18952.rs
index 56378b59e36..56378b59e36 100644
--- a/src/test/run-pass/issue-18952.rs
+++ b/src/test/run-pass/issues/issue-18952.rs
diff --git a/src/test/run-pass/issues/issue-19293.rs b/src/test/run-pass/issues/issue-19293.rs
index 90f96566f38..b6e9e3d065a 100644
--- a/src/test/run-pass/issues/issue-19293.rs
+++ b/src/test/run-pass/issues/issue-19293.rs
@@ -1,5 +1,5 @@
 // run-pass
-// aux-build:issue_19293.rs
+// aux-build:issue-19293.rs
 // pretty-expanded FIXME #23616
 
 extern crate issue_19293;
diff --git a/src/test/run-pass/issues/issue-20389.rs b/src/test/run-pass/issues/issue-20389.rs
index 9c5a1844e29..9bc3efcc1c4 100644
--- a/src/test/run-pass/issues/issue-20389.rs
+++ b/src/test/run-pass/issues/issue-20389.rs
@@ -1,6 +1,6 @@
 // run-pass
 #![allow(dead_code)]
-// aux-build:issue_20389.rs
+// aux-build:issue-20389.rs
 
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-2170-exe.rs b/src/test/run-pass/issues/issue-2170-exe.rs
new file mode 100644
index 00000000000..a89579706c8
--- /dev/null
+++ b/src/test/run-pass/issues/issue-2170-exe.rs
@@ -0,0 +1,9 @@
+// run-pass
+// aux-build:issue-2170-lib.rs
+// pretty-expanded FIXME #23616
+
+extern crate issue_2170_lib;
+
+pub fn main() {
+   // let _ = issue_2170_lib::rsrc(2);
+}
diff --git a/src/test/run-pass/issues/issue-2316-c.rs b/src/test/run-pass/issues/issue-2316-c.rs
index 6783f3fcfc6..d975aa695c8 100644
--- a/src/test/run-pass/issues/issue-2316-c.rs
+++ b/src/test/run-pass/issues/issue-2316-c.rs
@@ -1,6 +1,6 @@
 // run-pass
-// aux-build:issue_2316_a.rs
-// aux-build:issue_2316_b.rs
+// aux-build:issue-2316-a.rs
+// aux-build:issue-2316-b.rs
 
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs b/src/test/run-pass/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-lib.rs
index 3ae53baa82a..2275a8da696 100644
--- a/src/test/run-pass/issues/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs
+++ b/src/test/run-pass/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-lib.rs
@@ -4,7 +4,8 @@
 // that separate file has many multi-byte characters, to try to
 // encourage the compiler to trip on them.
 
-mod issue24687_mbcs_in_comments;
+#[path = "issue-24687-mbcs-in-comments.rs"]
+mod issue_24687_mbcs_in_comments;
 
-pub use issue24687_mbcs_in_comments::D;
+pub use issue_24687_mbcs_in_comments::D;
 
diff --git a/src/test/run-pass/issues/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs b/src/test/run-pass/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-mbcs-in-comments.rs
index 215145a64b1..215145a64b1 100644
--- a/src/test/run-pass/issues/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs
+++ b/src/test/run-pass/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-mbcs-in-comments.rs
diff --git a/src/test/run-pass/issues/issue24687-embed-debuginfo/main.rs b/src/test/run-pass/issues/issue-24687-embed-debuginfo/main.rs
index a0cda4fad26..773792c7a3f 100644
--- a/src/test/run-pass/issues/issue24687-embed-debuginfo/main.rs
+++ b/src/test/run-pass/issues/issue-24687-embed-debuginfo/main.rs
@@ -1,11 +1,11 @@
 // run-pass
-// aux-build:issue24687_lib.rs
+// aux-build:issue-24687-lib.rs
 // compile-flags:-g
 
-extern crate issue24687_lib as d;
+extern crate issue_24687_lib as d;
 
 fn main() {
-    // Create a d, which has a destructor whose body will be codegen'ed
+    // Create a `D`, which has a destructor whose body will be codegen'ed
     // into the generated code here, and thus the local debuginfo will
     // need references into the original source locations from
     // `importer` above.
diff --git a/src/test/run-pass/issues/issue-2472.rs b/src/test/run-pass/issues/issue-2472.rs
index cadd0151b4e..c790bc2d095 100644
--- a/src/test/run-pass/issues/issue-2472.rs
+++ b/src/test/run-pass/issues/issue-2472.rs
@@ -1,5 +1,5 @@
 // run-pass
-// aux-build:issue_2472_b.rs
+// aux-build:issue-2472-b.rs
 
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-26873-multifile.rs b/src/test/run-pass/issues/issue-26873-multifile.rs
index 7b19713fcc6..da2acf6c9f7 100644
--- a/src/test/run-pass/issues/issue-26873-multifile.rs
+++ b/src/test/run-pass/issues/issue-26873-multifile.rs
@@ -5,6 +5,7 @@
 
 // ignore-pretty issue #37195
 
-mod issue_26873_multifile;
+#[path = "issue-26873-multifile/mod.rs"]
+mod multifile;
 
 fn main() {}
diff --git a/src/test/run-pass/issues/issue_26873_multifile/A/B.rs b/src/test/run-pass/issues/issue-26873-multifile/A/B.rs
index d1b802ff3cd..d1b802ff3cd 100644
--- a/src/test/run-pass/issues/issue_26873_multifile/A/B.rs
+++ b/src/test/run-pass/issues/issue-26873-multifile/A/B.rs
diff --git a/src/test/run-pass/issues/issue_26873_multifile/A/C.rs b/src/test/run-pass/issues/issue-26873-multifile/A/C.rs
index 88f3eb04afb..88f3eb04afb 100644
--- a/src/test/run-pass/issues/issue_26873_multifile/A/C.rs
+++ b/src/test/run-pass/issues/issue-26873-multifile/A/C.rs
diff --git a/src/test/run-pass/issues/issue_26873_multifile/A/mod.rs b/src/test/run-pass/issues/issue-26873-multifile/A/mod.rs
index 20f40a06782..20f40a06782 100644
--- a/src/test/run-pass/issues/issue_26873_multifile/A/mod.rs
+++ b/src/test/run-pass/issues/issue-26873-multifile/A/mod.rs
diff --git a/src/test/run-pass/issues/issue_26873_multifile/compiletest-ignore-dir b/src/test/run-pass/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/run-pass/issues/issue-26873-multifile/compiletest-ignore-dir
diff --git a/src/test/run-pass/issues/issue_26873_multifile/mod.rs b/src/test/run-pass/issues/issue-26873-multifile/mod.rs
index 52deea79a20..52deea79a20 100644
--- a/src/test/run-pass/issues/issue_26873_multifile/mod.rs
+++ b/src/test/run-pass/issues/issue-26873-multifile/mod.rs
diff --git a/src/test/run-pass/issues/issue-2723-b.rs b/src/test/run-pass/issues/issue-2723-b.rs
index 41f264b6dc0..1910561d0ba 100644
--- a/src/test/run-pass/issues/issue-2723-b.rs
+++ b/src/test/run-pass/issues/issue-2723-b.rs
@@ -1,5 +1,5 @@
 // run-pass
-// aux-build:issue_2723_a.rs
+// aux-build:issue-2723-a.rs
 
 extern crate issue_2723_a;
 use issue_2723_a::f;
diff --git a/src/test/run-pass/issues/issue28498-must-work-ex1.rs b/src/test/run-pass/issues/issue-28498-must-work-ex1.rs
index 4699d3352ad..4699d3352ad 100644
--- a/src/test/run-pass/issues/issue28498-must-work-ex1.rs
+++ b/src/test/run-pass/issues/issue-28498-must-work-ex1.rs
diff --git a/src/test/run-pass/issues/issue28498-must-work-ex2.rs b/src/test/run-pass/issues/issue-28498-must-work-ex2.rs
index 17111308555..17111308555 100644
--- a/src/test/run-pass/issues/issue28498-must-work-ex2.rs
+++ b/src/test/run-pass/issues/issue-28498-must-work-ex2.rs
diff --git a/src/test/run-pass/issues/issue28498-ugeh-ex1.rs b/src/test/run-pass/issues/issue-28498-ugeh-ex1.rs
index 65d5588871b..65d5588871b 100644
--- a/src/test/run-pass/issues/issue28498-ugeh-ex1.rs
+++ b/src/test/run-pass/issues/issue-28498-ugeh-ex1.rs
diff --git a/src/test/run-pass/issues/issue28498-ugeh-with-lifetime-param.rs b/src/test/run-pass/issues/issue-28498-ugeh-with-lifetime-param.rs
index 573ec8f6131..573ec8f6131 100644
--- a/src/test/run-pass/issues/issue28498-ugeh-with-lifetime-param.rs
+++ b/src/test/run-pass/issues/issue-28498-ugeh-with-lifetime-param.rs
diff --git a/src/test/run-pass/issues/issue28498-ugeh-with-passed-to-fn.rs b/src/test/run-pass/issues/issue-28498-ugeh-with-passed-to-fn.rs
index e0863fa9947..e0863fa9947 100644
--- a/src/test/run-pass/issues/issue28498-ugeh-with-passed-to-fn.rs
+++ b/src/test/run-pass/issues/issue-28498-ugeh-with-passed-to-fn.rs
diff --git a/src/test/run-pass/issues/issue28498-ugeh-with-trait-bound.rs b/src/test/run-pass/issues/issue-28498-ugeh-with-trait-bound.rs
index 01d884584f6..01d884584f6 100644
--- a/src/test/run-pass/issues/issue28498-ugeh-with-trait-bound.rs
+++ b/src/test/run-pass/issues/issue-28498-ugeh-with-trait-bound.rs
diff --git a/src/test/run-pass/issues/issue29927-1.rs b/src/test/run-pass/issues/issue-29927-1.rs
index a236e491375..a236e491375 100644
--- a/src/test/run-pass/issues/issue29927-1.rs
+++ b/src/test/run-pass/issues/issue-29927-1.rs
diff --git a/src/test/run-pass/issues/issue_3136_b.rs b/src/test/run-pass/issues/issue-3136-b.rs
index f0bdd2b5ec0..c4ca7236e76 100644
--- a/src/test/run-pass/issues/issue_3136_b.rs
+++ b/src/test/run-pass/issues/issue-3136-b.rs
@@ -1,7 +1,8 @@
 // run-pass
-// aux-build:issue_3136_a.rc
+// aux-build:issue-3136-a.rc
 
 // pretty-expanded FIXME #23616
 
 extern crate issue_3136_a;
+
 pub fn main() {}
diff --git a/src/test/run-pass/issues/issue-34796.rs b/src/test/run-pass/issues/issue-34796.rs
index a81040b8f4d..88d5c50a27d 100644
--- a/src/test/run-pass/issues/issue-34796.rs
+++ b/src/test/run-pass/issues/issue-34796.rs
@@ -8,8 +8,8 @@
 // the symbol name.
 // The fix was to make the order in which predicates get encoded stable.
 
-// aux-build:issue34796aux.rs
-extern crate issue34796aux;
+// aux-build:issue-34796-aux.rs
+extern crate issue_34796_aux;
 
 fn mk<T>() -> T { loop {} }
 
@@ -19,7 +19,7 @@ struct Data<T, E> {
 }
 
 fn main() {
-    issue34796aux::bar(|()| {
+    issue_34796_aux::bar(|()| {
         Data::<(), std::io::Error> {
             data: mk(),
             error: mk(),
diff --git a/src/test/run-pass/issues/issue-38190.rs b/src/test/run-pass/issues/issue-38190.rs
index 4f83dd26383..cfa0420c80d 100644
--- a/src/test/run-pass/issues/issue-38190.rs
+++ b/src/test/run-pass/issues/issue-38190.rs
@@ -1,12 +1,15 @@
 // run-pass
-// aux-build:issue_38190.rs
+// aux-build:issue-38190.rs
 // ignore-pretty issue #37195
 
 #[macro_use]
 extern crate issue_38190;
 
 mod auxiliary {
-    m!([mod issue_38190;]);
+    m!([
+        #[path = "issue-38190.rs"]
+        mod issue_38190;
+    ]);
 }
 
 fn main() {}
diff --git a/src/test/run-pass/issues/issue-38226.rs b/src/test/run-pass/issues/issue-38226.rs
index cd569c583f3..3213e3618a8 100644
--- a/src/test/run-pass/issues/issue-38226.rs
+++ b/src/test/run-pass/issues/issue-38226.rs
@@ -2,7 +2,7 @@
 // This test makes sure that we don't run into a linker error because of the
 // middle::reachable pass missing trait methods with default impls.
 
-// aux-build:issue_38226_aux.rs
+// aux-build:issue-38226-aux.rs
 
 // Need -Cno-prepopulate-passes to really disable inlining, otherwise the faulty
 // code gets optimized out:
diff --git a/src/test/run-pass/issues/issue-38715.rs b/src/test/run-pass/issues/issue-38715.rs
index 9d793147e24..e3c3a027f3c 100644
--- a/src/test/run-pass/issues/issue-38715.rs
+++ b/src/test/run-pass/issues/issue-38715.rs
@@ -1,6 +1,6 @@
 // run-pass
-// aux-build:issue_38715.rs
-// aux-build:issue_38715-modern.rs
+// aux-build:issue-38715.rs
+// aux-build:issue-38715-modern.rs
 
 // Test that `#[macro_export] macro_rules!` shadow earlier `#[macro_export] macro_rules!`
 
diff --git a/src/test/run-pass/issues/issue-3979-xcrate.rs b/src/test/run-pass/issues/issue-3979-xcrate.rs
index 0e47dee5b65..fcb1f55c32f 100644
--- a/src/test/run-pass/issues/issue-3979-xcrate.rs
+++ b/src/test/run-pass/issues/issue-3979-xcrate.rs
@@ -1,6 +1,6 @@
 // run-pass
 #![allow(dead_code)]
-// aux-build:issue_3979_traits.rs
+// aux-build:issue-3979-traits.rs
 
 extern crate issue_3979_traits;
 use issue_3979_traits::{Positioned, Movable};
diff --git a/src/test/run-pass/issues/issue-39823.rs b/src/test/run-pass/issues/issue-39823.rs
index 8a52399273b..0dfa8a75c4f 100644
--- a/src/test/run-pass/issues/issue-39823.rs
+++ b/src/test/run-pass/issues/issue-39823.rs
@@ -1,5 +1,5 @@
 // run-pass
-// aux-build:issue_39823.rs
+// aux-build:issue-39823.rs
 
 extern crate issue_39823;
 use issue_39823::{RemoteC, RemoteG};
diff --git a/src/test/run-pass/issues/issue-40469.rs b/src/test/run-pass/issues/issue-40469.rs
index 2e8247e032b..25e08ef85e9 100644
--- a/src/test/run-pass/issues/issue-40469.rs
+++ b/src/test/run-pass/issues/issue-40469.rs
@@ -3,7 +3,7 @@
 
 #![allow(dead_code)]
 
-include!("auxiliary/issue_40469.rs");
+include!("auxiliary/issue-40469.rs");
 fn f() { m!(); }
 
 fn main() {}
diff --git a/src/test/run-pass/issues/issue-41053.rs b/src/test/run-pass/issues/issue-41053.rs
index b9d8f00ff21..cd7a0a22623 100644
--- a/src/test/run-pass/issues/issue-41053.rs
+++ b/src/test/run-pass/issues/issue-41053.rs
@@ -1,5 +1,5 @@
 // run-pass
-// aux-build:issue_41053.rs
+// aux-build:issue-41053.rs
 
 pub trait Trait { fn foo(&self) {} }
 
diff --git a/src/test/run-pass/issues/issue-42007.rs b/src/test/run-pass/issues/issue-42007.rs
index de1367ec80f..a477e476eb9 100644
--- a/src/test/run-pass/issues/issue-42007.rs
+++ b/src/test/run-pass/issues/issue-42007.rs
@@ -1,6 +1,6 @@
 // run-pass
 #![allow(dead_code)]
-// aux-build:issue_42007_s.rs
+// aux-build:issue-42007-s.rs
 
 extern crate issue_42007_s;
 
diff --git a/src/test/run-pass/issue-45510.rs b/src/test/run-pass/issues/issue-45510.rs
index 9e104ce6c4f..9e104ce6c4f 100644
--- a/src/test/run-pass/issue-45510.rs
+++ b/src/test/run-pass/issues/issue-45510.rs
diff --git a/src/test/run-pass/issue-48006.rs b/src/test/run-pass/issues/issue-48006.rs
index 8e7105cf10c..8e7105cf10c 100644
--- a/src/test/run-pass/issue-48006.rs
+++ b/src/test/run-pass/issues/issue-48006.rs
diff --git a/src/test/run-pass/issue-53728.rs b/src/test/run-pass/issues/issue-53728.rs
index 00666972e25..00666972e25 100644
--- a/src/test/run-pass/issue-53728.rs
+++ b/src/test/run-pass/issues/issue-53728.rs
diff --git a/src/test/run-pass/issue-53843.rs b/src/test/run-pass/issues/issue-53843.rs
index 53728ec4d9f..53728ec4d9f 100644
--- a/src/test/run-pass/issue-53843.rs
+++ b/src/test/run-pass/issues/issue-53843.rs
diff --git a/src/test/run-pass/issue-54462-mutable-noalias-correctness.rs b/src/test/run-pass/issues/issue-54462-mutable-noalias-correctness.rs
index e7966b2978f..e7966b2978f 100644
--- a/src/test/run-pass/issue-54462-mutable-noalias-correctness.rs
+++ b/src/test/run-pass/issues/issue-54462-mutable-noalias-correctness.rs
diff --git a/src/test/run-pass/issue-54467.rs b/src/test/run-pass/issues/issue-54467.rs
index 52a9828b548..52a9828b548 100644
--- a/src/test/run-pass/issue-54467.rs
+++ b/src/test/run-pass/issues/issue-54467.rs
diff --git a/src/test/run-pass/issue-55376.rs b/src/test/run-pass/issues/issue-55376.rs
index fa92a85a445..fa92a85a445 100644
--- a/src/test/run-pass/issue-55376.rs
+++ b/src/test/run-pass/issues/issue-55376.rs
diff --git a/src/test/run-pass/issue-55380.rs b/src/test/run-pass/issues/issue-55380.rs
index 862218e2192..862218e2192 100644
--- a/src/test/run-pass/issue-55380.rs
+++ b/src/test/run-pass/issues/issue-55380.rs
diff --git a/src/test/run-pass/issue-56237.rs b/src/test/run-pass/issues/issue-56237.rs
index 87e10e83612..87e10e83612 100644
--- a/src/test/run-pass/issue-56237.rs
+++ b/src/test/run-pass/issues/issue-56237.rs
diff --git a/src/test/run-pass/issues/issue-8401.rs b/src/test/run-pass/issues/issue-8401.rs
index 97d66c5e40f..1257bab6c0c 100644
--- a/src/test/run-pass/issues/issue-8401.rs
+++ b/src/test/run-pass/issues/issue-8401.rs
@@ -1,5 +1,5 @@
 // run-pass
-// aux-build:issue_8401.rs
+// aux-build:issue-8401.rs
 
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-9123.rs b/src/test/run-pass/issues/issue-9123.rs
index 5072ca6ba53..8c21d06c477 100644
--- a/src/test/run-pass/issues/issue-9123.rs
+++ b/src/test/run-pass/issues/issue-9123.rs
@@ -1,5 +1,5 @@
 // run-pass
-// aux-build:issue_9123.rs
+// aux-build:issue-9123.rs
 
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue_9155.rs b/src/test/run-pass/issues/issue-9155.rs
index 87c453be142..4b5c451e853 100644
--- a/src/test/run-pass/issues/issue_9155.rs
+++ b/src/test/run-pass/issues/issue-9155.rs
@@ -1,5 +1,5 @@
 // run-pass
-// aux-build:issue_9155.rs
+// aux-build:issue-9155.rs
 
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/issues/issue-9188.rs b/src/test/run-pass/issues/issue-9188.rs
index d7c39e9d505..34e61fdf68b 100644
--- a/src/test/run-pass/issues/issue-9188.rs
+++ b/src/test/run-pass/issues/issue-9188.rs
@@ -1,5 +1,5 @@
 // run-pass
-// aux-build:issue_9188.rs
+// aux-build:issue-9188.rs
 
 
 extern crate issue_9188;
diff --git a/src/test/run-pass/issues/issue2170exe.rs b/src/test/run-pass/issues/issue2170exe.rs
deleted file mode 100644
index 4169ddf9bb7..00000000000
--- a/src/test/run-pass/issues/issue2170exe.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// run-pass
-// aux-build:issue2170lib.rs
-// pretty-expanded FIXME #23616
-
-extern crate issue2170lib;
-
-pub fn main() {
-   // let _ = issue2170lib::rsrc(2);
-}
diff --git a/src/test/run-pass/rmeta.rs b/src/test/run-pass/rmeta.rs
index bd8125bbb56..cbbdd78dc20 100644
--- a/src/test/run-pass/rmeta.rs
+++ b/src/test/run-pass/rmeta.rs
@@ -1,8 +1,8 @@
 // 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-rmeta.rs
+// aux-build:rmeta-rlib.rs
 
 extern crate rmeta_aux;
 use rmeta_aux::Foo;
diff --git a/src/test/rustdoc/auxiliary/enum_primitive.rs b/src/test/rustdoc/auxiliary/enum-primitive.rs
index ed1da253a97..ed1da253a97 100644
--- a/src/test/rustdoc/auxiliary/enum_primitive.rs
+++ b/src/test/rustdoc/auxiliary/enum-primitive.rs
diff --git a/src/test/rustdoc/auxiliary/reexp_stripped.rs b/src/test/rustdoc/auxiliary/reexp-stripped.rs
index ccc3dc11fd1..ccc3dc11fd1 100644
--- a/src/test/rustdoc/auxiliary/reexp_stripped.rs
+++ b/src/test/rustdoc/auxiliary/reexp-stripped.rs
diff --git a/src/test/rustdoc/no-stack-overflow-25295.rs b/src/test/rustdoc/no-stack-overflow-25295.rs
index 7e5c0279031..dd79f1e4baa 100644
--- a/src/test/rustdoc/no-stack-overflow-25295.rs
+++ b/src/test/rustdoc/no-stack-overflow-25295.rs
@@ -1,5 +1,5 @@
-// ensure this code doesn't stack overflow
-// aux-build:enum_primitive.rs
+// Ensure this code doesn't stack overflow.
+// aux-build:enum-primitive.rs
 
 #[macro_use] extern crate enum_primitive;
 
@@ -33,4 +33,3 @@ enum_from_primitive! {
         Z1,Z2,Z3,Z4,Z5,Z6,
     }
 }
-
diff --git a/src/test/rustdoc/redirect.rs b/src/test/rustdoc/redirect.rs
index 65c57ab65be..e3a14c7a74a 100644
--- a/src/test/rustdoc/redirect.rs
+++ b/src/test/rustdoc/redirect.rs
@@ -1,4 +1,4 @@
-// aux-build:reexp_stripped.rs
+// aux-build:reexp-stripped.rs
 // build-aux-docs
 // ignore-cross-compile
 
diff --git a/src/test/ui-fulldeps/auxiliary/attr_plugin_test.rs b/src/test/ui-fulldeps/auxiliary/attr-plugin-test.rs
index c83e7bdb998..c83e7bdb998 100644
--- a/src/test/ui-fulldeps/auxiliary/attr_plugin_test.rs
+++ b/src/test/ui-fulldeps/auxiliary/attr-plugin-test.rs
diff --git a/src/test/ui-fulldeps/auxiliary/lint_for_crate.rs b/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs
index 82aa28b26b6..82aa28b26b6 100644
--- a/src/test/ui-fulldeps/auxiliary/lint_for_crate.rs
+++ b/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs
diff --git a/src/test/ui-fulldeps/auxiliary/lint_group_plugin_test.rs b/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs
index 16630e2b312..16630e2b312 100644
--- a/src/test/ui-fulldeps/auxiliary/lint_group_plugin_test.rs
+++ b/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs
diff --git a/src/test/ui-fulldeps/auxiliary/lint_plugin_test.rs b/src/test/ui-fulldeps/auxiliary/lint-plugin-test.rs
index 4e45189b424..4e45189b424 100644
--- a/src/test/ui-fulldeps/auxiliary/lint_plugin_test.rs
+++ b/src/test/ui-fulldeps/auxiliary/lint-plugin-test.rs
diff --git a/src/test/ui-fulldeps/auxiliary/lint_tool_test.rs b/src/test/ui-fulldeps/auxiliary/lint-tool-test.rs
index d25a5ea3746..d25a5ea3746 100644
--- a/src/test/ui-fulldeps/auxiliary/lint_tool_test.rs
+++ b/src/test/ui-fulldeps/auxiliary/lint-tool-test.rs
diff --git a/src/test/ui-fulldeps/auxiliary/rlib_crate_test.rs b/src/test/ui-fulldeps/auxiliary/rlib-crate-test.rs
index 3df40df7b33..3df40df7b33 100644
--- a/src/test/ui-fulldeps/auxiliary/rlib_crate_test.rs
+++ b/src/test/ui-fulldeps/auxiliary/rlib-crate-test.rs
diff --git a/src/test/ui-fulldeps/dropck_tarena_cycle_checked.rs b/src/test/ui-fulldeps/dropck-tarena-cycle-checked.rs
index a7e8131342f..a7e8131342f 100644
--- a/src/test/ui-fulldeps/dropck_tarena_cycle_checked.rs
+++ b/src/test/ui-fulldeps/dropck-tarena-cycle-checked.rs
diff --git a/src/test/ui-fulldeps/dropck_tarena_cycle_checked.stderr b/src/test/ui-fulldeps/dropck-tarena-cycle-checked.stderr
index 37d8b964c24..b6d5ee0cafe 100644
--- a/src/test/ui-fulldeps/dropck_tarena_cycle_checked.stderr
+++ b/src/test/ui-fulldeps/dropck-tarena-cycle-checked.stderr
@@ -1,5 +1,5 @@
 error[E0597]: `arena` does not live long enough
-  --> $DIR/dropck_tarena_cycle_checked.rs:116:8
+  --> $DIR/dropck-tarena-cycle-checked.rs:116:8
    |
 LL |     f(&arena);
    |        ^^^^^ borrowed value does not live long enough
diff --git a/src/test/ui-fulldeps/dropck_tarena_unsound_drop.rs b/src/test/ui-fulldeps/dropck-tarena-unsound-drop.rs
index 3103aef36cb..3103aef36cb 100644
--- a/src/test/ui-fulldeps/dropck_tarena_unsound_drop.rs
+++ b/src/test/ui-fulldeps/dropck-tarena-unsound-drop.rs
diff --git a/src/test/ui-fulldeps/dropck_tarena_unsound_drop.stderr b/src/test/ui-fulldeps/dropck-tarena-unsound-drop.stderr
index c791b8b451e..1e612f04983 100644
--- a/src/test/ui-fulldeps/dropck_tarena_unsound_drop.stderr
+++ b/src/test/ui-fulldeps/dropck-tarena-unsound-drop.stderr
@@ -1,5 +1,5 @@
 error[E0597]: `arena` does not live long enough
-  --> $DIR/dropck_tarena_unsound_drop.rs:41:8
+  --> $DIR/dropck-tarena-unsound-drop.rs:41:8
    |
 LL |     f(&arena);
    |        ^^^^^ borrowed value does not live long enough
diff --git a/src/test/ui-fulldeps/gated-plugin.rs b/src/test/ui-fulldeps/gated-plugin.rs
index a647585e621..be1ec061480 100644
--- a/src/test/ui-fulldeps/gated-plugin.rs
+++ b/src/test/ui-fulldeps/gated-plugin.rs
@@ -1,4 +1,4 @@
-// aux-build:attr_plugin_test.rs
+// aux-build:attr-plugin-test.rs
 
 #![plugin(attr_plugin_test)]
 //~^ ERROR compiler plugins are experimental and possibly buggy
diff --git a/src/test/ui-fulldeps/issue-15778-fail.rs b/src/test/ui-fulldeps/issue-15778-fail.rs
index 91c379673b3..75c52fdb4bd 100644
--- a/src/test/ui-fulldeps/issue-15778-fail.rs
+++ b/src/test/ui-fulldeps/issue-15778-fail.rs
@@ -1,4 +1,4 @@
-// aux-build:lint_for_crate.rs
+// aux-build:lint-for-crate.rs
 // ignore-stage1
 // compile-flags: -D crate-not-okay
 
diff --git a/src/test/ui-fulldeps/lint-group-plugin-deny-cmdline.rs b/src/test/ui-fulldeps/lint-group-plugin-deny-cmdline.rs
index 75e0a8fc31f..c9d8654a909 100644
--- a/src/test/ui-fulldeps/lint-group-plugin-deny-cmdline.rs
+++ b/src/test/ui-fulldeps/lint-group-plugin-deny-cmdline.rs
@@ -1,4 +1,4 @@
-// aux-build:lint_group_plugin_test.rs
+// aux-build:lint-group-plugin-test.rs
 // ignore-stage1
 // compile-flags: -D lint-me
 
diff --git a/src/test/ui-fulldeps/lint-group-plugin.rs b/src/test/ui-fulldeps/lint-group-plugin.rs
index 7a650afe5f8..55a880be0f9 100644
--- a/src/test/ui-fulldeps/lint-group-plugin.rs
+++ b/src/test/ui-fulldeps/lint-group-plugin.rs
@@ -1,5 +1,5 @@
 // run-pass
-// aux-build:lint_group_plugin_test.rs
+// aux-build:lint-group-plugin-test.rs
 // ignore-stage1
 
 #![feature(plugin)]
diff --git a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.rs b/src/test/ui-fulldeps/lint-plugin-cmdline-allow.rs
index 21042c5e7d0..8017379ab3d 100644
--- a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.rs
+++ b/src/test/ui-fulldeps/lint-plugin-cmdline-allow.rs
@@ -1,5 +1,5 @@
 // run-pass
-// aux-build:lint_plugin_test.rs
+// aux-build:lint-plugin-test.rs
 // ignore-stage1
 // compile-flags: -A test-lint
 
diff --git a/src/test/ui-fulldeps/lint-plugin-cmdline-load.rs b/src/test/ui-fulldeps/lint-plugin-cmdline-load.rs
index 0dca00040bf..fd681536b5b 100644
--- a/src/test/ui-fulldeps/lint-plugin-cmdline-load.rs
+++ b/src/test/ui-fulldeps/lint-plugin-cmdline-load.rs
@@ -1,5 +1,5 @@
 // run-pass
-// aux-build:lint_plugin_test.rs
+// aux-build:lint-plugin-test.rs
 // ignore-stage1
 // compile-flags: -Z extra-plugins=lint_plugin_test
 
diff --git a/src/test/ui-fulldeps/lint-plugin-deny-attr.rs b/src/test/ui-fulldeps/lint-plugin-deny-attr.rs
index 65a36236180..2d424af8707 100644
--- a/src/test/ui-fulldeps/lint-plugin-deny-attr.rs
+++ b/src/test/ui-fulldeps/lint-plugin-deny-attr.rs
@@ -1,4 +1,4 @@
-// aux-build:lint_plugin_test.rs
+// aux-build:lint-plugin-test.rs
 // ignore-stage1
 
 #![feature(plugin)]
diff --git a/src/test/ui-fulldeps/lint-plugin-deny-cmdline.rs b/src/test/ui-fulldeps/lint-plugin-deny-cmdline.rs
index b0c4dc0bce5..87324e85b3b 100644
--- a/src/test/ui-fulldeps/lint-plugin-deny-cmdline.rs
+++ b/src/test/ui-fulldeps/lint-plugin-deny-cmdline.rs
@@ -1,4 +1,4 @@
-// aux-build:lint_plugin_test.rs
+// aux-build:lint-plugin-test.rs
 // ignore-stage1
 // compile-flags: -D test-lint
 
diff --git a/src/test/ui-fulldeps/lint-plugin-forbid-attrs.rs b/src/test/ui-fulldeps/lint-plugin-forbid-attrs.rs
index 964fed3b37d..c7f7f2be99e 100644
--- a/src/test/ui-fulldeps/lint-plugin-forbid-attrs.rs
+++ b/src/test/ui-fulldeps/lint-plugin-forbid-attrs.rs
@@ -1,4 +1,4 @@
-// aux-build:lint_plugin_test.rs
+// aux-build:lint-plugin-test.rs
 // ignore-stage1
 
 #![feature(plugin)]
diff --git a/src/test/ui-fulldeps/lint-plugin-forbid-cmdline.rs b/src/test/ui-fulldeps/lint-plugin-forbid-cmdline.rs
index 07bd785ee71..91fe3b65be6 100644
--- a/src/test/ui-fulldeps/lint-plugin-forbid-cmdline.rs
+++ b/src/test/ui-fulldeps/lint-plugin-forbid-cmdline.rs
@@ -1,4 +1,4 @@
-// aux-build:lint_plugin_test.rs
+// aux-build:lint-plugin-test.rs
 // ignore-stage1
 // compile-flags: -F test-lint
 
diff --git a/src/test/ui-fulldeps/lint-plugin.rs b/src/test/ui-fulldeps/lint-plugin.rs
index 031f3b86b14..5f8bc16301a 100644
--- a/src/test/ui-fulldeps/lint-plugin.rs
+++ b/src/test/ui-fulldeps/lint-plugin.rs
@@ -1,5 +1,5 @@
 // run-pass
-// aux-build:lint_plugin_test.rs
+// aux-build:lint-plugin-test.rs
 // ignore-stage1
 #![feature(plugin)]
 #![plugin(lint_plugin_test)]
diff --git a/src/test/ui-fulldeps/lint_tool_cmdline_allow.rs b/src/test/ui-fulldeps/lint-tool-cmdline-allow.rs
index d60f41dd5a3..529f04c6fc4 100644
--- a/src/test/ui-fulldeps/lint_tool_cmdline_allow.rs
+++ b/src/test/ui-fulldeps/lint-tool-cmdline-allow.rs
@@ -1,5 +1,5 @@
 // run-pass
-// aux-build:lint_tool_test.rs
+// aux-build:lint-tool-test.rs
 // ignore-stage1
 // compile-flags: -A test-lint
 
@@ -7,7 +7,6 @@
 #![warn(unused)]
 #![plugin(lint_tool_test)]
 
-fn lintme() { }
+fn lintme() {}
 
-pub fn main() {
-}
+pub fn main() {}
diff --git a/src/test/ui-fulldeps/lint_tool_cmdline_allow.stderr b/src/test/ui-fulldeps/lint-tool-cmdline-allow.stderr
index 9634f1d572f..1d851013831 100644
--- a/src/test/ui-fulldeps/lint_tool_cmdline_allow.stderr
+++ b/src/test/ui-fulldeps/lint-tool-cmdline-allow.stderr
@@ -3,21 +3,21 @@ warning: lint name `test_lint` is deprecated and does not have an effect anymore
    = note: requested on the command line with `-A test_lint`
 
 warning: item is named 'lintme'
-  --> $DIR/lint_tool_cmdline_allow.rs:10:1
+  --> $DIR/lint-tool-cmdline-allow.rs:10:1
    |
-LL | fn lintme() { }
-   | ^^^^^^^^^^^^^^^
+LL | fn lintme() {}
+   | ^^^^^^^^^^^^^^
    |
    = note: #[warn(clippy::test_lint)] on by default
 
 warning: function is never used: `lintme`
-  --> $DIR/lint_tool_cmdline_allow.rs:10:1
+  --> $DIR/lint-tool-cmdline-allow.rs:10:1
    |
-LL | fn lintme() { }
+LL | fn lintme() {}
    | ^^^^^^^^^^^
    |
 note: lint level defined here
-  --> $DIR/lint_tool_cmdline_allow.rs:7:9
+  --> $DIR/lint-tool-cmdline-allow.rs:7:9
    |
 LL | #![warn(unused)]
    |         ^^^^^^
diff --git a/src/test/ui-fulldeps/lint_tool_test.rs b/src/test/ui-fulldeps/lint-tool-test.rs
index 04608b62f43..8bd06d1f1e3 100644
--- a/src/test/ui-fulldeps/lint_tool_test.rs
+++ b/src/test/ui-fulldeps/lint-tool-test.rs
@@ -1,4 +1,4 @@
-// aux-build:lint_tool_test.rs
+// aux-build:lint-tool-test.rs
 // ignore-stage1
 // compile-flags: --cfg foo
 
diff --git a/src/test/ui-fulldeps/lint_tool_test.stderr b/src/test/ui-fulldeps/lint-tool-test.stderr
index cec8800a25c..67e55e65c7e 100644
--- a/src/test/ui-fulldeps/lint_tool_test.stderr
+++ b/src/test/ui-fulldeps/lint-tool-test.stderr
@@ -1,5 +1,5 @@
 warning: lint name `test_lint` is deprecated and may not have an effect in the future. Also `cfg_attr(cargo-clippy)` won't be necessary anymore
-  --> $DIR/lint_tool_test.rs:8:23
+  --> $DIR/lint-tool-test.rs:8:23
    |
 LL | #![cfg_attr(foo, warn(test_lint))]
    |                       ^^^^^^^^^ help: change it to: `clippy::test_lint`
@@ -7,19 +7,19 @@ LL | #![cfg_attr(foo, warn(test_lint))]
    = note: #[warn(renamed_and_removed_lints)] on by default
 
 warning: lint name `clippy_group` is deprecated and may not have an effect in the future. Also `cfg_attr(cargo-clippy)` won't be necessary anymore
-  --> $DIR/lint_tool_test.rs:11:9
+  --> $DIR/lint-tool-test.rs:11:9
    |
 LL | #![deny(clippy_group)]
    |         ^^^^^^^^^^^^ help: change it to: `clippy::group`
 
 warning: lint name `test_group` is deprecated and may not have an effect in the future. Also `cfg_attr(cargo-clippy)` won't be necessary anymore
-  --> $DIR/lint_tool_test.rs:25:9
+  --> $DIR/lint-tool-test.rs:25:9
    |
 LL | #[allow(test_group)]
    |         ^^^^^^^^^^ help: change it to: `clippy::test_group`
 
 warning: unknown lint: `this_lint_does_not_exist`
-  --> $DIR/lint_tool_test.rs:27:8
+  --> $DIR/lint-tool-test.rs:27:8
    |
 LL | #[deny(this_lint_does_not_exist)]
    |        ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -27,32 +27,32 @@ LL | #[deny(this_lint_does_not_exist)]
    = note: #[warn(unknown_lints)] on by default
 
 warning: lint name `test_lint` is deprecated and may not have an effect in the future. Also `cfg_attr(cargo-clippy)` won't be necessary anymore
-  --> $DIR/lint_tool_test.rs:8:23
+  --> $DIR/lint-tool-test.rs:8:23
    |
 LL | #![cfg_attr(foo, warn(test_lint))]
    |                       ^^^^^^^^^ help: change it to: `clippy::test_lint`
 
 error: item is named 'lintme'
-  --> $DIR/lint_tool_test.rs:14:1
+  --> $DIR/lint-tool-test.rs:14:1
    |
 LL | fn lintme() { }
    | ^^^^^^^^^^^^^^^
    |
 note: lint level defined here
-  --> $DIR/lint_tool_test.rs:11:9
+  --> $DIR/lint-tool-test.rs:11:9
    |
 LL | #![deny(clippy_group)]
    |         ^^^^^^^^^^^^
    = note: #[deny(clippy::test_lint)] implied by #[deny(clippy::group)]
 
 error: item is named 'lintmetoo'
-  --> $DIR/lint_tool_test.rs:22:5
+  --> $DIR/lint-tool-test.rs:22:5
    |
 LL |     fn lintmetoo() { }
    |     ^^^^^^^^^^^^^^^^^^
    |
 note: lint level defined here
-  --> $DIR/lint_tool_test.rs:11:9
+  --> $DIR/lint-tool-test.rs:11:9
    |
 LL | #![deny(clippy_group)]
    |         ^^^^^^^^^^^^
diff --git a/src/test/ui-fulldeps/macro-crate-rlib.rs b/src/test/ui-fulldeps/macro-crate-rlib.rs
index 21e62171f0f..2962bb51fc4 100644
--- a/src/test/ui-fulldeps/macro-crate-rlib.rs
+++ b/src/test/ui-fulldeps/macro-crate-rlib.rs
@@ -1,4 +1,4 @@
-// aux-build:rlib_crate_test.rs
+// aux-build:rlib-crate-test.rs
 // ignore-tidy-linelength
 // ignore-cross-compile gives a different error message
 
diff --git a/src/test/ui-fulldeps/plugin-as-extern-crate.rs b/src/test/ui-fulldeps/plugin-as-extern-crate.rs
index 37ac8dfa391..c671ab581ef 100644
--- a/src/test/ui-fulldeps/plugin-as-extern-crate.rs
+++ b/src/test/ui-fulldeps/plugin-as-extern-crate.rs
@@ -1,4 +1,4 @@
-// aux-build:attr_plugin_test.rs
+// aux-build:attr-plugin-test.rs
 // ignore-cross-compile
 //
 // attr_plugin_test will not compile on a cross-compiled target because
diff --git a/src/test/ui-fulldeps/plugin-attr-register-deny.rs b/src/test/ui-fulldeps/plugin-attr-register-deny.rs
index f9922f7f606..8be73e330ab 100644
--- a/src/test/ui-fulldeps/plugin-attr-register-deny.rs
+++ b/src/test/ui-fulldeps/plugin-attr-register-deny.rs
@@ -1,4 +1,4 @@
-// aux-build:attr_plugin_test.rs
+// aux-build:attr-plugin-test.rs
 // ignore-stage1
 
 #![feature(plugin)]
diff --git a/src/test/ui/auxiliary/default_ty_param_cross_crate_crate.rs b/src/test/ui/auxiliary/default-ty-param-cross-crate-crate.rs
index 612f99dbcf8..612f99dbcf8 100644
--- a/src/test/ui/auxiliary/default_ty_param_cross_crate_crate.rs
+++ b/src/test/ui/auxiliary/default-ty-param-cross-crate-crate.rs
diff --git a/src/test/ui/auxiliary/define_macro.rs b/src/test/ui/auxiliary/define-macro.rs
index 4956907c55e..4956907c55e 100644
--- a/src/test/ui/auxiliary/define_macro.rs
+++ b/src/test/ui/auxiliary/define-macro.rs
diff --git a/src/test/ui/auxiliary/orphan_check_diagnostics.rs b/src/test/ui/auxiliary/orphan-check-diagnostics.rs
index 6b2c42b69b9..6b2c42b69b9 100644
--- a/src/test/ui/auxiliary/orphan_check_diagnostics.rs
+++ b/src/test/ui/auxiliary/orphan-check-diagnostics.rs
diff --git a/src/test/ui/auxiliary/pub_and_stability.rs b/src/test/ui/auxiliary/pub-and-stability.rs
index ee05a07dbb2..ee05a07dbb2 100644
--- a/src/test/ui/auxiliary/pub_and_stability.rs
+++ b/src/test/ui/auxiliary/pub-and-stability.rs
diff --git a/src/test/ui/auxiliary/rmeta_meta.rs b/src/test/ui/auxiliary/rmeta-meta.rs
index 6d8ed95bd38..6d8ed95bd38 100644
--- a/src/test/ui/auxiliary/rmeta_meta.rs
+++ b/src/test/ui/auxiliary/rmeta-meta.rs
diff --git a/src/test/ui/auxiliary/rmeta_rlib.rs b/src/test/ui/auxiliary/rmeta-rlib.rs
index 4a05710db66..4a05710db66 100644
--- a/src/test/ui/auxiliary/rmeta_rlib.rs
+++ b/src/test/ui/auxiliary/rmeta-rlib.rs
diff --git a/src/test/ui/auxiliary/stability_cfg2.rs b/src/test/ui/auxiliary/stability-cfg2.rs
index 8a2899584b9..8a2899584b9 100644
--- a/src/test/ui/auxiliary/stability_cfg2.rs
+++ b/src/test/ui/auxiliary/stability-cfg2.rs
diff --git a/src/test/ui/auxiliary/xc_private_method_lib.rs b/src/test/ui/auxiliary/xc-private-method-lib.rs
index 4d5ec6de392..4d5ec6de392 100644
--- a/src/test/ui/auxiliary/xc_private_method_lib.rs
+++ b/src/test/ui/auxiliary/xc-private-method-lib.rs
diff --git a/src/test/ui/e0119/auxiliary/issue_23563_a.rs b/src/test/ui/e0119/auxiliary/issue-23563-a.rs
index 4e85bcc4ba6..4e85bcc4ba6 100644
--- a/src/test/ui/e0119/auxiliary/issue_23563_a.rs
+++ b/src/test/ui/e0119/auxiliary/issue-23563-a.rs
diff --git a/src/test/ui/e0119/issue-23563.rs b/src/test/ui/e0119/issue-23563.rs
index a2804fcf1cc..f578560c552 100644
--- a/src/test/ui/e0119/issue-23563.rs
+++ b/src/test/ui/e0119/issue-23563.rs
@@ -1,4 +1,4 @@
-// aux-build:issue_23563_a.rs
+// aux-build:issue-23563-a.rs
 
 // Ref: https://github.com/rust-lang/rust/issues/23563#issuecomment-260751672
 
diff --git a/src/test/ui/enable-unstable-lib-feature.rs b/src/test/ui/enable-unstable-lib-feature.rs
index 2f248bf14c1..383c6868ce2 100644
--- a/src/test/ui/enable-unstable-lib-feature.rs
+++ b/src/test/ui/enable-unstable-lib-feature.rs
@@ -1,6 +1,6 @@
 // Test that enabling an unstable feature disables warnings
 
-// aux-build:stability_cfg2.rs
+// aux-build:stability-cfg2.rs
 
 #![feature(unstable_test_feature)]
 #![deny(non_snake_case)] // To trigger a hard error
diff --git a/src/test/ui/explore-issue-38412.rs b/src/test/ui/explore-issue-38412.rs
index cd0a69b0d8b..e7bcd7c6bfe 100644
--- a/src/test/ui/explore-issue-38412.rs
+++ b/src/test/ui/explore-issue-38412.rs
@@ -1,4 +1,4 @@
-// aux-build:pub_and_stability.rs
+// aux-build:pub-and-stability.rs
 
 #![feature(unused_feature)]
 
@@ -63,5 +63,4 @@ fn main() {
     t.pub_crate();                        //~ ERROR `pub_crate` is private
     t.pub_mod();                          //~ ERROR `pub_mod` is private
     t.private();                          //~ ERROR `private` is private
-
 }
diff --git a/src/test/ui/issue-42944.rs b/src/test/ui/issues/issue-42944.rs
index 9d746673f4d..9d746673f4d 100644
--- a/src/test/ui/issue-42944.rs
+++ b/src/test/ui/issues/issue-42944.rs
diff --git a/src/test/ui/issue-42944.stderr b/src/test/ui/issues/issue-42944.stderr
index 0613be0b3d0..0613be0b3d0 100644
--- a/src/test/ui/issue-42944.stderr
+++ b/src/test/ui/issues/issue-42944.stderr
diff --git a/src/test/ui/issue-53787-inline-assembler-macro.rs b/src/test/ui/issues/issue-53787-inline-assembler-macro.rs
index 937bce1b655..937bce1b655 100644
--- a/src/test/ui/issue-53787-inline-assembler-macro.rs
+++ b/src/test/ui/issues/issue-53787-inline-assembler-macro.rs
diff --git a/src/test/ui/issue-53787-inline-assembler-macro.stderr b/src/test/ui/issues/issue-53787-inline-assembler-macro.stderr
index 047ba341cfc..047ba341cfc 100644
--- a/src/test/ui/issue-53787-inline-assembler-macro.stderr
+++ b/src/test/ui/issues/issue-53787-inline-assembler-macro.stderr
diff --git a/src/test/ui/issue-54943-1.rs b/src/test/ui/issues/issue-54943-1.rs
index 7750e340361..7750e340361 100644
--- a/src/test/ui/issue-54943-1.rs
+++ b/src/test/ui/issues/issue-54943-1.rs
diff --git a/src/test/ui/issue-54943-2.rs b/src/test/ui/issues/issue-54943-2.rs
index f829c38c35d..f829c38c35d 100644
--- a/src/test/ui/issue-54943-2.rs
+++ b/src/test/ui/issues/issue-54943-2.rs
diff --git a/src/test/ui/issue-54943-3.rs b/src/test/ui/issues/issue-54943-3.rs
index 185077bd684..185077bd684 100644
--- a/src/test/ui/issue-54943-3.rs
+++ b/src/test/ui/issues/issue-54943-3.rs
diff --git a/src/test/ui/issue-54943.rs b/src/test/ui/issues/issue-54943.rs
index ce4e0106743..ce4e0106743 100644
--- a/src/test/ui/issue-54943.rs
+++ b/src/test/ui/issues/issue-54943.rs
diff --git a/src/test/ui/issue-54943.stderr b/src/test/ui/issues/issue-54943.stderr
index aa68177bcdb..aa68177bcdb 100644
--- a/src/test/ui/issue-54943.stderr
+++ b/src/test/ui/issues/issue-54943.stderr
diff --git a/src/test/ui/issue-55511.nll.stderr b/src/test/ui/issues/issue-55511.nll.stderr
index bf3e58e8cdb..bf3e58e8cdb 100644
--- a/src/test/ui/issue-55511.nll.stderr
+++ b/src/test/ui/issues/issue-55511.nll.stderr
diff --git a/src/test/ui/issue-55511.rs b/src/test/ui/issues/issue-55511.rs
index 4b9475ba627..4b9475ba627 100644
--- a/src/test/ui/issue-55511.rs
+++ b/src/test/ui/issues/issue-55511.rs
diff --git a/src/test/ui/issue-55511.stderr b/src/test/ui/issues/issue-55511.stderr
index 24668f04551..24668f04551 100644
--- a/src/test/ui/issue-55511.stderr
+++ b/src/test/ui/issues/issue-55511.stderr
diff --git a/src/test/ui/issue-55846.rs b/src/test/ui/issues/issue-55846.rs
index bd766752360..bd766752360 100644
--- a/src/test/ui/issue-55846.rs
+++ b/src/test/ui/issues/issue-55846.rs
diff --git a/src/test/ui/issues/issue_56411_aux.rs b/src/test/ui/issues/issue-56411-aux.rs
index bd689e913ab..bd689e913ab 100644
--- a/src/test/ui/issues/issue_56411_aux.rs
+++ b/src/test/ui/issues/issue-56411-aux.rs
diff --git a/src/test/ui/issues/issue-56411.rs b/src/test/ui/issues/issue-56411.rs
index 3561c21cc7e..163651a7ef6 100644
--- a/src/test/ui/issues/issue-56411.rs
+++ b/src/test/ui/issues/issue-56411.rs
@@ -1,6 +1,7 @@
 macro_rules! import {
-    ( $($name:ident),* ) => {
+    ( $(($path:expr, $name:ident)),* ) => {
         $(
+            #[path = $path]
             mod $name;
             pub use self::$name;
             //~^ ERROR the name `issue_56411_aux` is defined multiple times
@@ -10,7 +11,7 @@ macro_rules! import {
     }
 }
 
-import!(issue_56411_aux);
+import!(("issue-56411-aux.rs", issue_56411_aux));
 
 fn main() {
     println!("Hello, world!");
diff --git a/src/test/ui/issues/issue-56411.stderr b/src/test/ui/issues/issue-56411.stderr
index dd05852c091..7b23b3766be 100644
--- a/src/test/ui/issues/issue-56411.stderr
+++ b/src/test/ui/issues/issue-56411.stderr
@@ -1,5 +1,5 @@
 error[E0255]: the name `issue_56411_aux` is defined multiple times
-  --> $DIR/issue-56411.rs:5:21
+  --> $DIR/issue-56411.rs:6:21
    |
 LL |             mod $name;
    |             ---------- previous definition of the module `issue_56411_aux` here
@@ -9,19 +9,19 @@ LL |             pub use self::$name;
    |                     `issue_56411_aux` reimported here
    |                     you can use `as` to change the binding name of the import
 ...
-LL | import!(issue_56411_aux);
-   | ------------------------- in this macro invocation
+LL | import!(("issue-56411-aux.rs", issue_56411_aux));
+   | ------------------------------------------------- in this macro invocation
    |
    = note: `issue_56411_aux` must be defined only once in the type namespace of this module
 
 error[E0365]: `issue_56411_aux` is private, and cannot be re-exported
-  --> $DIR/issue-56411.rs:5:21
+  --> $DIR/issue-56411.rs:6:21
    |
 LL |             pub use self::$name;
    |                     ^^^^^^^^^^^ re-export of private `issue_56411_aux`
 ...
-LL | import!(issue_56411_aux);
-   | ------------------------- in this macro invocation
+LL | import!(("issue-56411-aux.rs", issue_56411_aux));
+   | ------------------------------------------------- in this macro invocation
    |
    = note: consider declaring type or module `issue_56411_aux` with `pub`
 
diff --git a/src/test/ui/lint/auxiliary/stability-cfg2.rs b/src/test/ui/lint/auxiliary/stability-cfg2.rs
new file mode 100644
index 00000000000..8a2899584b9
--- /dev/null
+++ b/src/test/ui/lint/auxiliary/stability-cfg2.rs
@@ -0,0 +1,5 @@
+// compile-flags:--cfg foo
+
+#![cfg_attr(foo, unstable(feature = "unstable_test_feature", issue = "0"))]
+#![cfg_attr(not(foo), stable(feature = "test_feature", since = "1.0.0"))]
+#![feature(staged_api)]
diff --git a/src/test/ui/lint/lint-stability-deprecated.rs b/src/test/ui/lint/lint-stability-deprecated.rs
index 8f6425bcc77..bf574d7144d 100644
--- a/src/test/ui/lint/lint-stability-deprecated.rs
+++ b/src/test/ui/lint/lint-stability-deprecated.rs
@@ -2,7 +2,7 @@
 // aux-build:lint_stability.rs
 // aux-build:inherited_stability.rs
 // aux-build:stability_cfg1.rs
-// aux-build:stability_cfg2.rs
+// aux-build:stability-cfg2.rs
 // ignore-tidy-linelength
 #![warn(deprecated)]
 #![allow(dead_code, unused_extern_crates)]
diff --git a/src/test/ui/lint/lint-stability.rs b/src/test/ui/lint/lint-stability.rs
index 6ff79083f46..3e4a3874d2c 100644
--- a/src/test/ui/lint/lint-stability.rs
+++ b/src/test/ui/lint/lint-stability.rs
@@ -1,7 +1,7 @@
 // aux-build:lint_stability.rs
 // aux-build:inherited_stability.rs
 // aux-build:stability_cfg1.rs
-// aux-build:stability_cfg2.rs
+// aux-build:stability-cfg2.rs
 
 #![allow(deprecated)]
 #![allow(dead_code)]
diff --git a/src/test/ui/orphan-check-diagnostics.rs b/src/test/ui/orphan-check-diagnostics.rs
index 9a29620ae65..c8803b9ae5d 100644
--- a/src/test/ui/orphan-check-diagnostics.rs
+++ b/src/test/ui/orphan-check-diagnostics.rs
@@ -1,5 +1,6 @@
-// aux-build:orphan_check_diagnostics.rs
-// see #22388
+// aux-build:orphan-check-diagnostics.rs
+
+// See issue #22388.
 
 extern crate orphan_check_diagnostics;
 
diff --git a/src/test/ui/orphan-check-diagnostics.stderr b/src/test/ui/orphan-check-diagnostics.stderr
index 4bd6aa2c154..3f868422c7f 100644
--- a/src/test/ui/orphan-check-diagnostics.stderr
+++ b/src/test/ui/orphan-check-diagnostics.stderr
@@ -1,5 +1,5 @@
 error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g., `MyStruct<T>`)
-  --> $DIR/orphan-check-diagnostics.rs:10:1
+  --> $DIR/orphan-check-diagnostics.rs:11:1
    |
 LL | impl<T> RemoteTrait for T where T: LocalTrait {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type
diff --git a/src/test/ui/out-of-order-shadowing.rs b/src/test/ui/out-of-order-shadowing.rs
index b4cb6a23830..a0d1a973764 100644
--- a/src/test/ui/out-of-order-shadowing.rs
+++ b/src/test/ui/out-of-order-shadowing.rs
@@ -1,4 +1,4 @@
-// aux-build:define_macro.rs
+// aux-build:define-macro.rs
 
 macro_rules! bar { () => {} }
 define_macro!(bar);
diff --git a/src/test/ui/proc-macro/auxiliary/issue_38586.rs b/src/test/ui/proc-macro/auxiliary/issue-38586.rs
index f3a19081c47..f3a19081c47 100644
--- a/src/test/ui/proc-macro/auxiliary/issue_38586.rs
+++ b/src/test/ui/proc-macro/auxiliary/issue-38586.rs
diff --git a/src/test/ui/proc-macro/auxiliary/issue_50493.rs b/src/test/ui/proc-macro/auxiliary/issue-50493.rs
index f72024948a9..f72024948a9 100644
--- a/src/test/ui/proc-macro/auxiliary/issue_50493.rs
+++ b/src/test/ui/proc-macro/auxiliary/issue-50493.rs
diff --git a/src/test/ui/proc-macro/issue-38586.rs b/src/test/ui/proc-macro/issue-38586.rs
index 4f291ba990a..24e88ed93ca 100644
--- a/src/test/ui/proc-macro/issue-38586.rs
+++ b/src/test/ui/proc-macro/issue-38586.rs
@@ -1,4 +1,4 @@
-// aux-build:issue_38586.rs
+// aux-build:issue-38586.rs
 
 #[macro_use]
 extern crate issue_38586;
diff --git a/src/test/ui/proc-macro/issue-50493.rs b/src/test/ui/proc-macro/issue-50493.rs
index f504dbdfce2..eeb08f5eebd 100644
--- a/src/test/ui/proc-macro/issue-50493.rs
+++ b/src/test/ui/proc-macro/issue-50493.rs
@@ -1,4 +1,4 @@
-// aux-build:issue_50493.rs
+// aux-build:issue-50493.rs
 
 #[macro_use]
 extern crate issue_50493;
diff --git a/src/test/ui/resolve/auxiliary/issue_19452_aux.rs b/src/test/ui/resolve/auxiliary/issue-19452-aux.rs
index 9c7bcec51df..9c7bcec51df 100644
--- a/src/test/ui/resolve/auxiliary/issue_19452_aux.rs
+++ b/src/test/ui/resolve/auxiliary/issue-19452-aux.rs
diff --git a/src/test/ui/resolve/auxiliary/issue_3907.rs b/src/test/ui/resolve/auxiliary/issue-3907.rs
index 5dc502930ae..5dc502930ae 100644
--- a/src/test/ui/resolve/auxiliary/issue_3907.rs
+++ b/src/test/ui/resolve/auxiliary/issue-3907.rs
diff --git a/src/test/ui/resolve/issue-19452.rs b/src/test/ui/resolve/issue-19452.rs
index 5c58cabb3cd..1d3aa49eac6 100644
--- a/src/test/ui/resolve/issue-19452.rs
+++ b/src/test/ui/resolve/issue-19452.rs
@@ -1,4 +1,5 @@
-// aux-build:issue_19452_aux.rs
+// aux-build:issue-19452-aux.rs
+
 extern crate issue_19452_aux;
 
 enum Homura {
diff --git a/src/test/ui/resolve/issue-19452.stderr b/src/test/ui/resolve/issue-19452.stderr
index ef96fffee92..56a0e397b85 100644
--- a/src/test/ui/resolve/issue-19452.stderr
+++ b/src/test/ui/resolve/issue-19452.stderr
@@ -1,11 +1,11 @@
 error[E0423]: expected value, found struct variant `Homura::Madoka`
-  --> $DIR/issue-19452.rs:9:18
+  --> $DIR/issue-19452.rs:10:18
    |
 LL |     let homura = Homura::Madoka;
    |                  ^^^^^^^^^^^^^^ did you mean `Homura::Madoka { /* fields */ }`?
 
 error[E0423]: expected value, found struct variant `issue_19452_aux::Homura::Madoka`
-  --> $DIR/issue-19452.rs:12:18
+  --> $DIR/issue-19452.rs:13:18
    |
 LL |     let homura = issue_19452_aux::Homura::Madoka;
    |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ did you mean `issue_19452_aux::Homura::Madoka { /* fields */ }`?
diff --git a/src/test/ui/resolve/issue-3907-2.rs b/src/test/ui/resolve/issue-3907-2.rs
index 89e10ca4f2c..dc9624698df 100644
--- a/src/test/ui/resolve/issue-3907-2.rs
+++ b/src/test/ui/resolve/issue-3907-2.rs
@@ -1,4 +1,5 @@
-// aux-build:issue_3907.rs
+// aux-build:issue-3907.rs
+
 extern crate issue_3907;
 
 type Foo = issue_3907::Foo+'static;
diff --git a/src/test/ui/resolve/issue-3907-2.stderr b/src/test/ui/resolve/issue-3907-2.stderr
index 4fce898dfa9..968c1f3e463 100644
--- a/src/test/ui/resolve/issue-3907-2.stderr
+++ b/src/test/ui/resolve/issue-3907-2.stderr
@@ -1,5 +1,5 @@
 error[E0038]: the trait `issue_3907::Foo` cannot be made into an object
-  --> $DIR/issue-3907-2.rs:10:1
+  --> $DIR/issue-3907-2.rs:11:1
    |
 LL | fn bar(_x: Foo) {}
    | ^^^^^^^^^^^^^^^ the trait `issue_3907::Foo` cannot be made into an object
diff --git a/src/test/ui/resolve/issue-3907.rs b/src/test/ui/resolve/issue-3907.rs
index a76c3134c0c..87e465489a4 100644
--- a/src/test/ui/resolve/issue-3907.rs
+++ b/src/test/ui/resolve/issue-3907.rs
@@ -1,4 +1,5 @@
-// aux-build:issue_3907.rs
+// aux-build:issue-3907.rs
+
 extern crate issue_3907;
 
 type Foo = issue_3907::Foo;
diff --git a/src/test/ui/resolve/issue-3907.stderr b/src/test/ui/resolve/issue-3907.stderr
index 49f7ae84491..384df571e2a 100644
--- a/src/test/ui/resolve/issue-3907.stderr
+++ b/src/test/ui/resolve/issue-3907.stderr
@@ -1,5 +1,5 @@
 error[E0404]: expected trait, found type alias `Foo`
-  --> $DIR/issue-3907.rs:10:6
+  --> $DIR/issue-3907.rs:11:6
    |
 LL | impl Foo for S {
    |      ^^^ type aliases cannot be used as traits
diff --git a/src/test/ui/rmeta-lib-pass.rs b/src/test/ui/rmeta-lib-pass.rs
index 6149b1685f5..4ab4117dd6c 100644
--- a/src/test/ui/rmeta-lib-pass.rs
+++ b/src/test/ui/rmeta-lib-pass.rs
@@ -1,5 +1,5 @@
 // compile-flags: --emit=metadata
-// aux-build:rmeta_rlib.rs
+// aux-build:rmeta-rlib.rs
 // no-prefer-dynamic
 // compile-pass
 
diff --git a/src/test/ui/rmeta-pass.rs b/src/test/ui/rmeta-pass.rs
index bcd40144f72..9c88de7a033 100644
--- a/src/test/ui/rmeta-pass.rs
+++ b/src/test/ui/rmeta-pass.rs
@@ -1,5 +1,5 @@
 // compile-flags: --emit=metadata
-// aux-build:rmeta_meta.rs
+// aux-build:rmeta-meta.rs
 // no-prefer-dynamic
 // compile-pass
 
diff --git a/src/test/ui/rmeta_lib.rs b/src/test/ui/rmeta_lib.rs
index 345b712e37e..6c74aec32e3 100644
--- a/src/test/ui/rmeta_lib.rs
+++ b/src/test/ui/rmeta_lib.rs
@@ -1,4 +1,4 @@
-// aux-build:rmeta_meta.rs
+// aux-build:rmeta-meta.rs
 // no-prefer-dynamic
 // error-pattern: crate `rmeta_meta` required to be available in rlib format, but was not found
 
diff --git a/src/test/ui/rmeta_meta_main.rs b/src/test/ui/rmeta_meta_main.rs
index df550775ee4..52cd0c2f53f 100644
--- a/src/test/ui/rmeta_meta_main.rs
+++ b/src/test/ui/rmeta_meta_main.rs
@@ -1,5 +1,5 @@
 // compile-flags: --emit=metadata
-// aux-build:rmeta_meta.rs
+// aux-build:rmeta-meta.rs
 // no-prefer-dynamic
 
 // Check that building a metadata crate finds an error with a dependent,
diff --git a/src/test/ui/auxiliary/use_from_trait_xc.rs b/src/test/ui/use/auxiliary/use-from-trait-xc.rs
index 4abe11941b1..4abe11941b1 100644
--- a/src/test/ui/auxiliary/use_from_trait_xc.rs
+++ b/src/test/ui/use/auxiliary/use-from-trait-xc.rs
diff --git a/src/test/ui/use/auxiliary/use_from_trait_xc.rs b/src/test/ui/use/auxiliary/use_from_trait_xc.rs
deleted file mode 100644
index 4abe11941b1..00000000000
--- a/src/test/ui/use/auxiliary/use_from_trait_xc.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-pub use self::sub::{Bar, Baz};
-
-pub trait Trait {
-    fn foo(&self);
-    type Assoc;
-    const CONST: u32;
-}
-
-struct Foo;
-
-impl Foo {
-    pub fn new() {}
-
-    pub const C: u32 = 0;
-}
-
-mod sub {
-    pub struct Bar;
-
-    impl Bar {
-        pub fn new() {}
-    }
-
-    pub enum Baz {}
-
-    impl Baz {
-        pub fn new() {}
-    }
-}
diff --git a/src/test/ui/issue-18986.rs b/src/test/ui/use/issue-18986.rs
index 1c431a45ab2..f0b292f2911 100644
--- a/src/test/ui/issue-18986.rs
+++ b/src/test/ui/use/issue-18986.rs
@@ -1,4 +1,4 @@
-// aux-build:use_from_trait_xc.rs
+// aux-build:use-from-trait-xc.rs
 
 extern crate use_from_trait_xc;
 pub use use_from_trait_xc::Trait;
diff --git a/src/test/ui/issue-18986.stderr b/src/test/ui/use/issue-18986.stderr
index 6c23178c700..6c23178c700 100644
--- a/src/test/ui/issue-18986.stderr
+++ b/src/test/ui/use/issue-18986.stderr
diff --git a/src/test/ui/use/use-from-trait-xc.rs b/src/test/ui/use/use-from-trait-xc.rs
index e6f102f6269..695ed66a1c1 100644
--- a/src/test/ui/use/use-from-trait-xc.rs
+++ b/src/test/ui/use/use-from-trait-xc.rs
@@ -1,4 +1,4 @@
-// aux-build:use_from_trait_xc.rs
+// aux-build:use-from-trait-xc.rs
 
 extern crate use_from_trait_xc;
 
diff --git a/src/test/ui/useless_comment.rs b/src/test/ui/useless-comment.rs
index 7d2e5ab6f2b..7d2e5ab6f2b 100644
--- a/src/test/ui/useless_comment.rs
+++ b/src/test/ui/useless-comment.rs
diff --git a/src/test/ui/useless_comment.stderr b/src/test/ui/useless-comment.stderr
index 10d8ee60f99..925e3079636 100644
--- a/src/test/ui/useless_comment.stderr
+++ b/src/test/ui/useless-comment.stderr
@@ -1,5 +1,5 @@
 error: unused doc comment
-  --> $DIR/useless_comment.rs:9:1
+  --> $DIR/useless-comment.rs:9:1
    |
 LL | /// foo
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -7,14 +7,14 @@ LL | mac!();
    | ------- rustdoc does not generate documentation for macro expansions
    |
 note: lint level defined here
-  --> $DIR/useless_comment.rs:3:9
+  --> $DIR/useless-comment.rs:3:9
    |
 LL | #![deny(unused_doc_comments)]
    |         ^^^^^^^^^^^^^^^^^^^
    = help: to document an item produced by a macro, the macro must produce the documentation as part of its expansion
 
 error: unused doc comment
-  --> $DIR/useless_comment.rs:13:5
+  --> $DIR/useless-comment.rs:13:5
    |
 LL |     /// a
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -22,7 +22,7 @@ LL |     let x = 12;
    |     ----------- rustdoc does not generate documentation for statements
 
 error: unused doc comment
-  --> $DIR/useless_comment.rs:16:5
+  --> $DIR/useless-comment.rs:16:5
    |
 LL | /     /// multi-line
 LL | |     /// doc comment
@@ -36,7 +36,7 @@ LL | |     }
    | |_____- rustdoc does not generate documentation for expressions
 
 error: unused doc comment
-  --> $DIR/useless_comment.rs:20:9
+  --> $DIR/useless-comment.rs:20:9
    |
 LL |         /// c
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -44,7 +44,7 @@ LL |         1 => {},
    |         ------- rustdoc does not generate documentation for match arms
 
 error: unused doc comment
-  --> $DIR/useless_comment.rs:25:5
+  --> $DIR/useless-comment.rs:25:5
    |
 LL |     /// foo
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -52,7 +52,7 @@ LL |     unsafe {}
    |     --------- rustdoc does not generate documentation for expressions
 
 error: unused doc comment
-  --> $DIR/useless_comment.rs:28:5
+  --> $DIR/useless-comment.rs:28:5
    |
 LL |     #[doc = "foo"]
    |     ^^^^^^^^^^^^^^
@@ -61,7 +61,7 @@ LL |     3;
    |     - rustdoc does not generate documentation for expressions
 
 error: unused doc comment
-  --> $DIR/useless_comment.rs:29:5
+  --> $DIR/useless-comment.rs:29:5
    |
 LL |     #[doc = "bar"]
    |     ^^^^^^^^^^^^^^
@@ -69,7 +69,7 @@ LL |     3;
    |     - rustdoc does not generate documentation for expressions
 
 error: unused doc comment
-  --> $DIR/useless_comment.rs:32:5
+  --> $DIR/useless-comment.rs:32:5
    |
 LL |     /// bar
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -79,13 +79,13 @@ LL |     mac!();
    = help: to document an item produced by a macro, the macro must produce the documentation as part of its expansion
 
 error: unused doc comment
-  --> $DIR/useless_comment.rs:35:13
+  --> $DIR/useless-comment.rs:35:13
    |
 LL |     let x = /** comment */ 47;
    |             ^^^^^^^^^^^^^^ -- rustdoc does not generate documentation for expressions
 
 error: unused doc comment
-  --> $DIR/useless_comment.rs:37:5
+  --> $DIR/useless-comment.rs:37:5
    |
 LL |       /// dox
    |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/xc-private-method.rs b/src/test/ui/xc-private-method.rs
index 157249194a3..e95cab93d75 100644
--- a/src/test/ui/xc-private-method.rs
+++ b/src/test/ui/xc-private-method.rs
@@ -1,4 +1,4 @@
-// aux-build:xc_private_method_lib.rs
+// aux-build:xc-private-method-lib.rs
 
 extern crate xc_private_method_lib;
 
diff --git a/src/test/ui/xc-private-method2.rs b/src/test/ui/xc-private-method2.rs
index 6d73570318a..f11b251082b 100644
--- a/src/test/ui/xc-private-method2.rs
+++ b/src/test/ui/xc-private-method2.rs
@@ -1,4 +1,4 @@
-// aux-build:xc_private_method_lib.rs
+// aux-build:xc-private-method-lib.rs
 
 extern crate xc_private_method_lib;