s/aux/auxiliary, because windows

For legacy reasons (presumably), Windows does not permit files name aux.

365 files changed, 6 insertions, 6 deletions

diff --git a/src/test/codegen-units/item-collection/aux/cgu_export_trait_method.rs b/src/test/codegen-units/item-collection/auxiliary/cgu_export_trait_method.rs
index 49b8e43836e..49b8e43836e 100644
--- a/src/test/codegen-units/item-collection/aux/cgu_export_trait_method.rs
+++ b/src/test/codegen-units/item-collection/auxiliary/cgu_export_trait_method.rs
diff --git a/src/test/codegen-units/item-collection/aux/cgu_extern_closures.rs b/src/test/codegen-units/item-collection/auxiliary/cgu_extern_closures.rs
index 944d85db508..944d85db508 100644
--- a/src/test/codegen-units/item-collection/aux/cgu_extern_closures.rs
+++ b/src/test/codegen-units/item-collection/auxiliary/cgu_extern_closures.rs
diff --git a/src/test/codegen-units/item-collection/aux/cgu_generic_function.rs b/src/test/codegen-units/item-collection/auxiliary/cgu_generic_function.rs
index 04c68748eca..04c68748eca 100644
--- a/src/test/codegen-units/item-collection/aux/cgu_generic_function.rs
+++ b/src/test/codegen-units/item-collection/auxiliary/cgu_generic_function.rs
diff --git a/src/test/codegen-units/partitioning/aux/cgu_explicit_inlining.rs b/src/test/codegen-units/partitioning/auxiliary/cgu_explicit_inlining.rs
index e4ba9fae412..e4ba9fae412 100644
--- a/src/test/codegen-units/partitioning/aux/cgu_explicit_inlining.rs
+++ b/src/test/codegen-units/partitioning/auxiliary/cgu_explicit_inlining.rs
diff --git a/src/test/codegen-units/partitioning/aux/cgu_extern_drop_glue.rs b/src/test/codegen-units/partitioning/auxiliary/cgu_extern_drop_glue.rs
index 049bdb46579..049bdb46579 100644
--- a/src/test/codegen-units/partitioning/aux/cgu_extern_drop_glue.rs
+++ b/src/test/codegen-units/partitioning/auxiliary/cgu_extern_drop_glue.rs
diff --git a/src/test/codegen-units/partitioning/aux/cgu_generic_function.rs b/src/test/codegen-units/partitioning/auxiliary/cgu_generic_function.rs
index 04c68748eca..04c68748eca 100644
--- a/src/test/codegen-units/partitioning/aux/cgu_generic_function.rs
+++ b/src/test/codegen-units/partitioning/auxiliary/cgu_generic_function.rs
diff --git a/src/test/compile-fail-fulldeps/aux/attr_plugin_test.rs b/src/test/compile-fail-fulldeps/auxiliary/attr_plugin_test.rs
index bab3721a313..bab3721a313 100644
--- a/src/test/compile-fail-fulldeps/aux/attr_plugin_test.rs
+++ b/src/test/compile-fail-fulldeps/auxiliary/attr_plugin_test.rs
diff --git a/src/test/compile-fail-fulldeps/aux/lint_for_crate.rs b/src/test/compile-fail-fulldeps/auxiliary/lint_for_crate.rs
index a424517da12..a424517da12 100644
--- a/src/test/compile-fail-fulldeps/aux/lint_for_crate.rs
+++ b/src/test/compile-fail-fulldeps/auxiliary/lint_for_crate.rs
diff --git a/src/test/compile-fail-fulldeps/aux/lint_group_plugin_test.rs b/src/test/compile-fail-fulldeps/auxiliary/lint_group_plugin_test.rs
index 1e9a77724a8..1e9a77724a8 100644
--- a/src/test/compile-fail-fulldeps/aux/lint_group_plugin_test.rs
+++ b/src/test/compile-fail-fulldeps/auxiliary/lint_group_plugin_test.rs
diff --git a/src/test/compile-fail-fulldeps/aux/lint_plugin_test.rs b/src/test/compile-fail-fulldeps/auxiliary/lint_plugin_test.rs
index 8ea131da338..8ea131da338 100644
--- a/src/test/compile-fail-fulldeps/aux/lint_plugin_test.rs
+++ b/src/test/compile-fail-fulldeps/auxiliary/lint_plugin_test.rs
diff --git a/src/test/compile-fail-fulldeps/aux/macro_crate_MacroRulesTT.rs b/src/test/compile-fail-fulldeps/auxiliary/macro_crate_MacroRulesTT.rs
index 9e693fcc564..9e693fcc564 100644
--- a/src/test/compile-fail-fulldeps/aux/macro_crate_MacroRulesTT.rs
+++ b/src/test/compile-fail-fulldeps/auxiliary/macro_crate_MacroRulesTT.rs
diff --git a/src/test/compile-fail-fulldeps/aux/macro_crate_test.rs b/src/test/compile-fail-fulldeps/auxiliary/macro_crate_test.rs
index 3516f566e8a..3516f566e8a 100644
--- a/src/test/compile-fail-fulldeps/aux/macro_crate_test.rs
+++ b/src/test/compile-fail-fulldeps/auxiliary/macro_crate_test.rs
diff --git a/src/test/compile-fail-fulldeps/aux/macro_reexport_1.rs b/src/test/compile-fail-fulldeps/auxiliary/macro_reexport_1.rs
index aaeccc6e898..aaeccc6e898 100644
--- a/src/test/compile-fail-fulldeps/aux/macro_reexport_1.rs
+++ b/src/test/compile-fail-fulldeps/auxiliary/macro_reexport_1.rs
diff --git a/src/test/compile-fail-fulldeps/aux/rlib_crate_test.rs b/src/test/compile-fail-fulldeps/auxiliary/rlib_crate_test.rs
index ae1568b2f88..ae1568b2f88 100644
--- a/src/test/compile-fail-fulldeps/aux/rlib_crate_test.rs
+++ b/src/test/compile-fail-fulldeps/auxiliary/rlib_crate_test.rs
diff --git a/src/test/compile-fail-fulldeps/aux/use_from_trait_xc.rs b/src/test/compile-fail-fulldeps/auxiliary/use_from_trait_xc.rs
index 7024c9dad7c..7024c9dad7c 100644
--- a/src/test/compile-fail-fulldeps/aux/use_from_trait_xc.rs
+++ b/src/test/compile-fail-fulldeps/auxiliary/use_from_trait_xc.rs
diff --git a/src/test/compile-fail/aux/allocator-dylib.rs b/src/test/compile-fail/auxiliary/allocator-dylib.rs
index 568b247ecdb..568b247ecdb 100644
--- a/src/test/compile-fail/aux/allocator-dylib.rs
+++ b/src/test/compile-fail/auxiliary/allocator-dylib.rs
diff --git a/src/test/compile-fail/aux/allocator-dylib2.rs b/src/test/compile-fail/auxiliary/allocator-dylib2.rs
index 0d76c0e5eb8..0d76c0e5eb8 100644
--- a/src/test/compile-fail/aux/allocator-dylib2.rs
+++ b/src/test/compile-fail/auxiliary/allocator-dylib2.rs
diff --git a/src/test/compile-fail/aux/allocator1.rs b/src/test/compile-fail/auxiliary/allocator1.rs
index b24784838d0..b24784838d0 100644
--- a/src/test/compile-fail/aux/allocator1.rs
+++ b/src/test/compile-fail/auxiliary/allocator1.rs
diff --git a/src/test/compile-fail/aux/allocator2.rs b/src/test/compile-fail/auxiliary/allocator2.rs
index b24784838d0..b24784838d0 100644
--- a/src/test/compile-fail/aux/allocator2.rs
+++ b/src/test/compile-fail/auxiliary/allocator2.rs
diff --git a/src/test/compile-fail/aux/allocator3.rs b/src/test/compile-fail/auxiliary/allocator3.rs
index d3eb1f6f7ab..d3eb1f6f7ab 100644
--- a/src/test/compile-fail/aux/allocator3.rs
+++ b/src/test/compile-fail/auxiliary/allocator3.rs
diff --git a/src/test/compile-fail/aux/ambig_impl_2_lib.rs b/src/test/compile-fail/auxiliary/ambig_impl_2_lib.rs
index 4ba0ccdba9b..4ba0ccdba9b 100644
--- a/src/test/compile-fail/aux/ambig_impl_2_lib.rs
+++ b/src/test/compile-fail/auxiliary/ambig_impl_2_lib.rs
diff --git a/src/test/compile-fail/aux/cci_class.rs b/src/test/compile-fail/auxiliary/cci_class.rs
index 08a13fd8bcc..08a13fd8bcc 100644
--- a/src/test/compile-fail/aux/cci_class.rs
+++ b/src/test/compile-fail/auxiliary/cci_class.rs
diff --git a/src/test/compile-fail/aux/cci_class_5.rs b/src/test/compile-fail/auxiliary/cci_class_5.rs
index 7fe608f1634..7fe608f1634 100644
--- a/src/test/compile-fail/aux/cci_class_5.rs
+++ b/src/test/compile-fail/auxiliary/cci_class_5.rs
diff --git a/src/test/compile-fail/aux/changing-crates-a1.rs b/src/test/compile-fail/auxiliary/changing-crates-a1.rs
index 18162c5f756..18162c5f756 100644
--- a/src/test/compile-fail/aux/changing-crates-a1.rs
+++ b/src/test/compile-fail/auxiliary/changing-crates-a1.rs
diff --git a/src/test/compile-fail/aux/changing-crates-a2.rs b/src/test/compile-fail/auxiliary/changing-crates-a2.rs
index 28eae023d68..28eae023d68 100644
--- a/src/test/compile-fail/aux/changing-crates-a2.rs
+++ b/src/test/compile-fail/auxiliary/changing-crates-a2.rs
diff --git a/src/test/compile-fail/aux/changing-crates-b.rs b/src/test/compile-fail/auxiliary/changing-crates-b.rs
index 7b1190fc085..7b1190fc085 100644
--- a/src/test/compile-fail/aux/changing-crates-b.rs
+++ b/src/test/compile-fail/auxiliary/changing-crates-b.rs
diff --git a/src/test/compile-fail/aux/coherence_copy_like_lib.rs b/src/test/compile-fail/auxiliary/coherence_copy_like_lib.rs
index d3d389c6a8b..d3d389c6a8b 100644
--- a/src/test/compile-fail/aux/coherence_copy_like_lib.rs
+++ b/src/test/compile-fail/auxiliary/coherence_copy_like_lib.rs
diff --git a/src/test/compile-fail/aux/coherence_inherent_cc_lib.rs b/src/test/compile-fail/auxiliary/coherence_inherent_cc_lib.rs
index 0458636a401..0458636a401 100644
--- a/src/test/compile-fail/aux/coherence_inherent_cc_lib.rs
+++ b/src/test/compile-fail/auxiliary/coherence_inherent_cc_lib.rs
diff --git a/src/test/compile-fail/aux/coherence_lib.rs b/src/test/compile-fail/auxiliary/coherence_lib.rs
index daa123849e4..daa123849e4 100644
--- a/src/test/compile-fail/aux/coherence_lib.rs
+++ b/src/test/compile-fail/auxiliary/coherence_lib.rs
diff --git a/src/test/compile-fail/aux/coherence_orphan_lib.rs b/src/test/compile-fail/auxiliary/coherence_orphan_lib.rs
index b22d12300c7..b22d12300c7 100644
--- a/src/test/compile-fail/aux/coherence_orphan_lib.rs
+++ b/src/test/compile-fail/auxiliary/coherence_orphan_lib.rs
diff --git a/src/test/compile-fail/aux/const_fn_lib.rs b/src/test/compile-fail/auxiliary/const_fn_lib.rs
index b0d5a6b1272..b0d5a6b1272 100644
--- a/src/test/compile-fail/aux/const_fn_lib.rs
+++ b/src/test/compile-fail/auxiliary/const_fn_lib.rs
diff --git a/src/test/compile-fail/aux/crate_a1.rs b/src/test/compile-fail/auxiliary/crate_a1.rs
index 70f7cac94de..70f7cac94de 100644
--- a/src/test/compile-fail/aux/crate_a1.rs
+++ b/src/test/compile-fail/auxiliary/crate_a1.rs
diff --git a/src/test/compile-fail/aux/crate_a2.rs b/src/test/compile-fail/auxiliary/crate_a2.rs
index d801f25ba2e..d801f25ba2e 100644
--- a/src/test/compile-fail/aux/crate_a2.rs
+++ b/src/test/compile-fail/auxiliary/crate_a2.rs
diff --git a/src/test/compile-fail/aux/crateresolve1-1.rs b/src/test/compile-fail/auxiliary/crateresolve1-1.rs
index 050f2fe7329..050f2fe7329 100644
--- a/src/test/compile-fail/aux/crateresolve1-1.rs
+++ b/src/test/compile-fail/auxiliary/crateresolve1-1.rs
diff --git a/src/test/compile-fail/aux/crateresolve1-2.rs b/src/test/compile-fail/auxiliary/crateresolve1-2.rs
index d19b3bafba5..d19b3bafba5 100644
--- a/src/test/compile-fail/aux/crateresolve1-2.rs
+++ b/src/test/compile-fail/auxiliary/crateresolve1-2.rs
diff --git a/src/test/compile-fail/aux/crateresolve1-3.rs b/src/test/compile-fail/auxiliary/crateresolve1-3.rs
index c5096ac49a8..c5096ac49a8 100644
--- a/src/test/compile-fail/aux/crateresolve1-3.rs
+++ b/src/test/compile-fail/auxiliary/crateresolve1-3.rs
diff --git a/src/test/compile-fail/aux/default_ty_param_cross_crate_crate.rs b/src/test/compile-fail/auxiliary/default_ty_param_cross_crate_crate.rs
index 4bd8ecacb96..4bd8ecacb96 100644
--- a/src/test/compile-fail/aux/default_ty_param_cross_crate_crate.rs
+++ b/src/test/compile-fail/auxiliary/default_ty_param_cross_crate_crate.rs
diff --git a/src/test/compile-fail/aux/deprecation-lint.rs b/src/test/compile-fail/auxiliary/deprecation-lint.rs
index ff872efb7bd..ff872efb7bd 100644
--- a/src/test/compile-fail/aux/deprecation-lint.rs
+++ b/src/test/compile-fail/auxiliary/deprecation-lint.rs
diff --git a/src/test/compile-fail/aux/empty-struct.rs b/src/test/compile-fail/auxiliary/empty-struct.rs
index 22f65c2b0d8..22f65c2b0d8 100644
--- a/src/test/compile-fail/aux/empty-struct.rs
+++ b/src/test/compile-fail/auxiliary/empty-struct.rs
diff --git a/src/test/compile-fail/aux/go_trait.rs b/src/test/compile-fail/auxiliary/go_trait.rs
index 044bb606b40..044bb606b40 100644
--- a/src/test/compile-fail/aux/go_trait.rs
+++ b/src/test/compile-fail/auxiliary/go_trait.rs
diff --git a/src/test/compile-fail/aux/inherited_stability.rs b/src/test/compile-fail/auxiliary/inherited_stability.rs
index 0b1aee68f44..0b1aee68f44 100644
--- a/src/test/compile-fail/aux/inherited_stability.rs
+++ b/src/test/compile-fail/auxiliary/inherited_stability.rs
diff --git a/src/test/compile-fail/aux/internal_unstable.rs b/src/test/compile-fail/auxiliary/internal_unstable.rs
index a4cd487eb65..a4cd487eb65 100644
--- a/src/test/compile-fail/aux/internal_unstable.rs
+++ b/src/test/compile-fail/auxiliary/internal_unstable.rs
diff --git a/src/test/compile-fail/aux/issue-19163.rs b/src/test/compile-fail/auxiliary/issue-19163.rs
index 76c5cdafd7c..76c5cdafd7c 100644
--- a/src/test/compile-fail/aux/issue-19163.rs
+++ b/src/test/compile-fail/auxiliary/issue-19163.rs
diff --git a/src/test/compile-fail/aux/issue-21146-inc.rs b/src/test/compile-fail/auxiliary/issue-21146-inc.rs
index 1b740d112e9..1b740d112e9 100644
--- a/src/test/compile-fail/aux/issue-21146-inc.rs
+++ b/src/test/compile-fail/auxiliary/issue-21146-inc.rs
diff --git a/src/test/compile-fail/aux/issue-21221-3.rs b/src/test/compile-fail/auxiliary/issue-21221-3.rs
index fae0fe16a26..fae0fe16a26 100644
--- a/src/test/compile-fail/aux/issue-21221-3.rs
+++ b/src/test/compile-fail/auxiliary/issue-21221-3.rs
diff --git a/src/test/compile-fail/aux/issue-21221-4.rs b/src/test/compile-fail/auxiliary/issue-21221-4.rs
index fffe060ee24..fffe060ee24 100644
--- a/src/test/compile-fail/aux/issue-21221-4.rs
+++ b/src/test/compile-fail/auxiliary/issue-21221-4.rs
diff --git a/src/test/compile-fail/aux/issue-29181.rs b/src/test/compile-fail/auxiliary/issue-29181.rs
index 361f1ea5509..361f1ea5509 100644
--- a/src/test/compile-fail/aux/issue-29181.rs
+++ b/src/test/compile-fail/auxiliary/issue-29181.rs
diff --git a/src/test/compile-fail/aux/issue-30535.rs b/src/test/compile-fail/auxiliary/issue-30535.rs
index 8d44e8d1016..8d44e8d1016 100644
--- a/src/test/compile-fail/aux/issue-30535.rs
+++ b/src/test/compile-fail/auxiliary/issue-30535.rs
diff --git a/src/test/compile-fail/aux/issue_11680.rs b/src/test/compile-fail/auxiliary/issue_11680.rs
index 18f78750b15..18f78750b15 100644
--- a/src/test/compile-fail/aux/issue_11680.rs
+++ b/src/test/compile-fail/auxiliary/issue_11680.rs
diff --git a/src/test/compile-fail/aux/issue_12612_1.rs b/src/test/compile-fail/auxiliary/issue_12612_1.rs
index a0234c1185a..a0234c1185a 100644
--- a/src/test/compile-fail/aux/issue_12612_1.rs
+++ b/src/test/compile-fail/auxiliary/issue_12612_1.rs
diff --git a/src/test/compile-fail/aux/issue_16725.rs b/src/test/compile-fail/auxiliary/issue_16725.rs
index b3b04b4a5ac..b3b04b4a5ac 100644
--- a/src/test/compile-fail/aux/issue_16725.rs
+++ b/src/test/compile-fail/auxiliary/issue_16725.rs
diff --git a/src/test/compile-fail/aux/issue_17718_const_privacy.rs b/src/test/compile-fail/auxiliary/issue_17718_const_privacy.rs
index 3901d73382f..3901d73382f 100644
--- a/src/test/compile-fail/aux/issue_17718_const_privacy.rs
+++ b/src/test/compile-fail/auxiliary/issue_17718_const_privacy.rs
diff --git a/src/test/compile-fail/aux/issue_21202.rs b/src/test/compile-fail/auxiliary/issue_21202.rs
index afdbf78aa82..afdbf78aa82 100644
--- a/src/test/compile-fail/aux/issue_21202.rs
+++ b/src/test/compile-fail/auxiliary/issue_21202.rs
diff --git a/src/test/compile-fail/aux/issue_30123_aux.rs b/src/test/compile-fail/auxiliary/issue_30123_aux.rs
index f60311a9400..f60311a9400 100644
--- a/src/test/compile-fail/aux/issue_30123_aux.rs
+++ b/src/test/compile-fail/auxiliary/issue_30123_aux.rs
diff --git a/src/test/compile-fail/aux/issue_3907.rs b/src/test/compile-fail/auxiliary/issue_3907.rs
index 6472c08c222..6472c08c222 100644
--- a/src/test/compile-fail/aux/issue_3907.rs
+++ b/src/test/compile-fail/auxiliary/issue_3907.rs
diff --git a/src/test/compile-fail/aux/issue_5844_aux.rs b/src/test/compile-fail/auxiliary/issue_5844_aux.rs
index 5c878b1e667..5c878b1e667 100644
--- a/src/test/compile-fail/aux/issue_5844_aux.rs
+++ b/src/test/compile-fail/auxiliary/issue_5844_aux.rs
diff --git a/src/test/compile-fail/aux/lifetime_bound_will_change_warning_lib.rs b/src/test/compile-fail/auxiliary/lifetime_bound_will_change_warning_lib.rs
index 95f8b39c487..95f8b39c487 100644
--- a/src/test/compile-fail/aux/lifetime_bound_will_change_warning_lib.rs
+++ b/src/test/compile-fail/auxiliary/lifetime_bound_will_change_warning_lib.rs
diff --git a/src/test/compile-fail/aux/lint_output_format.rs b/src/test/compile-fail/auxiliary/lint_output_format.rs
index 0553b4a49b7..0553b4a49b7 100644
--- a/src/test/compile-fail/aux/lint_output_format.rs
+++ b/src/test/compile-fail/auxiliary/lint_output_format.rs
diff --git a/src/test/compile-fail/aux/lint_stability.rs b/src/test/compile-fail/auxiliary/lint_stability.rs
index 3100aba4b72..3100aba4b72 100644
--- a/src/test/compile-fail/aux/lint_stability.rs
+++ b/src/test/compile-fail/auxiliary/lint_stability.rs
diff --git a/src/test/compile-fail/aux/lint_stability_fields.rs b/src/test/compile-fail/auxiliary/lint_stability_fields.rs
index 8c6b98ab510..8c6b98ab510 100644
--- a/src/test/compile-fail/aux/lint_stability_fields.rs
+++ b/src/test/compile-fail/auxiliary/lint_stability_fields.rs
diff --git a/src/test/compile-fail/aux/lint_unused_extern_crate.rs b/src/test/compile-fail/auxiliary/lint_unused_extern_crate.rs
index 2661b1f4eb4..2661b1f4eb4 100644
--- a/src/test/compile-fail/aux/lint_unused_extern_crate.rs
+++ b/src/test/compile-fail/auxiliary/lint_unused_extern_crate.rs
diff --git a/src/test/compile-fail/aux/macro_crate_nonterminal.rs b/src/test/compile-fail/auxiliary/macro_crate_nonterminal.rs
index 4f75e2b5d75..4f75e2b5d75 100644
--- a/src/test/compile-fail/aux/macro_crate_nonterminal.rs
+++ b/src/test/compile-fail/auxiliary/macro_crate_nonterminal.rs
diff --git a/src/test/compile-fail/aux/macro_non_reexport_2.rs b/src/test/compile-fail/auxiliary/macro_non_reexport_2.rs
index 910fcd2e367..910fcd2e367 100644
--- a/src/test/compile-fail/aux/macro_non_reexport_2.rs
+++ b/src/test/compile-fail/auxiliary/macro_non_reexport_2.rs
diff --git a/src/test/compile-fail/aux/macro_reexport_1.rs b/src/test/compile-fail/auxiliary/macro_reexport_1.rs
index aaeccc6e898..aaeccc6e898 100644
--- a/src/test/compile-fail/aux/macro_reexport_1.rs
+++ b/src/test/compile-fail/auxiliary/macro_reexport_1.rs
diff --git a/src/test/compile-fail/aux/namespaced_enums.rs b/src/test/compile-fail/auxiliary/namespaced_enums.rs
index 3bf39b788db..3bf39b788db 100644
--- a/src/test/compile-fail/aux/namespaced_enums.rs
+++ b/src/test/compile-fail/auxiliary/namespaced_enums.rs
diff --git a/src/test/compile-fail/aux/needs_allocator.rs b/src/test/compile-fail/auxiliary/needs_allocator.rs
index 51003160427..51003160427 100644
--- a/src/test/compile-fail/aux/needs_allocator.rs
+++ b/src/test/compile-fail/auxiliary/needs_allocator.rs
diff --git a/src/test/compile-fail/aux/no_method_suggested_traits.rs b/src/test/compile-fail/auxiliary/no_method_suggested_traits.rs
index 20cebb9be17..20cebb9be17 100644
--- a/src/test/compile-fail/aux/no_method_suggested_traits.rs
+++ b/src/test/compile-fail/auxiliary/no_method_suggested_traits.rs
diff --git a/src/test/compile-fail/aux/noexporttypelib.rs b/src/test/compile-fail/auxiliary/noexporttypelib.rs
index 5ae8e0d298e..5ae8e0d298e 100644
--- a/src/test/compile-fail/aux/noexporttypelib.rs
+++ b/src/test/compile-fail/auxiliary/noexporttypelib.rs
diff --git a/src/test/compile-fail/aux/orphan_check_diagnostics.rs b/src/test/compile-fail/auxiliary/orphan_check_diagnostics.rs
index cf3e9903b5a..cf3e9903b5a 100644
--- a/src/test/compile-fail/aux/orphan_check_diagnostics.rs
+++ b/src/test/compile-fail/auxiliary/orphan_check_diagnostics.rs
diff --git a/src/test/compile-fail/aux/privacy_tuple_struct.rs b/src/test/compile-fail/auxiliary/privacy_tuple_struct.rs
index 141b6bdd604..141b6bdd604 100644
--- a/src/test/compile-fail/aux/privacy_tuple_struct.rs
+++ b/src/test/compile-fail/auxiliary/privacy_tuple_struct.rs
diff --git a/src/test/compile-fail/aux/private_trait_xc.rs b/src/test/compile-fail/auxiliary/private_trait_xc.rs
index 37ee10c8d37..37ee10c8d37 100644
--- a/src/test/compile-fail/aux/private_trait_xc.rs
+++ b/src/test/compile-fail/auxiliary/private_trait_xc.rs
diff --git a/src/test/compile-fail/aux/pub_static_array.rs b/src/test/compile-fail/auxiliary/pub_static_array.rs
index 4419a5ae83c..4419a5ae83c 100644
--- a/src/test/compile-fail/aux/pub_static_array.rs
+++ b/src/test/compile-fail/auxiliary/pub_static_array.rs
diff --git a/src/test/compile-fail/aux/rbmtp_cross_crate_lib.rs b/src/test/compile-fail/auxiliary/rbmtp_cross_crate_lib.rs
index f49ac4fc8e4..f49ac4fc8e4 100644
--- a/src/test/compile-fail/aux/rbmtp_cross_crate_lib.rs
+++ b/src/test/compile-fail/auxiliary/rbmtp_cross_crate_lib.rs
diff --git a/src/test/compile-fail/aux/stability_attribute_issue.rs b/src/test/compile-fail/auxiliary/stability_attribute_issue.rs
index 22c13f69af9..22c13f69af9 100644
--- a/src/test/compile-fail/aux/stability_attribute_issue.rs
+++ b/src/test/compile-fail/auxiliary/stability_attribute_issue.rs
diff --git a/src/test/compile-fail/aux/stability_cfg1.rs b/src/test/compile-fail/auxiliary/stability_cfg1.rs
index c839993b047..c839993b047 100644
--- a/src/test/compile-fail/aux/stability_cfg1.rs
+++ b/src/test/compile-fail/auxiliary/stability_cfg1.rs
diff --git a/src/test/compile-fail/aux/stability_cfg2.rs b/src/test/compile-fail/auxiliary/stability_cfg2.rs
index c1e2b1d1bfe..c1e2b1d1bfe 100644
--- a/src/test/compile-fail/aux/stability_cfg2.rs
+++ b/src/test/compile-fail/auxiliary/stability_cfg2.rs
diff --git a/src/test/compile-fail/aux/static_priv_by_default.rs b/src/test/compile-fail/auxiliary/static_priv_by_default.rs
index 859f38e809f..859f38e809f 100644
--- a/src/test/compile-fail/aux/static_priv_by_default.rs
+++ b/src/test/compile-fail/auxiliary/static_priv_by_default.rs
diff --git a/src/test/compile-fail/aux/struct_field_privacy.rs b/src/test/compile-fail/auxiliary/struct_field_privacy.rs
index 5fea97da03e..5fea97da03e 100644
--- a/src/test/compile-fail/aux/struct_field_privacy.rs
+++ b/src/test/compile-fail/auxiliary/struct_field_privacy.rs
diff --git a/src/test/compile-fail/aux/struct_variant_privacy.rs b/src/test/compile-fail/auxiliary/struct_variant_privacy.rs
index 40868fa3f70..40868fa3f70 100644
--- a/src/test/compile-fail/aux/struct_variant_privacy.rs
+++ b/src/test/compile-fail/auxiliary/struct_variant_privacy.rs
diff --git a/src/test/compile-fail/aux/svh-a-base.rs b/src/test/compile-fail/auxiliary/svh-a-base.rs
index 31a97f695f0..31a97f695f0 100644
--- a/src/test/compile-fail/aux/svh-a-base.rs
+++ b/src/test/compile-fail/auxiliary/svh-a-base.rs
diff --git a/src/test/compile-fail/aux/svh-a-change-lit.rs b/src/test/compile-fail/auxiliary/svh-a-change-lit.rs
index 5339fc8295c..5339fc8295c 100644
--- a/src/test/compile-fail/aux/svh-a-change-lit.rs
+++ b/src/test/compile-fail/auxiliary/svh-a-change-lit.rs
diff --git a/src/test/compile-fail/aux/svh-a-change-significant-cfg.rs b/src/test/compile-fail/auxiliary/svh-a-change-significant-cfg.rs
index 2a5d9446f87..2a5d9446f87 100644
--- a/src/test/compile-fail/aux/svh-a-change-significant-cfg.rs
+++ b/src/test/compile-fail/auxiliary/svh-a-change-significant-cfg.rs
diff --git a/src/test/compile-fail/aux/svh-a-change-trait-bound.rs b/src/test/compile-fail/auxiliary/svh-a-change-trait-bound.rs
index 61f2f2803ab..61f2f2803ab 100644
--- a/src/test/compile-fail/aux/svh-a-change-trait-bound.rs
+++ b/src/test/compile-fail/auxiliary/svh-a-change-trait-bound.rs
diff --git a/src/test/compile-fail/aux/svh-a-change-type-arg.rs b/src/test/compile-fail/auxiliary/svh-a-change-type-arg.rs
index 270ce95be2b..270ce95be2b 100644
--- a/src/test/compile-fail/aux/svh-a-change-type-arg.rs
+++ b/src/test/compile-fail/auxiliary/svh-a-change-type-arg.rs
diff --git a/src/test/compile-fail/aux/svh-a-change-type-ret.rs b/src/test/compile-fail/auxiliary/svh-a-change-type-ret.rs
index de4cc85a7dc..de4cc85a7dc 100644
--- a/src/test/compile-fail/aux/svh-a-change-type-ret.rs
+++ b/src/test/compile-fail/auxiliary/svh-a-change-type-ret.rs
diff --git a/src/test/compile-fail/aux/svh-a-change-type-static.rs b/src/test/compile-fail/auxiliary/svh-a-change-type-static.rs
index 62f7986f1c3..62f7986f1c3 100644
--- a/src/test/compile-fail/aux/svh-a-change-type-static.rs
+++ b/src/test/compile-fail/auxiliary/svh-a-change-type-static.rs
diff --git a/src/test/compile-fail/aux/svh-b.rs b/src/test/compile-fail/auxiliary/svh-b.rs
index b8946fdc995..b8946fdc995 100644
--- a/src/test/compile-fail/aux/svh-b.rs
+++ b/src/test/compile-fail/auxiliary/svh-b.rs
diff --git a/src/test/compile-fail/aux/svh-uta-base.rs b/src/test/compile-fail/auxiliary/svh-uta-base.rs
index 6bd3ddab06c..6bd3ddab06c 100644
--- a/src/test/compile-fail/aux/svh-uta-base.rs
+++ b/src/test/compile-fail/auxiliary/svh-uta-base.rs
diff --git a/src/test/compile-fail/aux/svh-uta-change-use-trait.rs b/src/test/compile-fail/auxiliary/svh-uta-change-use-trait.rs
index e8634168177..e8634168177 100644
--- a/src/test/compile-fail/aux/svh-uta-change-use-trait.rs
+++ b/src/test/compile-fail/auxiliary/svh-uta-change-use-trait.rs
diff --git a/src/test/compile-fail/aux/svh-utb.rs b/src/test/compile-fail/auxiliary/svh-utb.rs
index eb3da985242..eb3da985242 100644
--- a/src/test/compile-fail/aux/svh-utb.rs
+++ b/src/test/compile-fail/auxiliary/svh-utb.rs
diff --git a/src/test/compile-fail/aux/tdticc_coherence_lib.rs b/src/test/compile-fail/auxiliary/tdticc_coherence_lib.rs
index 2e425ac96c5..2e425ac96c5 100644
--- a/src/test/compile-fail/aux/tdticc_coherence_lib.rs
+++ b/src/test/compile-fail/auxiliary/tdticc_coherence_lib.rs
diff --git a/src/test/compile-fail/aux/trait_bounds_on_structs_and_enums_xc.rs b/src/test/compile-fail/auxiliary/trait_bounds_on_structs_and_enums_xc.rs
index 29cb0bc176a..29cb0bc176a 100644
--- a/src/test/compile-fail/aux/trait_bounds_on_structs_and_enums_xc.rs
+++ b/src/test/compile-fail/auxiliary/trait_bounds_on_structs_and_enums_xc.rs
diff --git a/src/test/compile-fail/aux/trait_impl_conflict.rs b/src/test/compile-fail/auxiliary/trait_impl_conflict.rs
index c3ecbb014dc..c3ecbb014dc 100644
--- a/src/test/compile-fail/aux/trait_impl_conflict.rs
+++ b/src/test/compile-fail/auxiliary/trait_impl_conflict.rs
diff --git a/src/test/compile-fail/aux/trait_safety_lib.rs b/src/test/compile-fail/auxiliary/trait_safety_lib.rs
index 585a756fd07..585a756fd07 100644
--- a/src/test/compile-fail/aux/trait_safety_lib.rs
+++ b/src/test/compile-fail/auxiliary/trait_safety_lib.rs
diff --git a/src/test/compile-fail/aux/trait_superkinds_in_metadata.rs b/src/test/compile-fail/auxiliary/trait_superkinds_in_metadata.rs
index 0fa2d3459f4..0fa2d3459f4 100644
--- a/src/test/compile-fail/aux/trait_superkinds_in_metadata.rs
+++ b/src/test/compile-fail/auxiliary/trait_superkinds_in_metadata.rs
diff --git a/src/test/compile-fail/aux/two_macros.rs b/src/test/compile-fail/auxiliary/two_macros.rs
index 060960f0dbc..060960f0dbc 100644
--- a/src/test/compile-fail/aux/two_macros.rs
+++ b/src/test/compile-fail/auxiliary/two_macros.rs
diff --git a/src/test/compile-fail/aux/unreachable_variant.rs b/src/test/compile-fail/auxiliary/unreachable_variant.rs
index 8ca85f20ab2..8ca85f20ab2 100644
--- a/src/test/compile-fail/aux/unreachable_variant.rs
+++ b/src/test/compile-fail/auxiliary/unreachable_variant.rs
diff --git a/src/test/compile-fail/aux/use_from_trait_xc.rs b/src/test/compile-fail/auxiliary/use_from_trait_xc.rs
index 7024c9dad7c..7024c9dad7c 100644
--- a/src/test/compile-fail/aux/use_from_trait_xc.rs
+++ b/src/test/compile-fail/auxiliary/use_from_trait_xc.rs
diff --git a/src/test/compile-fail/aux/variant-namespacing.rs b/src/test/compile-fail/auxiliary/variant-namespacing.rs
index d7fd2968495..d7fd2968495 100644
--- a/src/test/compile-fail/aux/variant-namespacing.rs
+++ b/src/test/compile-fail/auxiliary/variant-namespacing.rs
diff --git a/src/test/compile-fail/aux/weak-lang-items.rs b/src/test/compile-fail/auxiliary/weak-lang-items.rs
index 6434e62b6f7..6434e62b6f7 100644
--- a/src/test/compile-fail/aux/weak-lang-items.rs
+++ b/src/test/compile-fail/auxiliary/weak-lang-items.rs
diff --git a/src/test/compile-fail/aux/xc_private_method_lib.rs b/src/test/compile-fail/auxiliary/xc_private_method_lib.rs
index 5e7bc61943b..5e7bc61943b 100644
--- a/src/test/compile-fail/aux/xc_private_method_lib.rs
+++ b/src/test/compile-fail/auxiliary/xc_private_method_lib.rs
diff --git a/src/test/compile-fail/aux/xcrate_unit_struct.rs b/src/test/compile-fail/auxiliary/xcrate_unit_struct.rs
index 7a69be2b06c..7a69be2b06c 100644
--- a/src/test/compile-fail/aux/xcrate_unit_struct.rs
+++ b/src/test/compile-fail/auxiliary/xcrate_unit_struct.rs
diff --git a/src/test/compile-fail/issue-21146.rs b/src/test/compile-fail/issue-21146.rs
index 7ea6f6f18b9..02f128e1f56 100644
--- a/src/test/compile-fail/issue-21146.rs
+++ b/src/test/compile-fail/issue-21146.rs
@@ -9,5 +9,5 @@
 // except according to those terms.
 
 // error-pattern: expected item, found `parse_error`
