Auto merge of #59120 - alexreg:move-issue-tests-1, r=varkor

Moved issue tests to subdirs and normalised names

Consistency, decluttering, ease of navigation :-)

r? @Centril

src/test/debuginfo/issue-13213.rs

@@ -1,15 +1,15 @@
 // 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
 
 // This tests make sure that we get no linker error when using a completely inlined static. Some
 // 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...");
 }

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;

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

src/test/pretty/issue_12590_a.rs → 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() { }

src/test/pretty/issue-12590-b.rs

@@ -0,0 +1,5 @@
+// Second part of two-file test
+
+fn b() { }
+
+fn main() { }

src/test/pretty/issue_12590_c.pp → src/test/pretty/issue-12590-c.pp

@@ -6,10 +6,11 @@
 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() { }

src/test/pretty/issue_12590_c.rs → 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() { }

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

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

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

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
 

src/test/run-pass-fulldeps/issue_24106.rs → 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;
 

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

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

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

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

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

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

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

src/test/run-pass/issues/auxiliary/issue_3136_a.rc → 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;

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;

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
 

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

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;

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
 

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

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
 

src/test/run-pass/issues/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs → 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;
 

src/test/run-pass/issues/issue24687-embed-debuginfo/main.rs → 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.

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
 

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() {}

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;

src/test/run-pass/issues/issue_3136_b.rs → 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() {}

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(),

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() {}

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:

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!`
 

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

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

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() {}

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) {} }
 

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;
 

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