-include!("aux/issue-21146-inc.rs");
+include!("auxiliary/issue-21146-inc.rs");
 fn main() {}
diff --git a/src/test/compile-fail/privacy/restricted/aux/pub_restricted.rs b/src/test/compile-fail/privacy/restricted/auxiliary/pub_restricted.rs
index b1c88ce6ce5..b1c88ce6ce5 100644
--- a/src/test/compile-fail/privacy/restricted/aux/pub_restricted.rs
+++ b/src/test/compile-fail/privacy/restricted/auxiliary/pub_restricted.rs
diff --git a/src/test/debuginfo/aux/cross_crate_debuginfo_type_uniquing.rs b/src/test/debuginfo/auxiliary/cross_crate_debuginfo_type_uniquing.rs
index f4bc72305a0..f4bc72305a0 100644
--- a/src/test/debuginfo/aux/cross_crate_debuginfo_type_uniquing.rs
+++ b/src/test/debuginfo/auxiliary/cross_crate_debuginfo_type_uniquing.rs
diff --git a/src/test/debuginfo/aux/cross_crate_spans.rs b/src/test/debuginfo/auxiliary/cross_crate_spans.rs
index 9b6b6221bda..9b6b6221bda 100644
--- a/src/test/debuginfo/aux/cross_crate_spans.rs
+++ b/src/test/debuginfo/auxiliary/cross_crate_spans.rs
diff --git a/src/test/debuginfo/aux/issue13213aux.rs b/src/test/debuginfo/auxiliary/issue13213aux.rs
index d0566a1e091..d0566a1e091 100644
--- a/src/test/debuginfo/aux/issue13213aux.rs
+++ b/src/test/debuginfo/auxiliary/issue13213aux.rs
diff --git a/src/test/run-pass-fulldeps/aux/custom_derive_plugin.rs b/src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin.rs
index 5f0ef4de491..5f0ef4de491 100644
--- a/src/test/run-pass-fulldeps/aux/custom_derive_plugin.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin.rs
diff --git a/src/test/run-pass-fulldeps/aux/custom_derive_plugin_attr.rs b/src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin_attr.rs
index 2878674f0ea..2878674f0ea 100644
--- a/src/test/run-pass-fulldeps/aux/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/aux/dummy_mir_pass.rs b/src/test/run-pass-fulldeps/auxiliary/dummy_mir_pass.rs
index b5234af937b..b5234af937b 100644
--- a/src/test/run-pass-fulldeps/aux/dummy_mir_pass.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/dummy_mir_pass.rs
diff --git a/src/test/run-pass-fulldeps/aux/issue-13560-1.rs b/src/test/run-pass-fulldeps/auxiliary/issue-13560-1.rs
index 858d7269cd8..858d7269cd8 100644
--- a/src/test/run-pass-fulldeps/aux/issue-13560-1.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/issue-13560-1.rs
diff --git a/src/test/run-pass-fulldeps/aux/issue-13560-2.rs b/src/test/run-pass-fulldeps/auxiliary/issue-13560-2.rs
index 8e46acca124..8e46acca124 100644
--- a/src/test/run-pass-fulldeps/aux/issue-13560-2.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/issue-13560-2.rs
diff --git a/src/test/run-pass-fulldeps/aux/issue-13560-3.rs b/src/test/run-pass-fulldeps/auxiliary/issue-13560-3.rs
index c0539aa1b6e..c0539aa1b6e 100644
--- a/src/test/run-pass-fulldeps/aux/issue-13560-3.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/issue-13560-3.rs
diff --git a/src/test/run-pass-fulldeps/aux/issue-16822.rs b/src/test/run-pass-fulldeps/auxiliary/issue-16822.rs
index 0e3041c1174..0e3041c1174 100644
--- a/src/test/run-pass-fulldeps/aux/issue-16822.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/issue-16822.rs
diff --git a/src/test/run-pass-fulldeps/aux/issue-18502.rs b/src/test/run-pass-fulldeps/auxiliary/issue-18502.rs
index 718b046e1e4..718b046e1e4 100644
--- a/src/test/run-pass-fulldeps/aux/issue-18502.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/issue-18502.rs
diff --git a/src/test/run-pass-fulldeps/aux/issue_16723_multiple_items_syntax_ext.rs b/src/test/run-pass-fulldeps/auxiliary/issue_16723_multiple_items_syntax_ext.rs
index 25a75c2d295..25a75c2d295 100644
--- a/src/test/run-pass-fulldeps/aux/issue_16723_multiple_items_syntax_ext.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/issue_16723_multiple_items_syntax_ext.rs
diff --git a/src/test/run-pass-fulldeps/aux/linkage-visibility.rs b/src/test/run-pass-fulldeps/auxiliary/linkage-visibility.rs
index 09a2e8ecd87..09a2e8ecd87 100644
--- a/src/test/run-pass-fulldeps/aux/linkage-visibility.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/linkage-visibility.rs
diff --git a/src/test/run-pass-fulldeps/aux/lint_for_crate.rs b/src/test/run-pass-fulldeps/auxiliary/lint_for_crate.rs
index a424517da12..a424517da12 100644
--- a/src/test/run-pass-fulldeps/aux/lint_for_crate.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/lint_for_crate.rs
diff --git a/src/test/run-pass-fulldeps/aux/lint_group_plugin_test.rs b/src/test/run-pass-fulldeps/auxiliary/lint_group_plugin_test.rs
index 1e9a77724a8..1e9a77724a8 100644
--- a/src/test/run-pass-fulldeps/aux/lint_group_plugin_test.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/lint_group_plugin_test.rs
diff --git a/src/test/run-pass-fulldeps/aux/lint_plugin_test.rs b/src/test/run-pass-fulldeps/auxiliary/lint_plugin_test.rs
index 8ea131da338..8ea131da338 100644
--- a/src/test/run-pass-fulldeps/aux/lint_plugin_test.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/lint_plugin_test.rs
diff --git a/src/test/run-pass-fulldeps/aux/llvm_pass_plugin.rs b/src/test/run-pass-fulldeps/auxiliary/llvm_pass_plugin.rs
index 59cfdd1e04a..59cfdd1e04a 100644
--- a/src/test/run-pass-fulldeps/aux/llvm_pass_plugin.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/llvm_pass_plugin.rs
diff --git a/src/test/run-pass-fulldeps/aux/logging_right_crate.rs b/src/test/run-pass-fulldeps/auxiliary/logging_right_crate.rs
index db26b10fc67..db26b10fc67 100644
--- a/src/test/run-pass-fulldeps/aux/logging_right_crate.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/logging_right_crate.rs
diff --git a/src/test/run-pass-fulldeps/aux/lto-syntax-extension-lib.rs b/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-lib.rs
index 78c03bac33f..78c03bac33f 100644
--- a/src/test/run-pass-fulldeps/aux/lto-syntax-extension-lib.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-lib.rs
diff --git a/src/test/run-pass-fulldeps/aux/lto-syntax-extension-plugin.rs b/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-plugin.rs
index 9cf0d756f40..9cf0d756f40 100644
--- a/src/test/run-pass-fulldeps/aux/lto-syntax-extension-plugin.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-plugin.rs
diff --git a/src/test/run-pass-fulldeps/aux/macro_crate_test.rs b/src/test/run-pass-fulldeps/auxiliary/macro_crate_test.rs
index 3516f566e8a..3516f566e8a 100644
--- a/src/test/run-pass-fulldeps/aux/macro_crate_test.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/macro_crate_test.rs
diff --git a/src/test/run-pass-fulldeps/aux/plugin_args.rs b/src/test/run-pass-fulldeps/auxiliary/plugin_args.rs
index f6e80266a15..f6e80266a15 100644
--- a/src/test/run-pass-fulldeps/aux/plugin_args.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/plugin_args.rs
diff --git a/src/test/run-pass-fulldeps/aux/plugin_crate_outlive_expansion_phase.rs b/src/test/run-pass-fulldeps/auxiliary/plugin_crate_outlive_expansion_phase.rs
index f56983c14b1..f56983c14b1 100644
--- a/src/test/run-pass-fulldeps/aux/plugin_crate_outlive_expansion_phase.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/plugin_crate_outlive_expansion_phase.rs
diff --git a/src/test/run-pass-fulldeps/aux/plugin_with_plugin_lib.rs b/src/test/run-pass-fulldeps/auxiliary/plugin_with_plugin_lib.rs
index 8b5ff7cf07c..8b5ff7cf07c 100644
--- a/src/test/run-pass-fulldeps/aux/plugin_with_plugin_lib.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/plugin_with_plugin_lib.rs
diff --git a/src/test/run-pass-fulldeps/aux/procedural_mbe_matching.rs b/src/test/run-pass-fulldeps/auxiliary/procedural_mbe_matching.rs
index 713a7d1e811..713a7d1e811 100644
--- a/src/test/run-pass-fulldeps/aux/procedural_mbe_matching.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/procedural_mbe_matching.rs
diff --git a/src/test/run-pass-fulldeps/aux/roman_numerals.rs b/src/test/run-pass-fulldeps/auxiliary/roman_numerals.rs
index 839ece49c3e..839ece49c3e 100644
--- a/src/test/run-pass-fulldeps/aux/roman_numerals.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/roman_numerals.rs
diff --git a/src/test/run-pass-fulldeps/aux/syntax_extension_with_dll_deps_1.rs b/src/test/run-pass-fulldeps/auxiliary/syntax_extension_with_dll_deps_1.rs
index fadeb024405..fadeb024405 100644
--- a/src/test/run-pass-fulldeps/aux/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/aux/syntax_extension_with_dll_deps_2.rs b/src/test/run-pass-fulldeps/auxiliary/syntax_extension_with_dll_deps_2.rs
index 7281698a7fb..7281698a7fb 100644
--- a/src/test/run-pass-fulldeps/aux/syntax_extension_with_dll_deps_2.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/syntax_extension_with_dll_deps_2.rs
diff --git a/src/test/run-pass/aux/allocator-dummy.rs b/src/test/run-pass/auxiliary/allocator-dummy.rs
index a1d21db8f4d..a1d21db8f4d 100644
--- a/src/test/run-pass/aux/allocator-dummy.rs
+++ b/src/test/run-pass/auxiliary/allocator-dummy.rs
diff --git a/src/test/run-pass/aux/anon-extern-mod-cross-crate-1.rs b/src/test/run-pass/auxiliary/anon-extern-mod-cross-crate-1.rs
index 197fb9a6d01..197fb9a6d01 100644
--- a/src/test/run-pass/aux/anon-extern-mod-cross-crate-1.rs
+++ b/src/test/run-pass/auxiliary/anon-extern-mod-cross-crate-1.rs
diff --git a/src/test/run-pass/aux/anon_trait_static_method_lib.rs b/src/test/run-pass/auxiliary/anon_trait_static_method_lib.rs
index 9d93d9689e7..9d93d9689e7 100644
--- a/src/test/run-pass/aux/anon_trait_static_method_lib.rs
+++ b/src/test/run-pass/auxiliary/anon_trait_static_method_lib.rs
diff --git a/src/test/run-pass/aux/associated-const-cc-lib.rs b/src/test/run-pass/auxiliary/associated-const-cc-lib.rs
index 1fd8fee0117..1fd8fee0117 100644
--- a/src/test/run-pass/aux/associated-const-cc-lib.rs
+++ b/src/test/run-pass/auxiliary/associated-const-cc-lib.rs
diff --git a/src/test/run-pass/aux/associated-types-cc-lib.rs b/src/test/run-pass/auxiliary/associated-types-cc-lib.rs
index 175e8730cbc..175e8730cbc 100644
--- a/src/test/run-pass/aux/associated-types-cc-lib.rs
+++ b/src/test/run-pass/auxiliary/associated-types-cc-lib.rs
diff --git a/src/test/run-pass/aux/augmented_assignments.rs b/src/test/run-pass/auxiliary/augmented_assignments.rs
index 6601e7240a7..6601e7240a7 100644
--- a/src/test/run-pass/aux/augmented_assignments.rs
+++ b/src/test/run-pass/auxiliary/augmented_assignments.rs
diff --git a/src/test/run-pass/aux/blind-item-mixed-crate-use-item-foo.rs b/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo.rs
index f129b4b77bb..f129b4b77bb 100644
--- a/src/test/run-pass/aux/blind-item-mixed-crate-use-item-foo.rs
+++ b/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo.rs
diff --git a/src/test/run-pass/aux/blind-item-mixed-crate-use-item-foo2.rs b/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
index 91fa9124551..91fa9124551 100644
--- a/src/test/run-pass/aux/blind-item-mixed-crate-use-item-foo2.rs
+++ b/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
diff --git a/src/test/run-pass/aux/cci_borrow_lib.rs b/src/test/run-pass/auxiliary/cci_borrow_lib.rs
index 9c90510a857..9c90510a857 100644
--- a/src/test/run-pass/aux/cci_borrow_lib.rs
+++ b/src/test/run-pass/auxiliary/cci_borrow_lib.rs
diff --git a/src/test/run-pass/aux/cci_capture_clause.rs b/src/test/run-pass/auxiliary/cci_capture_clause.rs
index b38e955231e..b38e955231e 100644
--- a/src/test/run-pass/aux/cci_capture_clause.rs
+++ b/src/test/run-pass/auxiliary/cci_capture_clause.rs
diff --git a/src/test/run-pass/aux/cci_class.rs b/src/test/run-pass/auxiliary/cci_class.rs
index 08a13fd8bcc..08a13fd8bcc 100644
--- a/src/test/run-pass/aux/cci_class.rs
+++ b/src/test/run-pass/auxiliary/cci_class.rs
diff --git a/src/test/run-pass/aux/cci_class_2.rs b/src/test/run-pass/auxiliary/cci_class_2.rs
index 7d147832f09..7d147832f09 100644
--- a/src/test/run-pass/aux/cci_class_2.rs
+++ b/src/test/run-pass/auxiliary/cci_class_2.rs
diff --git a/src/test/run-pass/aux/cci_class_3.rs b/src/test/run-pass/auxiliary/cci_class_3.rs
index ec1bf108dcb..ec1bf108dcb 100644
--- a/src/test/run-pass/aux/cci_class_3.rs
+++ b/src/test/run-pass/auxiliary/cci_class_3.rs
diff --git a/src/test/run-pass/aux/cci_class_4.rs b/src/test/run-pass/auxiliary/cci_class_4.rs
index 300cc31632e..300cc31632e 100644
--- a/src/test/run-pass/aux/cci_class_4.rs
+++ b/src/test/run-pass/auxiliary/cci_class_4.rs
diff --git a/src/test/run-pass/aux/cci_class_6.rs b/src/test/run-pass/auxiliary/cci_class_6.rs
index c902a6c7dca..c902a6c7dca 100644
--- a/src/test/run-pass/aux/cci_class_6.rs
+++ b/src/test/run-pass/auxiliary/cci_class_6.rs
diff --git a/src/test/run-pass/aux/cci_class_cast.rs b/src/test/run-pass/auxiliary/cci_class_cast.rs
index f54a39d61ef..f54a39d61ef 100644
--- a/src/test/run-pass/aux/cci_class_cast.rs
+++ b/src/test/run-pass/auxiliary/cci_class_cast.rs
diff --git a/src/test/run-pass/aux/cci_class_trait.rs b/src/test/run-pass/auxiliary/cci_class_trait.rs
index 7ca3d7c4ac9..7ca3d7c4ac9 100644
--- a/src/test/run-pass/aux/cci_class_trait.rs
+++ b/src/test/run-pass/auxiliary/cci_class_trait.rs
diff --git a/src/test/run-pass/aux/cci_const.rs b/src/test/run-pass/auxiliary/cci_const.rs
index ee8290050f9..ee8290050f9 100644
--- a/src/test/run-pass/aux/cci_const.rs
+++ b/src/test/run-pass/auxiliary/cci_const.rs
diff --git a/src/test/run-pass/aux/cci_const_block.rs b/src/test/run-pass/auxiliary/cci_const_block.rs
index 76fe9fe5aa4..76fe9fe5aa4 100644
--- a/src/test/run-pass/aux/cci_const_block.rs
+++ b/src/test/run-pass/auxiliary/cci_const_block.rs
diff --git a/src/test/run-pass/aux/cci_impl_lib.rs b/src/test/run-pass/auxiliary/cci_impl_lib.rs
index d8921f4e09a..d8921f4e09a 100644
--- a/src/test/run-pass/aux/cci_impl_lib.rs
+++ b/src/test/run-pass/auxiliary/cci_impl_lib.rs
diff --git a/src/test/run-pass/aux/cci_intrinsic.rs b/src/test/run-pass/auxiliary/cci_intrinsic.rs
index b6e69d29f70..b6e69d29f70 100644
--- a/src/test/run-pass/aux/cci_intrinsic.rs
+++ b/src/test/run-pass/auxiliary/cci_intrinsic.rs
diff --git a/src/test/run-pass/aux/cci_iter_lib.rs b/src/test/run-pass/auxiliary/cci_iter_lib.rs
index 07d03b4c759..07d03b4c759 100644
--- a/src/test/run-pass/aux/cci_iter_lib.rs
+++ b/src/test/run-pass/auxiliary/cci_iter_lib.rs
diff --git a/src/test/run-pass/aux/cci_nested_lib.rs b/src/test/run-pass/auxiliary/cci_nested_lib.rs
index 8c1a283a72d..8c1a283a72d 100644
--- a/src/test/run-pass/aux/cci_nested_lib.rs
+++ b/src/test/run-pass/auxiliary/cci_nested_lib.rs
diff --git a/src/test/run-pass/aux/cci_no_inline_lib.rs b/src/test/run-pass/auxiliary/cci_no_inline_lib.rs
index 4c6f808c619..4c6f808c619 100644
--- a/src/test/run-pass/aux/cci_no_inline_lib.rs
+++ b/src/test/run-pass/auxiliary/cci_no_inline_lib.rs
diff --git a/src/test/run-pass/aux/cfg_inner_static.rs b/src/test/run-pass/auxiliary/cfg_inner_static.rs
index b5b4390657b..b5b4390657b 100644
--- a/src/test/run-pass/aux/cfg_inner_static.rs
+++ b/src/test/run-pass/auxiliary/cfg_inner_static.rs
diff --git a/src/test/run-pass/aux/cgu_test.rs b/src/test/run-pass/auxiliary/cgu_test.rs
index 7c88d3d37e3..7c88d3d37e3 100644
--- a/src/test/run-pass/aux/cgu_test.rs
+++ b/src/test/run-pass/auxiliary/cgu_test.rs
diff --git a/src/test/run-pass/aux/cgu_test_a.rs b/src/test/run-pass/auxiliary/cgu_test_a.rs
index 0f0d1cd87e1..0f0d1cd87e1 100644
--- a/src/test/run-pass/aux/cgu_test_a.rs
+++ b/src/test/run-pass/auxiliary/cgu_test_a.rs
diff --git a/src/test/run-pass/aux/cgu_test_b.rs b/src/test/run-pass/auxiliary/cgu_test_b.rs
index 0f0d1cd87e1..0f0d1cd87e1 100644
--- a/src/test/run-pass/aux/cgu_test_b.rs
+++ b/src/test/run-pass/auxiliary/cgu_test_b.rs
diff --git a/src/test/run-pass/aux/check_static_recursion_foreign_helper.rs b/src/test/run-pass/auxiliary/check_static_recursion_foreign_helper.rs
index c0d81cd8e1b..c0d81cd8e1b 100644
--- a/src/test/run-pass/aux/check_static_recursion_foreign_helper.rs
+++ b/src/test/run-pass/auxiliary/check_static_recursion_foreign_helper.rs
diff --git a/src/test/run-pass/aux/coherence_copy_like_lib.rs b/src/test/run-pass/auxiliary/coherence_copy_like_lib.rs
index d3d389c6a8b..d3d389c6a8b 100644
--- a/src/test/run-pass/aux/coherence_copy_like_lib.rs
+++ b/src/test/run-pass/auxiliary/coherence_copy_like_lib.rs
diff --git a/src/test/run-pass/aux/coherence_lib.rs b/src/test/run-pass/auxiliary/coherence_lib.rs
index daa123849e4..daa123849e4 100644
--- a/src/test/run-pass/aux/coherence_lib.rs
+++ b/src/test/run-pass/auxiliary/coherence_lib.rs
diff --git a/src/test/run-pass/aux/const_fn_lib.rs b/src/test/run-pass/auxiliary/const_fn_lib.rs
index b0d5a6b1272..b0d5a6b1272 100644
--- a/src/test/run-pass/aux/const_fn_lib.rs
+++ b/src/test/run-pass/auxiliary/const_fn_lib.rs
diff --git a/src/test/run-pass/aux/crate-attributes-using-cfg_attr.rs b/src/test/run-pass/auxiliary/crate-attributes-using-cfg_attr.rs
index 0028b51f9d1..0028b51f9d1 100644
--- a/src/test/run-pass/aux/crate-attributes-using-cfg_attr.rs
+++ b/src/test/run-pass/auxiliary/crate-attributes-using-cfg_attr.rs
diff --git a/src/test/run-pass/aux/crate-method-reexport-grrrrrrr2.rs b/src/test/run-pass/auxiliary/crate-method-reexport-grrrrrrr2.rs
index f3d5bf2d65e..f3d5bf2d65e 100644
--- a/src/test/run-pass/aux/crate-method-reexport-grrrrrrr2.rs
+++ b/src/test/run-pass/auxiliary/crate-method-reexport-grrrrrrr2.rs
diff --git a/src/test/run-pass/aux/default_type_params_xc.rs b/src/test/run-pass/auxiliary/default_type_params_xc.rs
index fe852e5d8ea..fe852e5d8ea 100644
--- a/src/test/run-pass/aux/default_type_params_xc.rs
+++ b/src/test/run-pass/auxiliary/default_type_params_xc.rs
diff --git a/src/test/run-pass/aux/derive-no-std.rs b/src/test/run-pass/auxiliary/derive-no-std.rs
index f083e10bfdb..f083e10bfdb 100644
--- a/src/test/run-pass/aux/derive-no-std.rs
+++ b/src/test/run-pass/auxiliary/derive-no-std.rs
diff --git a/src/test/run-pass/aux/empty-struct.rs b/src/test/run-pass/auxiliary/empty-struct.rs
index 22f65c2b0d8..22f65c2b0d8 100644
--- a/src/test/run-pass/aux/empty-struct.rs
+++ b/src/test/run-pass/auxiliary/empty-struct.rs
diff --git a/src/test/run-pass/aux/explicit_self_xcrate.rs b/src/test/run-pass/auxiliary/explicit_self_xcrate.rs
index dafa66d9286..dafa66d9286 100644
--- a/src/test/run-pass/aux/explicit_self_xcrate.rs
+++ b/src/test/run-pass/auxiliary/explicit_self_xcrate.rs
diff --git a/src/test/run-pass/aux/extern-crosscrate-source.rs b/src/test/run-pass/auxiliary/extern-crosscrate-source.rs
index fc2e328f686..fc2e328f686 100644
--- a/src/test/run-pass/aux/extern-crosscrate-source.rs
+++ b/src/test/run-pass/auxiliary/extern-crosscrate-source.rs
diff --git a/src/test/run-pass/aux/extern-take-value.rs b/src/test/run-pass/auxiliary/extern-take-value.rs
index 500c455136b..500c455136b 100644
--- a/src/test/run-pass/aux/extern-take-value.rs
+++ b/src/test/run-pass/auxiliary/extern-take-value.rs
diff --git a/src/test/run-pass/aux/extern_calling_convention.rs b/src/test/run-pass/auxiliary/extern_calling_convention.rs
index 55a4226c663..55a4226c663 100644
--- a/src/test/run-pass/aux/extern_calling_convention.rs
+++ b/src/test/run-pass/auxiliary/extern_calling_convention.rs
diff --git a/src/test/run-pass/aux/extern_mod_ordering_lib.rs b/src/test/run-pass/auxiliary/extern_mod_ordering_lib.rs
index 0fb6adfcda1..0fb6adfcda1 100644
--- a/src/test/run-pass/aux/extern_mod_ordering_lib.rs
+++ b/src/test/run-pass/auxiliary/extern_mod_ordering_lib.rs
diff --git a/src/test/run-pass/aux/fat_drop.rs b/src/test/run-pass/auxiliary/fat_drop.rs
index 1f944b6ed32..1f944b6ed32 100644
--- a/src/test/run-pass/aux/fat_drop.rs
+++ b/src/test/run-pass/auxiliary/fat_drop.rs
diff --git a/src/test/run-pass/aux/fn-abi.rs b/src/test/run-pass/auxiliary/fn-abi.rs
index 5d380ea6a5a..5d380ea6a5a 100644
--- a/src/test/run-pass/aux/fn-abi.rs
+++ b/src/test/run-pass/auxiliary/fn-abi.rs
diff --git a/src/test/run-pass/aux/foreign_lib.rs b/src/test/run-pass/auxiliary/foreign_lib.rs
index 460d0a0088c..460d0a0088c 100644
--- a/src/test/run-pass/aux/foreign_lib.rs
+++ b/src/test/run-pass/auxiliary/foreign_lib.rs
diff --git a/src/test/run-pass/aux/go_trait.rs b/src/test/run-pass/auxiliary/go_trait.rs
index 044bb606b40..044bb606b40 100644
--- a/src/test/run-pass/aux/go_trait.rs
+++ b/src/test/run-pass/auxiliary/go_trait.rs
diff --git a/src/test/run-pass/aux/i8.rs b/src/test/run-pass/auxiliary/i8.rs
index 44e62b99a96..44e62b99a96 100644
--- a/src/test/run-pass/aux/i8.rs
+++ b/src/test/run-pass/auxiliary/i8.rs
diff --git a/src/test/run-pass/aux/impl_privacy_xc_1.rs b/src/test/run-pass/auxiliary/impl_privacy_xc_1.rs
index ad3cdedf7ea..ad3cdedf7ea 100644
--- a/src/test/run-pass/aux/impl_privacy_xc_1.rs
+++ b/src/test/run-pass/auxiliary/impl_privacy_xc_1.rs
diff --git a/src/test/run-pass/aux/impl_privacy_xc_2.rs b/src/test/run-pass/auxiliary/impl_privacy_xc_2.rs
index c3212b0fc6d..c3212b0fc6d 100644
--- a/src/test/run-pass/aux/impl_privacy_xc_2.rs
+++ b/src/test/run-pass/auxiliary/impl_privacy_xc_2.rs
diff --git a/src/test/run-pass/aux/inline_dtor.rs b/src/test/run-pass/auxiliary/inline_dtor.rs
index dd1fdc2e498..dd1fdc2e498 100644
--- a/src/test/run-pass/aux/inline_dtor.rs
+++ b/src/test/run-pass/auxiliary/inline_dtor.rs
diff --git a/src/test/run-pass/aux/inner_static.rs b/src/test/run-pass/auxiliary/inner_static.rs
index 0d15c13a4ef..0d15c13a4ef 100644
--- a/src/test/run-pass/aux/inner_static.rs
+++ b/src/test/run-pass/auxiliary/inner_static.rs
diff --git a/src/test/run-pass/aux/iss.rs b/src/test/run-pass/auxiliary/iss.rs
index b231efa0fec..b231efa0fec 100644
--- a/src/test/run-pass/aux/iss.rs
+++ b/src/test/run-pass/auxiliary/iss.rs
diff --git a/src/test/run-pass/aux/issue-10028.rs b/src/test/run-pass/auxiliary/issue-10028.rs
index a21deb44fcc..a21deb44fcc 100644
--- a/src/test/run-pass/aux/issue-10028.rs
+++ b/src/test/run-pass/auxiliary/issue-10028.rs
diff --git a/src/test/run-pass/aux/issue-11224.rs b/src/test/run-pass/auxiliary/issue-11224.rs
index 15b72b37781..15b72b37781 100644
--- a/src/test/run-pass/aux/issue-11224.rs
+++ b/src/test/run-pass/auxiliary/issue-11224.rs
diff --git a/src/test/run-pass/aux/issue-11225-1.rs b/src/test/run-pass/auxiliary/issue-11225-1.rs
index e1ec15be927..e1ec15be927 100644
--- a/src/test/run-pass/aux/issue-11225-1.rs
+++ b/src/test/run-pass/auxiliary/issue-11225-1.rs
diff --git a/src/test/run-pass/aux/issue-11225-2.rs b/src/test/run-pass/auxiliary/issue-11225-2.rs
index 25110edda27..25110edda27 100644
--- a/src/test/run-pass/aux/issue-11225-2.rs
+++ b/src/test/run-pass/auxiliary/issue-11225-2.rs
diff --git a/src/test/run-pass/aux/issue-11225-3.rs b/src/test/run-pass/auxiliary/issue-11225-3.rs
index d48fb68ba0f..d48fb68ba0f 100644
--- a/src/test/run-pass/aux/issue-11225-3.rs
+++ b/src/test/run-pass/auxiliary/issue-11225-3.rs
diff --git a/src/test/run-pass/aux/issue-11508.rs b/src/test/run-pass/auxiliary/issue-11508.rs
index c5dc3439f2f..c5dc3439f2f 100644
--- a/src/test/run-pass/aux/issue-11508.rs
+++ b/src/test/run-pass/auxiliary/issue-11508.rs
diff --git a/src/test/run-pass/aux/issue-11529.rs b/src/test/run-pass/auxiliary/issue-11529.rs
index 21ef99e3c3d..21ef99e3c3d 100644
--- a/src/test/run-pass/aux/issue-11529.rs
+++ b/src/test/run-pass/auxiliary/issue-11529.rs
diff --git a/src/test/run-pass/aux/issue-12133-dylib.rs b/src/test/run-pass/auxiliary/issue-12133-dylib.rs
index ea22258f67d..ea22258f67d 100644
--- a/src/test/run-pass/aux/issue-12133-dylib.rs
+++ b/src/test/run-pass/auxiliary/issue-12133-dylib.rs
diff --git a/src/test/run-pass/aux/issue-12133-dylib2.rs b/src/test/run-pass/auxiliary/issue-12133-dylib2.rs
index fa5722ae6a3..fa5722ae6a3 100644
--- a/src/test/run-pass/aux/issue-12133-dylib2.rs
+++ b/src/test/run-pass/auxiliary/issue-12133-dylib2.rs
diff --git a/src/test/run-pass/aux/issue-12133-rlib.rs b/src/test/run-pass/auxiliary/issue-12133-rlib.rs
index 8e46acca124..8e46acca124 100644
--- a/src/test/run-pass/aux/issue-12133-rlib.rs
+++ b/src/test/run-pass/auxiliary/issue-12133-rlib.rs
diff --git a/src/test/run-pass/aux/issue-12660-aux.rs b/src/test/run-pass/auxiliary/issue-12660-aux.rs
index 9f2bd5d0e93..9f2bd5d0e93 100644
--- a/src/test/run-pass/aux/issue-12660-aux.rs
+++ b/src/test/run-pass/auxiliary/issue-12660-aux.rs
diff --git a/src/test/run-pass/aux/issue-13620-1.rs b/src/test/run-pass/auxiliary/issue-13620-1.rs
index e373421fabf..e373421fabf 100644
--- a/src/test/run-pass/aux/issue-13620-1.rs
+++ b/src/test/run-pass/auxiliary/issue-13620-1.rs
diff --git a/src/test/run-pass/aux/issue-13620-2.rs b/src/test/run-pass/auxiliary/issue-13620-2.rs
index 554170bc130..554170bc130 100644
--- a/src/test/run-pass/aux/issue-13620-2.rs
+++ b/src/test/run-pass/auxiliary/issue-13620-2.rs
diff --git a/src/test/run-pass/aux/issue-13872-1.rs b/src/test/run-pass/auxiliary/issue-13872-1.rs
index 941b67eb2da..941b67eb2da 100644
--- a/src/test/run-pass/aux/issue-13872-1.rs
+++ b/src/test/run-pass/auxiliary/issue-13872-1.rs
diff --git a/src/test/run-pass/aux/issue-13872-2.rs b/src/test/run-pass/auxiliary/issue-13872-2.rs
index bb51417528a..bb51417528a 100644
--- a/src/test/run-pass/aux/issue-13872-2.rs
+++ b/src/test/run-pass/auxiliary/issue-13872-2.rs
diff --git a/src/test/run-pass/aux/issue-13872-3.rs b/src/test/run-pass/auxiliary/issue-13872-3.rs
index e20618f1ec0..e20618f1ec0 100644
--- a/src/test/run-pass/aux/issue-13872-3.rs
+++ b/src/test/run-pass/auxiliary/issue-13872-3.rs
diff --git a/src/test/run-pass/aux/issue-14344-1.rs b/src/test/run-pass/auxiliary/issue-14344-1.rs
index 78c03bac33f..78c03bac33f 100644
--- a/src/test/run-pass/aux/issue-14344-1.rs
+++ b/src/test/run-pass/auxiliary/issue-14344-1.rs
diff --git a/src/test/run-pass/aux/issue-14344-2.rs b/src/test/run-pass/auxiliary/issue-14344-2.rs
index 9df35e50adb..9df35e50adb 100644
--- a/src/test/run-pass/aux/issue-14344-2.rs
+++ b/src/test/run-pass/auxiliary/issue-14344-2.rs
diff --git a/src/test/run-pass/aux/issue-14421.rs b/src/test/run-pass/auxiliary/issue-14421.rs
index a48088609f9..a48088609f9 100644
--- a/src/test/run-pass/aux/issue-14421.rs
+++ b/src/test/run-pass/auxiliary/issue-14421.rs
diff --git a/src/test/run-pass/aux/issue-14422.rs b/src/test/run-pass/auxiliary/issue-14422.rs
index 32af6d9255e..32af6d9255e 100644
--- a/src/test/run-pass/aux/issue-14422.rs
+++ b/src/test/run-pass/auxiliary/issue-14422.rs
diff --git a/src/test/run-pass/aux/issue-15562.rs b/src/test/run-pass/auxiliary/issue-15562.rs
index 76243d3bced..76243d3bced 100644
--- a/src/test/run-pass/aux/issue-15562.rs
+++ b/src/test/run-pass/auxiliary/issue-15562.rs
diff --git a/src/test/run-pass/aux/issue-16643.rs b/src/test/run-pass/auxiliary/issue-16643.rs
index b590160a0c2..b590160a0c2 100644
--- a/src/test/run-pass/aux/issue-16643.rs
+++ b/src/test/run-pass/auxiliary/issue-16643.rs
diff --git a/src/test/run-pass/aux/issue-17662.rs b/src/test/run-pass/auxiliary/issue-17662.rs
index fb55a077005..fb55a077005 100644
--- a/src/test/run-pass/aux/issue-17662.rs
+++ b/src/test/run-pass/auxiliary/issue-17662.rs
diff --git a/src/test/run-pass/aux/issue-17718-aux.rs b/src/test/run-pass/auxiliary/issue-17718-aux.rs
index 373fc042175..373fc042175 100644
--- a/src/test/run-pass/aux/issue-17718-aux.rs
+++ b/src/test/run-pass/auxiliary/issue-17718-aux.rs
diff --git a/src/test/run-pass/aux/issue-18501.rs b/src/test/run-pass/auxiliary/issue-18501.rs
index af3bc20378c..af3bc20378c 100644
--- a/src/test/run-pass/aux/issue-18501.rs
+++ b/src/test/run-pass/auxiliary/issue-18501.rs
diff --git a/src/test/run-pass/aux/issue-18514.rs b/src/test/run-pass/auxiliary/issue-18514.rs
index 2a5e07a3285..2a5e07a3285 100644
--- a/src/test/run-pass/aux/issue-18514.rs
+++ b/src/test/run-pass/auxiliary/issue-18514.rs
diff --git a/src/test/run-pass/aux/issue-18711.rs b/src/test/run-pass/auxiliary/issue-18711.rs
index a29dcc00cdd..a29dcc00cdd 100644
--- a/src/test/run-pass/aux/issue-18711.rs
+++ b/src/test/run-pass/auxiliary/issue-18711.rs
diff --git a/src/test/run-pass/aux/issue-18913-1.rs b/src/test/run-pass/auxiliary/issue-18913-1.rs
index 4315e27797f..4315e27797f 100644
--- a/src/test/run-pass/aux/issue-18913-1.rs
+++ b/src/test/run-pass/auxiliary/issue-18913-1.rs
diff --git a/src/test/run-pass/aux/issue-18913-2.rs b/src/test/run-pass/auxiliary/issue-18913-2.rs
index dcdeaec48f5..dcdeaec48f5 100644
--- a/src/test/run-pass/aux/issue-18913-2.rs
+++ b/src/test/run-pass/auxiliary/issue-18913-2.rs
diff --git a/src/test/run-pass/aux/issue-19340-1.rs b/src/test/run-pass/auxiliary/issue-19340-1.rs
index fc61b78d8a7..fc61b78d8a7 100644
--- a/src/test/run-pass/aux/issue-19340-1.rs
+++ b/src/test/run-pass/auxiliary/issue-19340-1.rs
diff --git a/src/test/run-pass/aux/issue-2380.rs b/src/test/run-pass/auxiliary/issue-2380.rs
index cfebc4abaaa..cfebc4abaaa 100644
--- a/src/test/run-pass/aux/issue-2380.rs
+++ b/src/test/run-pass/auxiliary/issue-2380.rs
diff --git a/src/test/run-pass/aux/issue-2414-a.rs b/src/test/run-pass/auxiliary/issue-2414-a.rs
index 8c414193bd6..8c414193bd6 100644
--- a/src/test/run-pass/aux/issue-2414-a.rs
+++ b/src/test/run-pass/auxiliary/issue-2414-a.rs
diff --git a/src/test/run-pass/aux/issue-2414-b.rs b/src/test/run-pass/auxiliary/issue-2414-b.rs
index b1c95bcb430..b1c95bcb430 100644
--- a/src/test/run-pass/aux/issue-2414-b.rs
+++ b/src/test/run-pass/auxiliary/issue-2414-b.rs
diff --git a/src/test/run-pass/aux/issue-25185-1.rs b/src/test/run-pass/auxiliary/issue-25185-1.rs
index 1ec29501b76..1ec29501b76 100644
--- a/src/test/run-pass/aux/issue-25185-1.rs
+++ b/src/test/run-pass/auxiliary/issue-25185-1.rs
diff --git a/src/test/run-pass/aux/issue-25185-2.rs b/src/test/run-pass/auxiliary/issue-25185-2.rs
index 00b5277d6c0..00b5277d6c0 100644
--- a/src/test/run-pass/aux/issue-25185-2.rs
+++ b/src/test/run-pass/auxiliary/issue-25185-2.rs
diff --git a/src/test/run-pass/aux/issue-2526.rs b/src/test/run-pass/auxiliary/issue-2526.rs
index 3d777d01d50..3d777d01d50 100644
--- a/src/test/run-pass/aux/issue-2526.rs
+++ b/src/test/run-pass/auxiliary/issue-2526.rs
diff --git a/src/test/run-pass/aux/issue-25467.rs b/src/test/run-pass/auxiliary/issue-25467.rs
index e358cde1573..e358cde1573 100644
--- a/src/test/run-pass/aux/issue-25467.rs
+++ b/src/test/run-pass/auxiliary/issue-25467.rs
diff --git a/src/test/run-pass/aux/issue-2631-a.rs b/src/test/run-pass/auxiliary/issue-2631-a.rs
index 604a3e69a21..604a3e69a21 100644
--- a/src/test/run-pass/aux/issue-2631-a.rs
+++ b/src/test/run-pass/auxiliary/issue-2631-a.rs
diff --git a/src/test/run-pass/aux/issue-29485.rs b/src/test/run-pass/auxiliary/issue-29485.rs
index 825c4497021..825c4497021 100644
--- a/src/test/run-pass/aux/issue-29485.rs
+++ b/src/test/run-pass/auxiliary/issue-29485.rs
diff --git a/src/test/run-pass/aux/issue-3012-1.rs b/src/test/run-pass/auxiliary/issue-3012-1.rs
index b6199f59ebe..b6199f59ebe 100644
--- a/src/test/run-pass/aux/issue-3012-1.rs
+++ b/src/test/run-pass/auxiliary/issue-3012-1.rs
diff --git a/src/test/run-pass/aux/issue-31702-1.rs b/src/test/run-pass/auxiliary/issue-31702-1.rs
index 50a31630df3..50a31630df3 100644
--- a/src/test/run-pass/aux/issue-31702-1.rs
+++ b/src/test/run-pass/auxiliary/issue-31702-1.rs
diff --git a/src/test/run-pass/aux/issue-31702-2.rs b/src/test/run-pass/auxiliary/issue-31702-2.rs
index c5b1bc6dfb0..c5b1bc6dfb0 100644
--- a/src/test/run-pass/aux/issue-31702-2.rs
+++ b/src/test/run-pass/auxiliary/issue-31702-2.rs
diff --git a/src/test/run-pass/aux/issue-4208-cc.rs b/src/test/run-pass/auxiliary/issue-4208-cc.rs
index a7c1633784d..a7c1633784d 100644
--- a/src/test/run-pass/aux/issue-4208-cc.rs
+++ b/src/test/run-pass/auxiliary/issue-4208-cc.rs
diff --git a/src/test/run-pass/aux/issue-4545.rs b/src/test/run-pass/auxiliary/issue-4545.rs
index 29feeaa7d92..29feeaa7d92 100644
--- a/src/test/run-pass/aux/issue-4545.rs
+++ b/src/test/run-pass/auxiliary/issue-4545.rs
diff --git a/src/test/run-pass/aux/issue-5518.rs b/src/test/run-pass/auxiliary/issue-5518.rs
index cea227e050f..cea227e050f 100644
--- a/src/test/run-pass/aux/issue-5518.rs
+++ b/src/test/run-pass/auxiliary/issue-5518.rs
diff --git a/src/test/run-pass/aux/issue-5521.rs b/src/test/run-pass/auxiliary/issue-5521.rs
index 82bd2b64204..82bd2b64204 100644
--- a/src/test/run-pass/aux/issue-5521.rs
+++ b/src/test/run-pass/auxiliary/issue-5521.rs
diff --git a/src/test/run-pass/aux/issue-7178.rs b/src/test/run-pass/auxiliary/issue-7178.rs
index 18b464bd924..18b464bd924 100644
--- a/src/test/run-pass/aux/issue-7178.rs
+++ b/src/test/run-pass/auxiliary/issue-7178.rs
diff --git a/src/test/run-pass/aux/issue-7899.rs b/src/test/run-pass/auxiliary/issue-7899.rs
index e197e84442b..e197e84442b 100644
--- a/src/test/run-pass/aux/issue-7899.rs
+++ b/src/test/run-pass/auxiliary/issue-7899.rs
diff --git a/src/test/run-pass/aux/issue-8044.rs b/src/test/run-pass/auxiliary/issue-8044.rs
index 8f328699ae0..8f328699ae0 100644
--- a/src/test/run-pass/aux/issue-8044.rs
+++ b/src/test/run-pass/auxiliary/issue-8044.rs
diff --git a/src/test/run-pass/aux/issue-8259.rs b/src/test/run-pass/auxiliary/issue-8259.rs
index 91167e8e32b..91167e8e32b 100644
--- a/src/test/run-pass/aux/issue-8259.rs
+++ b/src/test/run-pass/auxiliary/issue-8259.rs
diff --git a/src/test/run-pass/aux/issue-9906.rs b/src/test/run-pass/auxiliary/issue-9906.rs
index 5eb48985bf9..5eb48985bf9 100644
--- a/src/test/run-pass/aux/issue-9906.rs
+++ b/src/test/run-pass/auxiliary/issue-9906.rs
diff --git a/src/test/run-pass/aux/issue-9968.rs b/src/test/run-pass/auxiliary/issue-9968.rs
index d04d761e112..d04d761e112 100644
--- a/src/test/run-pass/aux/issue-9968.rs
+++ b/src/test/run-pass/auxiliary/issue-9968.rs
diff --git a/src/test/run-pass/aux/issue13507.rs b/src/test/run-pass/auxiliary/issue13507.rs
index 4cb846b5186..4cb846b5186 100644
--- a/src/test/run-pass/aux/issue13507.rs
+++ b/src/test/run-pass/auxiliary/issue13507.rs
diff --git a/src/test/run-pass/aux/issue2170lib.rs b/src/test/run-pass/auxiliary/issue2170lib.rs
index b311ee35674..b311ee35674 100644
--- a/src/test/run-pass/aux/issue2170lib.rs
+++ b/src/test/run-pass/auxiliary/issue2170lib.rs
diff --git a/src/test/run-pass/aux/issue_10031_aux.rs b/src/test/run-pass/auxiliary/issue_10031_aux.rs
index f0f1af2e3a3..f0f1af2e3a3 100644
--- a/src/test/run-pass/aux/issue_10031_aux.rs
+++ b/src/test/run-pass/auxiliary/issue_10031_aux.rs
diff --git a/src/test/run-pass/aux/issue_12612_1.rs b/src/test/run-pass/auxiliary/issue_12612_1.rs
index a0234c1185a..a0234c1185a 100644
--- a/src/test/run-pass/aux/issue_12612_1.rs
+++ b/src/test/run-pass/auxiliary/issue_12612_1.rs
diff --git a/src/test/run-pass/aux/issue_12612_2.rs b/src/test/run-pass/auxiliary/issue_12612_2.rs
index b4ae4374b2e..b4ae4374b2e 100644
--- a/src/test/run-pass/aux/issue_12612_2.rs
+++ b/src/test/run-pass/auxiliary/issue_12612_2.rs
diff --git a/src/test/run-pass/aux/issue_19293.rs b/src/test/run-pass/auxiliary/issue_19293.rs
index 12894ad72e1..12894ad72e1 100644
--- a/src/test/run-pass/aux/issue_19293.rs
+++ b/src/test/run-pass/auxiliary/issue_19293.rs
diff --git a/src/test/run-pass/aux/issue_20389.rs b/src/test/run-pass/auxiliary/issue_20389.rs
index 4ce7e3079e3..4ce7e3079e3 100644
--- a/src/test/run-pass/aux/issue_20389.rs
+++ b/src/test/run-pass/auxiliary/issue_20389.rs
diff --git a/src/test/run-pass/aux/issue_2316_a.rs b/src/test/run-pass/auxiliary/issue_2316_a.rs
index 6bd1e7335ad..6bd1e7335ad 100644
--- a/src/test/run-pass/aux/issue_2316_a.rs
+++ b/src/test/run-pass/auxiliary/issue_2316_a.rs
diff --git a/src/test/run-pass/aux/issue_2316_b.rs b/src/test/run-pass/auxiliary/issue_2316_b.rs
index 8a212f6e5a9..8a212f6e5a9 100644
--- a/src/test/run-pass/aux/issue_2316_b.rs
+++ b/src/test/run-pass/auxiliary/issue_2316_b.rs
diff --git a/src/test/run-pass/aux/issue_2472_b.rs b/src/test/run-pass/auxiliary/issue_2472_b.rs
index 5f55476427f..5f55476427f 100644
--- a/src/test/run-pass/aux/issue_2472_b.rs
+++ b/src/test/run-pass/auxiliary/issue_2472_b.rs
diff --git a/src/test/run-pass/aux/issue_2723_a.rs b/src/test/run-pass/auxiliary/issue_2723_a.rs
index 44bea136a7c..44bea136a7c 100644
--- a/src/test/run-pass/aux/issue_2723_a.rs
+++ b/src/test/run-pass/auxiliary/issue_2723_a.rs
diff --git a/src/test/run-pass/aux/issue_3136_a.rc b/src/test/run-pass/auxiliary/issue_3136_a.rc
index 320e0ceed0f..320e0ceed0f 100644
--- a/src/test/run-pass/aux/issue_3136_a.rc
+++ b/src/test/run-pass/auxiliary/issue_3136_a.rc
diff --git a/src/test/run-pass/aux/issue_3136_a.rs b/src/test/run-pass/auxiliary/issue_3136_a.rs
index 55de208cc90..55de208cc90 100644
--- a/src/test/run-pass/aux/issue_3136_a.rs
+++ b/src/test/run-pass/auxiliary/issue_3136_a.rs
diff --git a/src/test/run-pass/aux/issue_3979_traits.rs b/src/test/run-pass/auxiliary/issue_3979_traits.rs
index 5c306be69c4..5c306be69c4 100644
--- a/src/test/run-pass/aux/issue_3979_traits.rs
+++ b/src/test/run-pass/auxiliary/issue_3979_traits.rs
diff --git a/src/test/run-pass/aux/issue_8401.rs b/src/test/run-pass/auxiliary/issue_8401.rs
index 40e01c1474a..40e01c1474a 100644
--- a/src/test/run-pass/aux/issue_8401.rs
+++ b/src/test/run-pass/auxiliary/issue_8401.rs
diff --git a/src/test/run-pass/aux/issue_9123.rs b/src/test/run-pass/auxiliary/issue_9123.rs
index 8c2546e76cf..8c2546e76cf 100644
--- a/src/test/run-pass/aux/issue_9123.rs
+++ b/src/test/run-pass/auxiliary/issue_9123.rs
diff --git a/src/test/run-pass/aux/issue_9155.rs b/src/test/run-pass/auxiliary/issue_9155.rs
index 486eb8fd6f6..486eb8fd6f6 100644
--- a/src/test/run-pass/aux/issue_9155.rs
+++ b/src/test/run-pass/auxiliary/issue_9155.rs
diff --git a/src/test/run-pass/aux/issue_9188.rs b/src/test/run-pass/auxiliary/issue_9188.rs
index 8ff85cc359d..8ff85cc359d 100644
--- a/src/test/run-pass/aux/issue_9188.rs
+++ b/src/test/run-pass/auxiliary/issue_9188.rs
diff --git a/src/test/run-pass/aux/kinds_in_metadata.rs b/src/test/run-pass/auxiliary/kinds_in_metadata.rs
index 82f182c04bd..82f182c04bd 100644
--- a/src/test/run-pass/aux/kinds_in_metadata.rs
+++ b/src/test/run-pass/auxiliary/kinds_in_metadata.rs
diff --git a/src/test/run-pass/aux/linkage1.rs b/src/test/run-pass/auxiliary/linkage1.rs
index ca4046d8163..ca4046d8163 100644
--- a/src/test/run-pass/aux/linkage1.rs
+++ b/src/test/run-pass/auxiliary/linkage1.rs
diff --git a/src/test/run-pass/aux/macro-include-items-expr.rs b/src/test/run-pass/auxiliary/macro-include-items-expr.rs
index aea3c749930..aea3c749930 100644
--- a/src/test/run-pass/aux/macro-include-items-expr.rs
+++ b/src/test/run-pass/auxiliary/macro-include-items-expr.rs
diff --git a/src/test/run-pass/aux/macro-include-items-item.rs b/src/test/run-pass/auxiliary/macro-include-items-item.rs
index da72aaef805..da72aaef805 100644
--- a/src/test/run-pass/aux/macro-include-items-item.rs
+++ b/src/test/run-pass/auxiliary/macro-include-items-item.rs
diff --git a/src/test/run-pass/aux/macro_crate_def_only.rs b/src/test/run-pass/auxiliary/macro_crate_def_only.rs
index 4f55ac4f65f..4f55ac4f65f 100644
--- a/src/test/run-pass/aux/macro_crate_def_only.rs
+++ b/src/test/run-pass/auxiliary/macro_crate_def_only.rs
diff --git a/src/test/run-pass/aux/macro_crate_nonterminal.rs b/src/test/run-pass/auxiliary/macro_crate_nonterminal.rs
index 4f75e2b5d75..4f75e2b5d75 100644
--- a/src/test/run-pass/aux/macro_crate_nonterminal.rs
+++ b/src/test/run-pass/auxiliary/macro_crate_nonterminal.rs
diff --git a/src/test/run-pass/aux/macro_export_inner_module.rs b/src/test/run-pass/auxiliary/macro_export_inner_module.rs
index 84e944f69b9..84e944f69b9 100644
--- a/src/test/run-pass/aux/macro_export_inner_module.rs
+++ b/src/test/run-pass/auxiliary/macro_export_inner_module.rs
diff --git a/src/test/run-pass/aux/macro_reexport_1.rs b/src/test/run-pass/auxiliary/macro_reexport_1.rs
index aaeccc6e898..aaeccc6e898 100644
--- a/src/test/run-pass/aux/macro_reexport_1.rs
+++ b/src/test/run-pass/auxiliary/macro_reexport_1.rs
diff --git a/src/test/run-pass/aux/macro_reexport_2.rs b/src/test/run-pass/auxiliary/macro_reexport_2.rs
index 3918be88d86..3918be88d86 100644
--- a/src/test/run-pass/aux/macro_reexport_2.rs
+++ b/src/test/run-pass/auxiliary/macro_reexport_2.rs
diff --git a/src/test/run-pass/aux/macro_reexport_2_no_use.rs b/src/test/run-pass/auxiliary/macro_reexport_2_no_use.rs
index 1d3dc26b0b4..1d3dc26b0b4 100644
--- a/src/test/run-pass/aux/macro_reexport_2_no_use.rs
+++ b/src/test/run-pass/auxiliary/macro_reexport_2_no_use.rs
diff --git a/src/test/run-pass/aux/macro_with_super_1.rs b/src/test/run-pass/auxiliary/macro_with_super_1.rs
index fd2e52bb355..fd2e52bb355 100644
--- a/src/test/run-pass/aux/macro_with_super_1.rs
+++ b/src/test/run-pass/auxiliary/macro_with_super_1.rs
diff --git a/src/test/run-pass/aux/method_self_arg1.rs b/src/test/run-pass/auxiliary/method_self_arg1.rs
index 348b71faf0c..348b71faf0c 100644
--- a/src/test/run-pass/aux/method_self_arg1.rs
+++ b/src/test/run-pass/auxiliary/method_self_arg1.rs
diff --git a/src/test/run-pass/aux/method_self_arg2.rs b/src/test/run-pass/auxiliary/method_self_arg2.rs
index b67ec1b9bfc..b67ec1b9bfc 100644
--- a/src/test/run-pass/aux/method_self_arg2.rs
+++ b/src/test/run-pass/auxiliary/method_self_arg2.rs
diff --git a/src/test/run-pass/aux/mir_external_refs.rs b/src/test/run-pass/auxiliary/mir_external_refs.rs
index 4cad98004d7..4cad98004d7 100644
--- a/src/test/run-pass/aux/mir_external_refs.rs
+++ b/src/test/run-pass/auxiliary/mir_external_refs.rs
diff --git a/src/test/run-pass/aux/moves_based_on_type_lib.rs b/src/test/run-pass/auxiliary/moves_based_on_type_lib.rs
index f95be3f4a1d..f95be3f4a1d 100644
--- a/src/test/run-pass/aux/moves_based_on_type_lib.rs
+++ b/src/test/run-pass/auxiliary/moves_based_on_type_lib.rs
diff --git a/src/test/run-pass/aux/msvc-data-only-lib.rs b/src/test/run-pass/auxiliary/msvc-data-only-lib.rs
index 71fb9a51948..71fb9a51948 100644
--- a/src/test/run-pass/aux/msvc-data-only-lib.rs
+++ b/src/test/run-pass/auxiliary/msvc-data-only-lib.rs
diff --git a/src/test/run-pass/aux/namespaced_enum_emulate_flat.rs b/src/test/run-pass/auxiliary/namespaced_enum_emulate_flat.rs
index b7bde4a74a5..b7bde4a74a5 100644
--- a/src/test/run-pass/aux/namespaced_enum_emulate_flat.rs
+++ b/src/test/run-pass/auxiliary/namespaced_enum_emulate_flat.rs
diff --git a/src/test/run-pass/aux/namespaced_enums.rs b/src/test/run-pass/auxiliary/namespaced_enums.rs
index 3bf39b788db..3bf39b788db 100644
--- a/src/test/run-pass/aux/namespaced_enums.rs
+++ b/src/test/run-pass/auxiliary/namespaced_enums.rs
diff --git a/src/test/run-pass/aux/nested_item.rs b/src/test/run-pass/auxiliary/nested_item.rs
index 63639c4cdb3..63639c4cdb3 100644
--- a/src/test/run-pass/aux/nested_item.rs
+++ b/src/test/run-pass/auxiliary/nested_item.rs
diff --git a/src/test/run-pass/aux/newtype_struct_xc.rs b/src/test/run-pass/auxiliary/newtype_struct_xc.rs
index be3414b7ad2..be3414b7ad2 100644
--- a/src/test/run-pass/aux/newtype_struct_xc.rs
+++ b/src/test/run-pass/auxiliary/newtype_struct_xc.rs
diff --git a/src/test/run-pass/aux/overloaded_autoderef_xc.rs b/src/test/run-pass/auxiliary/overloaded_autoderef_xc.rs
index 3c8cba13ae7..3c8cba13ae7 100644
--- a/src/test/run-pass/aux/overloaded_autoderef_xc.rs
+++ b/src/test/run-pass/auxiliary/overloaded_autoderef_xc.rs
diff --git a/src/test/run-pass/aux/packed.rs b/src/test/run-pass/auxiliary/packed.rs
index 86f5f93e3cf..86f5f93e3cf 100644
--- a/src/test/run-pass/aux/packed.rs
+++ b/src/test/run-pass/auxiliary/packed.rs
diff --git a/src/test/run-pass/aux/priv-impl-prim-ty.rs b/src/test/run-pass/auxiliary/priv-impl-prim-ty.rs
index 19cdede5518..19cdede5518 100644
--- a/src/test/run-pass/aux/priv-impl-prim-ty.rs
+++ b/src/test/run-pass/auxiliary/priv-impl-prim-ty.rs
diff --git a/src/test/run-pass/aux/privacy_reexport.rs b/src/test/run-pass/auxiliary/privacy_reexport.rs
index fd97f210a55..fd97f210a55 100644
--- a/src/test/run-pass/aux/privacy_reexport.rs
+++ b/src/test/run-pass/auxiliary/privacy_reexport.rs
diff --git a/src/test/run-pass/aux/pub_use_mods_xcrate.rs b/src/test/run-pass/auxiliary/pub_use_mods_xcrate.rs
index e4890f4fe2d..e4890f4fe2d 100644
--- a/src/test/run-pass/aux/pub_use_mods_xcrate.rs
+++ b/src/test/run-pass/auxiliary/pub_use_mods_xcrate.rs
diff --git a/src/test/run-pass/aux/pub_use_xcrate1.rs b/src/test/run-pass/auxiliary/pub_use_xcrate1.rs
index 41aafd64cb3..41aafd64cb3 100644
--- a/src/test/run-pass/aux/pub_use_xcrate1.rs
+++ b/src/test/run-pass/auxiliary/pub_use_xcrate1.rs
diff --git a/src/test/run-pass/aux/pub_use_xcrate2.rs b/src/test/run-pass/auxiliary/pub_use_xcrate2.rs
index d59d7f2a613..d59d7f2a613 100644
--- a/src/test/run-pass/aux/pub_use_xcrate2.rs
+++ b/src/test/run-pass/auxiliary/pub_use_xcrate2.rs
diff --git a/src/test/run-pass/aux/reachable-unnameable-items.rs b/src/test/run-pass/auxiliary/reachable-unnameable-items.rs
index 7ec2bb9394c..7ec2bb9394c 100644
--- a/src/test/run-pass/aux/reachable-unnameable-items.rs
+++ b/src/test/run-pass/auxiliary/reachable-unnameable-items.rs
diff --git a/src/test/run-pass/aux/reexport-should-still-link.rs b/src/test/run-pass/auxiliary/reexport-should-still-link.rs
index 9d5464e6526..9d5464e6526 100644
--- a/src/test/run-pass/aux/reexport-should-still-link.rs
+++ b/src/test/run-pass/auxiliary/reexport-should-still-link.rs
diff --git a/src/test/run-pass/aux/reexported_static_methods.rs b/src/test/run-pass/auxiliary/reexported_static_methods.rs
index cc4db1a9581..cc4db1a9581 100644
--- a/src/test/run-pass/aux/reexported_static_methods.rs
+++ b/src/test/run-pass/auxiliary/reexported_static_methods.rs
diff --git a/src/test/run-pass/aux/sepcomp-extern-lib.rs b/src/test/run-pass/auxiliary/sepcomp-extern-lib.rs
index 72f1f73a81b..72f1f73a81b 100644
--- a/src/test/run-pass/aux/sepcomp-extern-lib.rs
+++ b/src/test/run-pass/auxiliary/sepcomp-extern-lib.rs
diff --git a/src/test/run-pass/aux/sepcomp_cci_lib.rs b/src/test/run-pass/auxiliary/sepcomp_cci_lib.rs
index c57d161d8f5..c57d161d8f5 100644
--- a/src/test/run-pass/aux/sepcomp_cci_lib.rs
+++ b/src/test/run-pass/auxiliary/sepcomp_cci_lib.rs
diff --git a/src/test/run-pass/aux/sepcomp_lib.rs b/src/test/run-pass/auxiliary/sepcomp_lib.rs
index 9aa16fb2694..9aa16fb2694 100644
--- a/src/test/run-pass/aux/sepcomp_lib.rs
+++ b/src/test/run-pass/auxiliary/sepcomp_lib.rs
diff --git a/src/test/run-pass/aux/static-function-pointer-aux.rs b/src/test/run-pass/auxiliary/static-function-pointer-aux.rs
index 2ccdb4e0864..2ccdb4e0864 100644
--- a/src/test/run-pass/aux/static-function-pointer-aux.rs
+++ b/src/test/run-pass/auxiliary/static-function-pointer-aux.rs
diff --git a/src/test/run-pass/aux/static-methods-crate.rs b/src/test/run-pass/auxiliary/static-methods-crate.rs
index b8fd59bf703..b8fd59bf703 100644
--- a/src/test/run-pass/aux/static-methods-crate.rs
+++ b/src/test/run-pass/auxiliary/static-methods-crate.rs
diff --git a/src/test/run-pass/aux/static_fn_inline_xc_aux.rs b/src/test/run-pass/auxiliary/static_fn_inline_xc_aux.rs
index 2193e12bceb..2193e12bceb 100644
--- a/src/test/run-pass/aux/static_fn_inline_xc_aux.rs
+++ b/src/test/run-pass/auxiliary/static_fn_inline_xc_aux.rs
diff --git a/src/test/run-pass/aux/static_fn_trait_xc_aux.rs b/src/test/run-pass/auxiliary/static_fn_trait_xc_aux.rs
index 44e875fbe3c..44e875fbe3c 100644
--- a/src/test/run-pass/aux/static_fn_trait_xc_aux.rs
+++ b/src/test/run-pass/auxiliary/static_fn_trait_xc_aux.rs
diff --git a/src/test/run-pass/aux/static_mut_xc.rs b/src/test/run-pass/auxiliary/static_mut_xc.rs
index 9d677e3dc46..9d677e3dc46 100644
--- a/src/test/run-pass/aux/static_mut_xc.rs
+++ b/src/test/run-pass/auxiliary/static_mut_xc.rs
diff --git a/src/test/run-pass/aux/struct_destructuring_cross_crate.rs b/src/test/run-pass/auxiliary/struct_destructuring_cross_crate.rs
index 26941b726d4..26941b726d4 100644
--- a/src/test/run-pass/aux/struct_destructuring_cross_crate.rs
+++ b/src/test/run-pass/auxiliary/struct_destructuring_cross_crate.rs
diff --git a/src/test/run-pass/aux/struct_variant_xc_aux.rs b/src/test/run-pass/auxiliary/struct_variant_xc_aux.rs
index 201f028b6b6..201f028b6b6 100644
--- a/src/test/run-pass/aux/struct_variant_xc_aux.rs
+++ b/src/test/run-pass/auxiliary/struct_variant_xc_aux.rs
diff --git a/src/test/run-pass/aux/svh-a-base.rs b/src/test/run-pass/auxiliary/svh-a-base.rs
index 31a97f695f0..31a97f695f0 100644
--- a/src/test/run-pass/aux/svh-a-base.rs
+++ b/src/test/run-pass/auxiliary/svh-a-base.rs
diff --git a/src/test/run-pass/aux/svh-a-comment.rs b/src/test/run-pass/auxiliary/svh-a-comment.rs
index 22e40822eec..22e40822eec 100644
--- a/src/test/run-pass/aux/svh-a-comment.rs
+++ b/src/test/run-pass/auxiliary/svh-a-comment.rs
diff --git a/src/test/run-pass/aux/svh-a-doc.rs b/src/test/run-pass/auxiliary/svh-a-doc.rs
index 3d8a728967a..3d8a728967a 100644
--- a/src/test/run-pass/aux/svh-a-doc.rs
+++ b/src/test/run-pass/auxiliary/svh-a-doc.rs
diff --git a/src/test/run-pass/aux/svh-a-macro.rs b/src/test/run-pass/auxiliary/svh-a-macro.rs
index 41d7eb7b186..41d7eb7b186 100644
--- a/src/test/run-pass/aux/svh-a-macro.rs
+++ b/src/test/run-pass/auxiliary/svh-a-macro.rs
diff --git a/src/test/run-pass/aux/svh-a-no-change.rs b/src/test/run-pass/auxiliary/svh-a-no-change.rs
index 31a97f695f0..31a97f695f0 100644
--- a/src/test/run-pass/aux/svh-a-no-change.rs
+++ b/src/test/run-pass/auxiliary/svh-a-no-change.rs
diff --git a/src/test/run-pass/aux/svh-a-redundant-cfg.rs b/src/test/run-pass/auxiliary/svh-a-redundant-cfg.rs
index e405c337abe..e405c337abe 100644
--- a/src/test/run-pass/aux/svh-a-redundant-cfg.rs
+++ b/src/test/run-pass/auxiliary/svh-a-redundant-cfg.rs
diff --git a/src/test/run-pass/aux/svh-a-whitespace.rs b/src/test/run-pass/auxiliary/svh-a-whitespace.rs
index 9ef788c9842..9ef788c9842 100644
--- a/src/test/run-pass/aux/svh-a-whitespace.rs
+++ b/src/test/run-pass/auxiliary/svh-a-whitespace.rs
diff --git a/src/test/run-pass/aux/svh-b.rs b/src/test/run-pass/auxiliary/svh-b.rs
index b8946fdc995..b8946fdc995 100644
--- a/src/test/run-pass/aux/svh-b.rs
+++ b/src/test/run-pass/auxiliary/svh-b.rs
diff --git a/src/test/run-pass/aux/thread-local-extern-static.rs b/src/test/run-pass/auxiliary/thread-local-extern-static.rs
index d1971a5e1ae..d1971a5e1ae 100644
--- a/src/test/run-pass/aux/thread-local-extern-static.rs
+++ b/src/test/run-pass/auxiliary/thread-local-extern-static.rs
diff --git a/src/test/run-pass/aux/trait_default_method_xc_aux.rs b/src/test/run-pass/auxiliary/trait_default_method_xc_aux.rs
index c1168a912dc..c1168a912dc 100644
--- a/src/test/run-pass/aux/trait_default_method_xc_aux.rs
+++ b/src/test/run-pass/auxiliary/trait_default_method_xc_aux.rs
diff --git a/src/test/run-pass/aux/trait_default_method_xc_aux_2.rs b/src/test/run-pass/auxiliary/trait_default_method_xc_aux_2.rs
index 7443ef9c0f3..7443ef9c0f3 100644
--- a/src/test/run-pass/aux/trait_default_method_xc_aux_2.rs
+++ b/src/test/run-pass/auxiliary/trait_default_method_xc_aux_2.rs
diff --git a/src/test/run-pass/aux/trait_inheritance_auto_xc_2_aux.rs b/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_2_aux.rs
index af0128d9676..af0128d9676 100644
--- a/src/test/run-pass/aux/trait_inheritance_auto_xc_2_aux.rs
+++ b/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_2_aux.rs
diff --git a/src/test/run-pass/aux/trait_inheritance_auto_xc_aux.rs b/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_aux.rs
index 6be1f8c45f4..6be1f8c45f4 100644
--- a/src/test/run-pass/aux/trait_inheritance_auto_xc_aux.rs
+++ b/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_aux.rs
diff --git a/src/test/run-pass/aux/trait_inheritance_cross_trait_call_xc_aux.rs b/src/test/run-pass/auxiliary/trait_inheritance_cross_trait_call_xc_aux.rs
index 9eeb815c5de..9eeb815c5de 100644
--- a/src/test/run-pass/aux/trait_inheritance_cross_trait_call_xc_aux.rs
+++ b/src/test/run-pass/auxiliary/trait_inheritance_cross_trait_call_xc_aux.rs
diff --git a/src/test/run-pass/aux/trait_inheritance_overloading_xc.rs b/src/test/run-pass/auxiliary/trait_inheritance_overloading_xc.rs
index 1bfada612eb..1bfada612eb 100644
--- a/src/test/run-pass/aux/trait_inheritance_overloading_xc.rs
+++ b/src/test/run-pass/auxiliary/trait_inheritance_overloading_xc.rs
diff --git a/src/test/run-pass/aux/trait_safety_lib.rs b/src/test/run-pass/auxiliary/trait_safety_lib.rs
index 585a756fd07..585a756fd07 100644
--- a/src/test/run-pass/aux/trait_safety_lib.rs
+++ b/src/test/run-pass/auxiliary/trait_safety_lib.rs
diff --git a/src/test/run-pass/aux/trait_superkinds_in_metadata.rs b/src/test/run-pass/auxiliary/trait_superkinds_in_metadata.rs
index 0fa2d3459f4..0fa2d3459f4 100644
--- a/src/test/run-pass/aux/trait_superkinds_in_metadata.rs
+++ b/src/test/run-pass/auxiliary/trait_superkinds_in_metadata.rs
diff --git a/src/test/run-pass/aux/traitimpl.rs b/src/test/run-pass/auxiliary/traitimpl.rs
index 22e79cc6284..22e79cc6284 100644
--- a/src/test/run-pass/aux/traitimpl.rs
+++ b/src/test/run-pass/auxiliary/traitimpl.rs
diff --git a/src/test/run-pass/aux/two_macros.rs b/src/test/run-pass/auxiliary/two_macros.rs
index 060960f0dbc..060960f0dbc 100644
--- a/src/test/run-pass/aux/two_macros.rs
+++ b/src/test/run-pass/auxiliary/two_macros.rs
diff --git a/src/test/run-pass/aux/typeid-intrinsic-aux1.rs b/src/test/run-pass/auxiliary/typeid-intrinsic-aux1.rs
index 388d3238d42..388d3238d42 100644
--- a/src/test/run-pass/aux/typeid-intrinsic-aux1.rs
+++ b/src/test/run-pass/auxiliary/typeid-intrinsic-aux1.rs
diff --git a/src/test/run-pass/aux/typeid-intrinsic-aux2.rs b/src/test/run-pass/auxiliary/typeid-intrinsic-aux2.rs
index 3ad307fd3b5..3ad307fd3b5 100644
--- a/src/test/run-pass/aux/typeid-intrinsic-aux2.rs
+++ b/src/test/run-pass/auxiliary/typeid-intrinsic-aux2.rs
diff --git a/src/test/run-pass/aux/unboxed-closures-cross-crate.rs b/src/test/run-pass/auxiliary/unboxed-closures-cross-crate.rs
index dac20dd2f7a..dac20dd2f7a 100644
--- a/src/test/run-pass/aux/unboxed-closures-cross-crate.rs
+++ b/src/test/run-pass/auxiliary/unboxed-closures-cross-crate.rs
diff --git a/src/test/run-pass/aux/weak-lang-items.rs b/src/test/run-pass/auxiliary/weak-lang-items.rs
index 6434e62b6f7..6434e62b6f7 100644
--- a/src/test/run-pass/aux/weak-lang-items.rs
+++ b/src/test/run-pass/auxiliary/weak-lang-items.rs
diff --git a/src/test/run-pass/aux/where_clauses_xc.rs b/src/test/run-pass/auxiliary/where_clauses_xc.rs
index 4549bd719c6..4549bd719c6 100644
--- a/src/test/run-pass/aux/where_clauses_xc.rs
+++ b/src/test/run-pass/auxiliary/where_clauses_xc.rs
diff --git a/src/test/run-pass/aux/xcrate-trait-lifetime-param.rs b/src/test/run-pass/auxiliary/xcrate-trait-lifetime-param.rs
index e8e5cc53aa3..e8e5cc53aa3 100644
--- a/src/test/run-pass/aux/xcrate-trait-lifetime-param.rs
+++ b/src/test/run-pass/auxiliary/xcrate-trait-lifetime-param.rs
diff --git a/src/test/run-pass/aux/xcrate_address_insignificant.rs b/src/test/run-pass/auxiliary/xcrate_address_insignificant.rs
index 5195839c067..5195839c067 100644
--- a/src/test/run-pass/aux/xcrate_address_insignificant.rs
+++ b/src/test/run-pass/auxiliary/xcrate_address_insignificant.rs
diff --git a/src/test/run-pass/aux/xcrate_associated_type_defaults.rs b/src/test/run-pass/auxiliary/xcrate_associated_type_defaults.rs
index 6779438c672..6779438c672 100644
--- a/src/test/run-pass/aux/xcrate_associated_type_defaults.rs
+++ b/src/test/run-pass/auxiliary/xcrate_associated_type_defaults.rs
diff --git a/src/test/run-pass/aux/xcrate_static_addresses.rs b/src/test/run-pass/auxiliary/xcrate_static_addresses.rs
index d0da80e31b9..d0da80e31b9 100644
--- a/src/test/run-pass/aux/xcrate_static_addresses.rs
+++ b/src/test/run-pass/auxiliary/xcrate_static_addresses.rs
diff --git a/src/test/run-pass/aux/xcrate_struct_aliases.rs b/src/test/run-pass/auxiliary/xcrate_struct_aliases.rs
index 334f7829bd1..334f7829bd1 100644
--- a/src/test/run-pass/aux/xcrate_struct_aliases.rs
+++ b/src/test/run-pass/auxiliary/xcrate_struct_aliases.rs
diff --git a/src/test/run-pass/aux/xcrate_unit_struct.rs b/src/test/run-pass/auxiliary/xcrate_unit_struct.rs
index 7a69be2b06c..7a69be2b06c 100644
--- a/src/test/run-pass/aux/xcrate_unit_struct.rs
+++ b/src/test/run-pass/auxiliary/xcrate_unit_struct.rs
diff --git a/src/test/run-pass/import-crate-with-invalid-spans/aux/crate_with_invalid_spans.rs b/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs
index b37533d2da7..b37533d2da7 100644
--- a/src/test/run-pass/import-crate-with-invalid-spans/aux/crate_with_invalid_spans.rs
+++ b/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs
diff --git a/src/test/run-pass/import-crate-with-invalid-spans/aux/crate_with_invalid_spans_macros.rs b/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs
index 112315af844..112315af844 100644
--- a/src/test/run-pass/import-crate-with-invalid-spans/aux/crate_with_invalid_spans_macros.rs
+++ b/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs
diff --git a/src/test/run-pass/issue24687-embed-debuginfo/aux/issue24687_lib.rs b/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs
index f1624fd2e58..f1624fd2e58 100644
--- a/src/test/run-pass/issue24687-embed-debuginfo/aux/issue24687_lib.rs
+++ b/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs
diff --git a/src/test/run-pass/issue24687-embed-debuginfo/aux/issue24687_mbcs_in_comments.rs b/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs
index 8dc243aed7e..8dc243aed7e 100644
--- a/src/test/run-pass/issue24687-embed-debuginfo/aux/issue24687_mbcs_in_comments.rs
+++ b/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs
diff --git a/src/test/run-pass/macro-include-items.rs b/src/test/run-pass/macro-include-items.rs
index a2e1d86a990..1e31c85afad 100644
--- a/src/test/run-pass/macro-include-items.rs
+++ b/src/test/run-pass/macro-include-items.rs
@@ -12,9 +12,9 @@
 
 fn bar() {}
 
-include!(concat!("", "", "aux/", "macro-include-items-item.rs"));
+include!(concat!("", "", "auxiliary/", "macro-include-items-item.rs"));
 
 fn main() {
     foo();
-    assert_eq!(include!(concat!("", "aux/", "macro-include-items-expr.rs")), 1_usize);
+    assert_eq!(include!(concat!("", "auxiliary/", "macro-include-items-expr.rs")), 1_usize);
 }
diff --git a/src/test/run-pass/specialization/aux/go_trait.rs b/src/test/run-pass/specialization/auxiliary/go_trait.rs
index 044bb606b40..044bb606b40 100644
--- a/src/test/run-pass/specialization/aux/go_trait.rs
+++ b/src/test/run-pass/specialization/auxiliary/go_trait.rs
diff --git a/src/test/run-pass/specialization/aux/specialization_cross_crate.rs b/src/test/run-pass/specialization/auxiliary/specialization_cross_crate.rs
index 1d235336de8..1d235336de8 100644
--- a/src/test/run-pass/specialization/aux/specialization_cross_crate.rs
+++ b/src/test/run-pass/specialization/auxiliary/specialization_cross_crate.rs
diff --git a/src/test/run-pass/specialization/aux/specialization_cross_crate_defaults.rs b/src/test/run-pass/specialization/auxiliary/specialization_cross_crate_defaults.rs
index b62d80b589f..b62d80b589f 100644
--- a/src/test/run-pass/specialization/aux/specialization_cross_crate_defaults.rs
+++ b/src/test/run-pass/specialization/auxiliary/specialization_cross_crate_defaults.rs
diff --git a/src/test/rustdoc/aux/empty.rs b/src/test/rustdoc/auxiliary/empty.rs
index 30669470522..30669470522 100644
--- a/src/test/rustdoc/aux/empty.rs
+++ b/src/test/rustdoc/auxiliary/empty.rs
diff --git a/src/test/rustdoc/aux/inline-default-methods.rs b/src/test/rustdoc/auxiliary/inline-default-methods.rs
index e21e6ad2043..e21e6ad2043 100644
--- a/src/test/rustdoc/aux/inline-default-methods.rs
+++ b/src/test/rustdoc/auxiliary/inline-default-methods.rs
diff --git a/src/test/rustdoc/aux/issue-13698.rs b/src/test/rustdoc/auxiliary/issue-13698.rs
index ecddfe99b3b..ecddfe99b3b 100644
--- a/src/test/rustdoc/aux/issue-13698.rs
+++ b/src/test/rustdoc/auxiliary/issue-13698.rs
diff --git a/src/test/rustdoc/aux/issue-15318.rs b/src/test/rustdoc/auxiliary/issue-15318.rs
index 145b4df6299..145b4df6299 100644
--- a/src/test/rustdoc/aux/issue-15318.rs
+++ b/src/test/rustdoc/auxiliary/issue-15318.rs
diff --git a/src/test/rustdoc/aux/issue-17476.rs b/src/test/rustdoc/auxiliary/issue-17476.rs
index 644d1634e9d..644d1634e9d 100644
--- a/src/test/rustdoc/aux/issue-17476.rs
+++ b/src/test/rustdoc/auxiliary/issue-17476.rs
diff --git a/src/test/rustdoc/aux/issue-19190-3.rs b/src/test/rustdoc/auxiliary/issue-19190-3.rs
index 2c9271202a6..2c9271202a6 100644
--- a/src/test/rustdoc/aux/issue-19190-3.rs
+++ b/src/test/rustdoc/auxiliary/issue-19190-3.rs
diff --git a/src/test/rustdoc/aux/issue-20646.rs b/src/test/rustdoc/auxiliary/issue-20646.rs
index 815b78a91d9..815b78a91d9 100644
--- a/src/test/rustdoc/aux/issue-20646.rs
+++ b/src/test/rustdoc/auxiliary/issue-20646.rs
diff --git a/src/test/rustdoc/aux/issue-20727.rs b/src/test/rustdoc/auxiliary/issue-20727.rs
index 2ec761fad96..2ec761fad96 100644
--- a/src/test/rustdoc/aux/issue-20727.rs
+++ b/src/test/rustdoc/auxiliary/issue-20727.rs
diff --git a/src/test/rustdoc/aux/issue-21092.rs b/src/test/rustdoc/auxiliary/issue-21092.rs
index e906311e3ae..e906311e3ae 100644
--- a/src/test/rustdoc/aux/issue-21092.rs
+++ b/src/test/rustdoc/auxiliary/issue-21092.rs
diff --git a/src/test/rustdoc/aux/issue-21801.rs b/src/test/rustdoc/auxiliary/issue-21801.rs
index f618edec598..f618edec598 100644
--- a/src/test/rustdoc/aux/issue-21801.rs
+++ b/src/test/rustdoc/auxiliary/issue-21801.rs
diff --git a/src/test/rustdoc/aux/issue-22025.rs b/src/test/rustdoc/auxiliary/issue-22025.rs
index 35a37e27d91..35a37e27d91 100644
--- a/src/test/rustdoc/aux/issue-22025.rs
+++ b/src/test/rustdoc/auxiliary/issue-22025.rs
diff --git a/src/test/rustdoc/aux/issue-23207-1.rs b/src/test/rustdoc/auxiliary/issue-23207-1.rs
index ec9f2004ebf..ec9f2004ebf 100644
--- a/src/test/rustdoc/aux/issue-23207-1.rs
+++ b/src/test/rustdoc/auxiliary/issue-23207-1.rs
diff --git a/src/test/rustdoc/aux/issue-23207-2.rs b/src/test/rustdoc/auxiliary/issue-23207-2.rs
index 5e9c540ab69..5e9c540ab69 100644
--- a/src/test/rustdoc/aux/issue-23207-2.rs
+++ b/src/test/rustdoc/auxiliary/issue-23207-2.rs
diff --git a/src/test/rustdoc/aux/issue-26606-macro.rs b/src/test/rustdoc/auxiliary/issue-26606-macro.rs
index 6059a252bce..6059a252bce 100644
--- a/src/test/rustdoc/aux/issue-26606-macro.rs
+++ b/src/test/rustdoc/auxiliary/issue-26606-macro.rs
diff --git a/src/test/rustdoc/aux/issue-27362.rs b/src/test/rustdoc/auxiliary/issue-27362.rs
index 25de698cad1..25de698cad1 100644
--- a/src/test/rustdoc/aux/issue-27362.rs
+++ b/src/test/rustdoc/auxiliary/issue-27362.rs
diff --git a/src/test/rustdoc/aux/issue-28927-1.rs b/src/test/rustdoc/auxiliary/issue-28927-1.rs
index 7d6b448df43..7d6b448df43 100644
--- a/src/test/rustdoc/aux/issue-28927-1.rs
+++ b/src/test/rustdoc/auxiliary/issue-28927-1.rs
diff --git a/src/test/rustdoc/aux/issue-28927-2.rs b/src/test/rustdoc/auxiliary/issue-28927-2.rs
index c5117005049..c5117005049 100644
--- a/src/test/rustdoc/aux/issue-28927-2.rs
+++ b/src/test/rustdoc/auxiliary/issue-28927-2.rs
diff --git a/src/test/rustdoc/aux/issue-29584.rs b/src/test/rustdoc/auxiliary/issue-29584.rs
index 63c79f875ef..63c79f875ef 100644
--- a/src/test/rustdoc/aux/issue-29584.rs
+++ b/src/test/rustdoc/auxiliary/issue-29584.rs
diff --git a/src/test/rustdoc/aux/issue-30109-1.rs b/src/test/rustdoc/auxiliary/issue-30109-1.rs
index 59f952a0b29..59f952a0b29 100644
--- a/src/test/rustdoc/aux/issue-30109-1.rs
+++ b/src/test/rustdoc/auxiliary/issue-30109-1.rs
diff --git a/src/test/rustdoc/aux/reexp_stripped.rs b/src/test/rustdoc/auxiliary/reexp_stripped.rs
index 2b061e3997d..2b061e3997d 100644
--- a/src/test/rustdoc/aux/reexp_stripped.rs
+++ b/src/test/rustdoc/auxiliary/reexp_stripped.rs
diff --git a/src/test/rustdoc/aux/rustdoc-default-impl.rs b/src/test/rustdoc/auxiliary/rustdoc-default-impl.rs
index c2ff7a0054f..c2ff7a0054f 100644
--- a/src/test/rustdoc/aux/rustdoc-default-impl.rs
+++ b/src/test/rustdoc/auxiliary/rustdoc-default-impl.rs
diff --git a/src/test/rustdoc/aux/rustdoc-extern-default-method.rs b/src/test/rustdoc/auxiliary/rustdoc-extern-default-method.rs
index 861562753f9..861562753f9 100644
--- a/src/test/rustdoc/aux/rustdoc-extern-default-method.rs
+++ b/src/test/rustdoc/auxiliary/rustdoc-extern-default-method.rs
diff --git a/src/test/rustdoc/aux/rustdoc-extern-method.rs b/src/test/rustdoc/auxiliary/rustdoc-extern-method.rs
index 96a7a8378b7..96a7a8378b7 100644
--- a/src/test/rustdoc/aux/rustdoc-extern-method.rs
+++ b/src/test/rustdoc/auxiliary/rustdoc-extern-method.rs
diff --git a/src/test/rustdoc/aux/rustdoc-ffi.rs b/src/test/rustdoc/auxiliary/rustdoc-ffi.rs
index e06dbe76dbb..e06dbe76dbb 100644
--- a/src/test/rustdoc/aux/rustdoc-ffi.rs
+++ b/src/test/rustdoc/auxiliary/rustdoc-ffi.rs
diff --git a/src/test/rustdoc/aux/rustdoc-impl-parts-crosscrate.rs b/src/test/rustdoc/auxiliary/rustdoc-impl-parts-crosscrate.rs
index 6e8f80c8f5f..6e8f80c8f5f 100644
--- a/src/test/rustdoc/aux/rustdoc-impl-parts-crosscrate.rs
+++ b/src/test/rustdoc/auxiliary/rustdoc-impl-parts-crosscrate.rs
diff --git a/src/test/rustdoc/aux/variant-struct.rs b/src/test/rustdoc/auxiliary/variant-struct.rs
index d846c0adf61..d846c0adf61 100644
--- a/src/test/rustdoc/aux/variant-struct.rs
+++ b/src/test/rustdoc/auxiliary/variant-struct.rs
diff --git a/src/test/rustdoc/inline_cross/aux/issue-33113.rs b/src/test/rustdoc/inline_cross/auxiliary/issue-33113.rs
index c476dda2690..c476dda2690 100644
--- a/src/test/rustdoc/inline_cross/aux/issue-33113.rs
+++ b/src/test/rustdoc/inline_cross/auxiliary/issue-33113.rs
diff --git a/src/test/rustdoc/inline_cross/aux/rustdoc-hidden-sig.rs b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden-sig.rs
index e2bc153ce0d..e2bc153ce0d 100644
--- a/src/test/rustdoc/inline_cross/aux/rustdoc-hidden-sig.rs
+++ b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden-sig.rs
diff --git a/src/test/rustdoc/inline_cross/aux/rustdoc-hidden.rs b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden.rs
index aae3eb84fb5..aae3eb84fb5 100644
--- a/src/test/rustdoc/inline_cross/aux/rustdoc-hidden.rs
+++ b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden.rs
diff --git a/src/test/rustdoc/inline_cross/aux/rustdoc-nonreachable-impls.rs b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-nonreachable-impls.rs
index 22a311d5797..22a311d5797 100644
--- a/src/test/rustdoc/inline_cross/aux/rustdoc-nonreachable-impls.rs
+++ b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-nonreachable-impls.rs
diff --git a/src/test/rustdoc/inline_cross/aux/rustdoc-trait-object-impl.rs b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-trait-object-impl.rs
index 317262f4175..317262f4175 100644
--- a/src/test/rustdoc/inline_cross/aux/rustdoc-trait-object-impl.rs
+++ b/src/test/rustdoc/inline_cross/auxiliary/rustdoc-trait-object-impl.rs
diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
index 6e1cae9b25c..245c3992bee 100644
--- a/src/tools/compiletest/src/main.rs
+++ b/src/tools/compiletest/src/main.rs
@@ -360,7 +360,7 @@ fn collect_tests_from_dir(config: &Config,
             tests.push(make_test(config, &paths))
         } else if file_path.is_dir() {
             let relative_file_path = relative_dir_path.join(file.file_name());
-            if &file_name == "aux" {
+            if &file_name == "auxiliary" {
                 // `aux` directories contain other crates used for
                 // cross-crate tests. Don't search them for tests, but
                 // do create a directory in the build dir for them,
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 858cecf8612..74e4b81f555 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -1153,7 +1153,7 @@ actual:\n\
         let test_ab = self.testpaths.file
                                     .parent()
                                     .expect("test file path has no parent")
-                                    .join("aux")
+                                    .join("auxiliary")
                                     .join(rel_ab);
         if !test_ab.exists() {
             self.fatal(&format!("aux-build `{}` source not found", test_ab.display()))
@@ -1163,7 +1163,7 @@ actual:\n\
             file: test_ab,
             base: self.testpaths.base.clone(),
             relative_dir: self.testpaths.relative_dir
-                                        .join("aux")
+                                        .join("auxiliary")
                                         .join(rel_ab)
                                         .parent()
                                         .expect("aux-build path has no parent")