Migrated slew of run-pass tests to various subdirectories of `ui/run-pass/`.

2396 files changed, 0 insertions, 0 deletions

diff --git a/src/test/run-pass/arr_cycle.rs b/src/test/ui/run-pass/array-slice-vec/arr_cycle.rs
index 400458b614b..400458b614b 100644
--- a/src/test/run-pass/arr_cycle.rs
+++ b/src/test/ui/run-pass/array-slice-vec/arr_cycle.rs
diff --git a/src/test/run-pass/array_const_index-1.rs b/src/test/ui/run-pass/array-slice-vec/array_const_index-1.rs
index 3e4504eb195..3e4504eb195 100644
--- a/src/test/run-pass/array_const_index-1.rs
+++ b/src/test/ui/run-pass/array-slice-vec/array_const_index-1.rs
diff --git a/src/test/run-pass/box-of-array-of-drop-1.rs b/src/test/ui/run-pass/array-slice-vec/box-of-array-of-drop-1.rs
index db055e6886a..db055e6886a 100644
--- a/src/test/run-pass/box-of-array-of-drop-1.rs
+++ b/src/test/ui/run-pass/array-slice-vec/box-of-array-of-drop-1.rs
diff --git a/src/test/run-pass/box-of-array-of-drop-2.rs b/src/test/ui/run-pass/array-slice-vec/box-of-array-of-drop-2.rs
index 9dde53bb31d..9dde53bb31d 100644
--- a/src/test/run-pass/box-of-array-of-drop-2.rs
+++ b/src/test/ui/run-pass/array-slice-vec/box-of-array-of-drop-2.rs
diff --git a/src/test/run-pass/cast-in-array-size.rs b/src/test/ui/run-pass/array-slice-vec/cast-in-array-size.rs
index 6f1fafba563..6f1fafba563 100644
--- a/src/test/run-pass/cast-in-array-size.rs
+++ b/src/test/ui/run-pass/array-slice-vec/cast-in-array-size.rs
diff --git a/src/test/run-pass/check-static-mut-slices.rs b/src/test/ui/run-pass/array-slice-vec/check-static-mut-slices.rs
index 1cfe5bdaebb..1cfe5bdaebb 100644
--- a/src/test/run-pass/check-static-mut-slices.rs
+++ b/src/test/ui/run-pass/array-slice-vec/check-static-mut-slices.rs
diff --git a/src/test/run-pass/check-static-slice.rs b/src/test/ui/run-pass/array-slice-vec/check-static-slice.rs
index b5f2bea5a38..b5f2bea5a38 100644
--- a/src/test/run-pass/check-static-slice.rs
+++ b/src/test/ui/run-pass/array-slice-vec/check-static-slice.rs
diff --git a/src/test/run-pass/copy-out-of-array-1.rs b/src/test/ui/run-pass/array-slice-vec/copy-out-of-array-1.rs
index 54147c73ff0..54147c73ff0 100644
--- a/src/test/run-pass/copy-out-of-array-1.rs
+++ b/src/test/ui/run-pass/array-slice-vec/copy-out-of-array-1.rs
diff --git a/src/test/run-pass/destructure-array-1.rs b/src/test/ui/run-pass/array-slice-vec/destructure-array-1.rs
index 43271162c18..43271162c18 100644
--- a/src/test/run-pass/destructure-array-1.rs
+++ b/src/test/ui/run-pass/array-slice-vec/destructure-array-1.rs
diff --git a/src/test/run-pass/empty-mutable-vec.rs b/src/test/ui/run-pass/array-slice-vec/empty-mutable-vec.rs
index 757579faa17..757579faa17 100644
--- a/src/test/run-pass/empty-mutable-vec.rs
+++ b/src/test/ui/run-pass/array-slice-vec/empty-mutable-vec.rs
diff --git a/src/test/run-pass/estr-slice.rs b/src/test/ui/run-pass/array-slice-vec/estr-slice.rs
index 5364cdc627f..5364cdc627f 100644
--- a/src/test/run-pass/estr-slice.rs
+++ b/src/test/ui/run-pass/array-slice-vec/estr-slice.rs
diff --git a/src/test/run-pass/evec-slice.rs b/src/test/ui/run-pass/array-slice-vec/evec-slice.rs
index 52ccbe52d46..52ccbe52d46 100644
--- a/src/test/run-pass/evec-slice.rs
+++ b/src/test/ui/run-pass/array-slice-vec/evec-slice.rs
diff --git a/src/test/run-pass/fixed_length_copy.rs b/src/test/ui/run-pass/array-slice-vec/fixed_length_copy.rs
index eefd9447535..eefd9447535 100644
--- a/src/test/run-pass/fixed_length_copy.rs
+++ b/src/test/ui/run-pass/array-slice-vec/fixed_length_copy.rs
diff --git a/src/test/run-pass/huge-largest-array.rs b/src/test/ui/run-pass/array-slice-vec/huge-largest-array.rs
index f0bb31b8470..f0bb31b8470 100644
--- a/src/test/run-pass/huge-largest-array.rs
+++ b/src/test/ui/run-pass/array-slice-vec/huge-largest-array.rs
diff --git a/src/test/run-pass/ivec-pass-by-value.rs b/src/test/ui/run-pass/array-slice-vec/ivec-pass-by-value.rs
index e3b42e60645..e3b42e60645 100644
--- a/src/test/run-pass/ivec-pass-by-value.rs
+++ b/src/test/ui/run-pass/array-slice-vec/ivec-pass-by-value.rs
diff --git a/src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs b/src/test/ui/run-pass/array-slice-vec/mutability-inherits-through-fixed-length-vec.rs
index 8b5b290aa6f..8b5b290aa6f 100644
--- a/src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs
+++ b/src/test/ui/run-pass/array-slice-vec/mutability-inherits-through-fixed-length-vec.rs
diff --git a/src/test/run-pass/mutable-alias-vec.rs b/src/test/ui/run-pass/array-slice-vec/mutable-alias-vec.rs
index 3f90cedca9b..3f90cedca9b 100644
--- a/src/test/run-pass/mutable-alias-vec.rs
+++ b/src/test/ui/run-pass/array-slice-vec/mutable-alias-vec.rs
diff --git a/src/test/run-pass/nested-vec-1.rs b/src/test/ui/run-pass/array-slice-vec/nested-vec-1.rs
index 2b92ed38eab..2b92ed38eab 100644
--- a/src/test/run-pass/nested-vec-1.rs
+++ b/src/test/ui/run-pass/array-slice-vec/nested-vec-1.rs
diff --git a/src/test/run-pass/nested-vec-2.rs b/src/test/ui/run-pass/array-slice-vec/nested-vec-2.rs
index 669f9e4f4bb..669f9e4f4bb 100644
--- a/src/test/run-pass/nested-vec-2.rs
+++ b/src/test/ui/run-pass/array-slice-vec/nested-vec-2.rs
diff --git a/src/test/run-pass/nested-vec-3.rs b/src/test/ui/run-pass/array-slice-vec/nested-vec-3.rs
index d1a63b44392..d1a63b44392 100644
--- a/src/test/run-pass/nested-vec-3.rs
+++ b/src/test/ui/run-pass/array-slice-vec/nested-vec-3.rs
diff --git a/src/test/run-pass/new-style-fixed-length-vec.rs b/src/test/ui/run-pass/array-slice-vec/new-style-fixed-length-vec.rs
index 4d9f0394eb4..4d9f0394eb4 100644
--- a/src/test/run-pass/new-style-fixed-length-vec.rs
+++ b/src/test/ui/run-pass/array-slice-vec/new-style-fixed-length-vec.rs
diff --git a/src/test/run-pass/rcvr-borrowed-to-slice.rs b/src/test/ui/run-pass/array-slice-vec/rcvr-borrowed-to-slice.rs
index efa73ad92ce..efa73ad92ce 100644
--- a/src/test/run-pass/rcvr-borrowed-to-slice.rs
+++ b/src/test/ui/run-pass/array-slice-vec/rcvr-borrowed-to-slice.rs
diff --git a/src/test/run-pass/repeated-vector-syntax.rs b/src/test/ui/run-pass/array-slice-vec/repeated-vector-syntax.rs
index 6d72e9774dc..6d72e9774dc 100644
--- a/src/test/run-pass/repeated-vector-syntax.rs
+++ b/src/test/ui/run-pass/array-slice-vec/repeated-vector-syntax.rs
diff --git a/src/test/run-pass/show-boxed-slice.rs b/src/test/ui/run-pass/array-slice-vec/show-boxed-slice.rs
index 47d0737dfc4..47d0737dfc4 100644
--- a/src/test/run-pass/show-boxed-slice.rs
+++ b/src/test/ui/run-pass/array-slice-vec/show-boxed-slice.rs
diff --git a/src/test/run-pass/slice-2.rs b/src/test/ui/run-pass/array-slice-vec/slice-2.rs
index 3a99fd9af93..3a99fd9af93 100644
--- a/src/test/run-pass/slice-2.rs
+++ b/src/test/ui/run-pass/array-slice-vec/slice-2.rs
diff --git a/src/test/run-pass/slice-of-zero-size-elements.rs b/src/test/ui/run-pass/array-slice-vec/slice-of-zero-size-elements.rs
index ab22b820503..ab22b820503 100644
--- a/src/test/run-pass/slice-of-zero-size-elements.rs
+++ b/src/test/ui/run-pass/array-slice-vec/slice-of-zero-size-elements.rs
diff --git a/src/test/run-pass/slice-panic-1.rs b/src/test/ui/run-pass/array-slice-vec/slice-panic-1.rs
index afec06adc86..afec06adc86 100644
--- a/src/test/run-pass/slice-panic-1.rs
+++ b/src/test/ui/run-pass/array-slice-vec/slice-panic-1.rs
diff --git a/src/test/run-pass/slice-panic-2.rs b/src/test/ui/run-pass/array-slice-vec/slice-panic-2.rs
index 2932b585b88..2932b585b88 100644
--- a/src/test/run-pass/slice-panic-2.rs
+++ b/src/test/ui/run-pass/array-slice-vec/slice-panic-2.rs
diff --git a/src/test/run-pass/slice.rs b/src/test/ui/run-pass/array-slice-vec/slice.rs
index dfd7b947c57..dfd7b947c57 100644
--- a/src/test/run-pass/slice.rs
+++ b/src/test/ui/run-pass/array-slice-vec/slice.rs
diff --git a/src/test/run-pass/slice_binary_search.rs b/src/test/ui/run-pass/array-slice-vec/slice_binary_search.rs
index 80b370d58fc..80b370d58fc 100644
--- a/src/test/run-pass/slice_binary_search.rs
+++ b/src/test/ui/run-pass/array-slice-vec/slice_binary_search.rs
diff --git a/src/test/run-pass/variance-vec-covariant.rs b/src/test/ui/run-pass/array-slice-vec/variance-vec-covariant.rs
index caec6df5a4d..caec6df5a4d 100644
--- a/src/test/run-pass/variance-vec-covariant.rs
+++ b/src/test/ui/run-pass/array-slice-vec/variance-vec-covariant.rs
diff --git a/src/test/run-pass/vec-concat.rs b/src/test/ui/run-pass/array-slice-vec/vec-concat.rs
index 8ba8df57e54..8ba8df57e54 100644
--- a/src/test/run-pass/vec-concat.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-concat.rs
diff --git a/src/test/run-pass/vec-dst.rs b/src/test/ui/run-pass/array-slice-vec/vec-dst.rs
index cf4222b405e..cf4222b405e 100644
--- a/src/test/run-pass/vec-dst.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-dst.rs
diff --git a/src/test/run-pass/vec-fixed-length.rs b/src/test/ui/run-pass/array-slice-vec/vec-fixed-length.rs
index befb27e6ccb..befb27e6ccb 100644
--- a/src/test/run-pass/vec-fixed-length.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-fixed-length.rs
diff --git a/src/test/run-pass/vec-growth.rs b/src/test/ui/run-pass/array-slice-vec/vec-growth.rs
index 5bf6a457df9..5bf6a457df9 100644
--- a/src/test/run-pass/vec-growth.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-growth.rs
diff --git a/src/test/run-pass/vec-late-init.rs b/src/test/ui/run-pass/array-slice-vec/vec-late-init.rs
index 420f6a429f1..420f6a429f1 100644
--- a/src/test/run-pass/vec-late-init.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-late-init.rs
diff --git a/src/test/run-pass/vec-macro-no-std.rs b/src/test/ui/run-pass/array-slice-vec/vec-macro-no-std.rs
index 56ff9cb2477..56ff9cb2477 100644
--- a/src/test/run-pass/vec-macro-no-std.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-macro-no-std.rs
diff --git a/src/test/run-pass/vec-macro-repeat.rs b/src/test/ui/run-pass/array-slice-vec/vec-macro-repeat.rs
index d178041b85e..d178041b85e 100644
--- a/src/test/run-pass/vec-macro-repeat.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-macro-repeat.rs
diff --git a/src/test/run-pass/vec-macro-rvalue-scope.rs b/src/test/ui/run-pass/array-slice-vec/vec-macro-rvalue-scope.rs
index 305755347d0..305755347d0 100644
--- a/src/test/run-pass/vec-macro-rvalue-scope.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-macro-rvalue-scope.rs
diff --git a/src/test/run-pass/vec-macro-with-brackets.rs b/src/test/ui/run-pass/array-slice-vec/vec-macro-with-brackets.rs
index cccf807572a..cccf807572a 100644
--- a/src/test/run-pass/vec-macro-with-brackets.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-macro-with-brackets.rs
diff --git a/src/test/run-pass/vec-macro-with-trailing-comma.rs b/src/test/ui/run-pass/array-slice-vec/vec-macro-with-trailing-comma.rs
index 135ecb47498..135ecb47498 100644
--- a/src/test/run-pass/vec-macro-with-trailing-comma.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-macro-with-trailing-comma.rs
diff --git a/src/test/run-pass/vec-matching-autoslice.rs b/src/test/ui/run-pass/array-slice-vec/vec-matching-autoslice.rs
index 7268536a51f..7268536a51f 100644
--- a/src/test/run-pass/vec-matching-autoslice.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-matching-autoslice.rs
diff --git a/src/test/run-pass/vec-matching-fixed.rs b/src/test/ui/run-pass/array-slice-vec/vec-matching-fixed.rs
index 060d152488a..060d152488a 100644
--- a/src/test/run-pass/vec-matching-fixed.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-matching-fixed.rs
diff --git a/src/test/run-pass/vec-matching-fold.rs b/src/test/ui/run-pass/array-slice-vec/vec-matching-fold.rs
index 1a30f875580..1a30f875580 100644
--- a/src/test/run-pass/vec-matching-fold.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-matching-fold.rs
diff --git a/src/test/run-pass/vec-matching-legal-tail-element-borrow.rs b/src/test/ui/run-pass/array-slice-vec/vec-matching-legal-tail-element-borrow.rs
index eecc3e7afdb..eecc3e7afdb 100644
--- a/src/test/run-pass/vec-matching-legal-tail-element-borrow.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-matching-legal-tail-element-borrow.rs
diff --git a/src/test/run-pass/vec-matching.rs b/src/test/ui/run-pass/array-slice-vec/vec-matching.rs
index ace418f2160..ace418f2160 100644
--- a/src/test/run-pass/vec-matching.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-matching.rs
diff --git a/src/test/run-pass/vec-push.rs b/src/test/ui/run-pass/array-slice-vec/vec-push.rs
index 14a52cc4b5c..14a52cc4b5c 100644
--- a/src/test/run-pass/vec-push.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-push.rs
diff --git a/src/test/run-pass/vec-repeat-with-cast.rs b/src/test/ui/run-pass/array-slice-vec/vec-repeat-with-cast.rs
index a6ca02d4fa9..a6ca02d4fa9 100644
--- a/src/test/run-pass/vec-repeat-with-cast.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-repeat-with-cast.rs
diff --git a/src/test/run-pass/vec-slice-drop.rs b/src/test/ui/run-pass/array-slice-vec/vec-slice-drop.rs
index 86d34d38f74..86d34d38f74 100644
--- a/src/test/run-pass/vec-slice-drop.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-slice-drop.rs
diff --git a/src/test/run-pass/vec-slice.rs b/src/test/ui/run-pass/array-slice-vec/vec-slice.rs
index a7e6cae93b3..a7e6cae93b3 100644
--- a/src/test/run-pass/vec-slice.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-slice.rs
diff --git a/src/test/run-pass/vec-tail-matching.rs b/src/test/ui/run-pass/array-slice-vec/vec-tail-matching.rs
index 4f31405ead5..4f31405ead5 100644
--- a/src/test/run-pass/vec-tail-matching.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-tail-matching.rs
diff --git a/src/test/run-pass/vec-to_str.rs b/src/test/ui/run-pass/array-slice-vec/vec-to_str.rs
index 1fed6a0be48..1fed6a0be48 100644
--- a/src/test/run-pass/vec-to_str.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec-to_str.rs
diff --git a/src/test/run-pass/vec.rs b/src/test/ui/run-pass/array-slice-vec/vec.rs
index 9cacb9db20e..9cacb9db20e 100644
--- a/src/test/run-pass/vec.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec.rs
diff --git a/src/test/run-pass/vec_cycle.rs b/src/test/ui/run-pass/array-slice-vec/vec_cycle.rs
index d5da8b35b6d..d5da8b35b6d 100644
--- a/src/test/run-pass/vec_cycle.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec_cycle.rs
diff --git a/src/test/run-pass/vec_cycle_wrapped.rs b/src/test/ui/run-pass/array-slice-vec/vec_cycle_wrapped.rs
index 56480268a01..56480268a01 100644
--- a/src/test/run-pass/vec_cycle_wrapped.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vec_cycle_wrapped.rs
diff --git a/src/test/run-pass/vector-no-ann-2.rs b/src/test/ui/run-pass/array-slice-vec/vector-no-ann-2.rs
index 09e70cf03ca..09e70cf03ca 100644
--- a/src/test/run-pass/vector-no-ann-2.rs
+++ b/src/test/ui/run-pass/array-slice-vec/vector-no-ann-2.rs
diff --git a/src/test/run-pass/associated-const-const-eval.rs b/src/test/ui/run-pass/associated-consts/associated-const-const-eval.rs
index 9c36a42527f..9c36a42527f 100644
--- a/src/test/run-pass/associated-const-const-eval.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-const-eval.rs
diff --git a/src/test/run-pass/associated-const-cross-crate-const-eval.rs b/src/test/ui/run-pass/associated-consts/associated-const-cross-crate-const-eval.rs
index c2758b1aed7..c2758b1aed7 100644
--- a/src/test/run-pass/associated-const-cross-crate-const-eval.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-cross-crate-const-eval.rs
diff --git a/src/test/run-pass/associated-const-cross-crate-defaults.rs b/src/test/ui/run-pass/associated-consts/associated-const-cross-crate-defaults.rs
index 084c448ba2a..084c448ba2a 100644
--- a/src/test/run-pass/associated-const-cross-crate-defaults.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-cross-crate-defaults.rs
diff --git a/src/test/run-pass/associated-const-cross-crate.rs b/src/test/ui/run-pass/associated-consts/associated-const-cross-crate.rs
index a882d6ae23d..a882d6ae23d 100644
--- a/src/test/run-pass/associated-const-cross-crate.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-cross-crate.rs
diff --git a/src/test/run-pass/associated-const-in-global-const.rs b/src/test/ui/run-pass/associated-consts/associated-const-in-global-const.rs
index b7fb4d73259..b7fb4d73259 100644
--- a/src/test/run-pass/associated-const-in-global-const.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-in-global-const.rs
diff --git a/src/test/run-pass/associated-const-inherent-impl.rs b/src/test/ui/run-pass/associated-consts/associated-const-inherent-impl.rs
index 86454a4a091..86454a4a091 100644
--- a/src/test/run-pass/associated-const-inherent-impl.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-inherent-impl.rs
diff --git a/src/test/run-pass/associated-const-marks-live-code.rs b/src/test/ui/run-pass/associated-consts/associated-const-marks-live-code.rs
index bfeb78ddfe5..bfeb78ddfe5 100644
--- a/src/test/run-pass/associated-const-marks-live-code.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-marks-live-code.rs
diff --git a/src/test/run-pass/associated-const-match-patterns.rs b/src/test/ui/run-pass/associated-consts/associated-const-match-patterns.rs
index 54603e6e0d9..54603e6e0d9 100644
--- a/src/test/run-pass/associated-const-match-patterns.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-match-patterns.rs
diff --git a/src/test/run-pass/associated-const-outer-ty-refs.rs b/src/test/ui/run-pass/associated-consts/associated-const-outer-ty-refs.rs
index 987c64dbff5..987c64dbff5 100644
--- a/src/test/run-pass/associated-const-outer-ty-refs.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-outer-ty-refs.rs
diff --git a/src/test/run-pass/associated-const-overwrite-default.rs b/src/test/ui/run-pass/associated-consts/associated-const-overwrite-default.rs
index bb594cfa0f9..bb594cfa0f9 100644
--- a/src/test/run-pass/associated-const-overwrite-default.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-overwrite-default.rs
diff --git a/src/test/run-pass/associated-const-public-impl.rs b/src/test/ui/run-pass/associated-consts/associated-const-public-impl.rs
index 5ff363844a1..5ff363844a1 100644
--- a/src/test/run-pass/associated-const-public-impl.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-public-impl.rs
diff --git a/src/test/run-pass/associated-const-range-match-patterns.rs b/src/test/ui/run-pass/associated-consts/associated-const-range-match-patterns.rs
index d72e1efc4d7..d72e1efc4d7 100644
--- a/src/test/run-pass/associated-const-range-match-patterns.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-range-match-patterns.rs
diff --git a/src/test/run-pass/associated-const-resolution-order.rs b/src/test/ui/run-pass/associated-consts/associated-const-resolution-order.rs
index 5fa49b48200..5fa49b48200 100644
--- a/src/test/run-pass/associated-const-resolution-order.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-resolution-order.rs
diff --git a/src/test/run-pass/associated-const-self-type.rs b/src/test/ui/run-pass/associated-consts/associated-const-self-type.rs
index 16ccb5b3955..16ccb5b3955 100644
--- a/src/test/run-pass/associated-const-self-type.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-self-type.rs
diff --git a/src/test/run-pass/associated-const-type-parameters.rs b/src/test/ui/run-pass/associated-consts/associated-const-type-parameters.rs
index 7859a87e014..7859a87e014 100644
--- a/src/test/run-pass/associated-const-type-parameters.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-type-parameters.rs
diff --git a/src/test/run-pass/associated-const-ufcs-infer-trait.rs b/src/test/ui/run-pass/associated-consts/associated-const-ufcs-infer-trait.rs
index b2263067824..b2263067824 100644
--- a/src/test/run-pass/associated-const-ufcs-infer-trait.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-ufcs-infer-trait.rs
diff --git a/src/test/run-pass/associated-const-use-default.rs b/src/test/ui/run-pass/associated-consts/associated-const-use-default.rs
index 5ed9a6dea3d..5ed9a6dea3d 100644
--- a/src/test/run-pass/associated-const-use-default.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-use-default.rs
diff --git a/src/test/run-pass/associated-const-use-impl-of-same-trait.rs b/src/test/ui/run-pass/associated-consts/associated-const-use-impl-of-same-trait.rs
index 986f160f3cb..986f160f3cb 100644
--- a/src/test/run-pass/associated-const-use-impl-of-same-trait.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const-use-impl-of-same-trait.rs
diff --git a/src/test/run-pass/associated-const.rs b/src/test/ui/run-pass/associated-consts/associated-const.rs
index 3c84f4a8335..3c84f4a8335 100644
--- a/src/test/run-pass/associated-const.rs
+++ b/src/test/ui/run-pass/associated-consts/associated-const.rs
diff --git a/src/test/run-pass/associated-types-basic.rs b/src/test/ui/run-pass/associated-types/associated-types-basic.rs
index 2617a05fe24..2617a05fe24 100644
--- a/src/test/run-pass/associated-types-basic.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-basic.rs
diff --git a/src/test/run-pass/associated-types-binding-in-trait.rs b/src/test/ui/run-pass/associated-types/associated-types-binding-in-trait.rs
index d82ba6add75..d82ba6add75 100644
--- a/src/test/run-pass/associated-types-binding-in-trait.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-binding-in-trait.rs
diff --git a/src/test/run-pass/associated-types-binding-in-where-clause.rs b/src/test/ui/run-pass/associated-types/associated-types-binding-in-where-clause.rs
index 82ebac7e5dc..82ebac7e5dc 100644
--- a/src/test/run-pass/associated-types-binding-in-where-clause.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-binding-in-where-clause.rs
diff --git a/src/test/run-pass/associated-types-bound.rs b/src/test/ui/run-pass/associated-types/associated-types-bound.rs
index 4eacd120bc6..4eacd120bc6 100644
--- a/src/test/run-pass/associated-types-bound.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-bound.rs
diff --git a/src/test/run-pass/associated-types-cc.rs b/src/test/ui/run-pass/associated-types/associated-types-cc.rs
index b2be87be4cb..b2be87be4cb 100644
--- a/src/test/run-pass/associated-types-cc.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-cc.rs
diff --git a/src/test/run-pass/associated-types-conditional-dispatch.rs b/src/test/ui/run-pass/associated-types/associated-types-conditional-dispatch.rs
index dbf975c6f2e..dbf975c6f2e 100644
--- a/src/test/run-pass/associated-types-conditional-dispatch.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-conditional-dispatch.rs
diff --git a/src/test/run-pass/associated-types-constant-type.rs b/src/test/ui/run-pass/associated-types/associated-types-constant-type.rs
index 77ab616ca91..77ab616ca91 100644
--- a/src/test/run-pass/associated-types-constant-type.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-constant-type.rs
diff --git a/src/test/run-pass/associated-types-doubleendediterator-object.rs b/src/test/ui/run-pass/associated-types/associated-types-doubleendediterator-object.rs
index de83e4edd85..de83e4edd85 100644
--- a/src/test/run-pass/associated-types-doubleendediterator-object.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-doubleendediterator-object.rs
diff --git a/src/test/run-pass/associated-types-duplicate-binding-in-env-hrtb.rs b/src/test/ui/run-pass/associated-types/associated-types-duplicate-binding-in-env-hrtb.rs
index 8ca3bc02548..8ca3bc02548 100644
--- a/src/test/run-pass/associated-types-duplicate-binding-in-env-hrtb.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-duplicate-binding-in-env-hrtb.rs
diff --git a/src/test/run-pass/associated-types-duplicate-binding-in-env.rs b/src/test/ui/run-pass/associated-types/associated-types-duplicate-binding-in-env.rs
index 5878f5dd51b..5878f5dd51b 100644
--- a/src/test/run-pass/associated-types-duplicate-binding-in-env.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-duplicate-binding-in-env.rs
diff --git a/src/test/run-pass/associated-types-enum-field-named.rs b/src/test/ui/run-pass/associated-types/associated-types-enum-field-named.rs
index 7014cc59b71..7014cc59b71 100644
--- a/src/test/run-pass/associated-types-enum-field-named.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-enum-field-named.rs
diff --git a/src/test/run-pass/associated-types-enum-field-numbered.rs b/src/test/ui/run-pass/associated-types/associated-types-enum-field-numbered.rs
index c983fdefc0e..c983fdefc0e 100644
--- a/src/test/run-pass/associated-types-enum-field-numbered.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-enum-field-numbered.rs
diff --git a/src/test/run-pass/associated-types-eq-obj.rs b/src/test/ui/run-pass/associated-types/associated-types-eq-obj.rs
index feccd1d2dce..feccd1d2dce 100644
--- a/src/test/run-pass/associated-types-eq-obj.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-eq-obj.rs
diff --git a/src/test/run-pass/associated-types-impl-redirect.rs b/src/test/ui/run-pass/associated-types/associated-types-impl-redirect.rs
index 3e34367a215..3e34367a215 100644
--- a/src/test/run-pass/associated-types-impl-redirect.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-impl-redirect.rs
diff --git a/src/test/run-pass/associated-types-in-bound-type-arg.rs b/src/test/ui/run-pass/associated-types/associated-types-in-bound-type-arg.rs
index 18803d15719..18803d15719 100644
--- a/src/test/run-pass/associated-types-in-bound-type-arg.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-in-bound-type-arg.rs
diff --git a/src/test/run-pass/associated-types-in-default-method.rs b/src/test/ui/run-pass/associated-types/associated-types-in-default-method.rs
index 74199f57fb6..74199f57fb6 100644
--- a/src/test/run-pass/associated-types-in-default-method.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-in-default-method.rs
diff --git a/src/test/run-pass/associated-types-in-fn.rs b/src/test/ui/run-pass/associated-types/associated-types-in-fn.rs
index dcd7895fa99..dcd7895fa99 100644
--- a/src/test/run-pass/associated-types-in-fn.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-in-fn.rs
diff --git a/src/test/run-pass/associated-types-in-impl-generics.rs b/src/test/ui/run-pass/associated-types/associated-types-in-impl-generics.rs
index 5b81ac70908..5b81ac70908 100644
--- a/src/test/run-pass/associated-types-in-impl-generics.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-in-impl-generics.rs
diff --git a/src/test/run-pass/associated-types-in-inherent-method.rs b/src/test/ui/run-pass/associated-types/associated-types-in-inherent-method.rs
index 5eaf4c2bc83..5eaf4c2bc83 100644
--- a/src/test/run-pass/associated-types-in-inherent-method.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-in-inherent-method.rs
diff --git a/src/test/run-pass/associated-types-issue-20220.rs b/src/test/ui/run-pass/associated-types/associated-types-issue-20220.rs
index 31336787e4c..31336787e4c 100644
--- a/src/test/run-pass/associated-types-issue-20220.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-issue-20220.rs
diff --git a/src/test/run-pass/associated-types-issue-20371.rs b/src/test/ui/run-pass/associated-types/associated-types-issue-20371.rs
index c93a0b76a95..c93a0b76a95 100644
--- a/src/test/run-pass/associated-types-issue-20371.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-issue-20371.rs
diff --git a/src/test/run-pass/associated-types-issue-21212.rs b/src/test/ui/run-pass/associated-types/associated-types-issue-21212.rs
index cf4b8272111..cf4b8272111 100644
--- a/src/test/run-pass/associated-types-issue-21212.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-issue-21212.rs
diff --git a/src/test/run-pass/associated-types-iterator-binding.rs b/src/test/ui/run-pass/associated-types/associated-types-iterator-binding.rs
index abd4917cae8..abd4917cae8 100644
--- a/src/test/run-pass/associated-types-iterator-binding.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-iterator-binding.rs
diff --git a/src/test/run-pass/associated-types-method.rs b/src/test/ui/run-pass/associated-types/associated-types-method.rs
index b57687a49fa..b57687a49fa 100644
--- a/src/test/run-pass/associated-types-method.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-method.rs
diff --git a/src/test/run-pass/associated-types-nested-projections.rs b/src/test/ui/run-pass/associated-types/associated-types-nested-projections.rs
index 62fa07e20b6..62fa07e20b6 100644
--- a/src/test/run-pass/associated-types-nested-projections.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-nested-projections.rs
diff --git a/src/test/run-pass/associated-types-normalize-in-bounds-binding.rs b/src/test/ui/run-pass/associated-types/associated-types-normalize-in-bounds-binding.rs
index 7e2d1aa2314..7e2d1aa2314 100644
--- a/src/test/run-pass/associated-types-normalize-in-bounds-binding.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-normalize-in-bounds-binding.rs
diff --git a/src/test/run-pass/associated-types-normalize-in-bounds-ufcs.rs b/src/test/ui/run-pass/associated-types/associated-types-normalize-in-bounds-ufcs.rs
index d8e4c5218d9..d8e4c5218d9 100644
--- a/src/test/run-pass/associated-types-normalize-in-bounds-ufcs.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-normalize-in-bounds-ufcs.rs
diff --git a/src/test/run-pass/associated-types-normalize-in-bounds.rs b/src/test/ui/run-pass/associated-types/associated-types-normalize-in-bounds.rs
index ff08e7b69bd..ff08e7b69bd 100644
--- a/src/test/run-pass/associated-types-normalize-in-bounds.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-normalize-in-bounds.rs
diff --git a/src/test/run-pass/associated-types-normalize-unifield-struct.rs b/src/test/ui/run-pass/associated-types/associated-types-normalize-unifield-struct.rs
index 517033d5870..517033d5870 100644
--- a/src/test/run-pass/associated-types-normalize-unifield-struct.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-normalize-unifield-struct.rs
diff --git a/src/test/run-pass/associated-types-project-from-type-param-via-bound-in-where.rs b/src/test/ui/run-pass/associated-types/associated-types-project-from-type-param-via-bound-in-where.rs
index 5ceb1013ad8..5ceb1013ad8 100644
--- a/src/test/run-pass/associated-types-project-from-type-param-via-bound-in-where.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-project-from-type-param-via-bound-in-where.rs
diff --git a/src/test/run-pass/associated-types-projection-bound-in-supertraits.rs b/src/test/ui/run-pass/associated-types/associated-types-projection-bound-in-supertraits.rs
index e150d015824..e150d015824 100644
--- a/src/test/run-pass/associated-types-projection-bound-in-supertraits.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-projection-bound-in-supertraits.rs
diff --git a/src/test/run-pass/associated-types-projection-from-known-type-in-impl.rs b/src/test/ui/run-pass/associated-types/associated-types-projection-from-known-type-in-impl.rs
index 8054b3aa52a..8054b3aa52a 100644
--- a/src/test/run-pass/associated-types-projection-from-known-type-in-impl.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-projection-from-known-type-in-impl.rs
diff --git a/src/test/run-pass/associated-types-projection-in-object-type.rs b/src/test/ui/run-pass/associated-types/associated-types-projection-in-object-type.rs
index 14e94dbff6c..14e94dbff6c 100644
--- a/src/test/run-pass/associated-types-projection-in-object-type.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-projection-in-object-type.rs
diff --git a/src/test/run-pass/associated-types-projection-in-supertrait.rs b/src/test/ui/run-pass/associated-types/associated-types-projection-in-supertrait.rs
index 70c7602ffce..70c7602ffce 100644
--- a/src/test/run-pass/associated-types-projection-in-supertrait.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-projection-in-supertrait.rs
diff --git a/src/test/run-pass/associated-types-projection-in-where-clause.rs b/src/test/ui/run-pass/associated-types/associated-types-projection-in-where-clause.rs
index 80e3aa09e3e..80e3aa09e3e 100644
--- a/src/test/run-pass/associated-types-projection-in-where-clause.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-projection-in-where-clause.rs
diff --git a/src/test/run-pass/associated-types-projection-to-unrelated-trait.rs b/src/test/ui/run-pass/associated-types/associated-types-projection-to-unrelated-trait.rs
index 8059db5204e..8059db5204e 100644
--- a/src/test/run-pass/associated-types-projection-to-unrelated-trait.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-projection-to-unrelated-trait.rs
diff --git a/src/test/run-pass/associated-types-qualified-path-with-trait-with-type-parameters.rs b/src/test/ui/run-pass/associated-types/associated-types-qualified-path-with-trait-with-type-parameters.rs
index a69de216ab9..a69de216ab9 100644
--- a/src/test/run-pass/associated-types-qualified-path-with-trait-with-type-parameters.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-qualified-path-with-trait-with-type-parameters.rs
diff --git a/src/test/run-pass/associated-types-ref-from-struct.rs b/src/test/ui/run-pass/associated-types/associated-types-ref-from-struct.rs
index ce09ec60bd6..ce09ec60bd6 100644
--- a/src/test/run-pass/associated-types-ref-from-struct.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-ref-from-struct.rs
diff --git a/src/test/run-pass/associated-types-ref-in-struct-literal.rs b/src/test/ui/run-pass/associated-types/associated-types-ref-in-struct-literal.rs
index 3b7fb65a8b4..3b7fb65a8b4 100644
--- a/src/test/run-pass/associated-types-ref-in-struct-literal.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-ref-in-struct-literal.rs
diff --git a/src/test/run-pass/associated-types-region-erasure-issue-20582.rs b/src/test/ui/run-pass/associated-types/associated-types-region-erasure-issue-20582.rs
index 40f352e2e1f..40f352e2e1f 100644
--- a/src/test/run-pass/associated-types-region-erasure-issue-20582.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-region-erasure-issue-20582.rs
diff --git a/src/test/run-pass/associated-types-resolve-lifetime.rs b/src/test/ui/run-pass/associated-types/associated-types-resolve-lifetime.rs
index 824291ea607..824291ea607 100644
--- a/src/test/run-pass/associated-types-resolve-lifetime.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-resolve-lifetime.rs
diff --git a/src/test/run-pass/associated-types-return.rs b/src/test/ui/run-pass/associated-types/associated-types-return.rs
index f5434c9eb86..f5434c9eb86 100644
--- a/src/test/run-pass/associated-types-return.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-return.rs
diff --git a/src/test/run-pass/associated-types-simple.rs b/src/test/ui/run-pass/associated-types/associated-types-simple.rs
index 776b2183d39..776b2183d39 100644
--- a/src/test/run-pass/associated-types-simple.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-simple.rs
diff --git a/src/test/run-pass/associated-types-stream.rs b/src/test/ui/run-pass/associated-types/associated-types-stream.rs
index 6adfaabcc23..6adfaabcc23 100644
--- a/src/test/run-pass/associated-types-stream.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-stream.rs
diff --git a/src/test/run-pass/associated-types-struct-field-named.rs b/src/test/ui/run-pass/associated-types/associated-types-struct-field-named.rs
index 00746c32e1c..00746c32e1c 100644
--- a/src/test/run-pass/associated-types-struct-field-named.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-struct-field-named.rs
diff --git a/src/test/run-pass/associated-types-struct-field-numbered.rs b/src/test/ui/run-pass/associated-types/associated-types-struct-field-numbered.rs
index 25e89892a29..25e89892a29 100644
--- a/src/test/run-pass/associated-types-struct-field-numbered.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-struct-field-numbered.rs
diff --git a/src/test/run-pass/associated-types-sugar-path.rs b/src/test/ui/run-pass/associated-types/associated-types-sugar-path.rs
index d8d42f2cba2..d8d42f2cba2 100644
--- a/src/test/run-pass/associated-types-sugar-path.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-sugar-path.rs
diff --git a/src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs b/src/test/ui/run-pass/associated-types/associated-types-where-clause-impl-ambiguity.rs
index ef1225d39a7..ef1225d39a7 100644
--- a/src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs
+++ b/src/test/ui/run-pass/associated-types/associated-types-where-clause-impl-ambiguity.rs
diff --git a/src/test/run-pass/auto-ref-bounded-ty-param.rs b/src/test/ui/run-pass/autoref-autoderef/auto-ref-bounded-ty-param.rs
index 77ec0e1791f..77ec0e1791f 100644
--- a/src/test/run-pass/auto-ref-bounded-ty-param.rs
+++ b/src/test/ui/run-pass/autoref-autoderef/auto-ref-bounded-ty-param.rs
diff --git a/src/test/run-pass/auto-ref-sliceable.rs b/src/test/ui/run-pass/autoref-autoderef/auto-ref-sliceable.rs
index f6cb314d06e..f6cb314d06e 100644
--- a/src/test/run-pass/auto-ref-sliceable.rs
+++ b/src/test/ui/run-pass/autoref-autoderef/auto-ref-sliceable.rs
diff --git a/src/test/run-pass/auto-ref.rs b/src/test/ui/run-pass/autoref-autoderef/auto-ref.rs
index 0ad2303a769..0ad2303a769 100644
--- a/src/test/run-pass/auto-ref.rs
+++ b/src/test/ui/run-pass/autoref-autoderef/auto-ref.rs
diff --git a/src/test/run-pass/autoderef-and-borrow-method-receiver.rs b/src/test/ui/run-pass/autoref-autoderef/autoderef-and-borrow-method-receiver.rs
index a4c6cdd544c..a4c6cdd544c 100644
--- a/src/test/run-pass/autoderef-and-borrow-method-receiver.rs
+++ b/src/test/ui/run-pass/autoref-autoderef/autoderef-and-borrow-method-receiver.rs
diff --git a/src/test/run-pass/autoderef-method-on-trait.rs b/src/test/ui/run-pass/autoref-autoderef/autoderef-method-on-trait.rs
index f6ff9a31fa1..f6ff9a31fa1 100644
--- a/src/test/run-pass/autoderef-method-on-trait.rs
+++ b/src/test/ui/run-pass/autoref-autoderef/autoderef-method-on-trait.rs
diff --git a/src/test/run-pass/autoderef-method-priority.rs b/src/test/ui/run-pass/autoref-autoderef/autoderef-method-priority.rs
index 234af92610a..234af92610a 100644
--- a/src/test/run-pass/autoderef-method-priority.rs
+++ b/src/test/ui/run-pass/autoref-autoderef/autoderef-method-priority.rs
diff --git a/src/test/run-pass/autoderef-method-twice-but-not-thrice.rs b/src/test/ui/run-pass/autoref-autoderef/autoderef-method-twice-but-not-thrice.rs
index 5890fe44166..5890fe44166 100644
--- a/src/test/run-pass/autoderef-method-twice-but-not-thrice.rs
+++ b/src/test/ui/run-pass/autoref-autoderef/autoderef-method-twice-but-not-thrice.rs
diff --git a/src/test/run-pass/autoderef-method-twice.rs b/src/test/ui/run-pass/autoref-autoderef/autoderef-method-twice.rs
index 2598ec17d2a..2598ec17d2a 100644
--- a/src/test/run-pass/autoderef-method-twice.rs
+++ b/src/test/ui/run-pass/autoref-autoderef/autoderef-method-twice.rs
diff --git a/src/test/run-pass/autoderef-method.rs b/src/test/ui/run-pass/autoref-autoderef/autoderef-method.rs
index 7c83b9c982f..7c83b9c982f 100644
--- a/src/test/run-pass/autoderef-method.rs
+++ b/src/test/ui/run-pass/autoref-autoderef/autoderef-method.rs
diff --git a/src/test/run-pass/autoderef-privacy.rs b/src/test/ui/run-pass/autoref-autoderef/autoderef-privacy.rs
index e50f1bea0d3..e50f1bea0d3 100644
--- a/src/test/run-pass/autoderef-privacy.rs
+++ b/src/test/ui/run-pass/autoref-autoderef/autoderef-privacy.rs
diff --git a/src/test/run-pass/autoref-intermediate-types-issue-3585.rs b/src/test/ui/run-pass/autoref-autoderef/autoref-intermediate-types-issue-3585.rs
index 4096d45d8df..4096d45d8df 100644
--- a/src/test/run-pass/autoref-intermediate-types-issue-3585.rs
+++ b/src/test/ui/run-pass/autoref-autoderef/autoref-intermediate-types-issue-3585.rs
diff --git a/src/test/run-pass/allow_irrefutable_let_patterns.rs b/src/test/ui/run-pass/binding/allow_irrefutable_let_patterns.rs
index ea114b63be7..ea114b63be7 100644
--- a/src/test/run-pass/allow_irrefutable_let_patterns.rs
+++ b/src/test/ui/run-pass/binding/allow_irrefutable_let_patterns.rs
diff --git a/src/test/run-pass/bind-field-short-with-modifiers.rs b/src/test/ui/run-pass/binding/bind-field-short-with-modifiers.rs
index b4c38bf450b..b4c38bf450b 100644
--- a/src/test/run-pass/bind-field-short-with-modifiers.rs
+++ b/src/test/ui/run-pass/binding/bind-field-short-with-modifiers.rs
diff --git a/src/test/run-pass/borrowed-ptr-pattern-2.rs b/src/test/ui/run-pass/binding/borrowed-ptr-pattern-2.rs
index 3e47764ba02..3e47764ba02 100644
--- a/src/test/run-pass/borrowed-ptr-pattern-2.rs
+++ b/src/test/ui/run-pass/binding/borrowed-ptr-pattern-2.rs
diff --git a/src/test/run-pass/borrowed-ptr-pattern-3.rs b/src/test/ui/run-pass/binding/borrowed-ptr-pattern-3.rs
index 91228efb9c1..91228efb9c1 100644
--- a/src/test/run-pass/borrowed-ptr-pattern-3.rs
+++ b/src/test/ui/run-pass/binding/borrowed-ptr-pattern-3.rs
diff --git a/src/test/run-pass/borrowed-ptr-pattern-infallible.rs b/src/test/ui/run-pass/binding/borrowed-ptr-pattern-infallible.rs
index 6656eb41f2e..6656eb41f2e 100644
--- a/src/test/run-pass/borrowed-ptr-pattern-infallible.rs
+++ b/src/test/ui/run-pass/binding/borrowed-ptr-pattern-infallible.rs
diff --git a/src/test/run-pass/borrowed-ptr-pattern-option.rs b/src/test/ui/run-pass/binding/borrowed-ptr-pattern-option.rs
index e1e9381eeb8..e1e9381eeb8 100644
--- a/src/test/run-pass/borrowed-ptr-pattern-option.rs
+++ b/src/test/ui/run-pass/binding/borrowed-ptr-pattern-option.rs
diff --git a/src/test/run-pass/borrowed-ptr-pattern.rs b/src/test/ui/run-pass/binding/borrowed-ptr-pattern.rs
index 3042ff7743b..3042ff7743b 100644
--- a/src/test/run-pass/borrowed-ptr-pattern.rs
+++ b/src/test/ui/run-pass/binding/borrowed-ptr-pattern.rs
diff --git a/src/test/run-pass/empty-types-in-patterns.rs b/src/test/ui/run-pass/binding/empty-types-in-patterns.rs
index 86cf9b5ec47..86cf9b5ec47 100644
--- a/src/test/run-pass/empty-types-in-patterns.rs
+++ b/src/test/ui/run-pass/binding/empty-types-in-patterns.rs
diff --git a/src/test/run-pass/exhaustive-bool-match-sanity.rs b/src/test/ui/run-pass/binding/exhaustive-bool-match-sanity.rs
index 27bcab43229..27bcab43229 100644
--- a/src/test/run-pass/exhaustive-bool-match-sanity.rs
+++ b/src/test/ui/run-pass/binding/exhaustive-bool-match-sanity.rs
diff --git a/src/test/run-pass/expr-match-generic-unique1.rs b/src/test/ui/run-pass/binding/expr-match-generic-unique1.rs
index 3fce798c285..3fce798c285 100644
--- a/src/test/run-pass/expr-match-generic-unique1.rs
+++ b/src/test/ui/run-pass/binding/expr-match-generic-unique1.rs
diff --git a/src/test/run-pass/expr-match-generic-unique2.rs b/src/test/ui/run-pass/binding/expr-match-generic-unique2.rs
index 5500edcf239..5500edcf239 100644
--- a/src/test/run-pass/expr-match-generic-unique2.rs
+++ b/src/test/ui/run-pass/binding/expr-match-generic-unique2.rs
diff --git a/src/test/run-pass/expr-match-generic.rs b/src/test/ui/run-pass/binding/expr-match-generic.rs
index 509106289d0..509106289d0 100644
--- a/src/test/run-pass/expr-match-generic.rs
+++ b/src/test/ui/run-pass/binding/expr-match-generic.rs
diff --git a/src/test/run-pass/expr-match-panic-all.rs b/src/test/ui/run-pass/binding/expr-match-panic-all.rs
index e712d552a81..e712d552a81 100644
--- a/src/test/run-pass/expr-match-panic-all.rs
+++ b/src/test/ui/run-pass/binding/expr-match-panic-all.rs
diff --git a/src/test/run-pass/expr-match-panic.rs b/src/test/ui/run-pass/binding/expr-match-panic.rs
index 1a6466048d9..1a6466048d9 100644
--- a/src/test/run-pass/expr-match-panic.rs
+++ b/src/test/ui/run-pass/binding/expr-match-panic.rs
diff --git a/src/test/run-pass/expr-match-unique.rs b/src/test/ui/run-pass/binding/expr-match-unique.rs
index e66f09c63ea..e66f09c63ea 100644
--- a/src/test/run-pass/expr-match-unique.rs
+++ b/src/test/ui/run-pass/binding/expr-match-unique.rs
diff --git a/src/test/run-pass/expr-match.rs b/src/test/ui/run-pass/binding/expr-match.rs
index 580ee52ed36..580ee52ed36 100644
--- a/src/test/run-pass/expr-match.rs
+++ b/src/test/ui/run-pass/binding/expr-match.rs
diff --git a/src/test/run-pass/fat-arrow-match.rs b/src/test/ui/run-pass/binding/fat-arrow-match.rs
index 004e6d48e37..004e6d48e37 100644
--- a/src/test/run-pass/fat-arrow-match.rs
+++ b/src/test/ui/run-pass/binding/fat-arrow-match.rs
diff --git a/src/test/run-pass/fn-pattern-expected-type-2.rs b/src/test/ui/run-pass/binding/fn-pattern-expected-type-2.rs
index 66a7123c795..66a7123c795 100644
--- a/src/test/run-pass/fn-pattern-expected-type-2.rs
+++ b/src/test/ui/run-pass/binding/fn-pattern-expected-type-2.rs
diff --git a/src/test/run-pass/fn-pattern-expected-type.rs b/src/test/ui/run-pass/binding/fn-pattern-expected-type.rs
index 2e9607602fd..2e9607602fd 100644
--- a/src/test/run-pass/fn-pattern-expected-type.rs
+++ b/src/test/ui/run-pass/binding/fn-pattern-expected-type.rs
diff --git a/src/test/run-pass/func-arg-incomplete-pattern.rs b/src/test/ui/run-pass/binding/func-arg-incomplete-pattern.rs
index 7d9501879d0..7d9501879d0 100644
--- a/src/test/run-pass/func-arg-incomplete-pattern.rs
+++ b/src/test/ui/run-pass/binding/func-arg-incomplete-pattern.rs
diff --git a/src/test/run-pass/func-arg-ref-pattern.rs b/src/test/ui/run-pass/binding/func-arg-ref-pattern.rs
index 5214f2d02f5..5214f2d02f5 100644
--- a/src/test/run-pass/func-arg-ref-pattern.rs
+++ b/src/test/ui/run-pass/binding/func-arg-ref-pattern.rs
diff --git a/src/test/run-pass/func-arg-wild-pattern.rs b/src/test/ui/run-pass/binding/func-arg-wild-pattern.rs
index 3ab3ee4db2d..3ab3ee4db2d 100644
--- a/src/test/run-pass/func-arg-wild-pattern.rs
+++ b/src/test/ui/run-pass/binding/func-arg-wild-pattern.rs
diff --git a/src/test/run-pass/if-let.rs b/src/test/ui/run-pass/binding/if-let.rs
index 13134abd8fd..13134abd8fd 100644
--- a/src/test/run-pass/if-let.rs
+++ b/src/test/ui/run-pass/binding/if-let.rs
diff --git a/src/test/run-pass/inconsistent-lifetime-mismatch.rs b/src/test/ui/run-pass/binding/inconsistent-lifetime-mismatch.rs
index 9a0d8e201c2..9a0d8e201c2 100644
--- a/src/test/run-pass/inconsistent-lifetime-mismatch.rs
+++ b/src/test/ui/run-pass/binding/inconsistent-lifetime-mismatch.rs
diff --git a/src/test/run-pass/inferred-suffix-in-pattern-range.rs b/src/test/ui/run-pass/binding/inferred-suffix-in-pattern-range.rs
index 89d26aade2e..89d26aade2e 100644
--- a/src/test/run-pass/inferred-suffix-in-pattern-range.rs
+++ b/src/test/ui/run-pass/binding/inferred-suffix-in-pattern-range.rs
diff --git a/src/test/run-pass/irrefutable-slice-patterns.rs b/src/test/ui/run-pass/binding/irrefutable-slice-patterns.rs
index c2e95eb54f9..c2e95eb54f9 100644
--- a/src/test/run-pass/irrefutable-slice-patterns.rs
+++ b/src/test/ui/run-pass/binding/irrefutable-slice-patterns.rs
diff --git a/src/test/run-pass/let-assignability.rs b/src/test/ui/run-pass/binding/let-assignability.rs
index 69b0eab99f7..69b0eab99f7 100644
--- a/src/test/run-pass/let-assignability.rs
+++ b/src/test/ui/run-pass/binding/let-assignability.rs
diff --git a/src/test/run-pass/let-destruct-ref.rs b/src/test/ui/run-pass/binding/let-destruct-ref.rs
index c9504f87c49..c9504f87c49 100644
--- a/src/test/run-pass/let-destruct-ref.rs
+++ b/src/test/ui/run-pass/binding/let-destruct-ref.rs
diff --git a/src/test/run-pass/let-var-hygiene.rs b/src/test/ui/run-pass/binding/let-var-hygiene.rs
index d9087f58bef..d9087f58bef 100644
--- a/src/test/run-pass/let-var-hygiene.rs
+++ b/src/test/ui/run-pass/binding/let-var-hygiene.rs
diff --git a/src/test/run-pass/match-arm-statics.rs b/src/test/ui/run-pass/binding/match-arm-statics.rs
index ca6ef2e4277..ca6ef2e4277 100644
--- a/src/test/run-pass/match-arm-statics.rs
+++ b/src/test/ui/run-pass/binding/match-arm-statics.rs
diff --git a/src/test/run-pass/match-beginning-vert.rs b/src/test/ui/run-pass/binding/match-beginning-vert.rs
index cdacfb2f057..cdacfb2f057 100644
--- a/src/test/run-pass/match-beginning-vert.rs
+++ b/src/test/ui/run-pass/binding/match-beginning-vert.rs
diff --git a/src/test/run-pass/match-borrowed_str.rs b/src/test/ui/run-pass/binding/match-borrowed_str.rs
index b027e62494c..b027e62494c 100644
--- a/src/test/run-pass/match-borrowed_str.rs
+++ b/src/test/ui/run-pass/binding/match-borrowed_str.rs
diff --git a/src/test/run-pass/match-bot-2.rs b/src/test/ui/run-pass/binding/match-bot-2.rs
index 88c514a724f..88c514a724f 100644
--- a/src/test/run-pass/match-bot-2.rs
+++ b/src/test/ui/run-pass/binding/match-bot-2.rs
diff --git a/src/test/run-pass/match-bot.rs b/src/test/ui/run-pass/binding/match-bot.rs
index 7745410fa43..7745410fa43 100644
--- a/src/test/run-pass/match-bot.rs
+++ b/src/test/ui/run-pass/binding/match-bot.rs
diff --git a/src/test/run-pass/match-byte-array-patterns.rs b/src/test/ui/run-pass/binding/match-byte-array-patterns.rs
index dbfe588fb0c..dbfe588fb0c 100644
--- a/src/test/run-pass/match-byte-array-patterns.rs
+++ b/src/test/ui/run-pass/binding/match-byte-array-patterns.rs
diff --git a/src/test/run-pass/match-enum-struct-0.rs b/src/test/ui/run-pass/binding/match-enum-struct-0.rs
index 1754dc0c960..1754dc0c960 100644
--- a/src/test/run-pass/match-enum-struct-0.rs
+++ b/src/test/ui/run-pass/binding/match-enum-struct-0.rs
diff --git a/src/test/run-pass/match-enum-struct-1.rs b/src/test/ui/run-pass/binding/match-enum-struct-1.rs
index ebf2db36700..ebf2db36700 100644
--- a/src/test/run-pass/match-enum-struct-1.rs
+++ b/src/test/ui/run-pass/binding/match-enum-struct-1.rs
diff --git a/src/test/run-pass/match-implicit-copy-unique.rs b/src/test/ui/run-pass/binding/match-implicit-copy-unique.rs
index 10de6eeabdd..10de6eeabdd 100644
--- a/src/test/run-pass/match-implicit-copy-unique.rs
+++ b/src/test/ui/run-pass/binding/match-implicit-copy-unique.rs
diff --git a/src/test/run-pass/match-in-macro.rs b/src/test/ui/run-pass/binding/match-in-macro.rs
index e096c97e16f..e096c97e16f 100644
--- a/src/test/run-pass/match-in-macro.rs
+++ b/src/test/ui/run-pass/binding/match-in-macro.rs
diff --git a/src/test/run-pass/match-join.rs b/src/test/ui/run-pass/binding/match-join.rs
index b47732b325a..b47732b325a 100644
--- a/src/test/run-pass/match-join.rs
+++ b/src/test/ui/run-pass/binding/match-join.rs
diff --git a/src/test/run-pass/match-larger-const.rs b/src/test/ui/run-pass/binding/match-larger-const.rs
index 8cb4d92c21c..8cb4d92c21c 100644
--- a/src/test/run-pass/match-larger-const.rs
+++ b/src/test/ui/run-pass/binding/match-larger-const.rs
diff --git a/src/test/run-pass/match-naked-record-expr.rs b/src/test/ui/run-pass/binding/match-naked-record-expr.rs
index e558e88e03d..e558e88e03d 100644
--- a/src/test/run-pass/match-naked-record-expr.rs
+++ b/src/test/ui/run-pass/binding/match-naked-record-expr.rs
diff --git a/src/test/run-pass/match-naked-record.rs b/src/test/ui/run-pass/binding/match-naked-record.rs
index a2b35e6558c..a2b35e6558c 100644
--- a/src/test/run-pass/match-naked-record.rs
+++ b/src/test/ui/run-pass/binding/match-naked-record.rs
diff --git a/src/test/run-pass/match-path.rs b/src/test/ui/run-pass/binding/match-path.rs
index 1b3594a0a79..1b3594a0a79 100644
--- a/src/test/run-pass/match-path.rs
+++ b/src/test/ui/run-pass/binding/match-path.rs
diff --git a/src/test/run-pass/match-pattern-bindings.rs b/src/test/ui/run-pass/binding/match-pattern-bindings.rs
index 9f687ab99e8..9f687ab99e8 100644
--- a/src/test/run-pass/match-pattern-bindings.rs
+++ b/src/test/ui/run-pass/binding/match-pattern-bindings.rs
diff --git a/src/test/run-pass/match-pattern-lit.rs b/src/test/ui/run-pass/binding/match-pattern-lit.rs
index 32de1c6c674..32de1c6c674 100644
--- a/src/test/run-pass/match-pattern-lit.rs
+++ b/src/test/ui/run-pass/binding/match-pattern-lit.rs
diff --git a/src/test/run-pass/match-pattern-no-type-params.rs b/src/test/ui/run-pass/binding/match-pattern-no-type-params.rs
index ccf23b87ea3..ccf23b87ea3 100644
--- a/src/test/run-pass/match-pattern-no-type-params.rs
+++ b/src/test/ui/run-pass/binding/match-pattern-no-type-params.rs
diff --git a/src/test/run-pass/match-pattern-simple.rs b/src/test/ui/run-pass/binding/match-pattern-simple.rs
index 8e729e2eab3..8e729e2eab3 100644
--- a/src/test/run-pass/match-pattern-simple.rs
+++ b/src/test/ui/run-pass/binding/match-pattern-simple.rs
diff --git a/src/test/run-pass/match-phi.rs b/src/test/ui/run-pass/binding/match-phi.rs
index 24185ffa412..24185ffa412 100644
--- a/src/test/run-pass/match-phi.rs
+++ b/src/test/ui/run-pass/binding/match-phi.rs
diff --git a/src/test/run-pass/match-pipe-binding.rs b/src/test/ui/run-pass/binding/match-pipe-binding.rs
index 9592da77a1b..9592da77a1b 100644
--- a/src/test/run-pass/match-pipe-binding.rs
+++ b/src/test/ui/run-pass/binding/match-pipe-binding.rs
diff --git a/src/test/run-pass/match-range-infer.rs b/src/test/ui/run-pass/binding/match-range-infer.rs
index cf07345d343..cf07345d343 100644
--- a/src/test/run-pass/match-range-infer.rs
+++ b/src/test/ui/run-pass/binding/match-range-infer.rs
diff --git a/src/test/run-pass/match-range-static.rs b/src/test/ui/run-pass/binding/match-range-static.rs
index b63ca7defd6..b63ca7defd6 100644
--- a/src/test/run-pass/match-range-static.rs
+++ b/src/test/ui/run-pass/binding/match-range-static.rs
diff --git a/src/test/run-pass/match-range.rs b/src/test/ui/run-pass/binding/match-range.rs
index efa72532196..efa72532196 100644
--- a/src/test/run-pass/match-range.rs
+++ b/src/test/ui/run-pass/binding/match-range.rs
diff --git a/src/test/run-pass/match-reassign.rs b/src/test/ui/run-pass/binding/match-reassign.rs
index bedcee43db5..bedcee43db5 100644
--- a/src/test/run-pass/match-reassign.rs
+++ b/src/test/ui/run-pass/binding/match-reassign.rs
diff --git a/src/test/run-pass/match-ref-binding-in-guard-3256.rs b/src/test/ui/run-pass/binding/match-ref-binding-in-guard-3256.rs
index dc3c759078f..dc3c759078f 100644
--- a/src/test/run-pass/match-ref-binding-in-guard-3256.rs
+++ b/src/test/ui/run-pass/binding/match-ref-binding-in-guard-3256.rs
diff --git a/src/test/run-pass/match-ref-binding-mut-option.rs b/src/test/ui/run-pass/binding/match-ref-binding-mut-option.rs
index f429e7b58e3..f429e7b58e3 100644
--- a/src/test/run-pass/match-ref-binding-mut-option.rs
+++ b/src/test/ui/run-pass/binding/match-ref-binding-mut-option.rs
diff --git a/src/test/run-pass/match-ref-binding-mut.rs b/src/test/ui/run-pass/binding/match-ref-binding-mut.rs
index abc418ddd51..abc418ddd51 100644
--- a/src/test/run-pass/match-ref-binding-mut.rs
+++ b/src/test/ui/run-pass/binding/match-ref-binding-mut.rs
diff --git a/src/test/run-pass/match-ref-binding.rs b/src/test/ui/run-pass/binding/match-ref-binding.rs
index eab7ed529b1..eab7ed529b1 100644
--- a/src/test/run-pass/match-ref-binding.rs
+++ b/src/test/ui/run-pass/binding/match-ref-binding.rs
diff --git a/src/test/run-pass/match-ref-unsized.rs b/src/test/ui/run-pass/binding/match-ref-unsized.rs
index 4de028299df..4de028299df 100644
--- a/src/test/run-pass/match-ref-unsized.rs
+++ b/src/test/ui/run-pass/binding/match-ref-unsized.rs
diff --git a/src/test/run-pass/match-static-const-rename.rs b/src/test/ui/run-pass/binding/match-static-const-rename.rs
index 77e3b724cbe..77e3b724cbe 100644
--- a/src/test/run-pass/match-static-const-rename.rs
+++ b/src/test/ui/run-pass/binding/match-static-const-rename.rs
diff --git a/src/test/run-pass/match-str.rs b/src/test/ui/run-pass/binding/match-str.rs
index e6def65e53a..e6def65e53a 100644
--- a/src/test/run-pass/match-str.rs
+++ b/src/test/ui/run-pass/binding/match-str.rs
diff --git a/src/test/run-pass/match-struct-0.rs b/src/test/ui/run-pass/binding/match-struct-0.rs
index e9e45df460d..e9e45df460d 100644
--- a/src/test/run-pass/match-struct-0.rs
+++ b/src/test/ui/run-pass/binding/match-struct-0.rs
diff --git a/src/test/run-pass/match-tag.rs b/src/test/ui/run-pass/binding/match-tag.rs
index e4a0d4e95f3..e4a0d4e95f3 100644
--- a/src/test/run-pass/match-tag.rs
+++ b/src/test/ui/run-pass/binding/match-tag.rs
diff --git a/src/test/run-pass/match-unique-bind.rs b/src/test/ui/run-pass/binding/match-unique-bind.rs
index ca864c05cfd..ca864c05cfd 100644
--- a/src/test/run-pass/match-unique-bind.rs
+++ b/src/test/ui/run-pass/binding/match-unique-bind.rs
diff --git a/src/test/run-pass/match-unsized.rs b/src/test/ui/run-pass/binding/match-unsized.rs
index 7253672a7ff..7253672a7ff 100644
--- a/src/test/run-pass/match-unsized.rs
+++ b/src/test/ui/run-pass/binding/match-unsized.rs
diff --git a/src/test/run-pass/match-value-binding-in-guard-3291.rs b/src/test/ui/run-pass/binding/match-value-binding-in-guard-3291.rs
index ab56a8cfc93..ab56a8cfc93 100644
--- a/src/test/run-pass/match-value-binding-in-guard-3291.rs
+++ b/src/test/ui/run-pass/binding/match-value-binding-in-guard-3291.rs
diff --git a/src/test/run-pass/match-var-hygiene.rs b/src/test/ui/run-pass/binding/match-var-hygiene.rs
index dfb23aabf19..dfb23aabf19 100644
--- a/src/test/run-pass/match-var-hygiene.rs
+++ b/src/test/ui/run-pass/binding/match-var-hygiene.rs
diff --git a/src/test/run-pass/match-vec-alternatives.rs b/src/test/ui/run-pass/binding/match-vec-alternatives.rs
index 7d03d9c2abe..7d03d9c2abe 100644
--- a/src/test/run-pass/match-vec-alternatives.rs
+++ b/src/test/ui/run-pass/binding/match-vec-alternatives.rs
diff --git a/src/test/run-pass/match-vec-rvalue.rs b/src/test/ui/run-pass/binding/match-vec-rvalue.rs
index 3d221927b96..3d221927b96 100644
--- a/src/test/run-pass/match-vec-rvalue.rs
+++ b/src/test/ui/run-pass/binding/match-vec-rvalue.rs
diff --git a/src/test/run-pass/match-with-ret-arm.rs b/src/test/ui/run-pass/binding/match-with-ret-arm.rs
index 79b197f08e2..79b197f08e2 100644
--- a/src/test/run-pass/match-with-ret-arm.rs
+++ b/src/test/ui/run-pass/binding/match-with-ret-arm.rs
diff --git a/src/test/run-pass/multi-let.rs b/src/test/ui/run-pass/binding/multi-let.rs
index 3b060bb1886..3b060bb1886 100644
--- a/src/test/run-pass/multi-let.rs
+++ b/src/test/ui/run-pass/binding/multi-let.rs
diff --git a/src/test/run-pass/mut-in-ident-patterns.rs b/src/test/ui/run-pass/binding/mut-in-ident-patterns.rs
index 32ff7efffa0..32ff7efffa0 100644
--- a/src/test/run-pass/mut-in-ident-patterns.rs
+++ b/src/test/ui/run-pass/binding/mut-in-ident-patterns.rs
diff --git a/src/test/run-pass/nested-exhaustive-match.rs b/src/test/ui/run-pass/binding/nested-exhaustive-match.rs
index e0a3b1adfe4..e0a3b1adfe4 100644
--- a/src/test/run-pass/nested-exhaustive-match.rs
+++ b/src/test/ui/run-pass/binding/nested-exhaustive-match.rs
diff --git a/src/test/run-pass/nested-matchs.rs b/src/test/ui/run-pass/binding/nested-matchs.rs
index 46d30b68f78..46d30b68f78 100644
--- a/src/test/run-pass/nested-matchs.rs
+++ b/src/test/ui/run-pass/binding/nested-matchs.rs
diff --git a/src/test/run-pass/nested-pattern.rs b/src/test/ui/run-pass/binding/nested-pattern.rs
index f9abdd56fa4..f9abdd56fa4 100644
--- a/src/test/run-pass/nested-pattern.rs
+++ b/src/test/ui/run-pass/binding/nested-pattern.rs
diff --git a/src/test/run-pass/nil-pattern.rs b/src/test/ui/run-pass/binding/nil-pattern.rs
index 342644e0384..342644e0384 100644
--- a/src/test/run-pass/nil-pattern.rs
+++ b/src/test/ui/run-pass/binding/nil-pattern.rs
diff --git a/src/test/run-pass/nullary-or-pattern.rs b/src/test/ui/run-pass/binding/nullary-or-pattern.rs
index feb8726c0e4..feb8726c0e4 100644
--- a/src/test/run-pass/nullary-or-pattern.rs
+++ b/src/test/ui/run-pass/binding/nullary-or-pattern.rs
diff --git a/src/test/run-pass/optional_comma_in_match_arm.rs b/src/test/ui/run-pass/binding/optional_comma_in_match_arm.rs
index b25ec444f22..b25ec444f22 100644
--- a/src/test/run-pass/optional_comma_in_match_arm.rs
+++ b/src/test/ui/run-pass/binding/optional_comma_in_match_arm.rs
diff --git a/src/test/run-pass/or-pattern.rs b/src/test/ui/run-pass/binding/or-pattern.rs
index 3bb0c71c581..3bb0c71c581 100644
--- a/src/test/run-pass/or-pattern.rs
+++ b/src/test/ui/run-pass/binding/or-pattern.rs
diff --git a/src/test/run-pass/order-drop-with-match.rs b/src/test/ui/run-pass/binding/order-drop-with-match.rs
index 8f82e3aaba1..8f82e3aaba1 100644
--- a/src/test/run-pass/order-drop-with-match.rs
+++ b/src/test/ui/run-pass/binding/order-drop-with-match.rs
diff --git a/src/test/run-pass/pat-ranges.rs b/src/test/ui/run-pass/binding/pat-ranges.rs
index 964989508cc..964989508cc 100644
--- a/src/test/run-pass/pat-ranges.rs
+++ b/src/test/ui/run-pass/binding/pat-ranges.rs
diff --git a/src/test/run-pass/pat-tuple-1.rs b/src/test/ui/run-pass/binding/pat-tuple-1.rs
index 45a9a2b303c..45a9a2b303c 100644
--- a/src/test/run-pass/pat-tuple-1.rs
+++ b/src/test/ui/run-pass/binding/pat-tuple-1.rs
diff --git a/src/test/run-pass/pat-tuple-2.rs b/src/test/ui/run-pass/binding/pat-tuple-2.rs
index ee60d1c01cf..ee60d1c01cf 100644
--- a/src/test/run-pass/pat-tuple-2.rs
+++ b/src/test/ui/run-pass/binding/pat-tuple-2.rs
diff --git a/src/test/run-pass/pat-tuple-3.rs b/src/test/ui/run-pass/binding/pat-tuple-3.rs
index 7a46c1deb59..7a46c1deb59 100644
--- a/src/test/run-pass/pat-tuple-3.rs
+++ b/src/test/ui/run-pass/binding/pat-tuple-3.rs
diff --git a/src/test/run-pass/pat-tuple-4.rs b/src/test/ui/run-pass/binding/pat-tuple-4.rs
index 1d75e1e9d14..1d75e1e9d14 100644
--- a/src/test/run-pass/pat-tuple-4.rs
+++ b/src/test/ui/run-pass/binding/pat-tuple-4.rs
diff --git a/src/test/run-pass/pat-tuple-5.rs b/src/test/ui/run-pass/binding/pat-tuple-5.rs
index 1192932f13d..1192932f13d 100644
--- a/src/test/run-pass/pat-tuple-5.rs
+++ b/src/test/ui/run-pass/binding/pat-tuple-5.rs
diff --git a/src/test/run-pass/pat-tuple-6.rs b/src/test/ui/run-pass/binding/pat-tuple-6.rs
index 9d3cd65b455..9d3cd65b455 100644
--- a/src/test/run-pass/pat-tuple-6.rs
+++ b/src/test/ui/run-pass/binding/pat-tuple-6.rs
diff --git a/src/test/run-pass/pat-tuple-7.rs b/src/test/ui/run-pass/binding/pat-tuple-7.rs
index 6d51df63e15..6d51df63e15 100644
--- a/src/test/run-pass/pat-tuple-7.rs
+++ b/src/test/ui/run-pass/binding/pat-tuple-7.rs
diff --git a/src/test/run-pass/pattern-bound-var-in-for-each.rs b/src/test/ui/run-pass/binding/pattern-bound-var-in-for-each.rs
index 778f355b24b..778f355b24b 100644
--- a/src/test/run-pass/pattern-bound-var-in-for-each.rs
+++ b/src/test/ui/run-pass/binding/pattern-bound-var-in-for-each.rs
diff --git a/src/test/run-pass/pattern-in-closure.rs b/src/test/ui/run-pass/binding/pattern-in-closure.rs
index 909ed985d7f..909ed985d7f 100644
--- a/src/test/run-pass/pattern-in-closure.rs
+++ b/src/test/ui/run-pass/binding/pattern-in-closure.rs
diff --git a/src/test/run-pass/range-inclusive-pattern-precedence.rs b/src/test/ui/run-pass/binding/range-inclusive-pattern-precedence.rs
index 5e491d48bcf..5e491d48bcf 100644
--- a/src/test/run-pass/range-inclusive-pattern-precedence.rs
+++ b/src/test/ui/run-pass/binding/range-inclusive-pattern-precedence.rs
diff --git a/src/test/run-pass/simple-generic-match.rs b/src/test/ui/run-pass/binding/simple-generic-match.rs
index 02fc2a61d01..02fc2a61d01 100644
--- a/src/test/run-pass/simple-generic-match.rs
+++ b/src/test/ui/run-pass/binding/simple-generic-match.rs
diff --git a/src/test/run-pass/use-uninit-match.rs b/src/test/ui/run-pass/binding/use-uninit-match.rs
index 9e606384f3f..9e606384f3f 100644
--- a/src/test/run-pass/use-uninit-match.rs
+++ b/src/test/ui/run-pass/binding/use-uninit-match.rs
diff --git a/src/test/run-pass/use-uninit-match2.rs b/src/test/ui/run-pass/binding/use-uninit-match2.rs
index dc0a6a26bc0..dc0a6a26bc0 100644
--- a/src/test/run-pass/use-uninit-match2.rs
+++ b/src/test/ui/run-pass/binding/use-uninit-match2.rs
diff --git a/src/test/run-pass/zero_sized_subslice_match.rs b/src/test/ui/run-pass/binding/zero_sized_subslice_match.rs
index d399ef72976..d399ef72976 100644
--- a/src/test/run-pass/zero_sized_subslice_match.rs
+++ b/src/test/ui/run-pass/binding/zero_sized_subslice_match.rs
diff --git a/src/test/run-pass/cfg-attr-cfg.rs b/src/test/ui/run-pass/cfg/cfg-attr-cfg.rs
index 74022d4c6c8..74022d4c6c8 100644
--- a/src/test/run-pass/cfg-attr-cfg.rs
+++ b/src/test/ui/run-pass/cfg/cfg-attr-cfg.rs
diff --git a/src/test/run-pass/cfg-attr-crate.rs b/src/test/ui/run-pass/cfg/cfg-attr-crate.rs
index 21dc7ff7e01..21dc7ff7e01 100644
--- a/src/test/run-pass/cfg-attr-crate.rs
+++ b/src/test/ui/run-pass/cfg/cfg-attr-crate.rs
diff --git a/src/test/run-pass/cfg-family.rs b/src/test/ui/run-pass/cfg/cfg-family.rs
index e45e35b370d..e45e35b370d 100644
--- a/src/test/run-pass/cfg-family.rs
+++ b/src/test/ui/run-pass/cfg/cfg-family.rs
diff --git a/src/test/run-pass/cfg-in-crate-1.rs b/src/test/ui/run-pass/cfg/cfg-in-crate-1.rs
index 5dd6fa45bb9..5dd6fa45bb9 100644
--- a/src/test/run-pass/cfg-in-crate-1.rs
+++ b/src/test/ui/run-pass/cfg/cfg-in-crate-1.rs
diff --git a/src/test/run-pass/cfg-macros-foo.rs b/src/test/ui/run-pass/cfg/cfg-macros-foo.rs
index 36b9ce1585c..36b9ce1585c 100644
--- a/src/test/run-pass/cfg-macros-foo.rs
+++ b/src/test/ui/run-pass/cfg/cfg-macros-foo.rs
diff --git a/src/test/run-pass/cfg-macros-notfoo.rs b/src/test/ui/run-pass/cfg/cfg-macros-notfoo.rs
index 4e1b833add0..4e1b833add0 100644
--- a/src/test/run-pass/cfg-macros-notfoo.rs
+++ b/src/test/ui/run-pass/cfg/cfg-macros-notfoo.rs
diff --git a/src/test/run-pass/cfg-match-arm.rs b/src/test/ui/run-pass/cfg/cfg-match-arm.rs
index 05dc7d52424..05dc7d52424 100644
--- a/src/test/run-pass/cfg-match-arm.rs
+++ b/src/test/ui/run-pass/cfg/cfg-match-arm.rs
diff --git a/src/test/run-pass/cfg-target-family.rs b/src/test/ui/run-pass/cfg/cfg-target-family.rs
index 7c279e43e0e..7c279e43e0e 100644
--- a/src/test/run-pass/cfg-target-family.rs
+++ b/src/test/ui/run-pass/cfg/cfg-target-family.rs
diff --git a/src/test/run-pass/cfg-target-vendor.rs b/src/test/ui/run-pass/cfg/cfg-target-vendor.rs
index 787ae5289dd..787ae5289dd 100644
--- a/src/test/run-pass/cfg-target-vendor.rs
+++ b/src/test/ui/run-pass/cfg/cfg-target-vendor.rs
diff --git a/src/test/run-pass/cfg_attr.rs b/src/test/ui/run-pass/cfg/cfg_attr.rs
index 9bef7f70420..9bef7f70420 100644
--- a/src/test/run-pass/cfg_attr.rs
+++ b/src/test/ui/run-pass/cfg/cfg_attr.rs
diff --git a/src/test/run-pass/cfg_inner_static.rs b/src/test/ui/run-pass/cfg/cfg_inner_static.rs
index b3d5ddc4283..b3d5ddc4283 100644
--- a/src/test/run-pass/cfg_inner_static.rs
+++ b/src/test/ui/run-pass/cfg/cfg_inner_static.rs
diff --git a/src/test/run-pass/cfg_stmt_expr.rs b/src/test/ui/run-pass/cfg/cfg_stmt_expr.rs
index fcc93557665..fcc93557665 100644
--- a/src/test/run-pass/cfg_stmt_expr.rs
+++ b/src/test/ui/run-pass/cfg/cfg_stmt_expr.rs
diff --git a/src/test/run-pass/cfgs-on-items.rs b/src/test/ui/run-pass/cfg/cfgs-on-items.rs
index 1b692d8bd51..1b692d8bd51 100644
--- a/src/test/run-pass/cfgs-on-items.rs
+++ b/src/test/ui/run-pass/cfg/cfgs-on-items.rs
diff --git a/src/test/run-pass/conditional-compile-arch.rs b/src/test/ui/run-pass/cfg/conditional-compile-arch.rs
index 1efbfb927fa..1efbfb927fa 100644
--- a/src/test/run-pass/conditional-compile-arch.rs
+++ b/src/test/ui/run-pass/cfg/conditional-compile-arch.rs
diff --git a/src/test/run-pass/conditional-compile.rs b/src/test/ui/run-pass/cfg/conditional-compile.rs
index 01bdcfeaefb..01bdcfeaefb 100644
--- a/src/test/run-pass/conditional-compile.rs
+++ b/src/test/ui/run-pass/cfg/conditional-compile.rs
diff --git a/src/test/run-pass/crate-attributes-using-cfg_attr.rs b/src/test/ui/run-pass/cfg/crate-attributes-using-cfg_attr.rs
index 72ccc6723f9..72ccc6723f9 100644
--- a/src/test/run-pass/crate-attributes-using-cfg_attr.rs
+++ b/src/test/ui/run-pass/cfg/crate-attributes-using-cfg_attr.rs
diff --git a/src/test/run-pass/coerce-expect-unsized.rs b/src/test/ui/run-pass/coerce/coerce-expect-unsized.rs
index 5a1953b563a..5a1953b563a 100644
--- a/src/test/run-pass/coerce-expect-unsized.rs
+++ b/src/test/ui/run-pass/coerce/coerce-expect-unsized.rs
diff --git a/src/test/run-pass/coerce-overloaded-autoderef.rs b/src/test/ui/run-pass/coerce/coerce-overloaded-autoderef.rs
index 091e29dd18a..091e29dd18a 100644
--- a/src/test/run-pass/coerce-overloaded-autoderef.rs
+++ b/src/test/ui/run-pass/coerce/coerce-overloaded-autoderef.rs
diff --git a/src/test/run-pass/coerce-reborrow-imm-ptr-arg.rs b/src/test/ui/run-pass/coerce/coerce-reborrow-imm-ptr-arg.rs
index 581764d4a3b..581764d4a3b 100644
--- a/src/test/run-pass/coerce-reborrow-imm-ptr-arg.rs
+++ b/src/test/ui/run-pass/coerce/coerce-reborrow-imm-ptr-arg.rs
diff --git a/src/test/run-pass/coerce-reborrow-imm-ptr-rcvr.rs b/src/test/ui/run-pass/coerce/coerce-reborrow-imm-ptr-rcvr.rs
index 5258ad1af51..5258ad1af51 100644
--- a/src/test/run-pass/coerce-reborrow-imm-ptr-rcvr.rs
+++ b/src/test/ui/run-pass/coerce/coerce-reborrow-imm-ptr-rcvr.rs
diff --git a/src/test/run-pass/coerce-reborrow-imm-vec-arg.rs b/src/test/ui/run-pass/coerce/coerce-reborrow-imm-vec-arg.rs
index 1786d5b54f3..1786d5b54f3 100644
--- a/src/test/run-pass/coerce-reborrow-imm-vec-arg.rs
+++ b/src/test/ui/run-pass/coerce/coerce-reborrow-imm-vec-arg.rs
diff --git a/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs b/src/test/ui/run-pass/coerce/coerce-reborrow-imm-vec-rcvr.rs
index e86f20694e1..e86f20694e1 100644
--- a/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs
+++ b/src/test/ui/run-pass/coerce/coerce-reborrow-imm-vec-rcvr.rs
diff --git a/src/test/run-pass/coerce-reborrow-mut-ptr-arg.rs b/src/test/ui/run-pass/coerce/coerce-reborrow-mut-ptr-arg.rs
index b70146ea2d3..b70146ea2d3 100644
--- a/src/test/run-pass/coerce-reborrow-mut-ptr-arg.rs
+++ b/src/test/ui/run-pass/coerce/coerce-reborrow-mut-ptr-arg.rs
diff --git a/src/test/run-pass/coerce-reborrow-mut-ptr-rcvr.rs b/src/test/ui/run-pass/coerce/coerce-reborrow-mut-ptr-rcvr.rs
index 5f4cc569ac4..5f4cc569ac4 100644
--- a/src/test/run-pass/coerce-reborrow-mut-ptr-rcvr.rs
+++ b/src/test/ui/run-pass/coerce/coerce-reborrow-mut-ptr-rcvr.rs
diff --git a/src/test/run-pass/coerce-reborrow-mut-vec-arg.rs b/src/test/ui/run-pass/coerce/coerce-reborrow-mut-vec-arg.rs
index ca4ee4a97d5..ca4ee4a97d5 100644
--- a/src/test/run-pass/coerce-reborrow-mut-vec-arg.rs
+++ b/src/test/ui/run-pass/coerce/coerce-reborrow-mut-vec-arg.rs
diff --git a/src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs b/src/test/ui/run-pass/coerce/coerce-reborrow-mut-vec-rcvr.rs
index f35735adbcf..f35735adbcf 100644
--- a/src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs
+++ b/src/test/ui/run-pass/coerce/coerce-reborrow-mut-vec-rcvr.rs
diff --git a/src/test/run-pass/coerce-unify-return.rs b/src/test/ui/run-pass/coerce/coerce-unify-return.rs
index 2299a03b2a4..2299a03b2a4 100644
--- a/src/test/run-pass/coerce-unify-return.rs
+++ b/src/test/ui/run-pass/coerce/coerce-unify-return.rs
diff --git a/src/test/run-pass/coerce-unify.rs b/src/test/ui/run-pass/coerce/coerce-unify.rs
index 3d690146931..3d690146931 100644
--- a/src/test/run-pass/coerce-unify.rs
+++ b/src/test/ui/run-pass/coerce/coerce-unify.rs
diff --git a/src/test/run-pass/coerce-unsize-subtype.rs b/src/test/ui/run-pass/coerce/coerce-unsize-subtype.rs
index b19708f5a89..b19708f5a89 100644
--- a/src/test/run-pass/coerce-unsize-subtype.rs
+++ b/src/test/ui/run-pass/coerce/coerce-unsize-subtype.rs
diff --git a/src/test/run-pass/coherence-bigint-int.rs b/src/test/ui/run-pass/coherence/coherence-bigint-int.rs
index 9ad4f6b9d75..9ad4f6b9d75 100644
--- a/src/test/run-pass/coherence-bigint-int.rs
+++ b/src/test/ui/run-pass/coherence/coherence-bigint-int.rs
diff --git a/src/test/run-pass/coherence-bigint-vecint.rs b/src/test/ui/run-pass/coherence/coherence-bigint-vecint.rs
index ac4b98cfc8c..ac4b98cfc8c 100644
--- a/src/test/run-pass/coherence-bigint-vecint.rs
+++ b/src/test/ui/run-pass/coherence/coherence-bigint-vecint.rs
diff --git a/src/test/run-pass/coherence-blanket.rs b/src/test/ui/run-pass/coherence/coherence-blanket.rs
index 32743aafa82..32743aafa82 100644
--- a/src/test/run-pass/coherence-blanket.rs
+++ b/src/test/ui/run-pass/coherence/coherence-blanket.rs
diff --git a/src/test/run-pass/coherence-covered-type-parameter.rs b/src/test/ui/run-pass/coherence/coherence-covered-type-parameter.rs
index 890470d8ac2..890470d8ac2 100644
--- a/src/test/run-pass/coherence-covered-type-parameter.rs
+++ b/src/test/ui/run-pass/coherence/coherence-covered-type-parameter.rs
diff --git a/src/test/run-pass/coherence-impl-in-fn.rs b/src/test/ui/run-pass/coherence/coherence-impl-in-fn.rs
index d7c21340afc..d7c21340afc 100644
--- a/src/test/run-pass/coherence-impl-in-fn.rs
+++ b/src/test/ui/run-pass/coherence/coherence-impl-in-fn.rs
diff --git a/src/test/run-pass/coherence-iterator-vec-any-elem.rs b/src/test/ui/run-pass/coherence/coherence-iterator-vec-any-elem.rs
index 04a6cd58827..04a6cd58827 100644
--- a/src/test/run-pass/coherence-iterator-vec-any-elem.rs
+++ b/src/test/ui/run-pass/coherence/coherence-iterator-vec-any-elem.rs
diff --git a/src/test/run-pass/coherence-iterator-vec.rs b/src/test/ui/run-pass/coherence/coherence-iterator-vec.rs
index 8a3301dee27..8a3301dee27 100644
--- a/src/test/run-pass/coherence-iterator-vec.rs
+++ b/src/test/ui/run-pass/coherence/coherence-iterator-vec.rs
diff --git a/src/test/run-pass/coherence-multidispatch-tuple.rs b/src/test/ui/run-pass/coherence/coherence-multidispatch-tuple.rs
index 07477f96c0d..07477f96c0d 100644
--- a/src/test/run-pass/coherence-multidispatch-tuple.rs
+++ b/src/test/ui/run-pass/coherence/coherence-multidispatch-tuple.rs
diff --git a/src/test/run-pass/coherence-negative-impls-safe.rs b/src/test/ui/run-pass/coherence/coherence-negative-impls-safe.rs
index 2f42ab4988a..2f42ab4988a 100644
--- a/src/test/run-pass/coherence-negative-impls-safe.rs
+++ b/src/test/ui/run-pass/coherence/coherence-negative-impls-safe.rs
diff --git a/src/test/run-pass/coherence-rfc447-constrained.rs b/src/test/ui/run-pass/coherence/coherence-rfc447-constrained.rs
index 4b52378e508..4b52378e508 100644
--- a/src/test/run-pass/coherence-rfc447-constrained.rs
+++ b/src/test/ui/run-pass/coherence/coherence-rfc447-constrained.rs
diff --git a/src/test/run-pass/coherence-subtyping.rs b/src/test/ui/run-pass/coherence/coherence-subtyping.rs
index eb04514271c..eb04514271c 100644
--- a/src/test/run-pass/coherence-subtyping.rs
+++ b/src/test/ui/run-pass/coherence/coherence-subtyping.rs
diff --git a/src/test/run-pass/coherence-where-clause.rs b/src/test/ui/run-pass/coherence/coherence-where-clause.rs
index 8ab340d1bff..8ab340d1bff 100644
--- a/src/test/run-pass/coherence-where-clause.rs
+++ b/src/test/ui/run-pass/coherence/coherence-where-clause.rs
diff --git a/src/test/run-pass/coherence_copy_like.rs b/src/test/ui/run-pass/coherence/coherence_copy_like.rs
index 71db5225ecc..71db5225ecc 100644
--- a/src/test/run-pass/coherence_copy_like.rs
+++ b/src/test/ui/run-pass/coherence/coherence_copy_like.rs
diff --git a/src/test/run-pass/const-adt-align-mismatch.rs b/src/test/ui/run-pass/consts/const-adt-align-mismatch.rs
index 46cd708a139..46cd708a139 100644
--- a/src/test/run-pass/const-adt-align-mismatch.rs
+++ b/src/test/ui/run-pass/consts/const-adt-align-mismatch.rs
diff --git a/src/test/run-pass/const-autoderef.rs b/src/test/ui/run-pass/consts/const-autoderef.rs
index 6b3970e4f19..6b3970e4f19 100644
--- a/src/test/run-pass/const-autoderef.rs
+++ b/src/test/ui/run-pass/consts/const-autoderef.rs
diff --git a/src/test/run-pass/const-big-enum.rs b/src/test/ui/run-pass/consts/const-big-enum.rs
index 33e5e054650..33e5e054650 100644
--- a/src/test/run-pass/const-big-enum.rs
+++ b/src/test/ui/run-pass/consts/const-big-enum.rs
diff --git a/src/test/run-pass/const-binops.rs b/src/test/ui/run-pass/consts/const-binops.rs
index a29953bea88..a29953bea88 100644
--- a/src/test/run-pass/const-binops.rs
+++ b/src/test/ui/run-pass/consts/const-binops.rs
diff --git a/src/test/run-pass/const-bitshift-rhs-inference.rs b/src/test/ui/run-pass/consts/const-bitshift-rhs-inference.rs
index b377fd230b9..b377fd230b9 100644
--- a/src/test/run-pass/const-bitshift-rhs-inference.rs
+++ b/src/test/ui/run-pass/consts/const-bitshift-rhs-inference.rs
diff --git a/src/test/run-pass/const-block-cross-crate-fn.rs b/src/test/ui/run-pass/consts/const-block-cross-crate-fn.rs
index 6fa6feffbfa..6fa6feffbfa 100644
--- a/src/test/run-pass/const-block-cross-crate-fn.rs
+++ b/src/test/ui/run-pass/consts/const-block-cross-crate-fn.rs
diff --git a/src/test/run-pass/const-block-item-macro-codegen.rs b/src/test/ui/run-pass/consts/const-block-item-macro-codegen.rs
index 8a4b220a376..8a4b220a376 100644
--- a/src/test/run-pass/const-block-item-macro-codegen.rs
+++ b/src/test/ui/run-pass/consts/const-block-item-macro-codegen.rs
diff --git a/src/test/run-pass/const-block-item.rs b/src/test/ui/run-pass/consts/const-block-item.rs
index 51ebc240e72..51ebc240e72 100644
--- a/src/test/run-pass/const-block-item.rs
+++ b/src/test/ui/run-pass/consts/const-block-item.rs
diff --git a/src/test/run-pass/const-block.rs b/src/test/ui/run-pass/consts/const-block.rs
index e6f191ea952..e6f191ea952 100644
--- a/src/test/run-pass/const-block.rs
+++ b/src/test/ui/run-pass/consts/const-block.rs
diff --git a/src/test/run-pass/const-bound.rs b/src/test/ui/run-pass/consts/const-bound.rs
index 72a23b998e5..72a23b998e5 100644
--- a/src/test/run-pass/const-bound.rs
+++ b/src/test/ui/run-pass/consts/const-bound.rs
diff --git a/src/test/run-pass/const-byte-str-cast.rs b/src/test/ui/run-pass/consts/const-byte-str-cast.rs
index 7297c71a6d6..7297c71a6d6 100644
--- a/src/test/run-pass/const-byte-str-cast.rs
+++ b/src/test/ui/run-pass/consts/const-byte-str-cast.rs
diff --git a/src/test/run-pass/const-cast-ptr-int.rs b/src/test/ui/run-pass/consts/const-cast-ptr-int.rs
index e7674f893d3..e7674f893d3 100644
--- a/src/test/run-pass/const-cast-ptr-int.rs
+++ b/src/test/ui/run-pass/consts/const-cast-ptr-int.rs
diff --git a/src/test/run-pass/const-cast.rs b/src/test/ui/run-pass/consts/const-cast.rs
index e77fd5f7139..e77fd5f7139 100644
--- a/src/test/run-pass/const-cast.rs
+++ b/src/test/ui/run-pass/consts/const-cast.rs
diff --git a/src/test/run-pass/const-const.rs b/src/test/ui/run-pass/consts/const-const.rs
index b28017b85ad..b28017b85ad 100644
--- a/src/test/run-pass/const-const.rs
+++ b/src/test/ui/run-pass/consts/const-const.rs
diff --git a/src/test/run-pass/const-contents.rs b/src/test/ui/run-pass/consts/const-contents.rs
index 0d9d0e0e0aa..0d9d0e0e0aa 100644
--- a/src/test/run-pass/const-contents.rs
+++ b/src/test/ui/run-pass/consts/const-contents.rs
diff --git a/src/test/run-pass/const-cross-crate-const.rs b/src/test/ui/run-pass/consts/const-cross-crate-const.rs
index d66c335db2e..d66c335db2e 100644
--- a/src/test/run-pass/const-cross-crate-const.rs
+++ b/src/test/ui/run-pass/consts/const-cross-crate-const.rs
diff --git a/src/test/run-pass/const-cross-crate-extern.rs b/src/test/ui/run-pass/consts/const-cross-crate-extern.rs
index bbe31ceed33..bbe31ceed33 100644
--- a/src/test/run-pass/const-cross-crate-extern.rs
+++ b/src/test/ui/run-pass/consts/const-cross-crate-extern.rs
diff --git a/src/test/run-pass/const-deref.rs b/src/test/ui/run-pass/consts/const-deref.rs
index f5407f0c815..f5407f0c815 100644
--- a/src/test/run-pass/const-deref.rs
+++ b/src/test/ui/run-pass/consts/const-deref.rs
diff --git a/src/test/run-pass/const-endianess.rs b/src/test/ui/run-pass/consts/const-endianess.rs
index 95c738d3ec4..95c738d3ec4 100644
--- a/src/test/run-pass/const-endianess.rs
+++ b/src/test/ui/run-pass/consts/const-endianess.rs
diff --git a/src/test/run-pass/const-enum-byref-self.rs b/src/test/ui/run-pass/consts/const-enum-byref-self.rs
index 57470c4a67e..57470c4a67e 100644
--- a/src/test/run-pass/const-enum-byref-self.rs
+++ b/src/test/ui/run-pass/consts/const-enum-byref-self.rs
diff --git a/src/test/run-pass/const-enum-byref.rs b/src/test/ui/run-pass/consts/const-enum-byref.rs
index e3f1d5d3532..e3f1d5d3532 100644
--- a/src/test/run-pass/const-enum-byref.rs
+++ b/src/test/ui/run-pass/consts/const-enum-byref.rs
diff --git a/src/test/run-pass/const-enum-cast.rs b/src/test/ui/run-pass/consts/const-enum-cast.rs
index 38f21f7e959..38f21f7e959 100644
--- a/src/test/run-pass/const-enum-cast.rs
+++ b/src/test/ui/run-pass/consts/const-enum-cast.rs
diff --git a/src/test/run-pass/const-enum-ptr.rs b/src/test/ui/run-pass/consts/const-enum-ptr.rs
index 40a1c99e987..40a1c99e987 100644
--- a/src/test/run-pass/const-enum-ptr.rs
+++ b/src/test/ui/run-pass/consts/const-enum-ptr.rs
diff --git a/src/test/run-pass/const-enum-struct.rs b/src/test/ui/run-pass/consts/const-enum-struct.rs
index 46c4f82eb98..46c4f82eb98 100644
--- a/src/test/run-pass/const-enum-struct.rs
+++ b/src/test/ui/run-pass/consts/const-enum-struct.rs
diff --git a/src/test/run-pass/const-enum-struct2.rs b/src/test/ui/run-pass/consts/const-enum-struct2.rs
index e356ecb385b..e356ecb385b 100644
--- a/src/test/run-pass/const-enum-struct2.rs
+++ b/src/test/ui/run-pass/consts/const-enum-struct2.rs
diff --git a/src/test/run-pass/const-enum-structlike.rs b/src/test/ui/run-pass/consts/const-enum-structlike.rs
index a526e0be3da..a526e0be3da 100644
--- a/src/test/run-pass/const-enum-structlike.rs
+++ b/src/test/ui/run-pass/consts/const-enum-structlike.rs
diff --git a/src/test/run-pass/const-enum-tuple.rs b/src/test/ui/run-pass/consts/const-enum-tuple.rs
index 476defaa524..476defaa524 100644
--- a/src/test/run-pass/const-enum-tuple.rs
+++ b/src/test/ui/run-pass/consts/const-enum-tuple.rs
diff --git a/src/test/run-pass/const-enum-tuple2.rs b/src/test/ui/run-pass/consts/const-enum-tuple2.rs
index 61043ef75a4..61043ef75a4 100644
--- a/src/test/run-pass/const-enum-tuple2.rs
+++ b/src/test/ui/run-pass/consts/const-enum-tuple2.rs
diff --git a/src/test/run-pass/const-enum-tuplestruct.rs b/src/test/ui/run-pass/consts/const-enum-tuplestruct.rs
index f574508522b..f574508522b 100644
--- a/src/test/run-pass/const-enum-tuplestruct.rs
+++ b/src/test/ui/run-pass/consts/const-enum-tuplestruct.rs
diff --git a/src/test/run-pass/const-enum-tuplestruct2.rs b/src/test/ui/run-pass/consts/const-enum-tuplestruct2.rs
index 88cfc0dec70..88cfc0dec70 100644
--- a/src/test/run-pass/const-enum-tuplestruct2.rs
+++ b/src/test/ui/run-pass/consts/const-enum-tuplestruct2.rs
diff --git a/src/test/run-pass/const-enum-vec-index.rs b/src/test/ui/run-pass/consts/const-enum-vec-index.rs
index 9c1a4dbdffa..9c1a4dbdffa 100644
--- a/src/test/run-pass/const-enum-vec-index.rs
+++ b/src/test/ui/run-pass/consts/const-enum-vec-index.rs
diff --git a/src/test/run-pass/const-enum-vec-ptr.rs b/src/test/ui/run-pass/consts/const-enum-vec-ptr.rs
index 0bd18a02e4a..0bd18a02e4a 100644
--- a/src/test/run-pass/const-enum-vec-ptr.rs
+++ b/src/test/ui/run-pass/consts/const-enum-vec-ptr.rs
diff --git a/src/test/run-pass/const-enum-vector.rs b/src/test/ui/run-pass/consts/const-enum-vector.rs
index e7a6f520a99..e7a6f520a99 100644
--- a/src/test/run-pass/const-enum-vector.rs
+++ b/src/test/ui/run-pass/consts/const-enum-vector.rs
diff --git a/src/test/run-pass/const-err.rs b/src/test/ui/run-pass/consts/const-err.rs
index f7f79356a0b..f7f79356a0b 100644
--- a/src/test/run-pass/const-err.rs
+++ b/src/test/ui/run-pass/consts/const-err.rs
diff --git a/src/test/run-pass/const-expr-in-fixed-length-vec.rs b/src/test/ui/run-pass/consts/const-expr-in-fixed-length-vec.rs
index 6cf9239e2e4..6cf9239e2e4 100644
--- a/src/test/run-pass/const-expr-in-fixed-length-vec.rs
+++ b/src/test/ui/run-pass/consts/const-expr-in-fixed-length-vec.rs
diff --git a/src/test/run-pass/const-expr-in-vec-repeat.rs b/src/test/ui/run-pass/consts/const-expr-in-vec-repeat.rs
index fc3e6749f6e..fc3e6749f6e 100644
--- a/src/test/run-pass/const-expr-in-vec-repeat.rs
+++ b/src/test/ui/run-pass/consts/const-expr-in-vec-repeat.rs
diff --git a/src/test/run-pass/const-extern-function.rs b/src/test/ui/run-pass/consts/const-extern-function.rs
index 214b0400e86..214b0400e86 100644
--- a/src/test/run-pass/const-extern-function.rs
+++ b/src/test/ui/run-pass/consts/const-extern-function.rs
diff --git a/src/test/run-pass/const-fields-and-indexing.rs b/src/test/ui/run-pass/consts/const-fields-and-indexing.rs
index 55d6b60c192..55d6b60c192 100644
--- a/src/test/run-pass/const-fields-and-indexing.rs
+++ b/src/test/ui/run-pass/consts/const-fields-and-indexing.rs
diff --git a/src/test/run-pass/const-fn-const-eval.rs b/src/test/ui/run-pass/consts/const-fn-const-eval.rs
index 3fe27ca200c..3fe27ca200c 100644
--- a/src/test/run-pass/const-fn-const-eval.rs
+++ b/src/test/ui/run-pass/consts/const-fn-const-eval.rs
diff --git a/src/test/run-pass/const-fn-feature-flags.rs b/src/test/ui/run-pass/consts/const-fn-feature-flags.rs
index a7736a2eb34..a7736a2eb34 100644
--- a/src/test/run-pass/const-fn-feature-flags.rs
+++ b/src/test/ui/run-pass/consts/const-fn-feature-flags.rs
diff --git a/src/test/run-pass/const-fn-method.rs b/src/test/ui/run-pass/consts/const-fn-method.rs
index bed78f1e897..bed78f1e897 100644
--- a/src/test/run-pass/const-fn-method.rs
+++ b/src/test/ui/run-pass/consts/const-fn-method.rs
diff --git a/src/test/run-pass/const-fn-nested.rs b/src/test/ui/run-pass/consts/const-fn-nested.rs
index d5959a89e51..d5959a89e51 100644
--- a/src/test/run-pass/const-fn-nested.rs
+++ b/src/test/ui/run-pass/consts/const-fn-nested.rs
diff --git a/src/test/run-pass/const-fn-stability-calls.rs b/src/test/ui/run-pass/consts/const-fn-stability-calls.rs
index c5f97d55c06..c5f97d55c06 100644
--- a/src/test/run-pass/const-fn-stability-calls.rs
+++ b/src/test/ui/run-pass/consts/const-fn-stability-calls.rs
diff --git a/src/test/run-pass/const-fn-val.rs b/src/test/ui/run-pass/consts/const-fn-val.rs
index 85c92dda434..85c92dda434 100644
--- a/src/test/run-pass/const-fn-val.rs
+++ b/src/test/ui/run-pass/consts/const-fn-val.rs
diff --git a/src/test/run-pass/const-fn.rs b/src/test/ui/run-pass/consts/const-fn.rs
index 562040dc562..562040dc562 100644
--- a/src/test/run-pass/const-fn.rs
+++ b/src/test/ui/run-pass/consts/const-fn.rs
diff --git a/src/test/run-pass/const-index-feature-gate.rs b/src/test/ui/run-pass/consts/const-index-feature-gate.rs
index 2e60634d15e..2e60634d15e 100644
--- a/src/test/run-pass/const-index-feature-gate.rs
+++ b/src/test/ui/run-pass/consts/const-index-feature-gate.rs
diff --git a/src/test/run-pass/const-meth-pattern.rs b/src/test/ui/run-pass/consts/const-meth-pattern.rs
index 836716051d2..836716051d2 100644
--- a/src/test/run-pass/const-meth-pattern.rs
+++ b/src/test/ui/run-pass/consts/const-meth-pattern.rs
diff --git a/src/test/run-pass/const-negation.rs b/src/test/ui/run-pass/consts/const-negation.rs
index 5c633eb6112..5c633eb6112 100644
--- a/src/test/run-pass/const-negation.rs
+++ b/src/test/ui/run-pass/consts/const-negation.rs
diff --git a/src/test/run-pass/const-negative.rs b/src/test/ui/run-pass/consts/const-negative.rs
index 7f26a977339..7f26a977339 100644
--- a/src/test/run-pass/const-negative.rs
+++ b/src/test/ui/run-pass/consts/const-negative.rs
diff --git a/src/test/run-pass/const-nullary-enum.rs b/src/test/ui/run-pass/consts/const-nullary-enum.rs
index b3f6549ef01..b3f6549ef01 100644
--- a/src/test/run-pass/const-nullary-enum.rs
+++ b/src/test/ui/run-pass/consts/const-nullary-enum.rs
diff --git a/src/test/run-pass/const-nullary-univariant-enum.rs b/src/test/ui/run-pass/consts/const-nullary-univariant-enum.rs
index b1b7f782cd0..b1b7f782cd0 100644
--- a/src/test/run-pass/const-nullary-univariant-enum.rs
+++ b/src/test/ui/run-pass/consts/const-nullary-univariant-enum.rs
diff --git a/src/test/run-pass/const-pattern-variant.rs b/src/test/ui/run-pass/consts/const-pattern-variant.rs
index 689ae19e7d4..689ae19e7d4 100644
--- a/src/test/run-pass/const-pattern-variant.rs
+++ b/src/test/ui/run-pass/consts/const-pattern-variant.rs
diff --git a/src/test/run-pass/const-rec-and-tup.rs b/src/test/ui/run-pass/consts/const-rec-and-tup.rs
index e6680fe3e8f..e6680fe3e8f 100644
--- a/src/test/run-pass/const-rec-and-tup.rs
+++ b/src/test/ui/run-pass/consts/const-rec-and-tup.rs
diff --git a/src/test/run-pass/const-region-ptrs-noncopy.rs b/src/test/ui/run-pass/consts/const-region-ptrs-noncopy.rs
index 9a1f747ce59..9a1f747ce59 100644
--- a/src/test/run-pass/const-region-ptrs-noncopy.rs
+++ b/src/test/ui/run-pass/consts/const-region-ptrs-noncopy.rs
diff --git a/src/test/run-pass/const-region-ptrs.rs b/src/test/ui/run-pass/consts/const-region-ptrs.rs
index c783d4b8184..c783d4b8184 100644
--- a/src/test/run-pass/const-region-ptrs.rs
+++ b/src/test/ui/run-pass/consts/const-region-ptrs.rs
diff --git a/src/test/run-pass/const-repeated-values.rs b/src/test/ui/run-pass/consts/const-repeated-values.rs
index 1d749a2626e..1d749a2626e 100644
--- a/src/test/run-pass/const-repeated-values.rs
+++ b/src/test/ui/run-pass/consts/const-repeated-values.rs
diff --git a/src/test/run-pass/const-size_of-align_of.rs b/src/test/ui/run-pass/consts/const-size_of-align_of.rs
index 245dd673b51..245dd673b51 100644
--- a/src/test/run-pass/const-size_of-align_of.rs
+++ b/src/test/ui/run-pass/consts/const-size_of-align_of.rs
diff --git a/src/test/run-pass/const-str-ptr.rs b/src/test/ui/run-pass/consts/const-str-ptr.rs
index f58bf4fc39f..f58bf4fc39f 100644
--- a/src/test/run-pass/const-str-ptr.rs
+++ b/src/test/ui/run-pass/consts/const-str-ptr.rs
diff --git a/src/test/run-pass/const-struct-offsets.rs b/src/test/ui/run-pass/consts/const-struct-offsets.rs
index 4f38a6431b8..4f38a6431b8 100644
--- a/src/test/run-pass/const-struct-offsets.rs
+++ b/src/test/ui/run-pass/consts/const-struct-offsets.rs
diff --git a/src/test/run-pass/const-struct.rs b/src/test/ui/run-pass/consts/const-struct.rs
index 3cd58c6c52a..3cd58c6c52a 100644
--- a/src/test/run-pass/const-struct.rs
+++ b/src/test/ui/run-pass/consts/const-struct.rs
diff --git a/src/test/run-pass/const-trait-to-trait.rs b/src/test/ui/run-pass/consts/const-trait-to-trait.rs
index 4b53e116789..4b53e116789 100644
--- a/src/test/run-pass/const-trait-to-trait.rs
+++ b/src/test/ui/run-pass/consts/const-trait-to-trait.rs
diff --git a/src/test/run-pass/const-tuple-struct.rs b/src/test/ui/run-pass/consts/const-tuple-struct.rs
index ddc50fc6646..ddc50fc6646 100644
--- a/src/test/run-pass/const-tuple-struct.rs
+++ b/src/test/ui/run-pass/consts/const-tuple-struct.rs
diff --git a/src/test/run-pass/const-typeid-of.rs b/src/test/ui/run-pass/consts/const-typeid-of.rs
index ce29e55c6d7..ce29e55c6d7 100644
--- a/src/test/run-pass/const-typeid-of.rs
+++ b/src/test/ui/run-pass/consts/const-typeid-of.rs
diff --git a/src/test/run-pass/const-unit-struct.rs b/src/test/ui/run-pass/consts/const-unit-struct.rs
index 320f41006e5..320f41006e5 100644
--- a/src/test/run-pass/const-unit-struct.rs
+++ b/src/test/ui/run-pass/consts/const-unit-struct.rs
diff --git a/src/test/run-pass/const-unsafe-fn.rs b/src/test/ui/run-pass/consts/const-unsafe-fn.rs
index b267245b789..b267245b789 100644
--- a/src/test/run-pass/const-unsafe-fn.rs
+++ b/src/test/ui/run-pass/consts/const-unsafe-fn.rs
diff --git a/src/test/run-pass/const-vec-of-fns.rs b/src/test/ui/run-pass/consts/const-vec-of-fns.rs
index f16fbac0079..f16fbac0079 100644
--- a/src/test/run-pass/const-vec-of-fns.rs
+++ b/src/test/ui/run-pass/consts/const-vec-of-fns.rs
diff --git a/src/test/run-pass/const-vec-syntax.rs b/src/test/ui/run-pass/consts/const-vec-syntax.rs
index a577bbd8278..a577bbd8278 100644
--- a/src/test/run-pass/const-vec-syntax.rs
+++ b/src/test/ui/run-pass/consts/const-vec-syntax.rs
diff --git a/src/test/run-pass/const-vecs-and-slices.rs b/src/test/ui/run-pass/consts/const-vecs-and-slices.rs
index 758812054cd..758812054cd 100644
--- a/src/test/run-pass/const-vecs-and-slices.rs
+++ b/src/test/ui/run-pass/consts/const-vecs-and-slices.rs
diff --git a/src/test/run-pass/const.rs b/src/test/ui/run-pass/consts/const.rs
index 95ae514636e..95ae514636e 100644
--- a/src/test/run-pass/const.rs
+++ b/src/test/ui/run-pass/consts/const.rs
diff --git a/src/test/run-pass/consts-in-patterns.rs b/src/test/ui/run-pass/consts/consts-in-patterns.rs
index 574fb29e82c..574fb29e82c 100644
--- a/src/test/run-pass/consts-in-patterns.rs
+++ b/src/test/ui/run-pass/consts/consts-in-patterns.rs
diff --git a/src/test/run-pass/anon-extern-mod-cross-crate-2.rs b/src/test/ui/run-pass/cross-crate/anon-extern-mod-cross-crate-2.rs
index 8c480d7deeb..8c480d7deeb 100644
--- a/src/test/run-pass/anon-extern-mod-cross-crate-2.rs
+++ b/src/test/ui/run-pass/cross-crate/anon-extern-mod-cross-crate-2.rs
diff --git a/src/test/run-pass/cci_borrow.rs b/src/test/ui/run-pass/cross-crate/cci_borrow.rs
index 1535ddfb4de..1535ddfb4de 100644
--- a/src/test/run-pass/cci_borrow.rs
+++ b/src/test/ui/run-pass/cross-crate/cci_borrow.rs
diff --git a/src/test/run-pass/cci_capture_clause.rs b/src/test/ui/run-pass/cross-crate/cci_capture_clause.rs
index 5019455c2a7..5019455c2a7 100644
--- a/src/test/run-pass/cci_capture_clause.rs
+++ b/src/test/ui/run-pass/cross-crate/cci_capture_clause.rs
diff --git a/src/test/run-pass/cci_impl_exe.rs b/src/test/ui/run-pass/cross-crate/cci_impl_exe.rs
index 998f4125977..998f4125977 100644
--- a/src/test/run-pass/cci_impl_exe.rs
+++ b/src/test/ui/run-pass/cross-crate/cci_impl_exe.rs
diff --git a/src/test/run-pass/cci_iter_exe.rs b/src/test/ui/run-pass/cross-crate/cci_iter_exe.rs
index 4d964652274..4d964652274 100644
--- a/src/test/run-pass/cci_iter_exe.rs
+++ b/src/test/ui/run-pass/cross-crate/cci_iter_exe.rs
diff --git a/src/test/run-pass/cci_nested_exe.rs b/src/test/ui/run-pass/cross-crate/cci_nested_exe.rs
index b40c29dd715..b40c29dd715 100644
--- a/src/test/run-pass/cci_nested_exe.rs
+++ b/src/test/ui/run-pass/cross-crate/cci_nested_exe.rs
diff --git a/src/test/run-pass/cci_no_inline_exe.rs b/src/test/ui/run-pass/cross-crate/cci_no_inline_exe.rs
index b105411c284..b105411c284 100644
--- a/src/test/run-pass/cci_no_inline_exe.rs
+++ b/src/test/ui/run-pass/cross-crate/cci_no_inline_exe.rs
diff --git a/src/test/run-pass/cross-crate-const-pat.rs b/src/test/ui/run-pass/cross-crate/cross-crate-const-pat.rs
index a85541bb8ba..a85541bb8ba 100644
--- a/src/test/run-pass/cross-crate-const-pat.rs
+++ b/src/test/ui/run-pass/cross-crate/cross-crate-const-pat.rs
diff --git a/src/test/run-pass/cross-crate-newtype-struct-pat.rs b/src/test/ui/run-pass/cross-crate/cross-crate-newtype-struct-pat.rs
index 7eae9017420..7eae9017420 100644
--- a/src/test/run-pass/cross-crate-newtype-struct-pat.rs
+++ b/src/test/ui/run-pass/cross-crate/cross-crate-newtype-struct-pat.rs
diff --git a/src/test/run-pass/moves-based-on-type-cross-crate.rs b/src/test/ui/run-pass/cross-crate/moves-based-on-type-cross-crate.rs
index a313ec998f0..a313ec998f0 100644
--- a/src/test/run-pass/moves-based-on-type-cross-crate.rs
+++ b/src/test/ui/run-pass/cross-crate/moves-based-on-type-cross-crate.rs
diff --git a/src/test/run-pass/reexported-static-methods-cross-crate.rs b/src/test/ui/run-pass/cross-crate/reexported-static-methods-cross-crate.rs
index 4d105038384..4d105038384 100644
--- a/src/test/run-pass/reexported-static-methods-cross-crate.rs
+++ b/src/test/ui/run-pass/cross-crate/reexported-static-methods-cross-crate.rs
diff --git a/src/test/run-pass/static-array-across-crate.rs b/src/test/ui/run-pass/cross-crate/static-array-across-crate.rs
index 732d94cee8e..732d94cee8e 100644
--- a/src/test/run-pass/static-array-across-crate.rs
+++ b/src/test/ui/run-pass/cross-crate/static-array-across-crate.rs
diff --git a/src/test/run-pass/xcrate-address-insignificant.rs b/src/test/ui/run-pass/cross-crate/xcrate-address-insignificant.rs
index 8794ecd061b..8794ecd061b 100644
--- a/src/test/run-pass/xcrate-address-insignificant.rs
+++ b/src/test/ui/run-pass/cross-crate/xcrate-address-insignificant.rs
diff --git a/src/test/run-pass/xcrate-associated-type-defaults.rs b/src/test/ui/run-pass/cross-crate/xcrate-associated-type-defaults.rs
index 2dacbe0966e..2dacbe0966e 100644
--- a/src/test/run-pass/xcrate-associated-type-defaults.rs
+++ b/src/test/ui/run-pass/cross-crate/xcrate-associated-type-defaults.rs
diff --git a/src/test/run-pass/xcrate-static-addresses.rs b/src/test/ui/run-pass/cross-crate/xcrate-static-addresses.rs
index 43bae9c7ce0..43bae9c7ce0 100644
--- a/src/test/run-pass/xcrate-static-addresses.rs
+++ b/src/test/ui/run-pass/cross-crate/xcrate-static-addresses.rs
diff --git a/src/test/run-pass/xcrate-trait-lifetime-param.rs b/src/test/ui/run-pass/cross-crate/xcrate-trait-lifetime-param.rs
index 62d62839ba3..62d62839ba3 100644
--- a/src/test/run-pass/xcrate-trait-lifetime-param.rs
+++ b/src/test/ui/run-pass/cross-crate/xcrate-trait-lifetime-param.rs
diff --git a/src/test/run-pass/xcrate-unit-struct.rs b/src/test/ui/run-pass/cross-crate/xcrate-unit-struct.rs
index 78e92053a11..78e92053a11 100644
--- a/src/test/run-pass/xcrate-unit-struct.rs
+++ b/src/test/ui/run-pass/cross-crate/xcrate-unit-struct.rs
diff --git a/src/test/run-pass/xcrate_generic_fn_nested_return.rs b/src/test/ui/run-pass/cross-crate/xcrate_generic_fn_nested_return.rs
index 181c9168682..181c9168682 100644
--- a/src/test/run-pass/xcrate_generic_fn_nested_return.rs
+++ b/src/test/ui/run-pass/cross-crate/xcrate_generic_fn_nested_return.rs
diff --git a/src/test/run-pass/derive-no-std.rs b/src/test/ui/run-pass/deriving/derive-no-std.rs
index 0cbe4f4ebd0..0cbe4f4ebd0 100644
--- a/src/test/run-pass/derive-no-std.rs
+++ b/src/test/ui/run-pass/deriving/derive-no-std.rs
diff --git a/src/test/run-pass/derive-partialord-correctness.rs b/src/test/ui/run-pass/deriving/derive-partialord-correctness.rs
index bc9e9a70087..bc9e9a70087 100644
--- a/src/test/run-pass/derive-partialord-correctness.rs
+++ b/src/test/ui/run-pass/deriving/derive-partialord-correctness.rs
diff --git a/src/test/run-pass/deriving-associated-types.rs b/src/test/ui/run-pass/deriving/deriving-associated-types.rs
index d3aaa3ded69..d3aaa3ded69 100644
--- a/src/test/run-pass/deriving-associated-types.rs
+++ b/src/test/ui/run-pass/deriving/deriving-associated-types.rs
diff --git a/src/test/run-pass/deriving-bounds.rs b/src/test/ui/run-pass/deriving/deriving-bounds.rs
index 6d0a43997bc..6d0a43997bc 100644
--- a/src/test/run-pass/deriving-bounds.rs
+++ b/src/test/ui/run-pass/deriving/deriving-bounds.rs
diff --git a/src/test/run-pass/deriving-clone-array.rs b/src/test/ui/run-pass/deriving/deriving-clone-array.rs
index 182a1390b1f..182a1390b1f 100644
--- a/src/test/run-pass/deriving-clone-array.rs
+++ b/src/test/ui/run-pass/deriving/deriving-clone-array.rs
diff --git a/src/test/run-pass/deriving-clone-enum.rs b/src/test/ui/run-pass/deriving/deriving-clone-enum.rs
index 22daffc4869..22daffc4869 100644
--- a/src/test/run-pass/deriving-clone-enum.rs
+++ b/src/test/ui/run-pass/deriving/deriving-clone-enum.rs
diff --git a/src/test/run-pass/deriving-clone-generic-enum.rs b/src/test/ui/run-pass/deriving/deriving-clone-generic-enum.rs
index 8a07bad6961..8a07bad6961 100644
--- a/src/test/run-pass/deriving-clone-generic-enum.rs
+++ b/src/test/ui/run-pass/deriving/deriving-clone-generic-enum.rs
diff --git a/src/test/run-pass/deriving-clone-generic-struct.rs b/src/test/ui/run-pass/deriving/deriving-clone-generic-struct.rs
index d80f14c3694..d80f14c3694 100644
--- a/src/test/run-pass/deriving-clone-generic-struct.rs
+++ b/src/test/ui/run-pass/deriving/deriving-clone-generic-struct.rs
diff --git a/src/test/run-pass/deriving-clone-generic-tuple-struct.rs b/src/test/ui/run-pass/deriving/deriving-clone-generic-tuple-struct.rs
index f2f2ec3de76..f2f2ec3de76 100644
--- a/src/test/run-pass/deriving-clone-generic-tuple-struct.rs
+++ b/src/test/ui/run-pass/deriving/deriving-clone-generic-tuple-struct.rs
diff --git a/src/test/run-pass/deriving-clone-struct.rs b/src/test/ui/run-pass/deriving/deriving-clone-struct.rs
index 8bca8345085..8bca8345085 100644
--- a/src/test/run-pass/deriving-clone-struct.rs
+++ b/src/test/ui/run-pass/deriving/deriving-clone-struct.rs
diff --git a/src/test/run-pass/deriving-clone-tuple-struct.rs b/src/test/ui/run-pass/deriving/deriving-clone-tuple-struct.rs
index 8be029ba2ac..8be029ba2ac 100644
--- a/src/test/run-pass/deriving-clone-tuple-struct.rs
+++ b/src/test/ui/run-pass/deriving/deriving-clone-tuple-struct.rs
diff --git a/src/test/run-pass/deriving-cmp-generic-enum.rs b/src/test/ui/run-pass/deriving/deriving-cmp-generic-enum.rs
index b2add21dcd4..b2add21dcd4 100644
--- a/src/test/run-pass/deriving-cmp-generic-enum.rs
+++ b/src/test/ui/run-pass/deriving/deriving-cmp-generic-enum.rs
diff --git a/src/test/run-pass/deriving-cmp-generic-struct-enum.rs b/src/test/ui/run-pass/deriving/deriving-cmp-generic-struct-enum.rs
index f061b6cf4c1..f061b6cf4c1 100644
--- a/src/test/run-pass/deriving-cmp-generic-struct-enum.rs
+++ b/src/test/ui/run-pass/deriving/deriving-cmp-generic-struct-enum.rs
diff --git a/src/test/run-pass/deriving-cmp-generic-struct.rs b/src/test/ui/run-pass/deriving/deriving-cmp-generic-struct.rs
index d6c73f394ac..d6c73f394ac 100644
--- a/src/test/run-pass/deriving-cmp-generic-struct.rs
+++ b/src/test/ui/run-pass/deriving/deriving-cmp-generic-struct.rs
diff --git a/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs b/src/test/ui/run-pass/deriving/deriving-cmp-generic-tuple-struct.rs
index fc256228507..fc256228507 100644
--- a/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs
+++ b/src/test/ui/run-pass/deriving/deriving-cmp-generic-tuple-struct.rs
diff --git a/src/test/run-pass/deriving-cmp-shortcircuit.rs b/src/test/ui/run-pass/deriving/deriving-cmp-shortcircuit.rs
index e22e4767d52..e22e4767d52 100644
--- a/src/test/run-pass/deriving-cmp-shortcircuit.rs
+++ b/src/test/ui/run-pass/deriving/deriving-cmp-shortcircuit.rs
diff --git a/src/test/run-pass/deriving-copyclone.rs b/src/test/ui/run-pass/deriving/deriving-copyclone.rs
index 96d0406d9eb..96d0406d9eb 100644
--- a/src/test/run-pass/deriving-copyclone.rs
+++ b/src/test/ui/run-pass/deriving/deriving-copyclone.rs
diff --git a/src/test/run-pass/deriving-default-box.rs b/src/test/ui/run-pass/deriving/deriving-default-box.rs
index 70ac284cd30..70ac284cd30 100644
--- a/src/test/run-pass/deriving-default-box.rs
+++ b/src/test/ui/run-pass/deriving/deriving-default-box.rs
diff --git a/src/test/run-pass/deriving-enum-single-variant.rs b/src/test/ui/run-pass/deriving/deriving-enum-single-variant.rs
index d45247c593e..d45247c593e 100644
--- a/src/test/run-pass/deriving-enum-single-variant.rs
+++ b/src/test/ui/run-pass/deriving/deriving-enum-single-variant.rs
diff --git a/src/test/run-pass/deriving-eq-ord-boxed-slice.rs b/src/test/ui/run-pass/deriving/deriving-eq-ord-boxed-slice.rs
index 16c49065008..16c49065008 100644
--- a/src/test/run-pass/deriving-eq-ord-boxed-slice.rs
+++ b/src/test/ui/run-pass/deriving/deriving-eq-ord-boxed-slice.rs
diff --git a/src/test/run-pass/deriving-hash.rs b/src/test/ui/run-pass/deriving/deriving-hash.rs
index ceeb4266396..ceeb4266396 100644
--- a/src/test/run-pass/deriving-hash.rs
+++ b/src/test/ui/run-pass/deriving/deriving-hash.rs
diff --git a/src/test/run-pass/deriving-in-fn.rs b/src/test/ui/run-pass/deriving/deriving-in-fn.rs
index 435d15aab8f..435d15aab8f 100644
--- a/src/test/run-pass/deriving-in-fn.rs
+++ b/src/test/ui/run-pass/deriving/deriving-in-fn.rs
diff --git a/src/test/run-pass/deriving-in-macro.rs b/src/test/ui/run-pass/deriving/deriving-in-macro.rs
index adc3e3efd70..adc3e3efd70 100644
--- a/src/test/run-pass/deriving-in-macro.rs
+++ b/src/test/ui/run-pass/deriving/deriving-in-macro.rs
diff --git a/src/test/run-pass/deriving-meta-multiple.rs b/src/test/ui/run-pass/deriving/deriving-meta-multiple.rs
index a2d22699fcc..a2d22699fcc 100644
--- a/src/test/run-pass/deriving-meta-multiple.rs
+++ b/src/test/ui/run-pass/deriving/deriving-meta-multiple.rs
diff --git a/src/test/run-pass/deriving-meta.rs b/src/test/ui/run-pass/deriving/deriving-meta.rs
index f1c930828d2..f1c930828d2 100644
--- a/src/test/run-pass/deriving-meta.rs
+++ b/src/test/ui/run-pass/deriving/deriving-meta.rs
diff --git a/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs b/src/test/ui/run-pass/deriving/deriving-self-lifetime-totalord-totaleq.rs
index 3fdf840d596..3fdf840d596 100644
--- a/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs
+++ b/src/test/ui/run-pass/deriving/deriving-self-lifetime-totalord-totaleq.rs
diff --git a/src/test/run-pass/deriving-show-2.rs b/src/test/ui/run-pass/deriving/deriving-show-2.rs
index 2b7438fd845..2b7438fd845 100644
--- a/src/test/run-pass/deriving-show-2.rs
+++ b/src/test/ui/run-pass/deriving/deriving-show-2.rs
diff --git a/src/test/run-pass/deriving-show.rs b/src/test/ui/run-pass/deriving/deriving-show.rs
index e858ba8c823..e858ba8c823 100644
--- a/src/test/run-pass/deriving-show.rs
+++ b/src/test/ui/run-pass/deriving/deriving-show.rs
diff --git a/src/test/run-pass/deriving-via-extension-c-enum.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-c-enum.rs
index 92ffd82d902..92ffd82d902 100644
--- a/src/test/run-pass/deriving-via-extension-c-enum.rs
+++ b/src/test/ui/run-pass/deriving/deriving-via-extension-c-enum.rs
diff --git a/src/test/run-pass/deriving-via-extension-enum.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-enum.rs
index f43f5162196..f43f5162196 100644
--- a/src/test/run-pass/deriving-via-extension-enum.rs
+++ b/src/test/ui/run-pass/deriving/deriving-via-extension-enum.rs
diff --git a/src/test/run-pass/deriving-via-extension-hash-enum.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-hash-enum.rs
index cbe23ea0522..cbe23ea0522 100644
--- a/src/test/run-pass/deriving-via-extension-hash-enum.rs
+++ b/src/test/ui/run-pass/deriving/deriving-via-extension-hash-enum.rs
diff --git a/src/test/run-pass/deriving-via-extension-hash-struct.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-hash-struct.rs
index 42f0e456270..42f0e456270 100644
--- a/src/test/run-pass/deriving-via-extension-hash-struct.rs
+++ b/src/test/ui/run-pass/deriving/deriving-via-extension-hash-struct.rs
diff --git a/src/test/run-pass/deriving-via-extension-struct-empty.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-struct-empty.rs
index 9c929940eba..9c929940eba 100644
--- a/src/test/run-pass/deriving-via-extension-struct-empty.rs
+++ b/src/test/ui/run-pass/deriving/deriving-via-extension-struct-empty.rs
diff --git a/src/test/run-pass/deriving-via-extension-struct-like-enum-variant.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-struct-like-enum-variant.rs
index 5f9d9b6fb21..5f9d9b6fb21 100644
--- a/src/test/run-pass/deriving-via-extension-struct-like-enum-variant.rs
+++ b/src/test/ui/run-pass/deriving/deriving-via-extension-struct-like-enum-variant.rs
diff --git a/src/test/run-pass/deriving-via-extension-struct-tuple.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-struct-tuple.rs
index 9dffac00a22..9dffac00a22 100644
--- a/src/test/run-pass/deriving-via-extension-struct-tuple.rs
+++ b/src/test/ui/run-pass/deriving/deriving-via-extension-struct-tuple.rs
diff --git a/src/test/run-pass/deriving-via-extension-struct.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-struct.rs
index 624fb4a58e1..624fb4a58e1 100644
--- a/src/test/run-pass/deriving-via-extension-struct.rs
+++ b/src/test/ui/run-pass/deriving/deriving-via-extension-struct.rs
diff --git a/src/test/run-pass/deriving-via-extension-type-params.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-type-params.rs
index 4d88dbbca37..4d88dbbca37 100644
--- a/src/test/run-pass/deriving-via-extension-type-params.rs
+++ b/src/test/ui/run-pass/deriving/deriving-via-extension-type-params.rs
diff --git a/src/test/run-pass/deriving-with-repr-packed.rs b/src/test/ui/run-pass/deriving/deriving-with-repr-packed.rs
index f5130908c0b..f5130908c0b 100644
--- a/src/test/run-pass/deriving-with-repr-packed.rs
+++ b/src/test/ui/run-pass/deriving/deriving-with-repr-packed.rs
diff --git a/src/test/run-pass/drop-on-empty-block-exit.rs b/src/test/ui/run-pass/drop/drop-on-empty-block-exit.rs
index 8dea648508d..8dea648508d 100644
--- a/src/test/run-pass/drop-on-empty-block-exit.rs
+++ b/src/test/ui/run-pass/drop/drop-on-empty-block-exit.rs
diff --git a/src/test/run-pass/drop-on-ret.rs b/src/test/ui/run-pass/drop/drop-on-ret.rs
index fc517fa592f..fc517fa592f 100644
--- a/src/test/run-pass/drop-on-ret.rs
+++ b/src/test/ui/run-pass/drop/drop-on-ret.rs
diff --git a/src/test/run-pass/drop-struct-as-object.rs b/src/test/ui/run-pass/drop/drop-struct-as-object.rs
index 17603e11ddd..17603e11ddd 100644
--- a/src/test/run-pass/drop-struct-as-object.rs
+++ b/src/test/ui/run-pass/drop/drop-struct-as-object.rs
diff --git a/src/test/run-pass/drop-trait-enum.rs b/src/test/ui/run-pass/drop/drop-trait-enum.rs
index a6027615adb..a6027615adb 100644
--- a/src/test/run-pass/drop-trait-enum.rs
+++ b/src/test/ui/run-pass/drop/drop-trait-enum.rs
diff --git a/src/test/run-pass/drop-trait-generic.rs b/src/test/ui/run-pass/drop/drop-trait-generic.rs
index e55eae1e74f..e55eae1e74f 100644
--- a/src/test/run-pass/drop-trait-generic.rs
+++ b/src/test/ui/run-pass/drop/drop-trait-generic.rs
diff --git a/src/test/run-pass/drop-trait.rs b/src/test/ui/run-pass/drop/drop-trait.rs
index 21740eb3930..21740eb3930 100644
--- a/src/test/run-pass/drop-trait.rs
+++ b/src/test/ui/run-pass/drop/drop-trait.rs
diff --git a/src/test/run-pass/drop-uninhabited-enum.rs b/src/test/ui/run-pass/drop/drop-uninhabited-enum.rs
index 9fa085b6701..9fa085b6701 100644
--- a/src/test/run-pass/drop-uninhabited-enum.rs
+++ b/src/test/ui/run-pass/drop/drop-uninhabited-enum.rs
diff --git a/src/test/run-pass/drop-with-type-ascription-1.rs b/src/test/ui/run-pass/drop/drop-with-type-ascription-1.rs
index 15f229dbca5..15f229dbca5 100644
--- a/src/test/run-pass/drop-with-type-ascription-1.rs
+++ b/src/test/ui/run-pass/drop/drop-with-type-ascription-1.rs
diff --git a/src/test/run-pass/drop-with-type-ascription-2.rs b/src/test/ui/run-pass/drop/drop-with-type-ascription-2.rs
index 1f486c1834c..1f486c1834c 100644
--- a/src/test/run-pass/drop-with-type-ascription-2.rs
+++ b/src/test/ui/run-pass/drop/drop-with-type-ascription-2.rs
diff --git a/src/test/run-pass/dropck-eyepatch-extern-crate.rs b/src/test/ui/run-pass/drop/dropck-eyepatch-extern-crate.rs
index 20f069f77ea..20f069f77ea 100644
--- a/src/test/run-pass/dropck-eyepatch-extern-crate.rs
+++ b/src/test/ui/run-pass/drop/dropck-eyepatch-extern-crate.rs
diff --git a/src/test/run-pass/dropck-eyepatch-reorder.rs b/src/test/ui/run-pass/drop/dropck-eyepatch-reorder.rs
index a99a7232e9e..a99a7232e9e 100644
--- a/src/test/run-pass/dropck-eyepatch-reorder.rs
+++ b/src/test/ui/run-pass/drop/dropck-eyepatch-reorder.rs
diff --git a/src/test/run-pass/dropck-eyepatch.rs b/src/test/ui/run-pass/drop/dropck-eyepatch.rs
index c0c091d78eb..c0c091d78eb 100644
--- a/src/test/run-pass/dropck-eyepatch.rs
+++ b/src/test/ui/run-pass/drop/dropck-eyepatch.rs
diff --git a/src/test/run-pass/dropck_legal_cycles.rs b/src/test/ui/run-pass/drop/dropck_legal_cycles.rs
index 5f915a762d1..5f915a762d1 100644
--- a/src/test/run-pass/dropck_legal_cycles.rs
+++ b/src/test/ui/run-pass/drop/dropck_legal_cycles.rs
diff --git a/src/test/run-pass/dynamic-drop.rs b/src/test/ui/run-pass/drop/dynamic-drop.rs
index 765fb06e5f3..765fb06e5f3 100644
--- a/src/test/run-pass/dynamic-drop.rs
+++ b/src/test/ui/run-pass/drop/dynamic-drop.rs
diff --git a/src/test/run-pass/no-drop-flag-size.rs b/src/test/ui/run-pass/drop/no-drop-flag-size.rs
index a606a8a9f4b..a606a8a9f4b 100644
--- a/src/test/run-pass/no-drop-flag-size.rs
+++ b/src/test/ui/run-pass/drop/no-drop-flag-size.rs
diff --git a/src/test/run-pass/nondrop-cycle.rs b/src/test/ui/run-pass/drop/nondrop-cycle.rs
index a28f2b15b92..a28f2b15b92 100644
--- a/src/test/run-pass/nondrop-cycle.rs
+++ b/src/test/ui/run-pass/drop/nondrop-cycle.rs
diff --git a/src/test/run-pass/dst-coerce-custom.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-coerce-custom.rs
index 6eb01e879df..6eb01e879df 100644
--- a/src/test/run-pass/dst-coerce-custom.rs
+++ b/src/test/ui/run-pass/dynamically-sized-types/dst-coerce-custom.rs
diff --git a/src/test/run-pass/dst-coerce-rc.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-coerce-rc.rs
index 039f4d8fd51..039f4d8fd51 100644
--- a/src/test/run-pass/dst-coerce-rc.rs
+++ b/src/test/ui/run-pass/dynamically-sized-types/dst-coerce-rc.rs
diff --git a/src/test/run-pass/dst-coercions.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-coercions.rs
index 6b5bd6ad35e..6b5bd6ad35e 100644
--- a/src/test/run-pass/dst-coercions.rs
+++ b/src/test/ui/run-pass/dynamically-sized-types/dst-coercions.rs
diff --git a/src/test/run-pass/dst-deref-mut.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-deref-mut.rs
index 9fb4635765c..9fb4635765c 100644
--- a/src/test/run-pass/dst-deref-mut.rs
+++ b/src/test/ui/run-pass/dynamically-sized-types/dst-deref-mut.rs
diff --git a/src/test/run-pass/dst-deref.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-deref.rs
index 4a143873e6e..4a143873e6e 100644
--- a/src/test/run-pass/dst-deref.rs
+++ b/src/test/ui/run-pass/dynamically-sized-types/dst-deref.rs
diff --git a/src/test/run-pass/dst-field-align.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-field-align.rs
index c36833f2fb6..c36833f2fb6 100644
--- a/src/test/run-pass/dst-field-align.rs
+++ b/src/test/ui/run-pass/dynamically-sized-types/dst-field-align.rs
diff --git a/src/test/run-pass/dst-index.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-index.rs
index 6bda400a7cd..6bda400a7cd 100644
--- a/src/test/run-pass/dst-index.rs
+++ b/src/test/ui/run-pass/dynamically-sized-types/dst-index.rs
diff --git a/src/test/run-pass/dst-irrefutable-bind.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-irrefutable-bind.rs
index b1d6c732e7f..b1d6c732e7f 100644
--- a/src/test/run-pass/dst-irrefutable-bind.rs
+++ b/src/test/ui/run-pass/dynamically-sized-types/dst-irrefutable-bind.rs
diff --git a/src/test/run-pass/dst-raw.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-raw.rs
index 9ebfbee8a33..9ebfbee8a33 100644
--- a/src/test/run-pass/dst-raw.rs
+++ b/src/test/ui/run-pass/dynamically-sized-types/dst-raw.rs
diff --git a/src/test/run-pass/dst-struct-sole.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-struct-sole.rs
index 58d7b35a527..58d7b35a527 100644
--- a/src/test/run-pass/dst-struct-sole.rs
+++ b/src/test/ui/run-pass/dynamically-sized-types/dst-struct-sole.rs
diff --git a/src/test/run-pass/dst-struct.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-struct.rs
index 40ca8472787..40ca8472787 100644
--- a/src/test/run-pass/dst-struct.rs
+++ b/src/test/ui/run-pass/dynamically-sized-types/dst-struct.rs
diff --git a/src/test/run-pass/dst-trait-tuple.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-trait-tuple.rs
index 9803e26f5f8..9803e26f5f8 100644
--- a/src/test/run-pass/dst-trait-tuple.rs
+++ b/src/test/ui/run-pass/dynamically-sized-types/dst-trait-tuple.rs
diff --git a/src/test/run-pass/dst-trait.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-trait.rs
index a412306b966..a412306b966 100644
--- a/src/test/run-pass/dst-trait.rs
+++ b/src/test/ui/run-pass/dynamically-sized-types/dst-trait.rs
diff --git a/src/test/run-pass/dst-tuple-sole.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-tuple-sole.rs
index a788e25218e..a788e25218e 100644
--- a/src/test/run-pass/dst-tuple-sole.rs
+++ b/src/test/ui/run-pass/dynamically-sized-types/dst-tuple-sole.rs
diff --git a/src/test/run-pass/dst-tuple.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-tuple.rs
index 7c2125d00f9..7c2125d00f9 100644
--- a/src/test/run-pass/dst-tuple.rs
+++ b/src/test/ui/run-pass/dynamically-sized-types/dst-tuple.rs
diff --git a/src/test/run-pass/extern-1.rs b/src/test/ui/run-pass/extern/extern-1.rs
index 67f6a3e8fc4..67f6a3e8fc4 100644
--- a/src/test/run-pass/extern-1.rs
+++ b/src/test/ui/run-pass/extern/extern-1.rs
diff --git a/src/test/run-pass/extern-call-deep.rs b/src/test/ui/run-pass/extern/extern-call-deep.rs
index a41ab8da9de..a41ab8da9de 100644
--- a/src/test/run-pass/extern-call-deep.rs
+++ b/src/test/ui/run-pass/extern/extern-call-deep.rs
diff --git a/src/test/run-pass/extern-call-deep2.rs b/src/test/ui/run-pass/extern/extern-call-deep2.rs
index 3bdc8c18864..3bdc8c18864 100644
--- a/src/test/run-pass/extern-call-deep2.rs
+++ b/src/test/ui/run-pass/extern/extern-call-deep2.rs
diff --git a/src/test/run-pass/extern-call-direct.rs b/src/test/ui/run-pass/extern/extern-call-direct.rs
index ec6b6c8d39f..ec6b6c8d39f 100644
--- a/src/test/run-pass/extern-call-direct.rs
+++ b/src/test/ui/run-pass/extern/extern-call-direct.rs
diff --git a/src/test/run-pass/extern-call-indirect.rs b/src/test/ui/run-pass/extern/extern-call-indirect.rs
index ba108955c28..ba108955c28 100644
--- a/src/test/run-pass/extern-call-indirect.rs
+++ b/src/test/ui/run-pass/extern/extern-call-indirect.rs
diff --git a/src/test/run-pass/extern-call-scrub.rs b/src/test/ui/run-pass/extern/extern-call-scrub.rs
index a29ea377947..a29ea377947 100644
--- a/src/test/run-pass/extern-call-scrub.rs
+++ b/src/test/ui/run-pass/extern/extern-call-scrub.rs
diff --git a/src/test/run-pass/extern-calling-convention-test.rs b/src/test/ui/run-pass/extern/extern-calling-convention-test.rs
index 12f9c22c918..12f9c22c918 100644
--- a/src/test/run-pass/extern-calling-convention-test.rs
+++ b/src/test/ui/run-pass/extern/extern-calling-convention-test.rs
diff --git a/src/test/run-pass/extern-compare-with-return-type.rs b/src/test/ui/run-pass/extern/extern-compare-with-return-type.rs
index 6535ae2fca9..6535ae2fca9 100644
--- a/src/test/run-pass/extern-compare-with-return-type.rs
+++ b/src/test/ui/run-pass/extern/extern-compare-with-return-type.rs
diff --git a/src/test/run-pass/extern-crosscrate.rs b/src/test/ui/run-pass/extern/extern-crosscrate.rs
index 825b502d954..825b502d954 100644
--- a/src/test/run-pass/extern-crosscrate.rs
+++ b/src/test/ui/run-pass/extern/extern-crosscrate.rs
diff --git a/src/test/run-pass/extern-foreign-crate.rs b/src/test/ui/run-pass/extern/extern-foreign-crate.rs
index 1757ff51fed..1757ff51fed 100644
--- a/src/test/run-pass/extern-foreign-crate.rs
+++ b/src/test/ui/run-pass/extern/extern-foreign-crate.rs
diff --git a/src/test/run-pass/extern-methods.rs b/src/test/ui/run-pass/extern/extern-methods.rs
index 2587a978636..2587a978636 100644
--- a/src/test/run-pass/extern-methods.rs
+++ b/src/test/ui/run-pass/extern/extern-methods.rs
diff --git a/src/test/run-pass/extern-mod-abi.rs b/src/test/ui/run-pass/extern/extern-mod-abi.rs
index 74f47f08703..74f47f08703 100644
--- a/src/test/run-pass/extern-mod-abi.rs
+++ b/src/test/ui/run-pass/extern/extern-mod-abi.rs
diff --git a/src/test/run-pass/extern-mod-ordering-exe.rs b/src/test/ui/run-pass/extern/extern-mod-ordering-exe.rs
index 1c64716b822..1c64716b822 100644
--- a/src/test/run-pass/extern-mod-ordering-exe.rs
+++ b/src/test/ui/run-pass/extern/extern-mod-ordering-exe.rs
diff --git a/src/test/run-pass/extern-pass-TwoU16s.rs b/src/test/ui/run-pass/extern/extern-pass-TwoU16s.rs
index a1aa9b69fad..a1aa9b69fad 100644
--- a/src/test/run-pass/extern-pass-TwoU16s.rs
+++ b/src/test/ui/run-pass/extern/extern-pass-TwoU16s.rs
diff --git a/src/test/run-pass/extern-pass-TwoU32s.rs b/src/test/ui/run-pass/extern/extern-pass-TwoU32s.rs
index 6442f230d30..6442f230d30 100644
--- a/src/test/run-pass/extern-pass-TwoU32s.rs
+++ b/src/test/ui/run-pass/extern/extern-pass-TwoU32s.rs
diff --git a/src/test/run-pass/extern-pass-TwoU64s.rs b/src/test/ui/run-pass/extern/extern-pass-TwoU64s.rs
index bfb649c3f74..bfb649c3f74 100644
--- a/src/test/run-pass/extern-pass-TwoU64s.rs
+++ b/src/test/ui/run-pass/extern/extern-pass-TwoU64s.rs
diff --git a/src/test/run-pass/extern-pass-TwoU8s.rs b/src/test/ui/run-pass/extern/extern-pass-TwoU8s.rs
index 1f90d9c4366..1f90d9c4366 100644
--- a/src/test/run-pass/extern-pass-TwoU8s.rs
+++ b/src/test/ui/run-pass/extern/extern-pass-TwoU8s.rs
diff --git a/src/test/run-pass/extern-pass-char.rs b/src/test/ui/run-pass/extern/extern-pass-char.rs
index 920e15bf2c1..920e15bf2c1 100644
--- a/src/test/run-pass/extern-pass-char.rs
+++ b/src/test/ui/run-pass/extern/extern-pass-char.rs
diff --git a/src/test/run-pass/extern-pass-double.rs b/src/test/ui/run-pass/extern/extern-pass-double.rs
index 9c184477ad3..9c184477ad3 100644
--- a/src/test/run-pass/extern-pass-double.rs
+++ b/src/test/ui/run-pass/extern/extern-pass-double.rs
diff --git a/src/test/run-pass/extern-pass-empty.rs b/src/test/ui/run-pass/extern/extern-pass-empty.rs
index f4ee3b6e9e8..f4ee3b6e9e8 100644
--- a/src/test/run-pass/extern-pass-empty.rs
+++ b/src/test/ui/run-pass/extern/extern-pass-empty.rs
diff --git a/src/test/run-pass/extern-pass-u32.rs b/src/test/ui/run-pass/extern/extern-pass-u32.rs
index 691bd6295b1..691bd6295b1 100644
--- a/src/test/run-pass/extern-pass-u32.rs
+++ b/src/test/ui/run-pass/extern/extern-pass-u32.rs
diff --git a/src/test/run-pass/extern-pass-u64.rs b/src/test/ui/run-pass/extern/extern-pass-u64.rs
index 4b351ed2836..4b351ed2836 100644
--- a/src/test/run-pass/extern-pass-u64.rs
+++ b/src/test/ui/run-pass/extern/extern-pass-u64.rs
diff --git a/src/test/run-pass/extern-prelude-core.rs b/src/test/ui/run-pass/extern/extern-prelude-core.rs
index d0d01b34c6e..d0d01b34c6e 100644
--- a/src/test/run-pass/extern-prelude-core.rs
+++ b/src/test/ui/run-pass/extern/extern-prelude-core.rs
diff --git a/src/test/run-pass/extern-prelude-no-speculative.rs b/src/test/ui/run-pass/extern/extern-prelude-no-speculative.rs
index ff3aec439aa..ff3aec439aa 100644
--- a/src/test/run-pass/extern-prelude-no-speculative.rs
+++ b/src/test/ui/run-pass/extern/extern-prelude-no-speculative.rs
diff --git a/src/test/run-pass/extern-prelude-std.rs b/src/test/ui/run-pass/extern/extern-prelude-std.rs
index de73f1d2278..de73f1d2278 100644
--- a/src/test/run-pass/extern-prelude-std.rs
+++ b/src/test/ui/run-pass/extern/extern-prelude-std.rs
diff --git a/src/test/run-pass/extern-pub.rs b/src/test/ui/run-pass/extern/extern-pub.rs
index 29bcdef5dc9..29bcdef5dc9 100644
--- a/src/test/run-pass/extern-pub.rs
+++ b/src/test/ui/run-pass/extern/extern-pub.rs
diff --git a/src/test/run-pass/extern-return-TwoU16s.rs b/src/test/ui/run-pass/extern/extern-return-TwoU16s.rs
index b9ce3f45886..b9ce3f45886 100644
--- a/src/test/run-pass/extern-return-TwoU16s.rs
+++ b/src/test/ui/run-pass/extern/extern-return-TwoU16s.rs
diff --git a/src/test/run-pass/extern-return-TwoU32s.rs b/src/test/ui/run-pass/extern/extern-return-TwoU32s.rs
index 686ff16fe4d..686ff16fe4d 100644
--- a/src/test/run-pass/extern-return-TwoU32s.rs
+++ b/src/test/ui/run-pass/extern/extern-return-TwoU32s.rs
diff --git a/src/test/run-pass/extern-return-TwoU64s.rs b/src/test/ui/run-pass/extern/extern-return-TwoU64s.rs
index e754674fd1e..e754674fd1e 100644
--- a/src/test/run-pass/extern-return-TwoU64s.rs
+++ b/src/test/ui/run-pass/extern/extern-return-TwoU64s.rs
diff --git a/src/test/run-pass/extern-return-TwoU8s.rs b/src/test/ui/run-pass/extern/extern-return-TwoU8s.rs
index 68fe3832e90..68fe3832e90 100644
--- a/src/test/run-pass/extern-return-TwoU8s.rs
+++ b/src/test/ui/run-pass/extern/extern-return-TwoU8s.rs
diff --git a/src/test/run-pass/extern-rust.rs b/src/test/ui/run-pass/extern/extern-rust.rs
index e7f707bc334..e7f707bc334 100644
--- a/src/test/run-pass/extern-rust.rs
+++ b/src/test/ui/run-pass/extern/extern-rust.rs
diff --git a/src/test/run-pass/extern-take-value.rs b/src/test/ui/run-pass/extern/extern-take-value.rs
index f535e45e6cf..f535e45e6cf 100644
--- a/src/test/run-pass/extern-take-value.rs
+++ b/src/test/ui/run-pass/extern/extern-take-value.rs
diff --git a/src/test/run-pass/extern-thiscall.rs b/src/test/ui/run-pass/extern/extern-thiscall.rs
index a669f29d098..a669f29d098 100644
--- a/src/test/run-pass/extern-thiscall.rs
+++ b/src/test/ui/run-pass/extern/extern-thiscall.rs
diff --git a/src/test/run-pass/extern-types-inherent-impl.rs b/src/test/ui/run-pass/extern/extern-types-inherent-impl.rs
index 4e44af36900..4e44af36900 100644
--- a/src/test/run-pass/extern-types-inherent-impl.rs
+++ b/src/test/ui/run-pass/extern/extern-types-inherent-impl.rs
diff --git a/src/test/run-pass/extern-types-manual-sync-send.rs b/src/test/ui/run-pass/extern/extern-types-manual-sync-send.rs
index c6530c3ea77..c6530c3ea77 100644
--- a/src/test/run-pass/extern-types-manual-sync-send.rs
+++ b/src/test/ui/run-pass/extern/extern-types-manual-sync-send.rs
diff --git a/src/test/run-pass/extern-types-pointer-cast.rs b/src/test/ui/run-pass/extern/extern-types-pointer-cast.rs
index 0dede8eb70d..0dede8eb70d 100644
--- a/src/test/run-pass/extern-types-pointer-cast.rs
+++ b/src/test/ui/run-pass/extern/extern-types-pointer-cast.rs
diff --git a/src/test/run-pass/extern-types-size_of_val.rs b/src/test/ui/run-pass/extern/extern-types-size_of_val.rs
index 0aabce99deb..0aabce99deb 100644
--- a/src/test/run-pass/extern-types-size_of_val.rs
+++ b/src/test/ui/run-pass/extern/extern-types-size_of_val.rs
diff --git a/src/test/run-pass/extern-types-thin-pointer.rs b/src/test/ui/run-pass/extern/extern-types-thin-pointer.rs
index c2444a58b5a..c2444a58b5a 100644
--- a/src/test/run-pass/extern-types-thin-pointer.rs
+++ b/src/test/ui/run-pass/extern/extern-types-thin-pointer.rs
diff --git a/src/test/run-pass/extern-types-trait-impl.rs b/src/test/ui/run-pass/extern/extern-types-trait-impl.rs
index 0f61c936deb..0f61c936deb 100644
--- a/src/test/run-pass/extern-types-trait-impl.rs
+++ b/src/test/ui/run-pass/extern/extern-types-trait-impl.rs
diff --git a/src/test/run-pass/extern-vectorcall.rs b/src/test/ui/run-pass/extern/extern-vectorcall.rs
index 90c3459036b..90c3459036b 100644
--- a/src/test/run-pass/extern-vectorcall.rs
+++ b/src/test/ui/run-pass/extern/extern-vectorcall.rs
diff --git a/src/test/run-pass/extern_fat_drop.rs b/src/test/ui/run-pass/extern/extern_fat_drop.rs
index 123458ff97e..123458ff97e 100644
--- a/src/test/run-pass/extern_fat_drop.rs
+++ b/src/test/ui/run-pass/extern/extern_fat_drop.rs
diff --git a/src/test/run-pass/auto-loop.rs b/src/test/ui/run-pass/for-loop-while/auto-loop.rs
index b0afae79c36..b0afae79c36 100644
--- a/src/test/run-pass/auto-loop.rs
+++ b/src/test/ui/run-pass/for-loop-while/auto-loop.rs
diff --git a/src/test/run-pass/break-value.rs b/src/test/ui/run-pass/for-loop-while/break-value.rs
index e5a035fb562..e5a035fb562 100644
--- a/src/test/run-pass/break-value.rs
+++ b/src/test/ui/run-pass/for-loop-while/break-value.rs
diff --git a/src/test/run-pass/break.rs b/src/test/ui/run-pass/for-loop-while/break.rs
index 9a32fbc1031..9a32fbc1031 100644
--- a/src/test/run-pass/break.rs
+++ b/src/test/ui/run-pass/for-loop-while/break.rs
diff --git a/src/test/run-pass/for-destruct.rs b/src/test/ui/run-pass/for-loop-while/for-destruct.rs
index ba78ff4d539..ba78ff4d539 100644
--- a/src/test/run-pass/for-destruct.rs
+++ b/src/test/ui/run-pass/for-loop-while/for-destruct.rs
diff --git a/src/test/run-pass/for-loop-goofiness.rs b/src/test/ui/run-pass/for-loop-while/for-loop-goofiness.rs
index 411183e4f74..411183e4f74 100644
--- a/src/test/run-pass/for-loop-goofiness.rs
+++ b/src/test/ui/run-pass/for-loop-while/for-loop-goofiness.rs
diff --git a/src/test/run-pass/for-loop-has-unit-body.rs b/src/test/ui/run-pass/for-loop-while/for-loop-has-unit-body.rs
index 4036fc84800..4036fc84800 100644
--- a/src/test/run-pass/for-loop-has-unit-body.rs
+++ b/src/test/ui/run-pass/for-loop-while/for-loop-has-unit-body.rs
diff --git a/src/test/run-pass/for-loop-into-iterator.rs b/src/test/ui/run-pass/for-loop-while/for-loop-into-iterator.rs
index 7efd15f222e..7efd15f222e 100644
--- a/src/test/run-pass/for-loop-into-iterator.rs
+++ b/src/test/ui/run-pass/for-loop-while/for-loop-into-iterator.rs
diff --git a/src/test/run-pass/for-loop-lifetime-of-unbound-values.rs b/src/test/ui/run-pass/for-loop-while/for-loop-lifetime-of-unbound-values.rs
index 7a088b51334..7a088b51334 100644
--- a/src/test/run-pass/for-loop-lifetime-of-unbound-values.rs
+++ b/src/test/ui/run-pass/for-loop-while/for-loop-lifetime-of-unbound-values.rs
diff --git a/src/test/run-pass/for-loop-macro.rs b/src/test/ui/run-pass/for-loop-while/for-loop-macro.rs
index 17c5a98246b..17c5a98246b 100644
--- a/src/test/run-pass/for-loop-macro.rs
+++ b/src/test/ui/run-pass/for-loop-while/for-loop-macro.rs
diff --git a/src/test/run-pass/for-loop-mut-ref-element.rs b/src/test/ui/run-pass/for-loop-while/for-loop-mut-ref-element.rs
index 556c846b0b8..556c846b0b8 100644
--- a/src/test/run-pass/for-loop-mut-ref-element.rs
+++ b/src/test/ui/run-pass/for-loop-while/for-loop-mut-ref-element.rs
diff --git a/src/test/run-pass/for-loop-no-std.rs b/src/test/ui/run-pass/for-loop-while/for-loop-no-std.rs
index 856857156c9..856857156c9 100644
--- a/src/test/run-pass/for-loop-no-std.rs
+++ b/src/test/ui/run-pass/for-loop-while/for-loop-no-std.rs
diff --git a/src/test/run-pass/for-loop-panic.rs b/src/test/ui/run-pass/for-loop-while/for-loop-panic.rs
index 001ca1a02f6..001ca1a02f6 100644
--- a/src/test/run-pass/for-loop-panic.rs
+++ b/src/test/ui/run-pass/for-loop-while/for-loop-panic.rs
diff --git a/src/test/run-pass/for-loop-unconstrained-element-type-i32-fallback.rs b/src/test/ui/run-pass/for-loop-while/for-loop-unconstrained-element-type-i32-fallback.rs
index 0bfc4d2264c..0bfc4d2264c 100644
--- a/src/test/run-pass/for-loop-unconstrained-element-type-i32-fallback.rs
+++ b/src/test/ui/run-pass/for-loop-while/for-loop-unconstrained-element-type-i32-fallback.rs
diff --git a/src/test/run-pass/foreach-external-iterators-break.rs b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-break.rs
index e63c29eb017..e63c29eb017 100644
--- a/src/test/run-pass/foreach-external-iterators-break.rs
+++ b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-break.rs
diff --git a/src/test/run-pass/foreach-external-iterators-hashmap-break-restart.rs b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-hashmap-break-restart.rs
index 232af7eca41..232af7eca41 100644
--- a/src/test/run-pass/foreach-external-iterators-hashmap-break-restart.rs
+++ b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-hashmap-break-restart.rs
diff --git a/src/test/run-pass/foreach-external-iterators-hashmap.rs b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-hashmap.rs
index 2ef420187de..2ef420187de 100644
--- a/src/test/run-pass/foreach-external-iterators-hashmap.rs
+++ b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-hashmap.rs
diff --git a/src/test/run-pass/foreach-external-iterators-loop.rs b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-loop.rs
index 7248537d6a1..7248537d6a1 100644
--- a/src/test/run-pass/foreach-external-iterators-loop.rs
+++ b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-loop.rs
diff --git a/src/test/run-pass/foreach-external-iterators-nested.rs b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-nested.rs
index ea55c90bdf1..ea55c90bdf1 100644
--- a/src/test/run-pass/foreach-external-iterators-nested.rs
+++ b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-nested.rs
diff --git a/src/test/run-pass/foreach-external-iterators.rs b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators.rs
index 9b847517ec8..9b847517ec8 100644
--- a/src/test/run-pass/foreach-external-iterators.rs
+++ b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators.rs
diff --git a/src/test/run-pass/foreach-nested.rs b/src/test/ui/run-pass/for-loop-while/foreach-nested.rs
index 2c4d0cc7648..2c4d0cc7648 100644
--- a/src/test/run-pass/foreach-nested.rs
+++ b/src/test/ui/run-pass/for-loop-while/foreach-nested.rs
diff --git a/src/test/run-pass/foreach-put-structured.rs b/src/test/ui/run-pass/for-loop-while/foreach-put-structured.rs
index 028e31d76aa..028e31d76aa 100644
--- a/src/test/run-pass/foreach-put-structured.rs
+++ b/src/test/ui/run-pass/for-loop-while/foreach-put-structured.rs
diff --git a/src/test/run-pass/foreach-simple-outer-slot.rs b/src/test/ui/run-pass/for-loop-while/foreach-simple-outer-slot.rs
index 674c2e34482..674c2e34482 100644
--- a/src/test/run-pass/foreach-simple-outer-slot.rs
+++ b/src/test/ui/run-pass/for-loop-while/foreach-simple-outer-slot.rs
diff --git a/src/test/run-pass/label_break_value.rs b/src/test/ui/run-pass/for-loop-while/label_break_value.rs
index 444845e24dc..444845e24dc 100644
--- a/src/test/run-pass/label_break_value.rs
+++ b/src/test/ui/run-pass/for-loop-while/label_break_value.rs
diff --git a/src/test/run-pass/labeled-break.rs b/src/test/ui/run-pass/for-loop-while/labeled-break.rs
index fe2f35c5119..fe2f35c5119 100644
--- a/src/test/run-pass/labeled-break.rs
+++ b/src/test/ui/run-pass/for-loop-while/labeled-break.rs
diff --git a/src/test/run-pass/linear-for-loop.rs b/src/test/ui/run-pass/for-loop-while/linear-for-loop.rs
index fc6d435b034..fc6d435b034 100644
--- a/src/test/run-pass/linear-for-loop.rs
+++ b/src/test/ui/run-pass/for-loop-while/linear-for-loop.rs
diff --git a/src/test/run-pass/liveness-assign-imm-local-after-loop.rs b/src/test/ui/run-pass/for-loop-while/liveness-assign-imm-local-after-loop.rs
index dfa08055046..dfa08055046 100644
--- a/src/test/run-pass/liveness-assign-imm-local-after-loop.rs
+++ b/src/test/ui/run-pass/for-loop-while/liveness-assign-imm-local-after-loop.rs
diff --git a/src/test/run-pass/liveness-loop-break.rs b/src/test/ui/run-pass/for-loop-while/liveness-loop-break.rs
index 0dba1830cbd..0dba1830cbd 100644
--- a/src/test/run-pass/liveness-loop-break.rs
+++ b/src/test/ui/run-pass/for-loop-while/liveness-loop-break.rs
diff --git a/src/test/run-pass/liveness-move-in-loop.rs b/src/test/ui/run-pass/for-loop-while/liveness-move-in-loop.rs
index f9bb45ee400..f9bb45ee400 100644
--- a/src/test/run-pass/liveness-move-in-loop.rs
+++ b/src/test/ui/run-pass/for-loop-while/liveness-move-in-loop.rs
diff --git a/src/test/run-pass/loop-break-cont-1.rs b/src/test/ui/run-pass/for-loop-while/loop-break-cont-1.rs
index 5abac0e65a3..5abac0e65a3 100644
--- a/src/test/run-pass/loop-break-cont-1.rs
+++ b/src/test/ui/run-pass/for-loop-while/loop-break-cont-1.rs
diff --git a/src/test/run-pass/loop-break-cont.rs b/src/test/ui/run-pass/for-loop-while/loop-break-cont.rs
index a15efa2d8ee..a15efa2d8ee 100644
--- a/src/test/run-pass/loop-break-cont.rs
+++ b/src/test/ui/run-pass/for-loop-while/loop-break-cont.rs
diff --git a/src/test/run-pass/loop-break-value.rs b/src/test/ui/run-pass/for-loop-while/loop-break-value.rs
index 39053769b24..39053769b24 100644
--- a/src/test/run-pass/loop-break-value.rs
+++ b/src/test/ui/run-pass/for-loop-while/loop-break-value.rs
diff --git a/src/test/run-pass/loop-diverges.rs b/src/test/ui/run-pass/for-loop-while/loop-diverges.rs
index c2ad9a6ef73..c2ad9a6ef73 100644
--- a/src/test/run-pass/loop-diverges.rs
+++ b/src/test/ui/run-pass/for-loop-while/loop-diverges.rs
diff --git a/src/test/run-pass/loop-label-shadowing.rs b/src/test/ui/run-pass/for-loop-while/loop-label-shadowing.rs
index 399920a7e31..399920a7e31 100644
--- a/src/test/run-pass/loop-label-shadowing.rs
+++ b/src/test/ui/run-pass/for-loop-while/loop-label-shadowing.rs
diff --git a/src/test/run-pass/loop-labeled-break-value.rs b/src/test/ui/run-pass/for-loop-while/loop-labeled-break-value.rs
index 4f03b45b116..4f03b45b116 100644
--- a/src/test/run-pass/loop-labeled-break-value.rs
+++ b/src/test/ui/run-pass/for-loop-while/loop-labeled-break-value.rs
diff --git a/src/test/run-pass/loop-no-reinit-needed-post-bot.rs b/src/test/ui/run-pass/for-loop-while/loop-no-reinit-needed-post-bot.rs
index 689e17c170d..689e17c170d 100644
--- a/src/test/run-pass/loop-no-reinit-needed-post-bot.rs
+++ b/src/test/ui/run-pass/for-loop-while/loop-no-reinit-needed-post-bot.rs
diff --git a/src/test/run-pass/loop-scope.rs b/src/test/ui/run-pass/for-loop-while/loop-scope.rs
index 6916bfb8c61..6916bfb8c61 100644
--- a/src/test/run-pass/loop-scope.rs
+++ b/src/test/ui/run-pass/for-loop-while/loop-scope.rs
diff --git a/src/test/run-pass/while-cont.rs b/src/test/ui/run-pass/for-loop-while/while-cont.rs
index 3e1a232115f..3e1a232115f 100644
--- a/src/test/run-pass/while-cont.rs
+++ b/src/test/ui/run-pass/for-loop-while/while-cont.rs
diff --git a/src/test/run-pass/while-flow-graph.rs b/src/test/ui/run-pass/for-loop-while/while-flow-graph.rs
index 102a5a7558e..102a5a7558e 100644
--- a/src/test/run-pass/while-flow-graph.rs
+++ b/src/test/ui/run-pass/for-loop-while/while-flow-graph.rs
diff --git a/src/test/run-pass/while-label.rs b/src/test/ui/run-pass/for-loop-while/while-label.rs
index 8cbb845836f..8cbb845836f 100644
--- a/src/test/run-pass/while-label.rs
+++ b/src/test/ui/run-pass/for-loop-while/while-label.rs
diff --git a/src/test/run-pass/while-let.rs b/src/test/ui/run-pass/for-loop-while/while-let.rs
index aed6986c5fe..aed6986c5fe 100644
--- a/src/test/run-pass/while-let.rs
+++ b/src/test/ui/run-pass/for-loop-while/while-let.rs
diff --git a/src/test/run-pass/while-loop-constraints-2.rs b/src/test/ui/run-pass/for-loop-while/while-loop-constraints-2.rs
index 6e9e7bc24d6..6e9e7bc24d6 100644
--- a/src/test/run-pass/while-loop-constraints-2.rs
+++ b/src/test/ui/run-pass/for-loop-while/while-loop-constraints-2.rs
diff --git a/src/test/run-pass/while-prelude-drop.rs b/src/test/ui/run-pass/for-loop-while/while-prelude-drop.rs
index 39ed4f53cf7..39ed4f53cf7 100644
--- a/src/test/run-pass/while-prelude-drop.rs
+++ b/src/test/ui/run-pass/for-loop-while/while-prelude-drop.rs
diff --git a/src/test/run-pass/while-with-break.rs b/src/test/ui/run-pass/for-loop-while/while-with-break.rs
index 4c599e9c428..4c599e9c428 100644
--- a/src/test/run-pass/while-with-break.rs
+++ b/src/test/ui/run-pass/for-loop-while/while-with-break.rs
diff --git a/src/test/run-pass/while.rs b/src/test/ui/run-pass/for-loop-while/while.rs
index bf56e76687f..bf56e76687f 100644
--- a/src/test/run-pass/while.rs
+++ b/src/test/ui/run-pass/for-loop-while/while.rs
diff --git a/src/test/run-pass/foreign-call-no-runtime.rs b/src/test/ui/run-pass/foreign/foreign-call-no-runtime.rs
index dd5c075c39b..dd5c075c39b 100644
--- a/src/test/run-pass/foreign-call-no-runtime.rs
+++ b/src/test/ui/run-pass/foreign/foreign-call-no-runtime.rs
diff --git a/src/test/run-pass/foreign-dupe.rs b/src/test/ui/run-pass/foreign/foreign-dupe.rs
index b79e6e98fc0..b79e6e98fc0 100644
--- a/src/test/run-pass/foreign-dupe.rs
+++ b/src/test/ui/run-pass/foreign/foreign-dupe.rs
diff --git a/src/test/run-pass/foreign-fn-linkname.rs b/src/test/ui/run-pass/foreign/foreign-fn-linkname.rs
index fd827efbfdd..fd827efbfdd 100644
--- a/src/test/run-pass/foreign-fn-linkname.rs
+++ b/src/test/ui/run-pass/foreign/foreign-fn-linkname.rs
diff --git a/src/test/run-pass/foreign-fn-with-byval.rs b/src/test/ui/run-pass/foreign/foreign-fn-with-byval.rs
index 65efa571a9b..65efa571a9b 100644
--- a/src/test/run-pass/foreign-fn-with-byval.rs
+++ b/src/test/ui/run-pass/foreign/foreign-fn-with-byval.rs
diff --git a/src/test/run-pass/foreign-int-types.rs b/src/test/ui/run-pass/foreign/foreign-int-types.rs
index 5ea0ef6c7ba..5ea0ef6c7ba 100644
--- a/src/test/run-pass/foreign-int-types.rs
+++ b/src/test/ui/run-pass/foreign/foreign-int-types.rs
diff --git a/src/test/run-pass/foreign-mod-src/compiletest-ignore-dir b/src/test/ui/run-pass/foreign/foreign-mod-src/compiletest-ignore-dir
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/run-pass/foreign-mod-src/compiletest-ignore-dir
+++ b/src/test/ui/run-pass/foreign/foreign-mod-src/compiletest-ignore-dir
diff --git a/src/test/run-pass/foreign-mod-src/inner.rs b/src/test/ui/run-pass/foreign/foreign-mod-src/inner.rs
index 2fd316ce348..2fd316ce348 100644
--- a/src/test/run-pass/foreign-mod-src/inner.rs
+++ b/src/test/ui/run-pass/foreign/foreign-mod-src/inner.rs
diff --git a/src/test/run-pass/foreign-mod-unused-const.rs b/src/test/ui/run-pass/foreign/foreign-mod-unused-const.rs
index 5e9e529669a..5e9e529669a 100644
--- a/src/test/run-pass/foreign-mod-unused-const.rs
+++ b/src/test/ui/run-pass/foreign/foreign-mod-unused-const.rs
diff --git a/src/test/run-pass/foreign-no-abi.rs b/src/test/ui/run-pass/foreign/foreign-no-abi.rs
index b516cdf4416..b516cdf4416 100644
--- a/src/test/run-pass/foreign-no-abi.rs
+++ b/src/test/ui/run-pass/foreign/foreign-no-abi.rs
diff --git a/src/test/run-pass/foreign-src/compiletest-ignore-dir b/src/test/ui/run-pass/foreign/foreign-src/compiletest-ignore-dir
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/run-pass/foreign-src/compiletest-ignore-dir
+++ b/src/test/ui/run-pass/foreign/foreign-src/compiletest-ignore-dir
diff --git a/src/test/run-pass/foreign-src/foreign.rs b/src/test/ui/run-pass/foreign/foreign-src/foreign.rs
index 2e07795ec27..2e07795ec27 100644
--- a/src/test/run-pass/foreign-src/foreign.rs
+++ b/src/test/ui/run-pass/foreign/foreign-src/foreign.rs
diff --git a/src/test/run-pass/foreign-truncated-arguments.rs b/src/test/ui/run-pass/foreign/foreign-truncated-arguments.rs
index a983a4a9598..a983a4a9598 100644
--- a/src/test/run-pass/foreign-truncated-arguments.rs
+++ b/src/test/ui/run-pass/foreign/foreign-truncated-arguments.rs
diff --git a/src/test/run-pass/foreign2.rs b/src/test/ui/run-pass/foreign/foreign2.rs
index d69d6976e4a..d69d6976e4a 100644
--- a/src/test/run-pass/foreign2.rs
+++ b/src/test/ui/run-pass/foreign/foreign2.rs
diff --git a/src/test/run-pass/call-closure-from-overloaded-op.rs b/src/test/ui/run-pass/functions-closures/call-closure-from-overloaded-op.rs
index e35398a2291..e35398a2291 100644
--- a/src/test/run-pass/call-closure-from-overloaded-op.rs
+++ b/src/test/ui/run-pass/functions-closures/call-closure-from-overloaded-op.rs
diff --git a/src/test/run-pass/capture-clauses-boxed-closures.rs b/src/test/ui/run-pass/functions-closures/capture-clauses-boxed-closures.rs
index 45cec79e1a3..45cec79e1a3 100644
--- a/src/test/run-pass/capture-clauses-boxed-closures.rs
+++ b/src/test/ui/run-pass/functions-closures/capture-clauses-boxed-closures.rs
diff --git a/src/test/run-pass/capture-clauses-unboxed-closures.rs b/src/test/ui/run-pass/functions-closures/capture-clauses-unboxed-closures.rs
index e8a9dc7b8f3..e8a9dc7b8f3 100644
--- a/src/test/run-pass/capture-clauses-unboxed-closures.rs
+++ b/src/test/ui/run-pass/functions-closures/capture-clauses-unboxed-closures.rs
diff --git a/src/test/run-pass/clone-closure.rs b/src/test/ui/run-pass/functions-closures/clone-closure.rs
index 0fe3711d8d3..0fe3711d8d3 100644
--- a/src/test/run-pass/clone-closure.rs
+++ b/src/test/ui/run-pass/functions-closures/clone-closure.rs
diff --git a/src/test/run-pass/closure-bounds-can-capture-chan.rs b/src/test/ui/run-pass/functions-closures/closure-bounds-can-capture-chan.rs
index 5268e855d5f..5268e855d5f 100644
--- a/src/test/run-pass/closure-bounds-can-capture-chan.rs
+++ b/src/test/ui/run-pass/functions-closures/closure-bounds-can-capture-chan.rs
diff --git a/src/test/run-pass/closure-expected-type/README.md b/src/test/ui/run-pass/functions-closures/closure-expected-type/README.md
index fd493e1ff37..fd493e1ff37 100644
--- a/src/test/run-pass/closure-expected-type/README.md
+++ b/src/test/ui/run-pass/functions-closures/closure-expected-type/README.md
diff --git a/src/test/run-pass/closure-expected-type/expect-infer-supply-two-infers.rs b/src/test/ui/run-pass/functions-closures/closure-expected-type/expect-infer-supply-two-infers.rs
index 8a90a491f7e..8a90a491f7e 100644
--- a/src/test/run-pass/closure-expected-type/expect-infer-supply-two-infers.rs
+++ b/src/test/ui/run-pass/functions-closures/closure-expected-type/expect-infer-supply-two-infers.rs
diff --git a/src/test/run-pass/closure-expected-type/issue-38714.rs b/src/test/ui/run-pass/functions-closures/closure-expected-type/issue-38714.rs
index a1d512105c9..a1d512105c9 100644
--- a/src/test/run-pass/closure-expected-type/issue-38714.rs
+++ b/src/test/ui/run-pass/functions-closures/closure-expected-type/issue-38714.rs
diff --git a/src/test/run-pass/closure-expected-type/supply-just-return-type.rs b/src/test/ui/run-pass/functions-closures/closure-expected-type/supply-just-return-type.rs
index 0b930b338fd..0b930b338fd 100644
--- a/src/test/run-pass/closure-expected-type/supply-just-return-type.rs
+++ b/src/test/ui/run-pass/functions-closures/closure-expected-type/supply-just-return-type.rs
diff --git a/src/test/run-pass/closure-expected-type/supply-nothing.rs b/src/test/ui/run-pass/functions-closures/closure-expected-type/supply-nothing.rs
index 15d8b393c15..15d8b393c15 100644
--- a/src/test/run-pass/closure-expected-type/supply-nothing.rs
+++ b/src/test/ui/run-pass/functions-closures/closure-expected-type/supply-nothing.rs
diff --git a/src/test/run-pass/closure-immediate.rs b/src/test/ui/run-pass/functions-closures/closure-immediate.rs
index e566c105835..e566c105835 100644
--- a/src/test/run-pass/closure-immediate.rs
+++ b/src/test/ui/run-pass/functions-closures/closure-immediate.rs
diff --git a/src/test/run-pass/closure-inference.rs b/src/test/ui/run-pass/functions-closures/closure-inference.rs
index 630a510ca65..630a510ca65 100644
--- a/src/test/run-pass/closure-inference.rs
+++ b/src/test/ui/run-pass/functions-closures/closure-inference.rs
diff --git a/src/test/run-pass/closure-inference2.rs b/src/test/ui/run-pass/functions-closures/closure-inference2.rs
index 2f24cd4ce40..2f24cd4ce40 100644
--- a/src/test/run-pass/closure-inference2.rs
+++ b/src/test/ui/run-pass/functions-closures/closure-inference2.rs
diff --git a/src/test/run-pass/closure-reform.rs b/src/test/ui/run-pass/functions-closures/closure-reform.rs
index a37733bdc2d..a37733bdc2d 100644
--- a/src/test/run-pass/closure-reform.rs
+++ b/src/test/ui/run-pass/functions-closures/closure-reform.rs
diff --git a/src/test/run-pass/closure-returning-closure.rs b/src/test/ui/run-pass/functions-closures/closure-returning-closure.rs
index 2c00f770cd9..2c00f770cd9 100644
--- a/src/test/run-pass/closure-returning-closure.rs
+++ b/src/test/ui/run-pass/functions-closures/closure-returning-closure.rs
diff --git a/src/test/run-pass/closure-to-fn-coercion.rs b/src/test/ui/run-pass/functions-closures/closure-to-fn-coercion.rs
index 343209143cc..343209143cc 100644
--- a/src/test/run-pass/closure-to-fn-coercion.rs
+++ b/src/test/ui/run-pass/functions-closures/closure-to-fn-coercion.rs
diff --git a/src/test/run-pass/closure_to_fn_coercion-expected-types.rs b/src/test/ui/run-pass/functions-closures/closure_to_fn_coercion-expected-types.rs
index 41da3089c88..41da3089c88 100644
--- a/src/test/run-pass/closure_to_fn_coercion-expected-types.rs
+++ b/src/test/ui/run-pass/functions-closures/closure_to_fn_coercion-expected-types.rs
diff --git a/src/test/run-pass/copy-closure.rs b/src/test/ui/run-pass/functions-closures/copy-closure.rs
index a211d6fc3a3..a211d6fc3a3 100644
--- a/src/test/run-pass/copy-closure.rs
+++ b/src/test/ui/run-pass/functions-closures/copy-closure.rs
diff --git a/src/test/run-pass/fn-abi.rs b/src/test/ui/run-pass/functions-closures/fn-abi.rs
index 0e3005a2aaa..0e3005a2aaa 100644
--- a/src/test/run-pass/fn-abi.rs
+++ b/src/test/ui/run-pass/functions-closures/fn-abi.rs
diff --git a/src/test/run-pass/fn-bare-assign.rs b/src/test/ui/run-pass/functions-closures/fn-bare-assign.rs
index 2d3d4cbffd0..2d3d4cbffd0 100644
--- a/src/test/run-pass/fn-bare-assign.rs
+++ b/src/test/ui/run-pass/functions-closures/fn-bare-assign.rs
diff --git a/src/test/run-pass/fn-bare-coerce-to-block.rs b/src/test/ui/run-pass/functions-closures/fn-bare-coerce-to-block.rs
index 4ec32d23467..4ec32d23467 100644
--- a/src/test/run-pass/fn-bare-coerce-to-block.rs
+++ b/src/test/ui/run-pass/functions-closures/fn-bare-coerce-to-block.rs
diff --git a/src/test/run-pass/fn-bare-item.rs b/src/test/ui/run-pass/functions-closures/fn-bare-item.rs
index 455b71aff87..455b71aff87 100644
--- a/src/test/run-pass/fn-bare-item.rs
+++ b/src/test/ui/run-pass/functions-closures/fn-bare-item.rs
diff --git a/src/test/run-pass/fn-bare-size.rs b/src/test/ui/run-pass/functions-closures/fn-bare-size.rs
index 3ed4f103af0..3ed4f103af0 100644
--- a/src/test/run-pass/fn-bare-size.rs
+++ b/src/test/ui/run-pass/functions-closures/fn-bare-size.rs
diff --git a/src/test/run-pass/fn-bare-spawn.rs b/src/test/ui/run-pass/functions-closures/fn-bare-spawn.rs
index e6ee77cb62b..e6ee77cb62b 100644
--- a/src/test/run-pass/fn-bare-spawn.rs
+++ b/src/test/ui/run-pass/functions-closures/fn-bare-spawn.rs
diff --git a/src/test/run-pass/fn-coerce-field.rs b/src/test/ui/run-pass/functions-closures/fn-coerce-field.rs
index 74d107d15ab..74d107d15ab 100644
--- a/src/test/run-pass/fn-coerce-field.rs
+++ b/src/test/ui/run-pass/functions-closures/fn-coerce-field.rs
diff --git a/src/test/run-pass/fn-item-type-cast.rs b/src/test/ui/run-pass/functions-closures/fn-item-type-cast.rs
index 9a8a8d4782e..9a8a8d4782e 100644
--- a/src/test/run-pass/fn-item-type-cast.rs
+++ b/src/test/ui/run-pass/functions-closures/fn-item-type-cast.rs
diff --git a/src/test/run-pass/fn-item-type-coerce.rs b/src/test/ui/run-pass/functions-closures/fn-item-type-coerce.rs
index 67899bfd683..67899bfd683 100644
--- a/src/test/run-pass/fn-item-type-coerce.rs
+++ b/src/test/ui/run-pass/functions-closures/fn-item-type-coerce.rs
diff --git a/src/test/run-pass/fn-item-type-zero-sized.rs b/src/test/ui/run-pass/functions-closures/fn-item-type-zero-sized.rs
index 5fdaf083d07..5fdaf083d07 100644
--- a/src/test/run-pass/fn-item-type-zero-sized.rs
+++ b/src/test/ui/run-pass/functions-closures/fn-item-type-zero-sized.rs
diff --git a/src/test/run-pass/fn-lval.rs b/src/test/ui/run-pass/functions-closures/fn-lval.rs
index 13c96f43468..13c96f43468 100644
--- a/src/test/run-pass/fn-lval.rs
+++ b/src/test/ui/run-pass/functions-closures/fn-lval.rs
diff --git a/src/test/run-pass/fn-type-infer.rs b/src/test/ui/run-pass/functions-closures/fn-type-infer.rs
index ad6c10611aa..ad6c10611aa 100644
--- a/src/test/run-pass/fn-type-infer.rs
+++ b/src/test/ui/run-pass/functions-closures/fn-type-infer.rs
diff --git a/src/test/run-pass/implied-bounds-closure-arg-outlives.rs b/src/test/ui/run-pass/functions-closures/implied-bounds-closure-arg-outlives.rs
index 0e5cc574f00..0e5cc574f00 100644
--- a/src/test/run-pass/implied-bounds-closure-arg-outlives.rs
+++ b/src/test/ui/run-pass/functions-closures/implied-bounds-closure-arg-outlives.rs
diff --git a/src/test/run-pass/nullable-pointer-opt-closures.rs b/src/test/ui/run-pass/functions-closures/nullable-pointer-opt-closures.rs
index ac5634e6cdd..ac5634e6cdd 100644
--- a/src/test/run-pass/nullable-pointer-opt-closures.rs
+++ b/src/test/ui/run-pass/functions-closures/nullable-pointer-opt-closures.rs
diff --git a/src/test/run-pass/parallel-codegen-closures.rs b/src/test/ui/run-pass/functions-closures/parallel-codegen-closures.rs
index 27b9eeccbeb..27b9eeccbeb 100644
--- a/src/test/run-pass/parallel-codegen-closures.rs
+++ b/src/test/ui/run-pass/functions-closures/parallel-codegen-closures.rs
diff --git a/src/test/run-pass/return-from-closure.rs b/src/test/ui/run-pass/functions-closures/return-from-closure.rs
index 76eddd05382..76eddd05382 100644
--- a/src/test/run-pass/return-from-closure.rs
+++ b/src/test/ui/run-pass/functions-closures/return-from-closure.rs
diff --git a/src/test/run-pass/generic-alias-unique.rs b/src/test/ui/run-pass/generics/generic-alias-unique.rs
index c4fd3119615..c4fd3119615 100644
--- a/src/test/run-pass/generic-alias-unique.rs
+++ b/src/test/ui/run-pass/generics/generic-alias-unique.rs
diff --git a/src/test/run-pass/generic-default-type-params-cross-crate.rs b/src/test/ui/run-pass/generics/generic-default-type-params-cross-crate.rs
index 4cf9f93bcac..4cf9f93bcac 100644
--- a/src/test/run-pass/generic-default-type-params-cross-crate.rs
+++ b/src/test/ui/run-pass/generics/generic-default-type-params-cross-crate.rs
diff --git a/src/test/run-pass/generic-default-type-params.rs b/src/test/ui/run-pass/generics/generic-default-type-params.rs
index e30cb765798..e30cb765798 100644
--- a/src/test/run-pass/generic-default-type-params.rs
+++ b/src/test/ui/run-pass/generics/generic-default-type-params.rs
diff --git a/src/test/run-pass/generic-derived-type.rs b/src/test/ui/run-pass/generics/generic-derived-type.rs
index 74a71873e28..74a71873e28 100644
--- a/src/test/run-pass/generic-derived-type.rs
+++ b/src/test/ui/run-pass/generics/generic-derived-type.rs
diff --git a/src/test/run-pass/generic-exterior-unique.rs b/src/test/ui/run-pass/generics/generic-exterior-unique.rs
index 64091d2926c..64091d2926c 100644
--- a/src/test/run-pass/generic-exterior-unique.rs
+++ b/src/test/ui/run-pass/generics/generic-exterior-unique.rs
diff --git a/src/test/run-pass/generic-extern-mangle.rs b/src/test/ui/run-pass/generics/generic-extern-mangle.rs
index debe3706891..debe3706891 100644
--- a/src/test/run-pass/generic-extern-mangle.rs
+++ b/src/test/ui/run-pass/generics/generic-extern-mangle.rs
diff --git a/src/test/run-pass/generic-fn-infer.rs b/src/test/ui/run-pass/generics/generic-fn-infer.rs
index bff86207f78..bff86207f78 100644
--- a/src/test/run-pass/generic-fn-infer.rs
+++ b/src/test/ui/run-pass/generics/generic-fn-infer.rs
diff --git a/src/test/run-pass/generic-fn-twice.rs b/src/test/ui/run-pass/generics/generic-fn-twice.rs
index b37c73f7f75..b37c73f7f75 100644
--- a/src/test/run-pass/generic-fn-twice.rs
+++ b/src/test/ui/run-pass/generics/generic-fn-twice.rs
diff --git a/src/test/run-pass/generic-fn-unique.rs b/src/test/ui/run-pass/generics/generic-fn-unique.rs
index 3585cd2e079..3585cd2e079 100644
--- a/src/test/run-pass/generic-fn-unique.rs
+++ b/src/test/ui/run-pass/generics/generic-fn-unique.rs
diff --git a/src/test/run-pass/generic-fn.rs b/src/test/ui/run-pass/generics/generic-fn.rs
index 0ba0ed4bf7f..0ba0ed4bf7f 100644
--- a/src/test/run-pass/generic-fn.rs
+++ b/src/test/ui/run-pass/generics/generic-fn.rs
diff --git a/src/test/run-pass/generic-ivec-leak.rs b/src/test/ui/run-pass/generics/generic-ivec-leak.rs
index d439c623801..d439c623801 100644
--- a/src/test/run-pass/generic-ivec-leak.rs
+++ b/src/test/ui/run-pass/generics/generic-ivec-leak.rs
diff --git a/src/test/run-pass/generic-newtype-struct.rs b/src/test/ui/run-pass/generics/generic-newtype-struct.rs
index 24b51728000..24b51728000 100644
--- a/src/test/run-pass/generic-newtype-struct.rs
+++ b/src/test/ui/run-pass/generics/generic-newtype-struct.rs
diff --git a/src/test/run-pass/generic-object.rs b/src/test/ui/run-pass/generics/generic-object.rs
index 7e737fe00af..7e737fe00af 100644
--- a/src/test/run-pass/generic-object.rs
+++ b/src/test/ui/run-pass/generics/generic-object.rs
diff --git a/src/test/run-pass/generic-recursive-tag.rs b/src/test/ui/run-pass/generics/generic-recursive-tag.rs
index ca2bf0ac224..ca2bf0ac224 100644
--- a/src/test/run-pass/generic-recursive-tag.rs
+++ b/src/test/ui/run-pass/generics/generic-recursive-tag.rs
diff --git a/src/test/run-pass/generic-static-methods.rs b/src/test/ui/run-pass/generics/generic-static-methods.rs
index ad501ec7e9b..ad501ec7e9b 100644
--- a/src/test/run-pass/generic-static-methods.rs
+++ b/src/test/ui/run-pass/generics/generic-static-methods.rs
diff --git a/src/test/run-pass/generic-tag-corruption.rs b/src/test/ui/run-pass/generics/generic-tag-corruption.rs
index d61ae520ada..d61ae520ada 100644
--- a/src/test/run-pass/generic-tag-corruption.rs
+++ b/src/test/ui/run-pass/generics/generic-tag-corruption.rs
diff --git a/src/test/run-pass/generic-tag-local.rs b/src/test/ui/run-pass/generics/generic-tag-local.rs
index 9518d590279..9518d590279 100644
--- a/src/test/run-pass/generic-tag-local.rs
+++ b/src/test/ui/run-pass/generics/generic-tag-local.rs
diff --git a/src/test/run-pass/generic-tag-match.rs b/src/test/ui/run-pass/generics/generic-tag-match.rs
index 830c982e13c..830c982e13c 100644
--- a/src/test/run-pass/generic-tag-match.rs
+++ b/src/test/ui/run-pass/generics/generic-tag-match.rs
diff --git a/src/test/run-pass/generic-tag-values.rs b/src/test/ui/run-pass/generics/generic-tag-values.rs
index 1acb2320900..1acb2320900 100644
--- a/src/test/run-pass/generic-tag-values.rs
+++ b/src/test/ui/run-pass/generics/generic-tag-values.rs
diff --git a/src/test/run-pass/generic-tag.rs b/src/test/ui/run-pass/generics/generic-tag.rs
index a79465c8cd8..a79465c8cd8 100644
--- a/src/test/run-pass/generic-tag.rs
+++ b/src/test/ui/run-pass/generics/generic-tag.rs
diff --git a/src/test/run-pass/generic-temporary.rs b/src/test/ui/run-pass/generics/generic-temporary.rs
index 80a6efe7a0e..80a6efe7a0e 100644
--- a/src/test/run-pass/generic-temporary.rs
+++ b/src/test/ui/run-pass/generics/generic-temporary.rs
diff --git a/src/test/run-pass/generic-tup.rs b/src/test/ui/run-pass/generics/generic-tup.rs
index cd0e344b89c..cd0e344b89c 100644
--- a/src/test/run-pass/generic-tup.rs
+++ b/src/test/ui/run-pass/generics/generic-tup.rs
diff --git a/src/test/run-pass/generic-type-synonym.rs b/src/test/ui/run-pass/generics/generic-type-synonym.rs
index 2b3bd5ead94..2b3bd5ead94 100644
--- a/src/test/run-pass/generic-type-synonym.rs
+++ b/src/test/ui/run-pass/generics/generic-type-synonym.rs
diff --git a/src/test/run-pass/generic-type.rs b/src/test/ui/run-pass/generics/generic-type.rs
index 8e7a3add343..8e7a3add343 100644
--- a/src/test/run-pass/generic-type.rs
+++ b/src/test/ui/run-pass/generics/generic-type.rs
diff --git a/src/test/run-pass/generic-unique.rs b/src/test/ui/run-pass/generics/generic-unique.rs
index 1b1355ea336..1b1355ea336 100644
--- a/src/test/run-pass/generic-unique.rs
+++ b/src/test/ui/run-pass/generics/generic-unique.rs
diff --git a/src/test/run-pass/hrtb-binder-levels-in-object-types.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-binder-levels-in-object-types.rs
index bcd519bc25d..bcd519bc25d 100644
--- a/src/test/run-pass/hrtb-binder-levels-in-object-types.rs
+++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-binder-levels-in-object-types.rs
diff --git a/src/test/run-pass/hrtb-debruijn-object-types-in-closures.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-debruijn-object-types-in-closures.rs
index 6761cc12876..6761cc12876 100644
--- a/src/test/run-pass/hrtb-debruijn-object-types-in-closures.rs
+++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-debruijn-object-types-in-closures.rs
diff --git a/src/test/run-pass/hrtb-fn-like-trait-object.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-fn-like-trait-object.rs
index 8e2e21bed0a..8e2e21bed0a 100644
--- a/src/test/run-pass/hrtb-fn-like-trait-object.rs
+++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-fn-like-trait-object.rs
diff --git a/src/test/run-pass/hrtb-fn-like-trait.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-fn-like-trait.rs
index 71e314b5132..71e314b5132 100644
--- a/src/test/run-pass/hrtb-fn-like-trait.rs
+++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-fn-like-trait.rs
diff --git a/src/test/run-pass/hrtb-opt-in-copy.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-opt-in-copy.rs
index f0214d3f37b..f0214d3f37b 100644
--- a/src/test/run-pass/hrtb-opt-in-copy.rs
+++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-opt-in-copy.rs
diff --git a/src/test/run-pass/hrtb-parse.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-parse.rs
index cdffaef66eb..cdffaef66eb 100644
--- a/src/test/run-pass/hrtb-parse.rs
+++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-parse.rs
diff --git a/src/test/run-pass/hrtb-precedence-of-plus-where-clause.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-precedence-of-plus-where-clause.rs
index 46ea2562961..46ea2562961 100644
--- a/src/test/run-pass/hrtb-precedence-of-plus-where-clause.rs
+++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-precedence-of-plus-where-clause.rs
diff --git a/src/test/run-pass/hrtb-precedence-of-plus.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-precedence-of-plus.rs
index 511d3234857..511d3234857 100644
--- a/src/test/run-pass/hrtb-precedence-of-plus.rs
+++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-precedence-of-plus.rs
diff --git a/src/test/run-pass/hrtb-resolve-lifetime.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-resolve-lifetime.rs
index bdbcda89099..bdbcda89099 100644
--- a/src/test/run-pass/hrtb-resolve-lifetime.rs
+++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-resolve-lifetime.rs
diff --git a/src/test/run-pass/hrtb-trait-object-paren-notation.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-trait-object-paren-notation.rs
index 5b9d4a834d8..5b9d4a834d8 100644
--- a/src/test/run-pass/hrtb-trait-object-paren-notation.rs
+++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-trait-object-paren-notation.rs
diff --git a/src/test/run-pass/hrtb-trait-object-passed-to-closure.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-trait-object-passed-to-closure.rs
index 48d0959630f..48d0959630f 100644
--- a/src/test/run-pass/hrtb-trait-object-passed-to-closure.rs
+++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-trait-object-passed-to-closure.rs
diff --git a/src/test/run-pass/hrtb-type-outlives.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-type-outlives.rs
index 083f042fec2..083f042fec2 100644
--- a/src/test/run-pass/hrtb-type-outlives.rs
+++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-type-outlives.rs
diff --git a/src/test/run-pass/hrtb-unboxed-closure-trait.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-unboxed-closure-trait.rs
index 6666b61a4a7..6666b61a4a7 100644
--- a/src/test/run-pass/hrtb-unboxed-closure-trait.rs
+++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-unboxed-closure-trait.rs
diff --git a/src/test/run-pass/hygiene/auxiliary/legacy_interaction.rs b/src/test/ui/run-pass/hygiene/auxiliary/legacy_interaction.rs
index c614ee4d575..c614ee4d575 100644
--- a/src/test/run-pass/hygiene/auxiliary/legacy_interaction.rs
+++ b/src/test/ui/run-pass/hygiene/auxiliary/legacy_interaction.rs
diff --git a/src/test/run-pass/hygiene/auxiliary/my_crate.rs b/src/test/ui/run-pass/hygiene/auxiliary/my_crate.rs
index e10d20b6d47..e10d20b6d47 100644
--- a/src/test/run-pass/hygiene/auxiliary/my_crate.rs
+++ b/src/test/ui/run-pass/hygiene/auxiliary/my_crate.rs
diff --git a/src/test/run-pass/hygiene/auxiliary/unhygienic_example.rs b/src/test/ui/run-pass/hygiene/auxiliary/unhygienic_example.rs
index 298e0209a09..298e0209a09 100644
--- a/src/test/run-pass/hygiene/auxiliary/unhygienic_example.rs
+++ b/src/test/ui/run-pass/hygiene/auxiliary/unhygienic_example.rs
diff --git a/src/test/run-pass/hygiene/auxiliary/xcrate.rs b/src/test/ui/run-pass/hygiene/auxiliary/xcrate.rs
index 2ccd043097f..2ccd043097f 100644
--- a/src/test/run-pass/hygiene/auxiliary/xcrate.rs
+++ b/src/test/ui/run-pass/hygiene/auxiliary/xcrate.rs
diff --git a/src/test/run-pass/hygiene-dodging-1.rs b/src/test/ui/run-pass/hygiene/hygiene-dodging-1.rs
index 83f09850f77..83f09850f77 100644
--- a/src/test/run-pass/hygiene-dodging-1.rs
+++ b/src/test/ui/run-pass/hygiene/hygiene-dodging-1.rs
diff --git a/src/test/run-pass/hygiene.rs b/src/test/ui/run-pass/hygiene/hygiene.rs
index 91648ee5798..91648ee5798 100644
--- a/src/test/run-pass/hygiene.rs
+++ b/src/test/ui/run-pass/hygiene/hygiene.rs
diff --git a/src/test/run-pass/hygienic-labels-in-let.rs b/src/test/ui/run-pass/hygiene/hygienic-labels-in-let.rs
index 2aa5f59cda6..2aa5f59cda6 100644
--- a/src/test/run-pass/hygienic-labels-in-let.rs
+++ b/src/test/ui/run-pass/hygiene/hygienic-labels-in-let.rs
diff --git a/src/test/run-pass/hygienic-labels.rs b/src/test/ui/run-pass/hygiene/hygienic-labels.rs
index a5882f02292..a5882f02292 100644
--- a/src/test/run-pass/hygienic-labels.rs
+++ b/src/test/ui/run-pass/hygiene/hygienic-labels.rs
diff --git a/src/test/run-pass/hygiene/issue-44128.rs b/src/test/ui/run-pass/hygiene/issue-44128.rs
index 213ee1edff4..213ee1edff4 100644
--- a/src/test/run-pass/hygiene/issue-44128.rs
+++ b/src/test/ui/run-pass/hygiene/issue-44128.rs
diff --git a/src/test/run-pass/hygiene/issue-47311.rs b/src/test/ui/run-pass/hygiene/issue-47311.rs
index 3b6890cdce6..3b6890cdce6 100644
--- a/src/test/run-pass/hygiene/issue-47311.rs
+++ b/src/test/ui/run-pass/hygiene/issue-47311.rs
diff --git a/src/test/run-pass/hygiene/issue-47312.rs b/src/test/ui/run-pass/hygiene/issue-47312.rs
index 5e83f3808d8..5e83f3808d8 100644
--- a/src/test/run-pass/hygiene/issue-47312.rs
+++ b/src/test/ui/run-pass/hygiene/issue-47312.rs
diff --git a/src/test/run-pass/hygiene/items.rs b/src/test/ui/run-pass/hygiene/items.rs
index 121c341a124..121c341a124 100644
--- a/src/test/run-pass/hygiene/items.rs
+++ b/src/test/ui/run-pass/hygiene/items.rs
diff --git a/src/test/run-pass/hygiene/legacy_interaction.rs b/src/test/ui/run-pass/hygiene/legacy_interaction.rs
index 683a15b99ae..683a15b99ae 100644
--- a/src/test/run-pass/hygiene/legacy_interaction.rs
+++ b/src/test/ui/run-pass/hygiene/legacy_interaction.rs
diff --git a/src/test/run-pass/hygiene/lexical.rs b/src/test/ui/run-pass/hygiene/lexical.rs
index cb02a17fec3..cb02a17fec3 100644
--- a/src/test/run-pass/hygiene/lexical.rs
+++ b/src/test/ui/run-pass/hygiene/lexical.rs
diff --git a/src/test/run-pass/hygiene/specialization.rs b/src/test/ui/run-pass/hygiene/specialization.rs
index 3d46d2ec99e..3d46d2ec99e 100644
--- a/src/test/run-pass/hygiene/specialization.rs
+++ b/src/test/ui/run-pass/hygiene/specialization.rs
diff --git a/src/test/run-pass/hygiene/trait_items.rs b/src/test/ui/run-pass/hygiene/trait_items.rs
index 2344c97ce1b..2344c97ce1b 100644
--- a/src/test/run-pass/hygiene/trait_items.rs
+++ b/src/test/ui/run-pass/hygiene/trait_items.rs
diff --git a/src/test/run-pass/hygiene/ty_params.rs b/src/test/ui/run-pass/hygiene/ty_params.rs
index 510528ede40..510528ede40 100644
--- a/src/test/run-pass/hygiene/ty_params.rs
+++ b/src/test/ui/run-pass/hygiene/ty_params.rs
diff --git a/src/test/run-pass/hygiene/wrap_unhygienic_example.rs b/src/test/ui/run-pass/hygiene/wrap_unhygienic_example.rs
index 55206950214..55206950214 100644
--- a/src/test/run-pass/hygiene/wrap_unhygienic_example.rs
+++ b/src/test/ui/run-pass/hygiene/wrap_unhygienic_example.rs
diff --git a/src/test/run-pass/hygiene/xcrate.rs b/src/test/ui/run-pass/hygiene/xcrate.rs
index 6df3a34d3c8..6df3a34d3c8 100644
--- a/src/test/run-pass/hygiene/xcrate.rs
+++ b/src/test/ui/run-pass/hygiene/xcrate.rs
diff --git a/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs b/src/test/ui/run-pass/imports/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/auxiliary/crate_with_invalid_spans.rs
+++ b/src/test/ui/run-pass/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs
diff --git a/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs b/src/test/ui/run-pass/imports/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/auxiliary/crate_with_invalid_spans_macros.rs
+++ b/src/test/ui/run-pass/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs
diff --git a/src/test/run-pass/import-crate-with-invalid-spans/main.rs b/src/test/ui/run-pass/imports/import-crate-with-invalid-spans/main.rs
index 2f80a0954dc..2f80a0954dc 100644
--- a/src/test/run-pass/import-crate-with-invalid-spans/main.rs
+++ b/src/test/ui/run-pass/imports/import-crate-with-invalid-spans/main.rs
diff --git a/src/test/run-pass/import-from.rs b/src/test/ui/run-pass/imports/import-from.rs
index 9ac35fbb387..9ac35fbb387 100644
--- a/src/test/run-pass/import-from.rs
+++ b/src/test/ui/run-pass/imports/import-from.rs
diff --git a/src/test/run-pass/import-glob-0.rs b/src/test/ui/run-pass/imports/import-glob-0.rs
index a57b8de629e..a57b8de629e 100644
--- a/src/test/run-pass/import-glob-0.rs
+++ b/src/test/ui/run-pass/imports/import-glob-0.rs
diff --git a/src/test/run-pass/import-glob-1.rs b/src/test/ui/run-pass/imports/import-glob-1.rs
index a7949e7d6e3..a7949e7d6e3 100644
--- a/src/test/run-pass/import-glob-1.rs
+++ b/src/test/ui/run-pass/imports/import-glob-1.rs
diff --git a/src/test/run-pass/import-glob-crate.rs b/src/test/ui/run-pass/imports/import-glob-crate.rs
index fec46c7e1f8..fec46c7e1f8 100644
--- a/src/test/run-pass/import-glob-crate.rs
+++ b/src/test/ui/run-pass/imports/import-glob-crate.rs
diff --git a/src/test/run-pass/import-in-block.rs b/src/test/ui/run-pass/imports/import-in-block.rs
index 532cdbbee3c..532cdbbee3c 100644
--- a/src/test/run-pass/import-in-block.rs
+++ b/src/test/ui/run-pass/imports/import-in-block.rs
diff --git a/src/test/run-pass/import-prefix-macro.rs b/src/test/ui/run-pass/imports/import-prefix-macro.rs
index cfe4ff78e62..cfe4ff78e62 100644
--- a/src/test/run-pass/import-prefix-macro.rs
+++ b/src/test/ui/run-pass/imports/import-prefix-macro.rs
diff --git a/src/test/run-pass/import-rename.rs b/src/test/ui/run-pass/imports/import-rename.rs
index f293c284f94..f293c284f94 100644
--- a/src/test/run-pass/import-rename.rs
+++ b/src/test/ui/run-pass/imports/import-rename.rs
diff --git a/src/test/run-pass/import-trailing-comma.rs b/src/test/ui/run-pass/imports/import-trailing-comma.rs
index c4744853622..c4744853622 100644
--- a/src/test/run-pass/import-trailing-comma.rs
+++ b/src/test/ui/run-pass/imports/import-trailing-comma.rs
diff --git a/src/test/run-pass/import.rs b/src/test/ui/run-pass/imports/import.rs
index c2b459d2887..c2b459d2887 100644
--- a/src/test/run-pass/import.rs
+++ b/src/test/ui/run-pass/imports/import.rs
diff --git a/src/test/run-pass/import2.rs b/src/test/ui/run-pass/imports/import2.rs
index 4086acc0a8e..4086acc0a8e 100644
--- a/src/test/run-pass/import2.rs
+++ b/src/test/ui/run-pass/imports/import2.rs
diff --git a/src/test/run-pass/import3.rs b/src/test/ui/run-pass/imports/import3.rs
index 2c09eff7b12..2c09eff7b12 100644
--- a/src/test/run-pass/import3.rs
+++ b/src/test/ui/run-pass/imports/import3.rs
diff --git a/src/test/run-pass/import4.rs b/src/test/ui/run-pass/imports/import4.rs
index 229813ff55c..229813ff55c 100644
--- a/src/test/run-pass/import4.rs
+++ b/src/test/ui/run-pass/imports/import4.rs
diff --git a/src/test/run-pass/import5.rs b/src/test/ui/run-pass/imports/import5.rs
index 0cad094d55d..0cad094d55d 100644
--- a/src/test/run-pass/import5.rs
+++ b/src/test/ui/run-pass/imports/import5.rs
diff --git a/src/test/run-pass/import6.rs b/src/test/ui/run-pass/imports/import6.rs
index 545bd7cee5e..545bd7cee5e 100644
--- a/src/test/run-pass/import6.rs
+++ b/src/test/ui/run-pass/imports/import6.rs
diff --git a/src/test/run-pass/import7.rs b/src/test/ui/run-pass/imports/import7.rs
index 4b9d1328951..4b9d1328951 100644
--- a/src/test/run-pass/import7.rs
+++ b/src/test/ui/run-pass/imports/import7.rs
diff --git a/src/test/run-pass/import8.rs b/src/test/ui/run-pass/imports/import8.rs
index 0f3891bf067..0f3891bf067 100644
--- a/src/test/run-pass/import8.rs
+++ b/src/test/ui/run-pass/imports/import8.rs
diff --git a/src/test/run-pass/imports.rs b/src/test/ui/run-pass/imports/imports.rs
index f845a2ee571..f845a2ee571 100644
--- a/src/test/run-pass/imports.rs
+++ b/src/test/ui/run-pass/imports/imports.rs
diff --git a/src/test/run-pass/intrinsic-alignment.rs b/src/test/ui/run-pass/intrinsics/intrinsic-alignment.rs
index 5a6a6e0163e..5a6a6e0163e 100644
--- a/src/test/run-pass/intrinsic-alignment.rs
+++ b/src/test/ui/run-pass/intrinsics/intrinsic-alignment.rs
diff --git a/src/test/run-pass/intrinsic-assume.rs b/src/test/ui/run-pass/intrinsics/intrinsic-assume.rs
index 41ef62b0ced..41ef62b0ced 100644
--- a/src/test/run-pass/intrinsic-assume.rs
+++ b/src/test/ui/run-pass/intrinsics/intrinsic-assume.rs
diff --git a/src/test/run-pass/intrinsic-atomics-cc.rs b/src/test/ui/run-pass/intrinsics/intrinsic-atomics-cc.rs
index abb85cc7f19..abb85cc7f19 100644
--- a/src/test/run-pass/intrinsic-atomics-cc.rs
+++ b/src/test/ui/run-pass/intrinsics/intrinsic-atomics-cc.rs
diff --git a/src/test/run-pass/intrinsic-atomics.rs b/src/test/ui/run-pass/intrinsics/intrinsic-atomics.rs
index 4b11158e8c3..4b11158e8c3 100644
--- a/src/test/run-pass/intrinsic-atomics.rs
+++ b/src/test/ui/run-pass/intrinsics/intrinsic-atomics.rs
diff --git a/src/test/run-pass/intrinsic-move-val-cleanups.rs b/src/test/ui/run-pass/intrinsics/intrinsic-move-val-cleanups.rs
index 8f22579423f..8f22579423f 100644
--- a/src/test/run-pass/intrinsic-move-val-cleanups.rs
+++ b/src/test/ui/run-pass/intrinsics/intrinsic-move-val-cleanups.rs
diff --git a/src/test/run-pass/intrinsic-move-val.rs b/src/test/ui/run-pass/intrinsics/intrinsic-move-val.rs
index ea42b59f1f2..ea42b59f1f2 100644
--- a/src/test/run-pass/intrinsic-move-val.rs
+++ b/src/test/ui/run-pass/intrinsics/intrinsic-move-val.rs
diff --git a/src/test/run-pass/intrinsic-uninit.rs b/src/test/ui/run-pass/intrinsics/intrinsic-uninit.rs
index 3d2c1ec5c19..3d2c1ec5c19 100644
--- a/src/test/run-pass/intrinsic-uninit.rs
+++ b/src/test/ui/run-pass/intrinsics/intrinsic-uninit.rs
diff --git a/src/test/run-pass/intrinsic-unreachable.rs b/src/test/ui/run-pass/intrinsics/intrinsic-unreachable.rs
index 0ce446e445c..0ce446e445c 100644
--- a/src/test/run-pass/intrinsic-unreachable.rs
+++ b/src/test/ui/run-pass/intrinsics/intrinsic-unreachable.rs
diff --git a/src/test/run-pass/intrinsics-integer.rs b/src/test/ui/run-pass/intrinsics/intrinsics-integer.rs
index 7a8ff1befc7..7a8ff1befc7 100644
--- a/src/test/run-pass/intrinsics-integer.rs
+++ b/src/test/ui/run-pass/intrinsics/intrinsics-integer.rs
diff --git a/src/test/run-pass/intrinsics-math.rs b/src/test/ui/run-pass/intrinsics/intrinsics-math.rs
index 5132405a9d5..5132405a9d5 100644
--- a/src/test/run-pass/intrinsics-math.rs
+++ b/src/test/ui/run-pass/intrinsics/intrinsics-math.rs
diff --git a/src/test/run-pass/issue-10025.rs b/src/test/ui/run-pass/issues/issue-10025.rs
index 1ca2476a101..1ca2476a101 100644
--- a/src/test/run-pass/issue-10025.rs
+++ b/src/test/ui/run-pass/issues/issue-10025.rs
diff --git a/src/test/run-pass/issue-10028.rs b/src/test/ui/run-pass/issues/issue-10028.rs
index 53d6f67f119..53d6f67f119 100644
--- a/src/test/run-pass/issue-10028.rs
+++ b/src/test/ui/run-pass/issues/issue-10028.rs
diff --git a/src/test/run-pass/issue-10031.rs b/src/test/ui/run-pass/issues/issue-10031.rs
index 4dc1487b9af..4dc1487b9af 100644
--- a/src/test/run-pass/issue-10031.rs
+++ b/src/test/ui/run-pass/issues/issue-10031.rs
diff --git a/src/test/run-pass/issue-10228.rs b/src/test/ui/run-pass/issues/issue-10228.rs
index b5c97bd10ed..b5c97bd10ed 100644
--- a/src/test/run-pass/issue-10228.rs
+++ b/src/test/ui/run-pass/issues/issue-10228.rs
diff --git a/src/test/run-pass/issue-10392.rs b/src/test/ui/run-pass/issues/issue-10392.rs
index 1a5f423b0fd..1a5f423b0fd 100644
--- a/src/test/run-pass/issue-10392.rs
+++ b/src/test/ui/run-pass/issues/issue-10392.rs
diff --git a/src/test/run-pass/issue-10396.rs b/src/test/ui/run-pass/issues/issue-10396.rs
index b487608d4e6..b487608d4e6 100644
--- a/src/test/run-pass/issue-10396.rs
+++ b/src/test/ui/run-pass/issues/issue-10396.rs
diff --git a/src/test/run-pass/issue-10436.rs b/src/test/ui/run-pass/issues/issue-10436.rs
index 81a955b0f22..81a955b0f22 100644
--- a/src/test/run-pass/issue-10436.rs
+++ b/src/test/ui/run-pass/issues/issue-10436.rs
diff --git a/src/test/run-pass/issue-10456.rs b/src/test/ui/run-pass/issues/issue-10456.rs
index 10b41623054..10b41623054 100644
--- a/src/test/run-pass/issue-10456.rs
+++ b/src/test/ui/run-pass/issues/issue-10456.rs
diff --git a/src/test/run-pass/issue-10626.rs b/src/test/ui/run-pass/issues/issue-10626.rs
index 9262fc342f7..9262fc342f7 100644
--- a/src/test/run-pass/issue-10626.rs
+++ b/src/test/ui/run-pass/issues/issue-10626.rs
diff --git a/src/test/run-pass/issue-10638.rs b/src/test/ui/run-pass/issues/issue-10638.rs
index 379bdffbbb2..379bdffbbb2 100644
--- a/src/test/run-pass/issue-10638.rs
+++ b/src/test/ui/run-pass/issues/issue-10638.rs
diff --git a/src/test/run-pass/issue-10682.rs b/src/test/ui/run-pass/issues/issue-10682.rs
index 67b73bdadbb..67b73bdadbb 100644
--- a/src/test/run-pass/issue-10682.rs
+++ b/src/test/ui/run-pass/issues/issue-10682.rs
diff --git a/src/test/run-pass/issue-10683.rs b/src/test/ui/run-pass/issues/issue-10683.rs
index d3ba477fa57..d3ba477fa57 100644
--- a/src/test/run-pass/issue-10683.rs
+++ b/src/test/ui/run-pass/issues/issue-10683.rs
diff --git a/src/test/run-pass/issue-10718.rs b/src/test/ui/run-pass/issues/issue-10718.rs
index fedd94e22e7..fedd94e22e7 100644
--- a/src/test/run-pass/issue-10718.rs
+++ b/src/test/ui/run-pass/issues/issue-10718.rs
diff --git a/src/test/run-pass/issue-10734.rs b/src/test/ui/run-pass/issues/issue-10734.rs
index a521e5d4b6c..a521e5d4b6c 100644
--- a/src/test/run-pass/issue-10734.rs
+++ b/src/test/ui/run-pass/issues/issue-10734.rs
diff --git a/src/test/run-pass/issue-10763.rs b/src/test/ui/run-pass/issues/issue-10763.rs
index 3789b93ad76..3789b93ad76 100644
--- a/src/test/run-pass/issue-10763.rs
+++ b/src/test/ui/run-pass/issues/issue-10763.rs
diff --git a/src/test/run-pass/issue-10764.rs b/src/test/ui/run-pass/issues/issue-10764.rs
index cfabf699fa2..cfabf699fa2 100644
--- a/src/test/run-pass/issue-10764.rs
+++ b/src/test/ui/run-pass/issues/issue-10764.rs
diff --git a/src/test/run-pass/issue-10767.rs b/src/test/ui/run-pass/issues/issue-10767.rs
index 2184aa00fa4..2184aa00fa4 100644
--- a/src/test/run-pass/issue-10767.rs
+++ b/src/test/ui/run-pass/issues/issue-10767.rs
diff --git a/src/test/run-pass/issue-10802.rs b/src/test/ui/run-pass/issues/issue-10802.rs
index 1e700d4e18b..1e700d4e18b 100644
--- a/src/test/run-pass/issue-10802.rs
+++ b/src/test/ui/run-pass/issues/issue-10802.rs
diff --git a/src/test/run-pass/issue-10806.rs b/src/test/ui/run-pass/issues/issue-10806.rs
index 49883f15d31..49883f15d31 100644
--- a/src/test/run-pass/issue-10806.rs
+++ b/src/test/ui/run-pass/issues/issue-10806.rs
diff --git a/src/test/run-pass/issue-10853.rs b/src/test/ui/run-pass/issues/issue-10853.rs
index 2e6d2780379..2e6d2780379 100644
--- a/src/test/run-pass/issue-10853.rs
+++ b/src/test/ui/run-pass/issues/issue-10853.rs
diff --git a/src/test/run-pass/issue-10902.rs b/src/test/ui/run-pass/issues/issue-10902.rs
index 9f0417a8be9..9f0417a8be9 100644
--- a/src/test/run-pass/issue-10902.rs
+++ b/src/test/ui/run-pass/issues/issue-10902.rs
diff --git a/src/test/run-pass/issue-11047.rs b/src/test/ui/run-pass/issues/issue-11047.rs
index 1d97d579a61..1d97d579a61 100644
--- a/src/test/run-pass/issue-11047.rs
+++ b/src/test/ui/run-pass/issues/issue-11047.rs
diff --git a/src/test/run-pass/issue-11085.rs b/src/test/ui/run-pass/issues/issue-11085.rs
index c024c6297bf..c024c6297bf 100644
--- a/src/test/run-pass/issue-11085.rs
+++ b/src/test/ui/run-pass/issues/issue-11085.rs
diff --git a/src/test/run-pass/issue-1112.rs b/src/test/ui/run-pass/issues/issue-1112.rs
index 72d1a43e883..72d1a43e883 100644
--- a/src/test/run-pass/issue-1112.rs
+++ b/src/test/ui/run-pass/issues/issue-1112.rs
diff --git a/src/test/run-pass/issue-11205.rs b/src/test/ui/run-pass/issues/issue-11205.rs
index 25c66bf8d48..25c66bf8d48 100644
--- a/src/test/run-pass/issue-11205.rs
+++ b/src/test/ui/run-pass/issues/issue-11205.rs
diff --git a/src/test/run-pass/issue-11224.rs b/src/test/ui/run-pass/issues/issue-11224.rs
index 14017ee1789..14017ee1789 100644
--- a/src/test/run-pass/issue-11224.rs
+++ b/src/test/ui/run-pass/issues/issue-11224.rs
diff --git a/src/test/run-pass/issue-11225-1.rs b/src/test/ui/run-pass/issues/issue-11225-1.rs
index 60789be62b3..60789be62b3 100644
--- a/src/test/run-pass/issue-11225-1.rs
+++ b/src/test/ui/run-pass/issues/issue-11225-1.rs
diff --git a/src/test/run-pass/issue-11225-2.rs b/src/test/ui/run-pass/issues/issue-11225-2.rs
index 540183b7ef4..540183b7ef4 100644
--- a/src/test/run-pass/issue-11225-2.rs
+++ b/src/test/ui/run-pass/issues/issue-11225-2.rs
diff --git a/src/test/run-pass/issue-11225-3.rs b/src/test/ui/run-pass/issues/issue-11225-3.rs
index 317c3d3222d..317c3d3222d 100644
--- a/src/test/run-pass/issue-11225-3.rs
+++ b/src/test/ui/run-pass/issues/issue-11225-3.rs
diff --git a/src/test/run-pass/issue-11267.rs b/src/test/ui/run-pass/issues/issue-11267.rs
index 1a1227c7920..1a1227c7920 100644
--- a/src/test/run-pass/issue-11267.rs
+++ b/src/test/ui/run-pass/issues/issue-11267.rs
diff --git a/src/test/run-pass/issue-11382.rs b/src/test/ui/run-pass/issues/issue-11382.rs
index 51996614d25..51996614d25 100644
--- a/src/test/run-pass/issue-11382.rs
+++ b/src/test/ui/run-pass/issues/issue-11382.rs
diff --git a/src/test/run-pass/issue-11384.rs b/src/test/ui/run-pass/issues/issue-11384.rs
index 5b4bd6c9f2b..5b4bd6c9f2b 100644
--- a/src/test/run-pass/issue-11384.rs
+++ b/src/test/ui/run-pass/issues/issue-11384.rs
diff --git a/src/test/run-pass/issue-11508.rs b/src/test/ui/run-pass/issues/issue-11508.rs
index 21ed30683f5..21ed30683f5 100644
--- a/src/test/run-pass/issue-11508.rs
+++ b/src/test/ui/run-pass/issues/issue-11508.rs
diff --git a/src/test/run-pass/issue-11529.rs b/src/test/ui/run-pass/issues/issue-11529.rs
index e5d95874be6..e5d95874be6 100644
--- a/src/test/run-pass/issue-11529.rs
+++ b/src/test/ui/run-pass/issues/issue-11529.rs
diff --git a/src/test/run-pass/issue-11552.rs b/src/test/ui/run-pass/issues/issue-11552.rs
index aa980e48c5e..aa980e48c5e 100644
--- a/src/test/run-pass/issue-11552.rs
+++ b/src/test/ui/run-pass/issues/issue-11552.rs
diff --git a/src/test/run-pass/issue-11577.rs b/src/test/ui/run-pass/issues/issue-11577.rs
index a64fbb6afd6..a64fbb6afd6 100644
--- a/src/test/run-pass/issue-11577.rs
+++ b/src/test/ui/run-pass/issues/issue-11577.rs
diff --git a/src/test/run-pass/issue-11592.rs b/src/test/ui/run-pass/issues/issue-11592.rs
index 432e7ff2025..432e7ff2025 100644
--- a/src/test/run-pass/issue-11592.rs
+++ b/src/test/ui/run-pass/issues/issue-11592.rs
diff --git a/src/test/run-pass/issue-11612.rs b/src/test/ui/run-pass/issues/issue-11612.rs
index de1b0525d84..de1b0525d84 100644
--- a/src/test/run-pass/issue-11612.rs
+++ b/src/test/ui/run-pass/issues/issue-11612.rs
diff --git a/src/test/run-pass/issue-11677.rs b/src/test/ui/run-pass/issues/issue-11677.rs
index 62da3b14675..62da3b14675 100644
--- a/src/test/run-pass/issue-11677.rs
+++ b/src/test/ui/run-pass/issues/issue-11677.rs
diff --git a/src/test/run-pass/issue-11709.rs b/src/test/ui/run-pass/issues/issue-11709.rs
index 88d74a65813..88d74a65813 100644
--- a/src/test/run-pass/issue-11709.rs
+++ b/src/test/ui/run-pass/issues/issue-11709.rs
diff --git a/src/test/run-pass/issue-11820.rs b/src/test/ui/run-pass/issues/issue-11820.rs
index 6d2243db300..6d2243db300 100644
--- a/src/test/run-pass/issue-11820.rs
+++ b/src/test/ui/run-pass/issues/issue-11820.rs
diff --git a/src/test/run-pass/issue-11869.rs b/src/test/ui/run-pass/issues/issue-11869.rs
index 8a9b3e4b143..8a9b3e4b143 100644
--- a/src/test/run-pass/issue-11869.rs
+++ b/src/test/ui/run-pass/issues/issue-11869.rs
diff --git a/src/test/run-pass/issue-11940.rs b/src/test/ui/run-pass/issues/issue-11940.rs
index 186446a3456..186446a3456 100644
--- a/src/test/run-pass/issue-11940.rs
+++ b/src/test/ui/run-pass/issues/issue-11940.rs
diff --git a/src/test/run-pass/issue-11958.rs b/src/test/ui/run-pass/issues/issue-11958.rs
index 05de69cb966..05de69cb966 100644
--- a/src/test/run-pass/issue-11958.rs
+++ b/src/test/ui/run-pass/issues/issue-11958.rs
diff --git a/src/test/run-pass/issue-12033.rs b/src/test/ui/run-pass/issues/issue-12033.rs
index 5e1d82ce52c..5e1d82ce52c 100644
--- a/src/test/run-pass/issue-12033.rs
+++ b/src/test/ui/run-pass/issues/issue-12033.rs
diff --git a/src/test/run-pass/issue-12133-1.rs b/src/test/ui/run-pass/issues/issue-12133-1.rs
index d47bb818c49..d47bb818c49 100644
--- a/src/test/run-pass/issue-12133-1.rs
+++ b/src/test/ui/run-pass/issues/issue-12133-1.rs
diff --git a/src/test/run-pass/issue-12133-2.rs b/src/test/ui/run-pass/issues/issue-12133-2.rs
index 580c487af0d..580c487af0d 100644
--- a/src/test/run-pass/issue-12133-2.rs
+++ b/src/test/ui/run-pass/issues/issue-12133-2.rs
diff --git a/src/test/run-pass/issue-12133-3.rs b/src/test/ui/run-pass/issues/issue-12133-3.rs
index 2b36c94d2e2..2b36c94d2e2 100644
--- a/src/test/run-pass/issue-12133-3.rs
+++ b/src/test/ui/run-pass/issues/issue-12133-3.rs
diff --git a/src/test/run-pass/issue-12285.rs b/src/test/ui/run-pass/issues/issue-12285.rs
index fb98909eb97..fb98909eb97 100644
--- a/src/test/run-pass/issue-12285.rs
+++ b/src/test/ui/run-pass/issues/issue-12285.rs
diff --git a/src/test/run-pass/issue-1251.rs b/src/test/ui/run-pass/issues/issue-1251.rs
index 00e8aa69a89..00e8aa69a89 100644
--- a/src/test/run-pass/issue-1251.rs
+++ b/src/test/ui/run-pass/issues/issue-1251.rs
diff --git a/src/test/run-pass/issue-1257.rs b/src/test/ui/run-pass/issues/issue-1257.rs
index 44ebe362c72..44ebe362c72 100644
--- a/src/test/run-pass/issue-1257.rs
+++ b/src/test/ui/run-pass/issues/issue-1257.rs
diff --git a/src/test/run-pass/issue-12582.rs b/src/test/ui/run-pass/issues/issue-12582.rs
index b89964d968e..b89964d968e 100644
--- a/src/test/run-pass/issue-12582.rs
+++ b/src/test/ui/run-pass/issues/issue-12582.rs
diff --git a/src/test/run-pass/issue-12612.rs b/src/test/ui/run-pass/issues/issue-12612.rs
index bdf8f84a959..bdf8f84a959 100644
--- a/src/test/run-pass/issue-12612.rs
+++ b/src/test/ui/run-pass/issues/issue-12612.rs
diff --git a/src/test/run-pass/issue-12660.rs b/src/test/ui/run-pass/issues/issue-12660.rs
index ebf390cfe4f..ebf390cfe4f 100644
--- a/src/test/run-pass/issue-12660.rs
+++ b/src/test/ui/run-pass/issues/issue-12660.rs
diff --git a/src/test/run-pass/issue-12677.rs b/src/test/ui/run-pass/issues/issue-12677.rs
index e83a2e9727d..e83a2e9727d 100644
--- a/src/test/run-pass/issue-12677.rs
+++ b/src/test/ui/run-pass/issues/issue-12677.rs
diff --git a/src/test/run-pass/issue-12699.rs b/src/test/ui/run-pass/issues/issue-12699.rs
index 4620d982c1e..4620d982c1e 100644
--- a/src/test/run-pass/issue-12699.rs
+++ b/src/test/ui/run-pass/issues/issue-12699.rs
diff --git a/src/test/run-pass/issue-12729.rs b/src/test/ui/run-pass/issues/issue-12729.rs
index 1852ed21286..1852ed21286 100644
--- a/src/test/run-pass/issue-12729.rs
+++ b/src/test/ui/run-pass/issues/issue-12729.rs
diff --git a/src/test/run-pass/issue-12744.rs b/src/test/ui/run-pass/issues/issue-12744.rs
index aec45216b1b..aec45216b1b 100644
--- a/src/test/run-pass/issue-12744.rs
+++ b/src/test/ui/run-pass/issues/issue-12744.rs
diff --git a/src/test/run-pass/issue-12860.rs b/src/test/ui/run-pass/issues/issue-12860.rs
index 58ce390cac6..58ce390cac6 100644
--- a/src/test/run-pass/issue-12860.rs
+++ b/src/test/ui/run-pass/issues/issue-12860.rs
diff --git a/src/test/run-pass/issue-12909.rs b/src/test/ui/run-pass/issues/issue-12909.rs
index e1532190730..e1532190730 100644
--- a/src/test/run-pass/issue-12909.rs
+++ b/src/test/ui/run-pass/issues/issue-12909.rs
diff --git a/src/test/run-pass/issue-13027.rs b/src/test/ui/run-pass/issues/issue-13027.rs
index 2c460900ef6..2c460900ef6 100644
--- a/src/test/run-pass/issue-13027.rs
+++ b/src/test/ui/run-pass/issues/issue-13027.rs
diff --git a/src/test/run-pass/issue-13105.rs b/src/test/ui/run-pass/issues/issue-13105.rs
index f2a606a8bba..f2a606a8bba 100644
--- a/src/test/run-pass/issue-13105.rs
+++ b/src/test/ui/run-pass/issues/issue-13105.rs
diff --git a/src/test/run-pass/issue-13167.rs b/src/test/ui/run-pass/issues/issue-13167.rs
index 414f6768e0a..414f6768e0a 100644
--- a/src/test/run-pass/issue-13167.rs
+++ b/src/test/ui/run-pass/issues/issue-13167.rs
diff --git a/src/test/run-pass/issue-13204.rs b/src/test/ui/run-pass/issues/issue-13204.rs
index 13e8fe0e964..13e8fe0e964 100644
--- a/src/test/run-pass/issue-13204.rs
+++ b/src/test/ui/run-pass/issues/issue-13204.rs
diff --git a/src/test/run-pass/issue-13214.rs b/src/test/ui/run-pass/issues/issue-13214.rs
index 7a3d3f4ff48..7a3d3f4ff48 100644
--- a/src/test/run-pass/issue-13214.rs
+++ b/src/test/ui/run-pass/issues/issue-13214.rs
diff --git a/src/test/run-pass/issue-13259-windows-tcb-trash.rs b/src/test/ui/run-pass/issues/issue-13259-windows-tcb-trash.rs
index 634046e86ee..634046e86ee 100644
--- a/src/test/run-pass/issue-13259-windows-tcb-trash.rs
+++ b/src/test/ui/run-pass/issues/issue-13259-windows-tcb-trash.rs
diff --git a/src/test/run-pass/issue-13264.rs b/src/test/ui/run-pass/issues/issue-13264.rs
index 383c1aef234..383c1aef234 100644
--- a/src/test/run-pass/issue-13264.rs
+++ b/src/test/ui/run-pass/issues/issue-13264.rs
diff --git a/src/test/run-pass/issue-13304.rs b/src/test/ui/run-pass/issues/issue-13304.rs
index 36036ae241e..36036ae241e 100644
--- a/src/test/run-pass/issue-13304.rs
+++ b/src/test/ui/run-pass/issues/issue-13304.rs
diff --git a/src/test/run-pass/issue-13323.rs b/src/test/ui/run-pass/issues/issue-13323.rs
index de72d7152f8..de72d7152f8 100644
--- a/src/test/run-pass/issue-13323.rs
+++ b/src/test/ui/run-pass/issues/issue-13323.rs
diff --git a/src/test/run-pass/issue-13405.rs b/src/test/ui/run-pass/issues/issue-13405.rs
index c8b26dc4aed..c8b26dc4aed 100644
--- a/src/test/run-pass/issue-13405.rs
+++ b/src/test/ui/run-pass/issues/issue-13405.rs
diff --git a/src/test/run-pass/issue-13434.rs b/src/test/ui/run-pass/issues/issue-13434.rs
index 5d7a84d80d4..5d7a84d80d4 100644
--- a/src/test/run-pass/issue-13434.rs
+++ b/src/test/ui/run-pass/issues/issue-13434.rs
diff --git a/src/test/run-pass/issue-13494.rs b/src/test/ui/run-pass/issues/issue-13494.rs
index 316190b54eb..316190b54eb 100644
--- a/src/test/run-pass/issue-13494.rs
+++ b/src/test/ui/run-pass/issues/issue-13494.rs
diff --git a/src/test/run-pass/issue-13507-2.rs b/src/test/ui/run-pass/issues/issue-13507-2.rs
index 75a724e55fb..75a724e55fb 100644
--- a/src/test/run-pass/issue-13507-2.rs
+++ b/src/test/ui/run-pass/issues/issue-13507-2.rs
diff --git a/src/test/run-pass/issue-13620.rs b/src/test/ui/run-pass/issues/issue-13620.rs
index 4c468314187..4c468314187 100644
--- a/src/test/run-pass/issue-13620.rs
+++ b/src/test/ui/run-pass/issues/issue-13620.rs
diff --git a/src/test/run-pass/issue-13655.rs b/src/test/ui/run-pass/issues/issue-13655.rs
index 51a9c9264a8..51a9c9264a8 100644
--- a/src/test/run-pass/issue-13655.rs
+++ b/src/test/ui/run-pass/issues/issue-13655.rs
diff --git a/src/test/run-pass/issue-13665.rs b/src/test/ui/run-pass/issues/issue-13665.rs
index f4902c8e0ac..f4902c8e0ac 100644
--- a/src/test/run-pass/issue-13665.rs
+++ b/src/test/ui/run-pass/issues/issue-13665.rs
diff --git a/src/test/run-pass/issue-13703.rs b/src/test/ui/run-pass/issues/issue-13703.rs
index 173b8dda057..173b8dda057 100644
--- a/src/test/run-pass/issue-13703.rs
+++ b/src/test/ui/run-pass/issues/issue-13703.rs
diff --git a/src/test/run-pass/issue-13763.rs b/src/test/ui/run-pass/issues/issue-13763.rs
index 1367ab2ed85..1367ab2ed85 100644
--- a/src/test/run-pass/issue-13763.rs
+++ b/src/test/ui/run-pass/issues/issue-13763.rs
diff --git a/src/test/run-pass/issue-13775.rs b/src/test/ui/run-pass/issues/issue-13775.rs
index c69ae6a15cd..c69ae6a15cd 100644
--- a/src/test/run-pass/issue-13775.rs
+++ b/src/test/ui/run-pass/issues/issue-13775.rs
diff --git a/src/test/run-pass/issue-13808.rs b/src/test/ui/run-pass/issues/issue-13808.rs
index ccdfa0646c6..ccdfa0646c6 100644
--- a/src/test/run-pass/issue-13808.rs
+++ b/src/test/ui/run-pass/issues/issue-13808.rs
diff --git a/src/test/run-pass/issue-13837.rs b/src/test/ui/run-pass/issues/issue-13837.rs
index d90b9cffb6a..d90b9cffb6a 100644
--- a/src/test/run-pass/issue-13837.rs
+++ b/src/test/ui/run-pass/issues/issue-13837.rs
diff --git a/src/test/run-pass/issue-13867.rs b/src/test/ui/run-pass/issues/issue-13867.rs
index bc28dc54de6..bc28dc54de6 100644
--- a/src/test/run-pass/issue-13867.rs
+++ b/src/test/ui/run-pass/issues/issue-13867.rs
diff --git a/src/test/run-pass/issue-13872.rs b/src/test/ui/run-pass/issues/issue-13872.rs
index e9fb7945d04..e9fb7945d04 100644
--- a/src/test/run-pass/issue-13872.rs
+++ b/src/test/ui/run-pass/issues/issue-13872.rs
diff --git a/src/test/run-pass/issue-13902.rs b/src/test/ui/run-pass/issues/issue-13902.rs
index 14019aaacd4..14019aaacd4 100644
--- a/src/test/run-pass/issue-13902.rs
+++ b/src/test/ui/run-pass/issues/issue-13902.rs
diff --git a/src/test/run-pass/issue-14082.rs b/src/test/ui/run-pass/issues/issue-14082.rs
index d159d55c77c..d159d55c77c 100644
--- a/src/test/run-pass/issue-14082.rs
+++ b/src/test/ui/run-pass/issues/issue-14082.rs
diff --git a/src/test/run-pass/issue-14229.rs b/src/test/ui/run-pass/issues/issue-14229.rs
index ee2bbe63750..ee2bbe63750 100644
--- a/src/test/run-pass/issue-14229.rs
+++ b/src/test/ui/run-pass/issues/issue-14229.rs
diff --git a/src/test/run-pass/issue-14254.rs b/src/test/ui/run-pass/issues/issue-14254.rs
index 9049ae0548f..9049ae0548f 100644
--- a/src/test/run-pass/issue-14254.rs
+++ b/src/test/ui/run-pass/issues/issue-14254.rs
diff --git a/src/test/run-pass/issue-14308.rs b/src/test/ui/run-pass/issues/issue-14308.rs
index 74936411da2..74936411da2 100644
--- a/src/test/run-pass/issue-14308.rs
+++ b/src/test/ui/run-pass/issues/issue-14308.rs
diff --git a/src/test/run-pass/issue-14330.rs b/src/test/ui/run-pass/issues/issue-14330.rs
index dd5b7e722fe..dd5b7e722fe 100644
--- a/src/test/run-pass/issue-14330.rs
+++ b/src/test/ui/run-pass/issues/issue-14330.rs
diff --git a/src/test/run-pass/issue-14344.rs b/src/test/ui/run-pass/issues/issue-14344.rs
index 06b8f44ed26..06b8f44ed26 100644
--- a/src/test/run-pass/issue-14344.rs
+++ b/src/test/ui/run-pass/issues/issue-14344.rs
diff --git a/src/test/run-pass/issue-14382.rs b/src/test/ui/run-pass/issues/issue-14382.rs
index cdb44f6a606..cdb44f6a606 100644
--- a/src/test/run-pass/issue-14382.rs
+++ b/src/test/ui/run-pass/issues/issue-14382.rs
diff --git a/src/test/run-pass/issue-14393.rs b/src/test/ui/run-pass/issues/issue-14393.rs
index 88af6507495..88af6507495 100644
--- a/src/test/run-pass/issue-14393.rs
+++ b/src/test/ui/run-pass/issues/issue-14393.rs
diff --git a/src/test/run-pass/issue-14399.rs b/src/test/ui/run-pass/issues/issue-14399.rs
index d5c67bea099..d5c67bea099 100644
--- a/src/test/run-pass/issue-14399.rs
+++ b/src/test/ui/run-pass/issues/issue-14399.rs
diff --git a/src/test/run-pass/issue-14421.rs b/src/test/ui/run-pass/issues/issue-14421.rs
index 046d888030f..046d888030f 100644
--- a/src/test/run-pass/issue-14421.rs
+++ b/src/test/ui/run-pass/issues/issue-14421.rs
diff --git a/src/test/run-pass/issue-14422.rs b/src/test/ui/run-pass/issues/issue-14422.rs
index 178a219f5bf..178a219f5bf 100644
--- a/src/test/run-pass/issue-14422.rs
+++ b/src/test/ui/run-pass/issues/issue-14422.rs
diff --git a/src/test/run-pass/issue-14456.rs b/src/test/ui/run-pass/issues/issue-14456.rs
index 601fafbf02e..601fafbf02e 100644
--- a/src/test/run-pass/issue-14456.rs
+++ b/src/test/ui/run-pass/issues/issue-14456.rs
diff --git a/src/test/run-pass/issue-1451.rs b/src/test/ui/run-pass/issues/issue-1451.rs
index b65a3a9ab70..b65a3a9ab70 100644
--- a/src/test/run-pass/issue-1451.rs
+++ b/src/test/ui/run-pass/issues/issue-1451.rs
diff --git a/src/test/run-pass/issue-14589.rs b/src/test/ui/run-pass/issues/issue-14589.rs
index 8aaa24e991e..8aaa24e991e 100644
--- a/src/test/run-pass/issue-14589.rs
+++ b/src/test/ui/run-pass/issues/issue-14589.rs
diff --git a/src/test/run-pass/issue-1460.rs b/src/test/ui/run-pass/issues/issue-1460.rs
index 6e1cfc71862..6e1cfc71862 100644
--- a/src/test/run-pass/issue-1460.rs
+++ b/src/test/ui/run-pass/issues/issue-1460.rs
diff --git a/src/test/run-pass/issue-14821.rs b/src/test/ui/run-pass/issues/issue-14821.rs
index 50eb7767f82..50eb7767f82 100644
--- a/src/test/run-pass/issue-14821.rs
+++ b/src/test/ui/run-pass/issues/issue-14821.rs
diff --git a/src/test/run-pass/issue-14837.rs b/src/test/ui/run-pass/issues/issue-14837.rs
index 5589acdda37..5589acdda37 100644
--- a/src/test/run-pass/issue-14837.rs
+++ b/src/test/ui/run-pass/issues/issue-14837.rs
diff --git a/src/test/run-pass/issue-14865.rs b/src/test/ui/run-pass/issues/issue-14865.rs
index 1ec268bb170..1ec268bb170 100644
--- a/src/test/run-pass/issue-14865.rs
+++ b/src/test/ui/run-pass/issues/issue-14865.rs
diff --git a/src/test/run-pass/issue-14875.rs b/src/test/ui/run-pass/issues/issue-14875.rs
index e705539bb47..e705539bb47 100644
--- a/src/test/run-pass/issue-14875.rs
+++ b/src/test/ui/run-pass/issues/issue-14875.rs
diff --git a/src/test/run-pass/issue-14901.rs b/src/test/ui/run-pass/issues/issue-14901.rs
index 56683678469..56683678469 100644
--- a/src/test/run-pass/issue-14901.rs
+++ b/src/test/ui/run-pass/issues/issue-14901.rs
diff --git a/src/test/run-pass/issue-14919.rs b/src/test/ui/run-pass/issues/issue-14919.rs
index 5d0fde01798..5d0fde01798 100644
--- a/src/test/run-pass/issue-14919.rs
+++ b/src/test/ui/run-pass/issues/issue-14919.rs
diff --git a/src/test/run-pass/issue-14933.rs b/src/test/ui/run-pass/issues/issue-14933.rs
index f6815b76083..f6815b76083 100644
--- a/src/test/run-pass/issue-14933.rs
+++ b/src/test/ui/run-pass/issues/issue-14933.rs
diff --git a/src/test/run-pass/issue-14936.rs b/src/test/ui/run-pass/issues/issue-14936.rs
index 8a628b73c00..8a628b73c00 100644
--- a/src/test/run-pass/issue-14936.rs
+++ b/src/test/ui/run-pass/issues/issue-14936.rs
diff --git a/src/test/run-pass/issue-14940.rs b/src/test/ui/run-pass/issues/issue-14940.rs
index c0741820119..c0741820119 100644
--- a/src/test/run-pass/issue-14940.rs
+++ b/src/test/ui/run-pass/issues/issue-14940.rs
diff --git a/src/test/run-pass/issue-14958.rs b/src/test/ui/run-pass/issues/issue-14958.rs
index 0709ccf1406..0709ccf1406 100644
--- a/src/test/run-pass/issue-14958.rs
+++ b/src/test/ui/run-pass/issues/issue-14958.rs
diff --git a/src/test/run-pass/issue-14959.rs b/src/test/ui/run-pass/issues/issue-14959.rs
index 42824b563be..42824b563be 100644
--- a/src/test/run-pass/issue-14959.rs
+++ b/src/test/ui/run-pass/issues/issue-14959.rs
diff --git a/src/test/run-pass/issue-15043.rs b/src/test/ui/run-pass/issues/issue-15043.rs
index adf56388acd..adf56388acd 100644
--- a/src/test/run-pass/issue-15043.rs
+++ b/src/test/ui/run-pass/issues/issue-15043.rs
diff --git a/src/test/run-pass/issue-15063.rs b/src/test/ui/run-pass/issues/issue-15063.rs
index 695d30d7317..695d30d7317 100644
--- a/src/test/run-pass/issue-15063.rs
+++ b/src/test/ui/run-pass/issues/issue-15063.rs
diff --git a/src/test/run-pass/issue-15080.rs b/src/test/ui/run-pass/issues/issue-15080.rs
index 59267f79e26..59267f79e26 100644
--- a/src/test/run-pass/issue-15080.rs
+++ b/src/test/ui/run-pass/issues/issue-15080.rs
diff --git a/src/test/run-pass/issue-15104.rs b/src/test/ui/run-pass/issues/issue-15104.rs
index 2878f2795c5..2878f2795c5 100644
--- a/src/test/run-pass/issue-15104.rs
+++ b/src/test/ui/run-pass/issues/issue-15104.rs
diff --git a/src/test/run-pass/issue-15108.rs b/src/test/ui/run-pass/issues/issue-15108.rs
index aaf1e5fc183..aaf1e5fc183 100644
--- a/src/test/run-pass/issue-15108.rs
+++ b/src/test/ui/run-pass/issues/issue-15108.rs
diff --git a/src/test/run-pass/issue-15129.rs b/src/test/ui/run-pass/issues/issue-15129.rs
index 9bcfa6ea40a..9bcfa6ea40a 100644
--- a/src/test/run-pass/issue-15129.rs
+++ b/src/test/ui/run-pass/issues/issue-15129.rs
diff --git a/src/test/run-pass/issue-15155.rs b/src/test/ui/run-pass/issues/issue-15155.rs
index e1ecaaab026..e1ecaaab026 100644
--- a/src/test/run-pass/issue-15155.rs
+++ b/src/test/ui/run-pass/issues/issue-15155.rs
diff --git a/src/test/run-pass/issue-15189.rs b/src/test/ui/run-pass/issues/issue-15189.rs
index 54b96d66307..54b96d66307 100644
--- a/src/test/run-pass/issue-15189.rs
+++ b/src/test/ui/run-pass/issues/issue-15189.rs
diff --git a/src/test/run-pass/issue-15221.rs b/src/test/ui/run-pass/issues/issue-15221.rs
index bb89fb2fa10..bb89fb2fa10 100644
--- a/src/test/run-pass/issue-15221.rs
+++ b/src/test/ui/run-pass/issues/issue-15221.rs
diff --git a/src/test/run-pass/issue-15261.rs b/src/test/ui/run-pass/issues/issue-15261.rs
index 239fef12326..239fef12326 100644
--- a/src/test/run-pass/issue-15261.rs
+++ b/src/test/ui/run-pass/issues/issue-15261.rs
diff --git a/src/test/run-pass/issue-15444.rs b/src/test/ui/run-pass/issues/issue-15444.rs
index e9a9eabcd91..e9a9eabcd91 100644
--- a/src/test/run-pass/issue-15444.rs
+++ b/src/test/ui/run-pass/issues/issue-15444.rs
diff --git a/src/test/run-pass/issue-15487.rs b/src/test/ui/run-pass/issues/issue-15487.rs
index 3616ab9e6c7..3616ab9e6c7 100644
--- a/src/test/run-pass/issue-15487.rs
+++ b/src/test/ui/run-pass/issues/issue-15487.rs
diff --git a/src/test/run-pass/issue-15523-big.rs b/src/test/ui/run-pass/issues/issue-15523-big.rs
index 33c81cab381..33c81cab381 100644
--- a/src/test/run-pass/issue-15523-big.rs
+++ b/src/test/ui/run-pass/issues/issue-15523-big.rs
diff --git a/src/test/run-pass/issue-15523.rs b/src/test/ui/run-pass/issues/issue-15523.rs
index bb8fa6791a5..bb8fa6791a5 100644
--- a/src/test/run-pass/issue-15523.rs
+++ b/src/test/ui/run-pass/issues/issue-15523.rs
diff --git a/src/test/run-pass/issue-15562.rs b/src/test/ui/run-pass/issues/issue-15562.rs
index da1e15d826d..da1e15d826d 100644
--- a/src/test/run-pass/issue-15562.rs
+++ b/src/test/ui/run-pass/issues/issue-15562.rs
diff --git a/src/test/run-pass/issue-15571.rs b/src/test/ui/run-pass/issues/issue-15571.rs
index 35915a62102..35915a62102 100644
--- a/src/test/run-pass/issue-15571.rs
+++ b/src/test/ui/run-pass/issues/issue-15571.rs
diff --git a/src/test/run-pass/issue-15673.rs b/src/test/ui/run-pass/issues/issue-15673.rs
index ff9a17323e4..ff9a17323e4 100644
--- a/src/test/run-pass/issue-15673.rs
+++ b/src/test/ui/run-pass/issues/issue-15673.rs
diff --git a/src/test/run-pass/issue-15689-1.rs b/src/test/ui/run-pass/issues/issue-15689-1.rs
index 20d66cd8176..20d66cd8176 100644
--- a/src/test/run-pass/issue-15689-1.rs
+++ b/src/test/ui/run-pass/issues/issue-15689-1.rs
diff --git a/src/test/run-pass/issue-15689-2.rs b/src/test/ui/run-pass/issues/issue-15689-2.rs
index 922b18c01d9..922b18c01d9 100644
--- a/src/test/run-pass/issue-15689-2.rs
+++ b/src/test/ui/run-pass/issues/issue-15689-2.rs
diff --git a/src/test/run-pass/issue-15730.rs b/src/test/ui/run-pass/issues/issue-15730.rs
index 929580019ff..929580019ff 100644
--- a/src/test/run-pass/issue-15730.rs
+++ b/src/test/ui/run-pass/issues/issue-15730.rs
diff --git a/src/test/run-pass/issue-15734.rs b/src/test/ui/run-pass/issues/issue-15734.rs
index 5a35239cf72..5a35239cf72 100644
--- a/src/test/run-pass/issue-15734.rs
+++ b/src/test/ui/run-pass/issues/issue-15734.rs
diff --git a/src/test/run-pass/issue-15735.rs b/src/test/ui/run-pass/issues/issue-15735.rs
index bdd58bf6a7d..bdd58bf6a7d 100644
--- a/src/test/run-pass/issue-15735.rs
+++ b/src/test/ui/run-pass/issues/issue-15735.rs
diff --git a/src/test/run-pass/issue-15763.rs b/src/test/ui/run-pass/issues/issue-15763.rs
index e1176d47063..e1176d47063 100644
--- a/src/test/run-pass/issue-15763.rs
+++ b/src/test/ui/run-pass/issues/issue-15763.rs
diff --git a/src/test/run-pass/issue-15774.rs b/src/test/ui/run-pass/issues/issue-15774.rs
index eb3322e0370..eb3322e0370 100644
--- a/src/test/run-pass/issue-15774.rs
+++ b/src/test/ui/run-pass/issues/issue-15774.rs
diff --git a/src/test/run-pass/issue-15793.rs b/src/test/ui/run-pass/issues/issue-15793.rs
index 432174a1f52..432174a1f52 100644
--- a/src/test/run-pass/issue-15793.rs
+++ b/src/test/ui/run-pass/issues/issue-15793.rs
diff --git a/src/test/run-pass/issue-15858.rs b/src/test/ui/run-pass/issues/issue-15858.rs
index a1ada18984e..a1ada18984e 100644
--- a/src/test/run-pass/issue-15858.rs
+++ b/src/test/ui/run-pass/issues/issue-15858.rs
diff --git a/src/test/run-pass/issue-15881-model-lexer-dotdotdot.rs b/src/test/ui/run-pass/issues/issue-15881-model-lexer-dotdotdot.rs
index 04ffad501b0..04ffad501b0 100644
--- a/src/test/run-pass/issue-15881-model-lexer-dotdotdot.rs
+++ b/src/test/ui/run-pass/issues/issue-15881-model-lexer-dotdotdot.rs
diff --git a/src/test/run-pass/issue-16151.rs b/src/test/ui/run-pass/issues/issue-16151.rs
index 212dfaf3cb6..212dfaf3cb6 100644
--- a/src/test/run-pass/issue-16151.rs
+++ b/src/test/ui/run-pass/issues/issue-16151.rs
diff --git a/src/test/run-pass/issue-16256.rs b/src/test/ui/run-pass/issues/issue-16256.rs
index b994fcb46b0..b994fcb46b0 100644
--- a/src/test/run-pass/issue-16256.rs
+++ b/src/test/ui/run-pass/issues/issue-16256.rs
diff --git a/src/test/run-pass/issue-16272.rs b/src/test/ui/run-pass/issues/issue-16272.rs
index f8d6e43c730..f8d6e43c730 100644
--- a/src/test/run-pass/issue-16272.rs
+++ b/src/test/ui/run-pass/issues/issue-16272.rs
diff --git a/src/test/run-pass/issue-16278.rs b/src/test/ui/run-pass/issues/issue-16278.rs
index 41af72db200..41af72db200 100644
--- a/src/test/run-pass/issue-16278.rs
+++ b/src/test/ui/run-pass/issues/issue-16278.rs
diff --git a/src/test/run-pass/issue-16441.rs b/src/test/ui/run-pass/issues/issue-16441.rs
index 4624953dea3..4624953dea3 100644
--- a/src/test/run-pass/issue-16441.rs
+++ b/src/test/ui/run-pass/issues/issue-16441.rs
diff --git a/src/test/run-pass/issue-16452.rs b/src/test/ui/run-pass/issues/issue-16452.rs
index b6056d0ab8c..b6056d0ab8c 100644
--- a/src/test/run-pass/issue-16452.rs
+++ b/src/test/ui/run-pass/issues/issue-16452.rs
diff --git a/src/test/run-pass/issue-16492.rs b/src/test/ui/run-pass/issues/issue-16492.rs
index 177550a0dd4..177550a0dd4 100644
--- a/src/test/run-pass/issue-16492.rs
+++ b/src/test/ui/run-pass/issues/issue-16492.rs
diff --git a/src/test/run-pass/issue-16530.rs b/src/test/ui/run-pass/issues/issue-16530.rs
index bd7e7c85189..bd7e7c85189 100644
--- a/src/test/run-pass/issue-16530.rs
+++ b/src/test/ui/run-pass/issues/issue-16530.rs
diff --git a/src/test/run-pass/issue-16560.rs b/src/test/ui/run-pass/issues/issue-16560.rs
index e91569f8b24..e91569f8b24 100644
--- a/src/test/run-pass/issue-16560.rs
+++ b/src/test/ui/run-pass/issues/issue-16560.rs
diff --git a/src/test/run-pass/issue-16596.rs b/src/test/ui/run-pass/issues/issue-16596.rs
index d70158743e7..d70158743e7 100644
--- a/src/test/run-pass/issue-16596.rs
+++ b/src/test/ui/run-pass/issues/issue-16596.rs
diff --git a/src/test/run-pass/issue-16597-empty.rs b/src/test/ui/run-pass/issues/issue-16597-empty.rs
index c51e33c0104..c51e33c0104 100644
--- a/src/test/run-pass/issue-16597-empty.rs
+++ b/src/test/ui/run-pass/issues/issue-16597-empty.rs
diff --git a/src/test/run-pass/issue-16597.rs b/src/test/ui/run-pass/issues/issue-16597.rs
index 583d8d46235..583d8d46235 100644
--- a/src/test/run-pass/issue-16597.rs
+++ b/src/test/ui/run-pass/issues/issue-16597.rs
diff --git a/src/test/run-pass/issue-1660.rs b/src/test/ui/run-pass/issues/issue-1660.rs
index 2a59c3051d5..2a59c3051d5 100644
--- a/src/test/run-pass/issue-1660.rs
+++ b/src/test/ui/run-pass/issues/issue-1660.rs
diff --git a/src/test/run-pass/issue-16602-1.rs b/src/test/ui/run-pass/issues/issue-16602-1.rs
index ee638edad6c..ee638edad6c 100644
--- a/src/test/run-pass/issue-16602-1.rs
+++ b/src/test/ui/run-pass/issues/issue-16602-1.rs
diff --git a/src/test/run-pass/issue-16602-2.rs b/src/test/ui/run-pass/issues/issue-16602-2.rs
index 742eb6c280e..742eb6c280e 100644
--- a/src/test/run-pass/issue-16602-2.rs
+++ b/src/test/ui/run-pass/issues/issue-16602-2.rs
diff --git a/src/test/run-pass/issue-16602-3.rs b/src/test/ui/run-pass/issues/issue-16602-3.rs
index d29932dcf68..d29932dcf68 100644
--- a/src/test/run-pass/issue-16602-3.rs
+++ b/src/test/ui/run-pass/issues/issue-16602-3.rs
diff --git a/src/test/run-pass/issue-16643.rs b/src/test/ui/run-pass/issues/issue-16643.rs
index 54572296df7..54572296df7 100644
--- a/src/test/run-pass/issue-16643.rs
+++ b/src/test/ui/run-pass/issues/issue-16643.rs
diff --git a/src/test/run-pass/issue-16648.rs b/src/test/ui/run-pass/issues/issue-16648.rs
index bf272308fa9..bf272308fa9 100644
--- a/src/test/run-pass/issue-16648.rs
+++ b/src/test/ui/run-pass/issues/issue-16648.rs
diff --git a/src/test/run-pass/issue-16668.rs b/src/test/ui/run-pass/issues/issue-16668.rs
index 7944e80a428..7944e80a428 100644
--- a/src/test/run-pass/issue-16668.rs
+++ b/src/test/ui/run-pass/issues/issue-16668.rs
diff --git a/src/test/run-pass/issue-16671.rs b/src/test/ui/run-pass/issues/issue-16671.rs
index 9f34ad6726c..9f34ad6726c 100644
--- a/src/test/run-pass/issue-16671.rs
+++ b/src/test/ui/run-pass/issues/issue-16671.rs
diff --git a/src/test/run-pass/issue-16739.rs b/src/test/ui/run-pass/issues/issue-16739.rs
index 2bdedfebe3e..2bdedfebe3e 100644
--- a/src/test/run-pass/issue-16739.rs
+++ b/src/test/ui/run-pass/issues/issue-16739.rs
diff --git a/src/test/run-pass/issue-16745.rs b/src/test/ui/run-pass/issues/issue-16745.rs
index 79fe0b0177a..79fe0b0177a 100644
--- a/src/test/run-pass/issue-16745.rs
+++ b/src/test/ui/run-pass/issues/issue-16745.rs
diff --git a/src/test/run-pass/issue-16774.rs b/src/test/ui/run-pass/issues/issue-16774.rs
index 1309d2ffab8..1309d2ffab8 100644
--- a/src/test/run-pass/issue-16774.rs
+++ b/src/test/ui/run-pass/issues/issue-16774.rs
diff --git a/src/test/run-pass/issue-16783.rs b/src/test/ui/run-pass/issues/issue-16783.rs
index 33cdbca14e3..33cdbca14e3 100644
--- a/src/test/run-pass/issue-16783.rs
+++ b/src/test/ui/run-pass/issues/issue-16783.rs
diff --git a/src/test/run-pass/issue-16819.rs b/src/test/ui/run-pass/issues/issue-16819.rs
index ecd8a3390b7..ecd8a3390b7 100644
--- a/src/test/run-pass/issue-16819.rs
+++ b/src/test/ui/run-pass/issues/issue-16819.rs
diff --git a/src/test/run-pass/issue-16922.rs b/src/test/ui/run-pass/issues/issue-16922.rs
index 1fdc27eb128..1fdc27eb128 100644
--- a/src/test/run-pass/issue-16922.rs
+++ b/src/test/ui/run-pass/issues/issue-16922.rs
diff --git a/src/test/run-pass/issue-1696.rs b/src/test/ui/run-pass/issues/issue-1696.rs
index b06285b06a5..b06285b06a5 100644
--- a/src/test/run-pass/issue-1696.rs
+++ b/src/test/ui/run-pass/issues/issue-1696.rs
diff --git a/src/test/run-pass/issue-1701.rs b/src/test/ui/run-pass/issues/issue-1701.rs
index 49ee99b22a1..49ee99b22a1 100644
--- a/src/test/run-pass/issue-1701.rs
+++ b/src/test/ui/run-pass/issues/issue-1701.rs
diff --git a/src/test/run-pass/issue-17068.rs b/src/test/ui/run-pass/issues/issue-17068.rs
index 91264b4ac3f..91264b4ac3f 100644
--- a/src/test/run-pass/issue-17068.rs
+++ b/src/test/ui/run-pass/issues/issue-17068.rs
diff --git a/src/test/run-pass/issue-17074.rs b/src/test/ui/run-pass/issues/issue-17074.rs
index ec2d8f79781..ec2d8f79781 100644
--- a/src/test/run-pass/issue-17074.rs
+++ b/src/test/ui/run-pass/issues/issue-17074.rs
diff --git a/src/test/run-pass/issue-17121.rs b/src/test/ui/run-pass/issues/issue-17121.rs
index 6eb813025ec..6eb813025ec 100644
--- a/src/test/run-pass/issue-17121.rs
+++ b/src/test/ui/run-pass/issues/issue-17121.rs
diff --git a/src/test/run-pass/issue-17170.rs b/src/test/ui/run-pass/issues/issue-17170.rs
index c786064ba01..c786064ba01 100644
--- a/src/test/run-pass/issue-17170.rs
+++ b/src/test/ui/run-pass/issues/issue-17170.rs
diff --git a/src/test/run-pass/issue-17216.rs b/src/test/ui/run-pass/issues/issue-17216.rs
index e713bbf127d..e713bbf127d 100644
--- a/src/test/run-pass/issue-17216.rs
+++ b/src/test/ui/run-pass/issues/issue-17216.rs
diff --git a/src/test/run-pass/issue-17233.rs b/src/test/ui/run-pass/issues/issue-17233.rs
index e9f0c73e29d..e9f0c73e29d 100644
--- a/src/test/run-pass/issue-17233.rs
+++ b/src/test/ui/run-pass/issues/issue-17233.rs
diff --git a/src/test/run-pass/issue-17302.rs b/src/test/ui/run-pass/issues/issue-17302.rs
index 59625581167..59625581167 100644
--- a/src/test/run-pass/issue-17302.rs
+++ b/src/test/ui/run-pass/issues/issue-17302.rs
diff --git a/src/test/run-pass/issue-17322.rs b/src/test/ui/run-pass/issues/issue-17322.rs
index c94345f794d..c94345f794d 100644
--- a/src/test/run-pass/issue-17322.rs
+++ b/src/test/ui/run-pass/issues/issue-17322.rs
diff --git a/src/test/run-pass/issue-17336.rs b/src/test/ui/run-pass/issues/issue-17336.rs
index ce04237081f..ce04237081f 100644
--- a/src/test/run-pass/issue-17336.rs
+++ b/src/test/ui/run-pass/issues/issue-17336.rs
diff --git a/src/test/run-pass/issue-17351.rs b/src/test/ui/run-pass/issues/issue-17351.rs
index 88f83a300a7..88f83a300a7 100644
--- a/src/test/run-pass/issue-17351.rs
+++ b/src/test/ui/run-pass/issues/issue-17351.rs
diff --git a/src/test/run-pass/issue-17361.rs b/src/test/ui/run-pass/issues/issue-17361.rs
index 354b0861758..354b0861758 100644
--- a/src/test/run-pass/issue-17361.rs
+++ b/src/test/ui/run-pass/issues/issue-17361.rs
diff --git a/src/test/run-pass/issue-17450.rs b/src/test/ui/run-pass/issues/issue-17450.rs
index 242d8c20cd7..242d8c20cd7 100644
--- a/src/test/run-pass/issue-17450.rs
+++ b/src/test/ui/run-pass/issues/issue-17450.rs
diff --git a/src/test/run-pass/issue-17503.rs b/src/test/ui/run-pass/issues/issue-17503.rs
index 796277ce74d..796277ce74d 100644
--- a/src/test/run-pass/issue-17503.rs
+++ b/src/test/ui/run-pass/issues/issue-17503.rs
diff --git a/src/test/run-pass/issue-17662.rs b/src/test/ui/run-pass/issues/issue-17662.rs
index 320d108cfae..320d108cfae 100644
--- a/src/test/run-pass/issue-17662.rs
+++ b/src/test/ui/run-pass/issues/issue-17662.rs
diff --git a/src/test/run-pass/issue-17718-borrow-interior.rs b/src/test/ui/run-pass/issues/issue-17718-borrow-interior.rs
index cafc0375257..cafc0375257 100644
--- a/src/test/run-pass/issue-17718-borrow-interior.rs
+++ b/src/test/ui/run-pass/issues/issue-17718-borrow-interior.rs
diff --git a/src/test/run-pass/issue-17718-const-destructors.rs b/src/test/ui/run-pass/issues/issue-17718-const-destructors.rs
index ca0b222050e..ca0b222050e 100644
--- a/src/test/run-pass/issue-17718-const-destructors.rs
+++ b/src/test/ui/run-pass/issues/issue-17718-const-destructors.rs
diff --git a/src/test/run-pass/issue-17718-parse-const.rs b/src/test/ui/run-pass/issues/issue-17718-parse-const.rs
index 9be92d65978..9be92d65978 100644
--- a/src/test/run-pass/issue-17718-parse-const.rs
+++ b/src/test/ui/run-pass/issues/issue-17718-parse-const.rs
diff --git a/src/test/run-pass/issue-17718-static-unsafe-interior.rs b/src/test/ui/run-pass/issues/issue-17718-static-unsafe-interior.rs
index 5f7629fa267..5f7629fa267 100644
--- a/src/test/run-pass/issue-17718-static-unsafe-interior.rs
+++ b/src/test/ui/run-pass/issues/issue-17718-static-unsafe-interior.rs
diff --git a/src/test/run-pass/issue-17718.rs b/src/test/ui/run-pass/issues/issue-17718.rs
index 502e4a81664..502e4a81664 100644
--- a/src/test/run-pass/issue-17718.rs
+++ b/src/test/ui/run-pass/issues/issue-17718.rs
diff --git a/src/test/run-pass/issue-17732.rs b/src/test/ui/run-pass/issues/issue-17732.rs
index 9a678f00157..9a678f00157 100644
--- a/src/test/run-pass/issue-17732.rs
+++ b/src/test/ui/run-pass/issues/issue-17732.rs
diff --git a/src/test/run-pass/issue-17734.rs b/src/test/ui/run-pass/issues/issue-17734.rs
index 8178c1fd7c8..8178c1fd7c8 100644
--- a/src/test/run-pass/issue-17734.rs
+++ b/src/test/ui/run-pass/issues/issue-17734.rs
diff --git a/src/test/run-pass/issue-17746.rs b/src/test/ui/run-pass/issues/issue-17746.rs
index a66d5e10288..a66d5e10288 100644
--- a/src/test/run-pass/issue-17746.rs
+++ b/src/test/ui/run-pass/issues/issue-17746.rs
diff --git a/src/test/run-pass/issue-17756.rs b/src/test/ui/run-pass/issues/issue-17756.rs
index 1b108463c74..1b108463c74 100644
--- a/src/test/run-pass/issue-17756.rs
+++ b/src/test/ui/run-pass/issues/issue-17756.rs
diff --git a/src/test/run-pass/issue-17771.rs b/src/test/ui/run-pass/issues/issue-17771.rs
index fc821441330..fc821441330 100644
--- a/src/test/run-pass/issue-17771.rs
+++ b/src/test/ui/run-pass/issues/issue-17771.rs
diff --git a/src/test/run-pass/issue-17816.rs b/src/test/ui/run-pass/issues/issue-17816.rs
index a9aa4cdd4f6..a9aa4cdd4f6 100644
--- a/src/test/run-pass/issue-17816.rs
+++ b/src/test/ui/run-pass/issues/issue-17816.rs
diff --git a/src/test/run-pass/issue-17877.rs b/src/test/ui/run-pass/issues/issue-17877.rs
index d3fe0903a1d..d3fe0903a1d 100644
--- a/src/test/run-pass/issue-17877.rs
+++ b/src/test/ui/run-pass/issues/issue-17877.rs
diff --git a/src/test/run-pass/issue-17897.rs b/src/test/ui/run-pass/issues/issue-17897.rs
index 82ecd636130..82ecd636130 100644
--- a/src/test/run-pass/issue-17897.rs
+++ b/src/test/ui/run-pass/issues/issue-17897.rs
diff --git a/src/test/run-pass/issue-17904.rs b/src/test/ui/run-pass/issues/issue-17904.rs
index 994001a82ce..994001a82ce 100644
--- a/src/test/run-pass/issue-17904.rs
+++ b/src/test/ui/run-pass/issues/issue-17904.rs
diff --git a/src/test/run-pass/issue-18060.rs b/src/test/ui/run-pass/issues/issue-18060.rs
index 322a3d8c9bb..322a3d8c9bb 100644
--- a/src/test/run-pass/issue-18060.rs
+++ b/src/test/ui/run-pass/issues/issue-18060.rs
diff --git a/src/test/run-pass/issue-18075.rs b/src/test/ui/run-pass/issues/issue-18075.rs
index 5f07ba2235f..5f07ba2235f 100644
--- a/src/test/run-pass/issue-18075.rs
+++ b/src/test/ui/run-pass/issues/issue-18075.rs
diff --git a/src/test/run-pass/issue-18083.rs b/src/test/ui/run-pass/issues/issue-18083.rs
index ff26e186db3..ff26e186db3 100644
--- a/src/test/run-pass/issue-18083.rs
+++ b/src/test/ui/run-pass/issues/issue-18083.rs
diff --git a/src/test/run-pass/issue-18088.rs b/src/test/ui/run-pass/issues/issue-18088.rs
index a45256387d6..a45256387d6 100644
--- a/src/test/run-pass/issue-18088.rs
+++ b/src/test/ui/run-pass/issues/issue-18088.rs
diff --git a/src/test/run-pass/issue-18110.rs b/src/test/ui/run-pass/issues/issue-18110.rs
index eecdea66cf6..eecdea66cf6 100644
--- a/src/test/run-pass/issue-18110.rs
+++ b/src/test/ui/run-pass/issues/issue-18110.rs
diff --git a/src/test/run-pass/issue-18173.rs b/src/test/ui/run-pass/issues/issue-18173.rs
index f4266fada32..f4266fada32 100644
--- a/src/test/run-pass/issue-18173.rs
+++ b/src/test/ui/run-pass/issues/issue-18173.rs
diff --git a/src/test/run-pass/issue-18188.rs b/src/test/ui/run-pass/issues/issue-18188.rs
index 18088a5f3ec..18088a5f3ec 100644
--- a/src/test/run-pass/issue-18188.rs
+++ b/src/test/ui/run-pass/issues/issue-18188.rs
diff --git a/src/test/run-pass/issue-1821.rs b/src/test/ui/run-pass/issues/issue-1821.rs
index bdff5ba484d..bdff5ba484d 100644
--- a/src/test/run-pass/issue-1821.rs
+++ b/src/test/ui/run-pass/issues/issue-1821.rs
diff --git a/src/test/run-pass/issue-18232.rs b/src/test/ui/run-pass/issues/issue-18232.rs
index 376d6523ccb..376d6523ccb 100644
--- a/src/test/run-pass/issue-18232.rs
+++ b/src/test/ui/run-pass/issues/issue-18232.rs
diff --git a/src/test/run-pass/issue-18352.rs b/src/test/ui/run-pass/issues/issue-18352.rs
index cce6ba407a6..cce6ba407a6 100644
--- a/src/test/run-pass/issue-18352.rs
+++ b/src/test/ui/run-pass/issues/issue-18352.rs
diff --git a/src/test/run-pass/issue-18353.rs b/src/test/ui/run-pass/issues/issue-18353.rs
index 1386c9d0daa..1386c9d0daa 100644
--- a/src/test/run-pass/issue-18353.rs
+++ b/src/test/ui/run-pass/issues/issue-18353.rs
diff --git a/src/test/run-pass/issue-18412.rs b/src/test/ui/run-pass/issues/issue-18412.rs
index 1017fab5ae2..1017fab5ae2 100644
--- a/src/test/run-pass/issue-18412.rs
+++ b/src/test/ui/run-pass/issues/issue-18412.rs
diff --git a/src/test/run-pass/issue-18425.rs b/src/test/ui/run-pass/issues/issue-18425.rs
index 797b3197182..797b3197182 100644
--- a/src/test/run-pass/issue-18425.rs
+++ b/src/test/ui/run-pass/issues/issue-18425.rs
diff --git a/src/test/run-pass/issue-18446.rs b/src/test/ui/run-pass/issues/issue-18446.rs
index eb321e046dc..eb321e046dc 100644
--- a/src/test/run-pass/issue-18446.rs
+++ b/src/test/ui/run-pass/issues/issue-18446.rs
diff --git a/src/test/run-pass/issue-18464.rs b/src/test/ui/run-pass/issues/issue-18464.rs
index f4faab5e468..f4faab5e468 100644
--- a/src/test/run-pass/issue-18464.rs
+++ b/src/test/ui/run-pass/issues/issue-18464.rs
diff --git a/src/test/run-pass/issue-18501.rs b/src/test/ui/run-pass/issues/issue-18501.rs
index fb8158c6ddc..fb8158c6ddc 100644
--- a/src/test/run-pass/issue-18501.rs
+++ b/src/test/ui/run-pass/issues/issue-18501.rs
diff --git a/src/test/run-pass/issue-18514.rs b/src/test/ui/run-pass/issues/issue-18514.rs
index f8bebb4a40b..f8bebb4a40b 100644
--- a/src/test/run-pass/issue-18514.rs
+++ b/src/test/ui/run-pass/issues/issue-18514.rs
diff --git a/src/test/run-pass/issue-18539.rs b/src/test/ui/run-pass/issues/issue-18539.rs
index 8de2d1e4259..8de2d1e4259 100644
--- a/src/test/run-pass/issue-18539.rs
+++ b/src/test/ui/run-pass/issues/issue-18539.rs
diff --git a/src/test/run-pass/issue-18652.rs b/src/test/ui/run-pass/issues/issue-18652.rs
index 1eddc34f5b1..1eddc34f5b1 100644
--- a/src/test/run-pass/issue-18652.rs
+++ b/src/test/ui/run-pass/issues/issue-18652.rs
diff --git a/src/test/run-pass/issue-18655.rs b/src/test/ui/run-pass/issues/issue-18655.rs
index cdb83ae5caa..cdb83ae5caa 100644
--- a/src/test/run-pass/issue-18655.rs
+++ b/src/test/ui/run-pass/issues/issue-18655.rs
diff --git a/src/test/run-pass/issue-1866.rs b/src/test/ui/run-pass/issues/issue-1866.rs
index 2c346b93f5e..2c346b93f5e 100644
--- a/src/test/run-pass/issue-1866.rs
+++ b/src/test/ui/run-pass/issues/issue-1866.rs
diff --git a/src/test/run-pass/issue-18661.rs b/src/test/ui/run-pass/issues/issue-18661.rs
index 4287f449c6f..4287f449c6f 100644
--- a/src/test/run-pass/issue-18661.rs
+++ b/src/test/ui/run-pass/issues/issue-18661.rs
diff --git a/src/test/run-pass/issue-18685.rs b/src/test/ui/run-pass/issues/issue-18685.rs
index b569dbc8062..b569dbc8062 100644
--- a/src/test/run-pass/issue-18685.rs
+++ b/src/test/ui/run-pass/issues/issue-18685.rs
diff --git a/src/test/run-pass/issue-18711.rs b/src/test/ui/run-pass/issues/issue-18711.rs
index 8239d74d6df..8239d74d6df 100644
--- a/src/test/run-pass/issue-18711.rs
+++ b/src/test/ui/run-pass/issues/issue-18711.rs
diff --git a/src/test/run-pass/issue-18738.rs b/src/test/ui/run-pass/issues/issue-18738.rs
index 819ec532ed2..819ec532ed2 100644
--- a/src/test/run-pass/issue-18738.rs
+++ b/src/test/ui/run-pass/issues/issue-18738.rs
diff --git a/src/test/run-pass/issue-18767.rs b/src/test/ui/run-pass/issues/issue-18767.rs
index 264985b791e..264985b791e 100644
--- a/src/test/run-pass/issue-18767.rs
+++ b/src/test/ui/run-pass/issues/issue-18767.rs
diff --git a/src/test/run-pass/issue-18804/auxiliary/lib.rs b/src/test/ui/run-pass/issues/issue-18804/auxiliary/lib.rs
index 06d454b2c89..06d454b2c89 100644
--- a/src/test/run-pass/issue-18804/auxiliary/lib.rs
+++ b/src/test/ui/run-pass/issues/issue-18804/auxiliary/lib.rs
diff --git a/src/test/run-pass/issue-18804/main.rs b/src/test/ui/run-pass/issues/issue-18804/main.rs
index b5aa0520349..b5aa0520349 100644
--- a/src/test/run-pass/issue-18804/main.rs
+++ b/src/test/ui/run-pass/issues/issue-18804/main.rs
diff --git a/src/test/run-pass/issue-18809.rs b/src/test/ui/run-pass/issues/issue-18809.rs
index b646fa9e62d..b646fa9e62d 100644
--- a/src/test/run-pass/issue-18809.rs
+++ b/src/test/ui/run-pass/issues/issue-18809.rs
diff --git a/src/test/run-pass/issue-18845.rs b/src/test/ui/run-pass/issues/issue-18845.rs
index 241408ddef1..241408ddef1 100644
--- a/src/test/run-pass/issue-18845.rs
+++ b/src/test/ui/run-pass/issues/issue-18845.rs
diff --git a/src/test/run-pass/issue-18859.rs b/src/test/ui/run-pass/issues/issue-18859.rs
index 7c7501d3420..7c7501d3420 100644
--- a/src/test/run-pass/issue-18859.rs
+++ b/src/test/ui/run-pass/issues/issue-18859.rs
diff --git a/src/test/run-pass/issue-18906.rs b/src/test/ui/run-pass/issues/issue-18906.rs
index 7cc61dd2532..7cc61dd2532 100644
--- a/src/test/run-pass/issue-18906.rs
+++ b/src/test/ui/run-pass/issues/issue-18906.rs
diff --git a/src/test/run-pass/issue-18913.rs b/src/test/ui/run-pass/issues/issue-18913.rs
index 9bb1371045e..9bb1371045e 100644
--- a/src/test/run-pass/issue-18913.rs
+++ b/src/test/ui/run-pass/issues/issue-18913.rs
diff --git a/src/test/run-pass/issue-18937-1.rs b/src/test/ui/run-pass/issues/issue-18937-1.rs
index 7a24d087b44..7a24d087b44 100644
--- a/src/test/run-pass/issue-18937-1.rs
+++ b/src/test/ui/run-pass/issues/issue-18937-1.rs
diff --git a/src/test/run-pass/issue-18988.rs b/src/test/ui/run-pass/issues/issue-18988.rs
index e41ac6bdbeb..e41ac6bdbeb 100644
--- a/src/test/run-pass/issue-18988.rs
+++ b/src/test/ui/run-pass/issues/issue-18988.rs
diff --git a/src/test/run-pass/issue-19001.rs b/src/test/ui/run-pass/issues/issue-19001.rs
index 3340ed1ffd9..3340ed1ffd9 100644
--- a/src/test/run-pass/issue-19001.rs
+++ b/src/test/ui/run-pass/issues/issue-19001.rs
diff --git a/src/test/run-pass/issue-19037.rs b/src/test/ui/run-pass/issues/issue-19037.rs
index 0735693a4bd..0735693a4bd 100644
--- a/src/test/run-pass/issue-19037.rs
+++ b/src/test/ui/run-pass/issues/issue-19037.rs
diff --git a/src/test/run-pass/issue-19081.rs b/src/test/ui/run-pass/issues/issue-19081.rs
index 8e2fa2b6197..8e2fa2b6197 100644
--- a/src/test/run-pass/issue-19081.rs
+++ b/src/test/ui/run-pass/issues/issue-19081.rs
diff --git a/src/test/run-pass/issue-19097.rs b/src/test/ui/run-pass/issues/issue-19097.rs
index ca4b72f9e5b..ca4b72f9e5b 100644
--- a/src/test/run-pass/issue-19097.rs
+++ b/src/test/ui/run-pass/issues/issue-19097.rs
diff --git a/src/test/run-pass/issue-19098.rs b/src/test/ui/run-pass/issues/issue-19098.rs
index e526dd2903e..e526dd2903e 100644
--- a/src/test/run-pass/issue-19098.rs
+++ b/src/test/ui/run-pass/issues/issue-19098.rs
diff --git a/src/test/run-pass/issue-19102.rs b/src/test/ui/run-pass/issues/issue-19102.rs
index da2af779217..da2af779217 100644
--- a/src/test/run-pass/issue-19102.rs
+++ b/src/test/ui/run-pass/issues/issue-19102.rs
diff --git a/src/test/run-pass/issue-19127.rs b/src/test/ui/run-pass/issues/issue-19127.rs
index 8d169917cad..8d169917cad 100644
--- a/src/test/run-pass/issue-19127.rs
+++ b/src/test/ui/run-pass/issues/issue-19127.rs
diff --git a/src/test/run-pass/issue-19129-1.rs b/src/test/ui/run-pass/issues/issue-19129-1.rs
index f9b605c44e9..f9b605c44e9 100644
--- a/src/test/run-pass/issue-19129-1.rs
+++ b/src/test/ui/run-pass/issues/issue-19129-1.rs
diff --git a/src/test/run-pass/issue-19129-2.rs b/src/test/ui/run-pass/issues/issue-19129-2.rs
index 47b8aaacdad..47b8aaacdad 100644
--- a/src/test/run-pass/issue-19129-2.rs
+++ b/src/test/ui/run-pass/issues/issue-19129-2.rs
diff --git a/src/test/run-pass/issue-19135.rs b/src/test/ui/run-pass/issues/issue-19135.rs
index ca2098138ef..ca2098138ef 100644
--- a/src/test/run-pass/issue-19135.rs
+++ b/src/test/ui/run-pass/issues/issue-19135.rs
diff --git a/src/test/run-pass/issue-19244.rs b/src/test/ui/run-pass/issues/issue-19244.rs
index 92ac2e37b90..92ac2e37b90 100644
--- a/src/test/run-pass/issue-19244.rs
+++ b/src/test/ui/run-pass/issues/issue-19244.rs
diff --git a/src/test/run-pass/issue-19293.rs b/src/test/ui/run-pass/issues/issue-19293.rs
index 95ca3efb099..95ca3efb099 100644
--- a/src/test/run-pass/issue-19293.rs
+++ b/src/test/ui/run-pass/issues/issue-19293.rs
diff --git a/src/test/run-pass/issue-19340-1.rs b/src/test/ui/run-pass/issues/issue-19340-1.rs
index e553c244c86..e553c244c86 100644
--- a/src/test/run-pass/issue-19340-1.rs
+++ b/src/test/ui/run-pass/issues/issue-19340-1.rs
diff --git a/src/test/run-pass/issue-19340-2.rs b/src/test/ui/run-pass/issues/issue-19340-2.rs
index d7747201cbe..d7747201cbe 100644
--- a/src/test/run-pass/issue-19340-2.rs
+++ b/src/test/ui/run-pass/issues/issue-19340-2.rs
diff --git a/src/test/run-pass/issue-19358.rs b/src/test/ui/run-pass/issues/issue-19358.rs
index c0c210b3e96..c0c210b3e96 100644
--- a/src/test/run-pass/issue-19358.rs
+++ b/src/test/ui/run-pass/issues/issue-19358.rs
diff --git a/src/test/run-pass/issue-19367.rs b/src/test/ui/run-pass/issues/issue-19367.rs
index d5bb6ebb7de..d5bb6ebb7de 100644
--- a/src/test/run-pass/issue-19367.rs
+++ b/src/test/ui/run-pass/issues/issue-19367.rs
diff --git a/src/test/run-pass/issue-19398.rs b/src/test/ui/run-pass/issues/issue-19398.rs
index 2dc5a6e9979..2dc5a6e9979 100644
--- a/src/test/run-pass/issue-19398.rs
+++ b/src/test/ui/run-pass/issues/issue-19398.rs
diff --git a/src/test/run-pass/issue-19404.rs b/src/test/ui/run-pass/issues/issue-19404.rs
index c0f13b0b6c7..c0f13b0b6c7 100644
--- a/src/test/run-pass/issue-19404.rs
+++ b/src/test/ui/run-pass/issues/issue-19404.rs
diff --git a/src/test/run-pass/issue-19479.rs b/src/test/ui/run-pass/issues/issue-19479.rs
index 7557c1b44e0..7557c1b44e0 100644
--- a/src/test/run-pass/issue-19479.rs
+++ b/src/test/ui/run-pass/issues/issue-19479.rs
diff --git a/src/test/run-pass/issue-19499.rs b/src/test/ui/run-pass/issues/issue-19499.rs
index 069ceadf916..069ceadf916 100644
--- a/src/test/run-pass/issue-19499.rs
+++ b/src/test/ui/run-pass/issues/issue-19499.rs
diff --git a/src/test/run-pass/issue-19631.rs b/src/test/ui/run-pass/issues/issue-19631.rs
index 562d2e4169e..562d2e4169e 100644
--- a/src/test/run-pass/issue-19631.rs
+++ b/src/test/ui/run-pass/issues/issue-19631.rs
diff --git a/src/test/run-pass/issue-19632.rs b/src/test/ui/run-pass/issues/issue-19632.rs
index 1cb20011c21..1cb20011c21 100644
--- a/src/test/run-pass/issue-19632.rs
+++ b/src/test/ui/run-pass/issues/issue-19632.rs
diff --git a/src/test/run-pass/issue-1974.rs b/src/test/ui/run-pass/issues/issue-1974.rs
index 7b33b4e7a4f..7b33b4e7a4f 100644
--- a/src/test/run-pass/issue-1974.rs
+++ b/src/test/ui/run-pass/issues/issue-1974.rs
diff --git a/src/test/run-pass/issue-19811-escape-unicode.rs b/src/test/ui/run-pass/issues/issue-19811-escape-unicode.rs
index b447ffd69b4..b447ffd69b4 100644
--- a/src/test/run-pass/issue-19811-escape-unicode.rs
+++ b/src/test/ui/run-pass/issues/issue-19811-escape-unicode.rs
diff --git a/src/test/run-pass/issue-19850.rs b/src/test/ui/run-pass/issues/issue-19850.rs
index 15ca6a9d4c1..15ca6a9d4c1 100644
--- a/src/test/run-pass/issue-19850.rs
+++ b/src/test/ui/run-pass/issues/issue-19850.rs
diff --git a/src/test/run-pass/issue-19982.rs b/src/test/ui/run-pass/issues/issue-19982.rs
index 30edf24e8b1..30edf24e8b1 100644
--- a/src/test/run-pass/issue-19982.rs
+++ b/src/test/ui/run-pass/issues/issue-19982.rs
diff --git a/src/test/run-pass/issue-20009.rs b/src/test/ui/run-pass/issues/issue-20009.rs
index 9d433eabe62..9d433eabe62 100644
--- a/src/test/run-pass/issue-20009.rs
+++ b/src/test/ui/run-pass/issues/issue-20009.rs
diff --git a/src/test/run-pass/issue-20055-box-trait.rs b/src/test/ui/run-pass/issues/issue-20055-box-trait.rs
index 7e89cfe24e1..7e89cfe24e1 100644
--- a/src/test/run-pass/issue-20055-box-trait.rs
+++ b/src/test/ui/run-pass/issues/issue-20055-box-trait.rs
diff --git a/src/test/run-pass/issue-20055-box-unsized-array.rs b/src/test/ui/run-pass/issues/issue-20055-box-unsized-array.rs
index 5af5186e94f..5af5186e94f 100644
--- a/src/test/run-pass/issue-20055-box-unsized-array.rs
+++ b/src/test/ui/run-pass/issues/issue-20055-box-unsized-array.rs
diff --git a/src/test/run-pass/issue-20091.rs b/src/test/ui/run-pass/issues/issue-20091.rs
index 7671b43d493..7671b43d493 100644
--- a/src/test/run-pass/issue-20091.rs
+++ b/src/test/ui/run-pass/issues/issue-20091.rs
diff --git a/src/test/run-pass/issue-20174.rs b/src/test/ui/run-pass/issues/issue-20174.rs
index 07273881272..07273881272 100644
--- a/src/test/run-pass/issue-20174.rs
+++ b/src/test/ui/run-pass/issues/issue-20174.rs
diff --git a/src/test/run-pass/issue-20186.rs b/src/test/ui/run-pass/issues/issue-20186.rs
index b3895e36a19..b3895e36a19 100644
--- a/src/test/run-pass/issue-20186.rs
+++ b/src/test/ui/run-pass/issues/issue-20186.rs
diff --git a/src/test/run-pass/issue-20313.rs b/src/test/ui/run-pass/issues/issue-20313.rs
index 0e5eaf857f3..0e5eaf857f3 100644
--- a/src/test/run-pass/issue-20313.rs
+++ b/src/test/ui/run-pass/issues/issue-20313.rs
diff --git a/src/test/run-pass/issue-20343.rs b/src/test/ui/run-pass/issues/issue-20343.rs
index 70064f4e267..70064f4e267 100644
--- a/src/test/run-pass/issue-20343.rs
+++ b/src/test/ui/run-pass/issues/issue-20343.rs
diff --git a/src/test/run-pass/issue-20389.rs b/src/test/ui/run-pass/issues/issue-20389.rs
index 03c7e9f8db7..03c7e9f8db7 100644
--- a/src/test/run-pass/issue-20389.rs
+++ b/src/test/ui/run-pass/issues/issue-20389.rs
diff --git a/src/test/run-pass/issue-20396.rs b/src/test/ui/run-pass/issues/issue-20396.rs
index f607ed373b3..f607ed373b3 100644
--- a/src/test/run-pass/issue-20396.rs
+++ b/src/test/ui/run-pass/issues/issue-20396.rs
diff --git a/src/test/run-pass/issue-20414.rs b/src/test/ui/run-pass/issues/issue-20414.rs
index d2e2d9bd6ef..d2e2d9bd6ef 100644
--- a/src/test/run-pass/issue-20414.rs
+++ b/src/test/ui/run-pass/issues/issue-20414.rs
diff --git a/src/test/run-pass/issue-20427.rs b/src/test/ui/run-pass/issues/issue-20427.rs
index 985ca067350..985ca067350 100644
--- a/src/test/run-pass/issue-20427.rs
+++ b/src/test/ui/run-pass/issues/issue-20427.rs
diff --git a/src/test/run-pass/issue-20454.rs b/src/test/ui/run-pass/issues/issue-20454.rs
index 15cb79ac6a8..15cb79ac6a8 100644
--- a/src/test/run-pass/issue-20454.rs
+++ b/src/test/ui/run-pass/issues/issue-20454.rs
diff --git a/src/test/run-pass/issue-20544.rs b/src/test/ui/run-pass/issues/issue-20544.rs
index 322c326ef0d..322c326ef0d 100644
--- a/src/test/run-pass/issue-20544.rs
+++ b/src/test/ui/run-pass/issues/issue-20544.rs
diff --git a/src/test/run-pass/issue-20575.rs b/src/test/ui/run-pass/issues/issue-20575.rs
index 7db7e3b28e8..7db7e3b28e8 100644
--- a/src/test/run-pass/issue-20575.rs
+++ b/src/test/ui/run-pass/issues/issue-20575.rs
diff --git a/src/test/run-pass/issue-20616.rs b/src/test/ui/run-pass/issues/issue-20616.rs
index 5727f54cd70..5727f54cd70 100644
--- a/src/test/run-pass/issue-20616.rs
+++ b/src/test/ui/run-pass/issues/issue-20616.rs
diff --git a/src/test/run-pass/issue-2063-resource.rs b/src/test/ui/run-pass/issues/issue-2063-resource.rs
index c3a0dc67e83..c3a0dc67e83 100644
--- a/src/test/run-pass/issue-2063-resource.rs
+++ b/src/test/ui/run-pass/issues/issue-2063-resource.rs
diff --git a/src/test/run-pass/issue-2063.rs b/src/test/ui/run-pass/issues/issue-2063.rs
index 5be4f8e8e73..5be4f8e8e73 100644
--- a/src/test/run-pass/issue-2063.rs
+++ b/src/test/ui/run-pass/issues/issue-2063.rs
diff --git a/src/test/run-pass/issue-20644.rs b/src/test/ui/run-pass/issues/issue-20644.rs
index 65a67d0b41a..65a67d0b41a 100644
--- a/src/test/run-pass/issue-20644.rs
+++ b/src/test/ui/run-pass/issues/issue-20644.rs
diff --git a/src/test/run-pass/issue-20676.rs b/src/test/ui/run-pass/issues/issue-20676.rs
index a3016227413..a3016227413 100644
--- a/src/test/run-pass/issue-20676.rs
+++ b/src/test/ui/run-pass/issues/issue-20676.rs
diff --git a/src/test/run-pass/issue-2074.rs b/src/test/ui/run-pass/issues/issue-2074.rs
index bd844b7720c..bd844b7720c 100644
--- a/src/test/run-pass/issue-2074.rs
+++ b/src/test/ui/run-pass/issues/issue-2074.rs
diff --git a/src/test/run-pass/issue-20763-1.rs b/src/test/ui/run-pass/issues/issue-20763-1.rs
index 98270099df9..98270099df9 100644
--- a/src/test/run-pass/issue-20763-1.rs
+++ b/src/test/ui/run-pass/issues/issue-20763-1.rs
diff --git a/src/test/run-pass/issue-20763-2.rs b/src/test/ui/run-pass/issues/issue-20763-2.rs
index 340670b4120..340670b4120 100644
--- a/src/test/run-pass/issue-20763-2.rs
+++ b/src/test/ui/run-pass/issues/issue-20763-2.rs
diff --git a/src/test/run-pass/issue-20797.rs b/src/test/ui/run-pass/issues/issue-20797.rs
index 3a4be580fc3..3a4be580fc3 100644
--- a/src/test/run-pass/issue-20797.rs
+++ b/src/test/ui/run-pass/issues/issue-20797.rs
diff --git a/src/test/run-pass/issue-20803.rs b/src/test/ui/run-pass/issues/issue-20803.rs
index 2c00510ba97..2c00510ba97 100644
--- a/src/test/run-pass/issue-20803.rs
+++ b/src/test/ui/run-pass/issues/issue-20803.rs
diff --git a/src/test/run-pass/issue-20823.rs b/src/test/ui/run-pass/issues/issue-20823.rs
index 4d31d0cedb6..4d31d0cedb6 100644
--- a/src/test/run-pass/issue-20823.rs
+++ b/src/test/ui/run-pass/issues/issue-20823.rs
diff --git a/src/test/run-pass/issue-20825.rs b/src/test/ui/run-pass/issues/issue-20825.rs
index 3c76b4bedff..3c76b4bedff 100644
--- a/src/test/run-pass/issue-20825.rs
+++ b/src/test/ui/run-pass/issues/issue-20825.rs
diff --git a/src/test/run-pass/issue-20847.rs b/src/test/ui/run-pass/issues/issue-20847.rs
index d2c33560545..d2c33560545 100644
--- a/src/test/run-pass/issue-20847.rs
+++ b/src/test/ui/run-pass/issues/issue-20847.rs
diff --git a/src/test/run-pass/issue-20953.rs b/src/test/ui/run-pass/issues/issue-20953.rs
index 647302bbc93..647302bbc93 100644
--- a/src/test/run-pass/issue-20953.rs
+++ b/src/test/ui/run-pass/issues/issue-20953.rs
diff --git a/src/test/run-pass/issue-21033.rs b/src/test/ui/run-pass/issues/issue-21033.rs
index 00e792c9a00..00e792c9a00 100644
--- a/src/test/run-pass/issue-21033.rs
+++ b/src/test/ui/run-pass/issues/issue-21033.rs
diff --git a/src/test/run-pass/issue-21058.rs b/src/test/ui/run-pass/issues/issue-21058.rs
index 862439e21f4..862439e21f4 100644
--- a/src/test/run-pass/issue-21058.rs
+++ b/src/test/ui/run-pass/issues/issue-21058.rs
diff --git a/src/test/run-pass/issue-21140.rs b/src/test/ui/run-pass/issues/issue-21140.rs
index c19f3327fbb..c19f3327fbb 100644
--- a/src/test/run-pass/issue-21140.rs
+++ b/src/test/ui/run-pass/issues/issue-21140.rs
diff --git a/src/test/run-pass/issue-21174.rs b/src/test/ui/run-pass/issues/issue-21174.rs
index 6c0280de36d..6c0280de36d 100644
--- a/src/test/run-pass/issue-21174.rs
+++ b/src/test/ui/run-pass/issues/issue-21174.rs
diff --git a/src/test/run-pass/issue-21245.rs b/src/test/ui/run-pass/issues/issue-21245.rs
index e3340d9767d..e3340d9767d 100644
--- a/src/test/run-pass/issue-21245.rs
+++ b/src/test/ui/run-pass/issues/issue-21245.rs
diff --git a/src/test/run-pass/issue-21291.rs b/src/test/ui/run-pass/issues/issue-21291.rs
index 6b45a4d0a52..6b45a4d0a52 100644
--- a/src/test/run-pass/issue-21291.rs
+++ b/src/test/ui/run-pass/issues/issue-21291.rs
diff --git a/src/test/run-pass/issue-21306.rs b/src/test/ui/run-pass/issues/issue-21306.rs
index bc2c7f09374..bc2c7f09374 100644
--- a/src/test/run-pass/issue-21306.rs
+++ b/src/test/ui/run-pass/issues/issue-21306.rs
diff --git a/src/test/run-pass/issue-21361.rs b/src/test/ui/run-pass/issues/issue-21361.rs
index b89e07ef31f..b89e07ef31f 100644
--- a/src/test/run-pass/issue-21361.rs
+++ b/src/test/ui/run-pass/issues/issue-21361.rs
diff --git a/src/test/run-pass/issue-21363.rs b/src/test/ui/run-pass/issues/issue-21363.rs
index 608c60d03b3..608c60d03b3 100644
--- a/src/test/run-pass/issue-21363.rs
+++ b/src/test/ui/run-pass/issues/issue-21363.rs
diff --git a/src/test/run-pass/issue-21384.rs b/src/test/ui/run-pass/issues/issue-21384.rs
index 2ef66809a8d..2ef66809a8d 100644
--- a/src/test/run-pass/issue-21384.rs
+++ b/src/test/ui/run-pass/issues/issue-21384.rs
diff --git a/src/test/run-pass/issue-21400.rs b/src/test/ui/run-pass/issues/issue-21400.rs
index 6715b71a5f5..6715b71a5f5 100644
--- a/src/test/run-pass/issue-21400.rs
+++ b/src/test/ui/run-pass/issues/issue-21400.rs
diff --git a/src/test/run-pass/issue-21402.rs b/src/test/ui/run-pass/issues/issue-21402.rs
index 7fd329da2b7..7fd329da2b7 100644
--- a/src/test/run-pass/issue-21402.rs
+++ b/src/test/ui/run-pass/issues/issue-21402.rs
diff --git a/src/test/run-pass/issue-21475.rs b/src/test/ui/run-pass/issues/issue-21475.rs
index 99839b56506..99839b56506 100644
--- a/src/test/run-pass/issue-21475.rs
+++ b/src/test/ui/run-pass/issues/issue-21475.rs
diff --git a/src/test/run-pass/issue-21486.rs b/src/test/ui/run-pass/issues/issue-21486.rs
index a61f294465d..a61f294465d 100644
--- a/src/test/run-pass/issue-21486.rs
+++ b/src/test/ui/run-pass/issues/issue-21486.rs
diff --git a/src/test/run-pass/issue-21520.rs b/src/test/ui/run-pass/issues/issue-21520.rs
index b512fd49193..b512fd49193 100644
--- a/src/test/run-pass/issue-21520.rs
+++ b/src/test/ui/run-pass/issues/issue-21520.rs
diff --git a/src/test/run-pass/issue-21562.rs b/src/test/ui/run-pass/issues/issue-21562.rs
index 51896786d0c..51896786d0c 100644
--- a/src/test/run-pass/issue-21562.rs
+++ b/src/test/ui/run-pass/issues/issue-21562.rs
diff --git a/src/test/run-pass/issue-21622.rs b/src/test/ui/run-pass/issues/issue-21622.rs
index 32f52308af1..32f52308af1 100644
--- a/src/test/run-pass/issue-21622.rs
+++ b/src/test/ui/run-pass/issues/issue-21622.rs
diff --git a/src/test/run-pass/issue-21634.rs b/src/test/ui/run-pass/issues/issue-21634.rs
index 08cc993ce4f..08cc993ce4f 100644
--- a/src/test/run-pass/issue-21634.rs
+++ b/src/test/ui/run-pass/issues/issue-21634.rs
diff --git a/src/test/run-pass/issue-21655.rs b/src/test/ui/run-pass/issues/issue-21655.rs
index bf01873bea5..bf01873bea5 100644
--- a/src/test/run-pass/issue-21655.rs
+++ b/src/test/ui/run-pass/issues/issue-21655.rs
diff --git a/src/test/run-pass/issue-21721.rs b/src/test/ui/run-pass/issues/issue-21721.rs
index d1fc61ff6a5..d1fc61ff6a5 100644
--- a/src/test/run-pass/issue-21721.rs
+++ b/src/test/ui/run-pass/issues/issue-21721.rs
diff --git a/src/test/run-pass/issue-21726.rs b/src/test/ui/run-pass/issues/issue-21726.rs
index 9fdd89e25a1..9fdd89e25a1 100644
--- a/src/test/run-pass/issue-21726.rs
+++ b/src/test/ui/run-pass/issues/issue-21726.rs
diff --git a/src/test/run-pass/issue-21891.rs b/src/test/ui/run-pass/issues/issue-21891.rs
index 0e35de7cdcb..0e35de7cdcb 100644
--- a/src/test/run-pass/issue-21891.rs
+++ b/src/test/ui/run-pass/issues/issue-21891.rs
diff --git a/src/test/run-pass/issue-2190-1.rs b/src/test/ui/run-pass/issues/issue-2190-1.rs
index 8cc23c883ed..8cc23c883ed 100644
--- a/src/test/run-pass/issue-2190-1.rs
+++ b/src/test/ui/run-pass/issues/issue-2190-1.rs
diff --git a/src/test/run-pass/issue-21909.rs b/src/test/ui/run-pass/issues/issue-21909.rs
index 6a5d76de8d3..6a5d76de8d3 100644
--- a/src/test/run-pass/issue-21909.rs
+++ b/src/test/ui/run-pass/issues/issue-21909.rs
diff --git a/src/test/run-pass/issue-21922.rs b/src/test/ui/run-pass/issues/issue-21922.rs
index 2f538b365e1..2f538b365e1 100644
--- a/src/test/run-pass/issue-21922.rs
+++ b/src/test/ui/run-pass/issues/issue-21922.rs
diff --git a/src/test/run-pass/issue-22008.rs b/src/test/ui/run-pass/issues/issue-22008.rs
index 3e145122e5a..3e145122e5a 100644
--- a/src/test/run-pass/issue-22008.rs
+++ b/src/test/ui/run-pass/issues/issue-22008.rs
diff --git a/src/test/run-pass/issue-22036.rs b/src/test/ui/run-pass/issues/issue-22036.rs
index 43fb286f0ec..43fb286f0ec 100644
--- a/src/test/run-pass/issue-22036.rs
+++ b/src/test/ui/run-pass/issues/issue-22036.rs
diff --git a/src/test/run-pass/issue-22066.rs b/src/test/ui/run-pass/issues/issue-22066.rs
index c2486f0dcb4..c2486f0dcb4 100644
--- a/src/test/run-pass/issue-22066.rs
+++ b/src/test/ui/run-pass/issues/issue-22066.rs
diff --git a/src/test/run-pass/issue-2214.rs b/src/test/ui/run-pass/issues/issue-2214.rs
index a87af59ee79..a87af59ee79 100644
--- a/src/test/run-pass/issue-2214.rs
+++ b/src/test/ui/run-pass/issues/issue-2214.rs
diff --git a/src/test/run-pass/issue-2216.rs b/src/test/ui/run-pass/issues/issue-2216.rs
index c2f74a9d653..c2f74a9d653 100644
--- a/src/test/run-pass/issue-2216.rs
+++ b/src/test/ui/run-pass/issues/issue-2216.rs
diff --git a/src/test/run-pass/issue-22258.rs b/src/test/ui/run-pass/issues/issue-22258.rs
index f749131345e..f749131345e 100644
--- a/src/test/run-pass/issue-22258.rs
+++ b/src/test/ui/run-pass/issues/issue-22258.rs
diff --git a/src/test/run-pass/issue-22346.rs b/src/test/ui/run-pass/issues/issue-22346.rs
index 895b9d222a8..895b9d222a8 100644
--- a/src/test/run-pass/issue-22346.rs
+++ b/src/test/ui/run-pass/issues/issue-22346.rs
diff --git a/src/test/run-pass/issue-22356.rs b/src/test/ui/run-pass/issues/issue-22356.rs
index 51a871d59b3..51a871d59b3 100644
--- a/src/test/run-pass/issue-22356.rs
+++ b/src/test/ui/run-pass/issues/issue-22356.rs
diff --git a/src/test/run-pass/issue-22375.rs b/src/test/ui/run-pass/issues/issue-22375.rs
index c6e941d844d..c6e941d844d 100644
--- a/src/test/run-pass/issue-22375.rs
+++ b/src/test/ui/run-pass/issues/issue-22375.rs
diff --git a/src/test/run-pass/issue-22403.rs b/src/test/ui/run-pass/issues/issue-22403.rs
index 7bd66e5a83d..7bd66e5a83d 100644
--- a/src/test/run-pass/issue-22403.rs
+++ b/src/test/ui/run-pass/issues/issue-22403.rs
diff --git a/src/test/run-pass/issue-22426.rs b/src/test/ui/run-pass/issues/issue-22426.rs
index ad6ade4c59f..ad6ade4c59f 100644
--- a/src/test/run-pass/issue-22426.rs
+++ b/src/test/ui/run-pass/issues/issue-22426.rs
diff --git a/src/test/run-pass/issue-22463.rs b/src/test/ui/run-pass/issues/issue-22463.rs
index 3aeb92f0bec..3aeb92f0bec 100644
--- a/src/test/run-pass/issue-22463.rs
+++ b/src/test/ui/run-pass/issues/issue-22463.rs
diff --git a/src/test/run-pass/issue-22471.rs b/src/test/ui/run-pass/issues/issue-22471.rs
index 1e7084b1ab3..1e7084b1ab3 100644
--- a/src/test/run-pass/issue-22471.rs
+++ b/src/test/ui/run-pass/issues/issue-22471.rs
diff --git a/src/test/run-pass/issue-22536-copy-mustnt-zero.rs b/src/test/ui/run-pass/issues/issue-22536-copy-mustnt-zero.rs
index af99b11c253..af99b11c253 100644
--- a/src/test/run-pass/issue-22536-copy-mustnt-zero.rs
+++ b/src/test/ui/run-pass/issues/issue-22536-copy-mustnt-zero.rs
diff --git a/src/test/run-pass/issue-22546.rs b/src/test/ui/run-pass/issues/issue-22546.rs
index 8516d344e1c..8516d344e1c 100644
--- a/src/test/run-pass/issue-22546.rs
+++ b/src/test/ui/run-pass/issues/issue-22546.rs
diff --git a/src/test/run-pass/issue-22577.rs b/src/test/ui/run-pass/issues/issue-22577.rs
index 83ffdb3bf44..83ffdb3bf44 100644
--- a/src/test/run-pass/issue-22577.rs
+++ b/src/test/ui/run-pass/issues/issue-22577.rs
diff --git a/src/test/run-pass/issue-22629.rs b/src/test/ui/run-pass/issues/issue-22629.rs
index 07ca79295bf..07ca79295bf 100644
--- a/src/test/run-pass/issue-22629.rs
+++ b/src/test/ui/run-pass/issues/issue-22629.rs
diff --git a/src/test/run-pass/issue-22777.rs b/src/test/ui/run-pass/issues/issue-22777.rs
index 4df46c0e2e1..4df46c0e2e1 100644
--- a/src/test/run-pass/issue-22777.rs
+++ b/src/test/ui/run-pass/issues/issue-22777.rs
diff --git a/src/test/run-pass/issue-22781.rs b/src/test/ui/run-pass/issues/issue-22781.rs
index 1aa32f20142..1aa32f20142 100644
--- a/src/test/run-pass/issue-22781.rs
+++ b/src/test/ui/run-pass/issues/issue-22781.rs
diff --git a/src/test/run-pass/issue-22814.rs b/src/test/ui/run-pass/issues/issue-22814.rs
index 6afcd770746..6afcd770746 100644
--- a/src/test/run-pass/issue-22814.rs
+++ b/src/test/ui/run-pass/issues/issue-22814.rs
diff --git a/src/test/run-pass/issue-22828.rs b/src/test/ui/run-pass/issues/issue-22828.rs
index d6a4d7834df..d6a4d7834df 100644
--- a/src/test/run-pass/issue-22828.rs
+++ b/src/test/ui/run-pass/issues/issue-22828.rs
diff --git a/src/test/run-pass/issue-2284.rs b/src/test/ui/run-pass/issues/issue-2284.rs
index d606c52607a..d606c52607a 100644
--- a/src/test/run-pass/issue-2284.rs
+++ b/src/test/ui/run-pass/issues/issue-2284.rs
diff --git a/src/test/run-pass/issue-22864-1.rs b/src/test/ui/run-pass/issues/issue-22864-1.rs
index df1e3c5de52..df1e3c5de52 100644
--- a/src/test/run-pass/issue-22864-1.rs
+++ b/src/test/ui/run-pass/issues/issue-22864-1.rs
diff --git a/src/test/run-pass/issue-22864-2.rs b/src/test/ui/run-pass/issues/issue-22864-2.rs
index f9360af011b..f9360af011b 100644
--- a/src/test/run-pass/issue-22864-2.rs
+++ b/src/test/ui/run-pass/issues/issue-22864-2.rs
diff --git a/src/test/run-pass/issue-2288.rs b/src/test/ui/run-pass/issues/issue-2288.rs
index b8353ea4413..b8353ea4413 100644
--- a/src/test/run-pass/issue-2288.rs
+++ b/src/test/ui/run-pass/issues/issue-2288.rs
diff --git a/src/test/run-pass/issue-22894.rs b/src/test/ui/run-pass/issues/issue-22894.rs
index 8acd88deef2..8acd88deef2 100644
--- a/src/test/run-pass/issue-22894.rs
+++ b/src/test/ui/run-pass/issues/issue-22894.rs
diff --git a/src/test/run-pass/issue-22992-2.rs b/src/test/ui/run-pass/issues/issue-22992-2.rs
index 070d4d11759..070d4d11759 100644
--- a/src/test/run-pass/issue-22992-2.rs
+++ b/src/test/ui/run-pass/issues/issue-22992-2.rs
diff --git a/src/test/run-pass/issue-22992.rs b/src/test/ui/run-pass/issues/issue-22992.rs
index dc612fc0bc7..dc612fc0bc7 100644
--- a/src/test/run-pass/issue-22992.rs
+++ b/src/test/ui/run-pass/issues/issue-22992.rs
diff --git a/src/test/run-pass/issue-23036.rs b/src/test/ui/run-pass/issues/issue-23036.rs
index c3c9ede5ada..c3c9ede5ada 100644
--- a/src/test/run-pass/issue-23036.rs
+++ b/src/test/ui/run-pass/issues/issue-23036.rs
diff --git a/src/test/run-pass/issue-2311-2.rs b/src/test/ui/run-pass/issues/issue-2311-2.rs
index a47c1512552..a47c1512552 100644
--- a/src/test/run-pass/issue-2311-2.rs
+++ b/src/test/ui/run-pass/issues/issue-2311-2.rs
diff --git a/src/test/run-pass/issue-2311.rs b/src/test/ui/run-pass/issues/issue-2311.rs
index 5a086fd6fc2..5a086fd6fc2 100644
--- a/src/test/run-pass/issue-2311.rs
+++ b/src/test/ui/run-pass/issues/issue-2311.rs
diff --git a/src/test/run-pass/issue-2312.rs b/src/test/ui/run-pass/issues/issue-2312.rs
index 6f479c62117..6f479c62117 100644
--- a/src/test/run-pass/issue-2312.rs
+++ b/src/test/ui/run-pass/issues/issue-2312.rs
diff --git a/src/test/run-pass/issue-2316-c.rs b/src/test/ui/run-pass/issues/issue-2316-c.rs
index 158e4570f2c..158e4570f2c 100644
--- a/src/test/run-pass/issue-2316-c.rs
+++ b/src/test/ui/run-pass/issues/issue-2316-c.rs
diff --git a/src/test/run-pass/issue-23208.rs b/src/test/ui/run-pass/issues/issue-23208.rs
index ee3c16be731..ee3c16be731 100644
--- a/src/test/run-pass/issue-23208.rs
+++ b/src/test/ui/run-pass/issues/issue-23208.rs
diff --git a/src/test/run-pass/issue-23261.rs b/src/test/ui/run-pass/issues/issue-23261.rs
index fc806f5429a..fc806f5429a 100644
--- a/src/test/run-pass/issue-23261.rs
+++ b/src/test/ui/run-pass/issues/issue-23261.rs
diff --git a/src/test/run-pass/issue-23304-1.rs b/src/test/ui/run-pass/issues/issue-23304-1.rs
index ec6cf5a5628..ec6cf5a5628 100644
--- a/src/test/run-pass/issue-23304-1.rs
+++ b/src/test/ui/run-pass/issues/issue-23304-1.rs
diff --git a/src/test/run-pass/issue-23304-2.rs b/src/test/ui/run-pass/issues/issue-23304-2.rs
index 5989b7e9c6a..5989b7e9c6a 100644
--- a/src/test/run-pass/issue-23304-2.rs
+++ b/src/test/ui/run-pass/issues/issue-23304-2.rs
diff --git a/src/test/run-pass/issue-23311.rs b/src/test/ui/run-pass/issues/issue-23311.rs
index fc286184dcb..fc286184dcb 100644
--- a/src/test/run-pass/issue-23311.rs
+++ b/src/test/ui/run-pass/issues/issue-23311.rs
diff --git a/src/test/run-pass/issue-23336.rs b/src/test/ui/run-pass/issues/issue-23336.rs
index 21e51298444..21e51298444 100644
--- a/src/test/run-pass/issue-23336.rs
+++ b/src/test/ui/run-pass/issues/issue-23336.rs
diff --git a/src/test/run-pass/issue-23338-ensure-param-drop-order.rs b/src/test/ui/run-pass/issues/issue-23338-ensure-param-drop-order.rs
index 42c72e647fd..42c72e647fd 100644
--- a/src/test/run-pass/issue-23338-ensure-param-drop-order.rs
+++ b/src/test/ui/run-pass/issues/issue-23338-ensure-param-drop-order.rs
diff --git a/src/test/run-pass/issue-23338-params-outlive-temps-of-body.rs b/src/test/ui/run-pass/issues/issue-23338-params-outlive-temps-of-body.rs
index cb9e852e526..cb9e852e526 100644
--- a/src/test/run-pass/issue-23338-params-outlive-temps-of-body.rs
+++ b/src/test/ui/run-pass/issues/issue-23338-params-outlive-temps-of-body.rs
diff --git a/src/test/run-pass/issue-23406.rs b/src/test/ui/run-pass/issues/issue-23406.rs
index c3c1b755af8..c3c1b755af8 100644
--- a/src/test/run-pass/issue-23406.rs
+++ b/src/test/ui/run-pass/issues/issue-23406.rs
diff --git a/src/test/run-pass/issue-23433.rs b/src/test/ui/run-pass/issues/issue-23433.rs
index 9547b2f08a6..9547b2f08a6 100644
--- a/src/test/run-pass/issue-23433.rs
+++ b/src/test/ui/run-pass/issues/issue-23433.rs
diff --git a/src/test/run-pass/issue-23442.rs b/src/test/ui/run-pass/issues/issue-23442.rs
index 88b5a92620b..88b5a92620b 100644
--- a/src/test/run-pass/issue-23442.rs
+++ b/src/test/ui/run-pass/issues/issue-23442.rs
diff --git a/src/test/run-pass/issue-23477.rs b/src/test/ui/run-pass/issues/issue-23477.rs
index d4671c919b7..d4671c919b7 100644
--- a/src/test/run-pass/issue-23477.rs
+++ b/src/test/ui/run-pass/issues/issue-23477.rs
diff --git a/src/test/run-pass/issue-23485.rs b/src/test/ui/run-pass/issues/issue-23485.rs
index f176c60346b..f176c60346b 100644
--- a/src/test/run-pass/issue-23485.rs
+++ b/src/test/ui/run-pass/issues/issue-23485.rs
diff --git a/src/test/run-pass/issue-23491.rs b/src/test/ui/run-pass/issues/issue-23491.rs
index 5ec228217ed..5ec228217ed 100644
--- a/src/test/run-pass/issue-23491.rs
+++ b/src/test/ui/run-pass/issues/issue-23491.rs
diff --git a/src/test/run-pass/issue-23550.rs b/src/test/ui/run-pass/issues/issue-23550.rs
index 6e20662b702..6e20662b702 100644
--- a/src/test/run-pass/issue-23550.rs
+++ b/src/test/ui/run-pass/issues/issue-23550.rs
diff --git a/src/test/run-pass/issue-23611-enum-swap-in-drop.rs b/src/test/ui/run-pass/issues/issue-23611-enum-swap-in-drop.rs
index 09bc3fd0214..09bc3fd0214 100644
--- a/src/test/run-pass/issue-23611-enum-swap-in-drop.rs
+++ b/src/test/ui/run-pass/issues/issue-23611-enum-swap-in-drop.rs
diff --git a/src/test/run-pass/issue-23649-1.rs b/src/test/ui/run-pass/issues/issue-23649-1.rs
index a631898d868..a631898d868 100644
--- a/src/test/run-pass/issue-23649-1.rs
+++ b/src/test/ui/run-pass/issues/issue-23649-1.rs
diff --git a/src/test/run-pass/issue-23649-2.rs b/src/test/ui/run-pass/issues/issue-23649-2.rs
index c48ae414cc3..c48ae414cc3 100644
--- a/src/test/run-pass/issue-23649-2.rs
+++ b/src/test/ui/run-pass/issues/issue-23649-2.rs
diff --git a/src/test/run-pass/issue-23649-3.rs b/src/test/ui/run-pass/issues/issue-23649-3.rs
index 4aa6c53ef9e..4aa6c53ef9e 100644
--- a/src/test/run-pass/issue-23649-3.rs
+++ b/src/test/ui/run-pass/issues/issue-23649-3.rs
diff --git a/src/test/run-pass/issue-23699.rs b/src/test/ui/run-pass/issues/issue-23699.rs
index 1909be4df7b..1909be4df7b 100644
--- a/src/test/run-pass/issue-23699.rs
+++ b/src/test/ui/run-pass/issues/issue-23699.rs
diff --git a/src/test/run-pass/issue-23781.rs b/src/test/ui/run-pass/issues/issue-23781.rs
index 23ac8d2b782..23ac8d2b782 100644
--- a/src/test/run-pass/issue-23781.rs
+++ b/src/test/ui/run-pass/issues/issue-23781.rs
diff --git a/src/test/run-pass/issue-2380-b.rs b/src/test/ui/run-pass/issues/issue-2380-b.rs
index b7041624247..b7041624247 100644
--- a/src/test/run-pass/issue-2380-b.rs
+++ b/src/test/ui/run-pass/issues/issue-2380-b.rs
diff --git a/src/test/run-pass/issue-23808.rs b/src/test/ui/run-pass/issues/issue-23808.rs
index 1435a1b5d38..1435a1b5d38 100644
--- a/src/test/run-pass/issue-23808.rs
+++ b/src/test/ui/run-pass/issues/issue-23808.rs
diff --git a/src/test/run-pass/issue-23825.rs b/src/test/ui/run-pass/issues/issue-23825.rs
index 1b857d94c72..1b857d94c72 100644
--- a/src/test/run-pass/issue-23825.rs
+++ b/src/test/ui/run-pass/issues/issue-23825.rs
diff --git a/src/test/run-pass/issue-2383.rs b/src/test/ui/run-pass/issues/issue-2383.rs
index a497a9fda6a..a497a9fda6a 100644
--- a/src/test/run-pass/issue-2383.rs
+++ b/src/test/ui/run-pass/issues/issue-2383.rs
diff --git a/src/test/run-pass/issue-23833.rs b/src/test/ui/run-pass/issues/issue-23833.rs
index 7d63c41eb26..7d63c41eb26 100644
--- a/src/test/run-pass/issue-23833.rs
+++ b/src/test/ui/run-pass/issues/issue-23833.rs
diff --git a/src/test/run-pass/issue-23891.rs b/src/test/ui/run-pass/issues/issue-23891.rs
index 55536de9123..55536de9123 100644
--- a/src/test/run-pass/issue-23891.rs
+++ b/src/test/ui/run-pass/issues/issue-23891.rs
diff --git a/src/test/run-pass/issue-23898.rs b/src/test/ui/run-pass/issues/issue-23898.rs
index 3f5546ce83d..3f5546ce83d 100644
--- a/src/test/run-pass/issue-23898.rs
+++ b/src/test/ui/run-pass/issues/issue-23898.rs
diff --git a/src/test/run-pass/issue-23958.rs b/src/test/ui/run-pass/issues/issue-23958.rs
index 5f1c79a3c15..5f1c79a3c15 100644
--- a/src/test/run-pass/issue-23958.rs
+++ b/src/test/ui/run-pass/issues/issue-23958.rs
diff --git a/src/test/run-pass/issue-23968-const-not-overflow.rs b/src/test/ui/run-pass/issues/issue-23968-const-not-overflow.rs
index 95f65917ceb..95f65917ceb 100644
--- a/src/test/run-pass/issue-23968-const-not-overflow.rs
+++ b/src/test/ui/run-pass/issues/issue-23968-const-not-overflow.rs
diff --git a/src/test/run-pass/issue-23992.rs b/src/test/ui/run-pass/issues/issue-23992.rs
index d1ee4208b78..d1ee4208b78 100644
--- a/src/test/run-pass/issue-23992.rs
+++ b/src/test/ui/run-pass/issues/issue-23992.rs
diff --git a/src/test/run-pass/issue-24085.rs b/src/test/ui/run-pass/issues/issue-24085.rs
index b15ec2986c2..b15ec2986c2 100644
--- a/src/test/run-pass/issue-24085.rs
+++ b/src/test/ui/run-pass/issues/issue-24085.rs
diff --git a/src/test/run-pass/issue-24086.rs b/src/test/ui/run-pass/issues/issue-24086.rs
index 0a8324eafe2..0a8324eafe2 100644
--- a/src/test/run-pass/issue-24086.rs
+++ b/src/test/ui/run-pass/issues/issue-24086.rs
diff --git a/src/test/run-pass/issue-2414-c.rs b/src/test/ui/run-pass/issues/issue-2414-c.rs
index 2e047ae0127..2e047ae0127 100644
--- a/src/test/run-pass/issue-2414-c.rs
+++ b/src/test/ui/run-pass/issues/issue-2414-c.rs
diff --git a/src/test/run-pass/issue-24161.rs b/src/test/ui/run-pass/issues/issue-24161.rs
index 2445ef17ecf..2445ef17ecf 100644
--- a/src/test/run-pass/issue-24161.rs
+++ b/src/test/ui/run-pass/issues/issue-24161.rs
diff --git a/src/test/run-pass/issue-24227.rs b/src/test/ui/run-pass/issues/issue-24227.rs
index 34c16bd4003..34c16bd4003 100644
--- a/src/test/run-pass/issue-24227.rs
+++ b/src/test/ui/run-pass/issues/issue-24227.rs
diff --git a/src/test/run-pass/issue-2428.rs b/src/test/ui/run-pass/issues/issue-2428.rs
index a07050d4582..a07050d4582 100644
--- a/src/test/run-pass/issue-2428.rs
+++ b/src/test/ui/run-pass/issues/issue-2428.rs
diff --git a/src/test/run-pass/issue-24308.rs b/src/test/ui/run-pass/issues/issue-24308.rs
index 0a483fc987a..0a483fc987a 100644
--- a/src/test/run-pass/issue-24308.rs
+++ b/src/test/ui/run-pass/issues/issue-24308.rs
diff --git a/src/test/run-pass/issue-24313.rs b/src/test/ui/run-pass/issues/issue-24313.rs
index 2e7d2e490b3..2e7d2e490b3 100644
--- a/src/test/run-pass/issue-24313.rs
+++ b/src/test/ui/run-pass/issues/issue-24313.rs
diff --git a/src/test/run-pass/issue-24353.rs b/src/test/ui/run-pass/issues/issue-24353.rs
index 7a41a013927..7a41a013927 100644
--- a/src/test/run-pass/issue-24353.rs
+++ b/src/test/ui/run-pass/issues/issue-24353.rs
diff --git a/src/test/run-pass/issue-24389.rs b/src/test/ui/run-pass/issues/issue-24389.rs
index 41599fa3e63..41599fa3e63 100644
--- a/src/test/run-pass/issue-24389.rs
+++ b/src/test/ui/run-pass/issues/issue-24389.rs
diff --git a/src/test/run-pass/issue-24434.rs b/src/test/ui/run-pass/issues/issue-24434.rs
index 2b0d09d7460..2b0d09d7460 100644
--- a/src/test/run-pass/issue-24434.rs
+++ b/src/test/ui/run-pass/issues/issue-24434.rs
diff --git a/src/test/run-pass/issue-2445-b.rs b/src/test/ui/run-pass/issues/issue-2445-b.rs
index c1d17d263d6..c1d17d263d6 100644
--- a/src/test/run-pass/issue-2445-b.rs
+++ b/src/test/ui/run-pass/issues/issue-2445-b.rs
diff --git a/src/test/run-pass/issue-2445.rs b/src/test/ui/run-pass/issues/issue-2445.rs
index 0b6cf5890fd..0b6cf5890fd 100644
--- a/src/test/run-pass/issue-2445.rs
+++ b/src/test/ui/run-pass/issues/issue-2445.rs
diff --git a/src/test/run-pass/issue-24533.rs b/src/test/ui/run-pass/issues/issue-24533.rs
index 440a4184780..440a4184780 100644
--- a/src/test/run-pass/issue-24533.rs
+++ b/src/test/ui/run-pass/issues/issue-24533.rs
diff --git a/src/test/run-pass/issue-24535-allow-mutable-borrow-in-match-guard.rs b/src/test/ui/run-pass/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs
index ac415e31f2b..ac415e31f2b 100644
--- a/src/test/run-pass/issue-24535-allow-mutable-borrow-in-match-guard.rs
+++ b/src/test/ui/run-pass/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs
diff --git a/src/test/run-pass/issue-24589.rs b/src/test/ui/run-pass/issues/issue-24589.rs
index 2fa8c8e98c0..2fa8c8e98c0 100644
--- a/src/test/run-pass/issue-24589.rs
+++ b/src/test/ui/run-pass/issues/issue-24589.rs
diff --git a/src/test/run-pass/issue-2463.rs b/src/test/ui/run-pass/issues/issue-2463.rs
index f0b0614535b..f0b0614535b 100644
--- a/src/test/run-pass/issue-2463.rs
+++ b/src/test/ui/run-pass/issues/issue-2463.rs
diff --git a/src/test/run-pass/issue-2472.rs b/src/test/ui/run-pass/issues/issue-2472.rs
index 0cbdbda6375..0cbdbda6375 100644
--- a/src/test/run-pass/issue-2472.rs
+++ b/src/test/ui/run-pass/issues/issue-2472.rs
diff --git a/src/test/run-pass/issue-24779.rs b/src/test/ui/run-pass/issues/issue-24779.rs
index 4f13b91cdb1..4f13b91cdb1 100644
--- a/src/test/run-pass/issue-24779.rs
+++ b/src/test/ui/run-pass/issues/issue-24779.rs
diff --git a/src/test/run-pass/issue-24805-dropck-itemless.rs b/src/test/ui/run-pass/issues/issue-24805-dropck-itemless.rs
index 9fa48202298..9fa48202298 100644
--- a/src/test/run-pass/issue-24805-dropck-itemless.rs
+++ b/src/test/ui/run-pass/issues/issue-24805-dropck-itemless.rs
diff --git a/src/test/run-pass/issue-2487-a.rs b/src/test/ui/run-pass/issues/issue-2487-a.rs
index 76450b351f4..76450b351f4 100644
--- a/src/test/run-pass/issue-2487-a.rs
+++ b/src/test/ui/run-pass/issues/issue-2487-a.rs
diff --git a/src/test/run-pass/issue-24945-repeat-dash-opts.rs b/src/test/ui/run-pass/issues/issue-24945-repeat-dash-opts.rs
index 33ac519a584..33ac519a584 100644
--- a/src/test/run-pass/issue-24945-repeat-dash-opts.rs
+++ b/src/test/ui/run-pass/issues/issue-24945-repeat-dash-opts.rs
diff --git a/src/test/run-pass/issue-24947.rs b/src/test/ui/run-pass/issues/issue-24947.rs
index 19a364a93fd..19a364a93fd 100644
--- a/src/test/run-pass/issue-24947.rs
+++ b/src/test/ui/run-pass/issues/issue-24947.rs
diff --git a/src/test/run-pass/issue-24954.rs b/src/test/ui/run-pass/issues/issue-24954.rs
index f525274a1df..f525274a1df 100644
--- a/src/test/run-pass/issue-24954.rs
+++ b/src/test/ui/run-pass/issues/issue-24954.rs
diff --git a/src/test/run-pass/issue-2502.rs b/src/test/ui/run-pass/issues/issue-2502.rs
index 63179cd14ac..63179cd14ac 100644
--- a/src/test/run-pass/issue-2502.rs
+++ b/src/test/ui/run-pass/issues/issue-2502.rs
diff --git a/src/test/run-pass/issue-25089.rs b/src/test/ui/run-pass/issues/issue-25089.rs
index e707023530b..e707023530b 100644
--- a/src/test/run-pass/issue-25089.rs
+++ b/src/test/ui/run-pass/issues/issue-25089.rs
diff --git a/src/test/run-pass/issue-25145.rs b/src/test/ui/run-pass/issues/issue-25145.rs
index d5d23012e04..d5d23012e04 100644
--- a/src/test/run-pass/issue-25145.rs
+++ b/src/test/ui/run-pass/issues/issue-25145.rs
diff --git a/src/test/run-pass/issue-25180.rs b/src/test/ui/run-pass/issues/issue-25180.rs
index 4e6f9b321ba..4e6f9b321ba 100644
--- a/src/test/run-pass/issue-25180.rs
+++ b/src/test/ui/run-pass/issues/issue-25180.rs
diff --git a/src/test/run-pass/issue-25185.rs b/src/test/ui/run-pass/issues/issue-25185.rs
index 9a2dbd1c96e..9a2dbd1c96e 100644
--- a/src/test/run-pass/issue-25185.rs
+++ b/src/test/ui/run-pass/issues/issue-25185.rs
diff --git a/src/test/run-pass/issue-2526-a.rs b/src/test/ui/run-pass/issues/issue-2526-a.rs
index 0c68c470231..0c68c470231 100644
--- a/src/test/run-pass/issue-2526-a.rs
+++ b/src/test/ui/run-pass/issues/issue-2526-a.rs
diff --git a/src/test/run-pass/issue-25279.rs b/src/test/ui/run-pass/issues/issue-25279.rs
index e483866790f..e483866790f 100644
--- a/src/test/run-pass/issue-25279.rs
+++ b/src/test/ui/run-pass/issues/issue-25279.rs
diff --git a/src/test/run-pass/issue-25339.rs b/src/test/ui/run-pass/issues/issue-25339.rs
index 381df7c5d59..381df7c5d59 100644
--- a/src/test/run-pass/issue-25339.rs
+++ b/src/test/ui/run-pass/issues/issue-25339.rs
diff --git a/src/test/run-pass/issue-25343.rs b/src/test/ui/run-pass/issues/issue-25343.rs
index 64e7350fb82..64e7350fb82 100644
--- a/src/test/run-pass/issue-25343.rs
+++ b/src/test/ui/run-pass/issues/issue-25343.rs
diff --git a/src/test/run-pass/issue-25394.rs b/src/test/ui/run-pass/issues/issue-25394.rs
index c42de6fdf34..c42de6fdf34 100644
--- a/src/test/run-pass/issue-25394.rs
+++ b/src/test/ui/run-pass/issues/issue-25394.rs
diff --git a/src/test/run-pass/issue-25467.rs b/src/test/ui/run-pass/issues/issue-25467.rs
index 47758768269..47758768269 100644
--- a/src/test/run-pass/issue-25467.rs
+++ b/src/test/ui/run-pass/issues/issue-25467.rs
diff --git a/src/test/run-pass/issue-25497.rs b/src/test/ui/run-pass/issues/issue-25497.rs
index 730b0a274bf..730b0a274bf 100644
--- a/src/test/run-pass/issue-25497.rs
+++ b/src/test/ui/run-pass/issues/issue-25497.rs
diff --git a/src/test/run-pass/issue-2550.rs b/src/test/ui/run-pass/issues/issue-2550.rs
index 87b0b198f9b..87b0b198f9b 100644
--- a/src/test/run-pass/issue-2550.rs
+++ b/src/test/ui/run-pass/issues/issue-2550.rs
diff --git a/src/test/run-pass/issue-25515.rs b/src/test/ui/run-pass/issues/issue-25515.rs
index d1746ec0191..d1746ec0191 100644
--- a/src/test/run-pass/issue-25515.rs
+++ b/src/test/ui/run-pass/issues/issue-25515.rs
diff --git a/src/test/run-pass/issue-25549-multiple-drop.rs b/src/test/ui/run-pass/issues/issue-25549-multiple-drop.rs
index 5280891677e..5280891677e 100644
--- a/src/test/run-pass/issue-25549-multiple-drop.rs
+++ b/src/test/ui/run-pass/issues/issue-25549-multiple-drop.rs
diff --git a/src/test/run-pass/issue-25679.rs b/src/test/ui/run-pass/issues/issue-25679.rs
index 0ba7feece60..0ba7feece60 100644
--- a/src/test/run-pass/issue-25679.rs
+++ b/src/test/ui/run-pass/issues/issue-25679.rs
diff --git a/src/test/run-pass/issue-25693.rs b/src/test/ui/run-pass/issues/issue-25693.rs
index 0d9dc3cf605..0d9dc3cf605 100644
--- a/src/test/run-pass/issue-25693.rs
+++ b/src/test/ui/run-pass/issues/issue-25693.rs
diff --git a/src/test/run-pass/issue-25700-1.rs b/src/test/ui/run-pass/issues/issue-25700-1.rs
index 57f5b84b285..57f5b84b285 100644
--- a/src/test/run-pass/issue-25700-1.rs
+++ b/src/test/ui/run-pass/issues/issue-25700-1.rs
diff --git a/src/test/run-pass/issue-25700-2.rs b/src/test/ui/run-pass/issues/issue-25700-2.rs
index 3117e6f3681..3117e6f3681 100644
--- a/src/test/run-pass/issue-25700-2.rs
+++ b/src/test/ui/run-pass/issues/issue-25700-2.rs
diff --git a/src/test/run-pass/issue-25746-bool-transmute.rs b/src/test/ui/run-pass/issues/issue-25746-bool-transmute.rs
index 434e019219f..434e019219f 100644
--- a/src/test/run-pass/issue-25746-bool-transmute.rs
+++ b/src/test/ui/run-pass/issues/issue-25746-bool-transmute.rs
diff --git a/src/test/run-pass/issue-25757.rs b/src/test/ui/run-pass/issues/issue-25757.rs
index d1fb7537705..d1fb7537705 100644
--- a/src/test/run-pass/issue-25757.rs
+++ b/src/test/ui/run-pass/issues/issue-25757.rs
diff --git a/src/test/run-pass/issue-25810.rs b/src/test/ui/run-pass/issues/issue-25810.rs
index 820872ad3fc..820872ad3fc 100644
--- a/src/test/run-pass/issue-25810.rs
+++ b/src/test/ui/run-pass/issues/issue-25810.rs
diff --git a/src/test/run-pass/issue-25916.rs b/src/test/ui/run-pass/issues/issue-25916.rs
index eb52e2e21c4..eb52e2e21c4 100644
--- a/src/test/run-pass/issue-25916.rs
+++ b/src/test/ui/run-pass/issues/issue-25916.rs
diff --git a/src/test/run-pass/issue-26095.rs b/src/test/ui/run-pass/issues/issue-26095.rs
index 9d8d9c3ff2e..9d8d9c3ff2e 100644
--- a/src/test/run-pass/issue-26095.rs
+++ b/src/test/ui/run-pass/issues/issue-26095.rs
diff --git a/src/test/run-pass/issue-2611-3.rs b/src/test/ui/run-pass/issues/issue-2611-3.rs
index e223d3412e0..e223d3412e0 100644
--- a/src/test/run-pass/issue-2611-3.rs
+++ b/src/test/ui/run-pass/issues/issue-2611-3.rs
diff --git a/src/test/run-pass/issue-26127.rs b/src/test/ui/run-pass/issues/issue-26127.rs
index 75cbcc83d61..75cbcc83d61 100644
--- a/src/test/run-pass/issue-26127.rs
+++ b/src/test/ui/run-pass/issues/issue-26127.rs
diff --git a/src/test/run-pass/issue-26205.rs b/src/test/ui/run-pass/issues/issue-26205.rs
index dd34612af0f..dd34612af0f 100644
--- a/src/test/run-pass/issue-26205.rs
+++ b/src/test/ui/run-pass/issues/issue-26205.rs
diff --git a/src/test/run-pass/issue-26251.rs b/src/test/ui/run-pass/issues/issue-26251.rs
index 3735d36147d..3735d36147d 100644
--- a/src/test/run-pass/issue-26251.rs
+++ b/src/test/ui/run-pass/issues/issue-26251.rs
diff --git a/src/test/run-pass/issue-2631-b.rs b/src/test/ui/run-pass/issues/issue-2631-b.rs
index 913b07613e0..913b07613e0 100644
--- a/src/test/run-pass/issue-2631-b.rs
+++ b/src/test/ui/run-pass/issues/issue-2631-b.rs
diff --git a/src/test/run-pass/issue-26322.rs b/src/test/ui/run-pass/issues/issue-26322.rs
index 7f8c7f5521f..7f8c7f5521f 100644
--- a/src/test/run-pass/issue-26322.rs
+++ b/src/test/ui/run-pass/issues/issue-26322.rs
diff --git a/src/test/run-pass/issue-2633-2.rs b/src/test/ui/run-pass/issues/issue-2633-2.rs
index b955947c410..b955947c410 100644
--- a/src/test/run-pass/issue-2633-2.rs
+++ b/src/test/ui/run-pass/issues/issue-2633-2.rs
diff --git a/src/test/run-pass/issue-2633.rs b/src/test/ui/run-pass/issues/issue-2633.rs
index 5841a9ec176..5841a9ec176 100644
--- a/src/test/run-pass/issue-2633.rs
+++ b/src/test/ui/run-pass/issues/issue-2633.rs
diff --git a/src/test/run-pass/issue-2642.rs b/src/test/ui/run-pass/issues/issue-2642.rs
index f0bc31fb391..f0bc31fb391 100644
--- a/src/test/run-pass/issue-2642.rs
+++ b/src/test/ui/run-pass/issues/issue-2642.rs
diff --git a/src/test/run-pass/issue-26468.rs b/src/test/ui/run-pass/issues/issue-26468.rs
index 9fb8675e84e..9fb8675e84e 100644
--- a/src/test/run-pass/issue-26468.rs
+++ b/src/test/ui/run-pass/issues/issue-26468.rs
diff --git a/src/test/run-pass/issue-26484.rs b/src/test/ui/run-pass/issues/issue-26484.rs
index d3e6fc85f13..d3e6fc85f13 100644
--- a/src/test/run-pass/issue-26484.rs
+++ b/src/test/ui/run-pass/issues/issue-26484.rs
diff --git a/src/test/run-pass/issue-26641.rs b/src/test/ui/run-pass/issues/issue-26641.rs
index 16f1d4626fb..16f1d4626fb 100644
--- a/src/test/run-pass/issue-26641.rs
+++ b/src/test/ui/run-pass/issues/issue-26641.rs
diff --git a/src/test/run-pass/issue-26646.rs b/src/test/ui/run-pass/issues/issue-26646.rs
index 89c0a11e292..89c0a11e292 100644
--- a/src/test/run-pass/issue-26646.rs
+++ b/src/test/ui/run-pass/issues/issue-26646.rs
diff --git a/src/test/run-pass/issue-26655.rs b/src/test/ui/run-pass/issues/issue-26655.rs
index 6d43451af6b..6d43451af6b 100644
--- a/src/test/run-pass/issue-26655.rs
+++ b/src/test/ui/run-pass/issues/issue-26655.rs
diff --git a/src/test/run-pass/issue-26709.rs b/src/test/ui/run-pass/issues/issue-26709.rs
index 62626d75865..62626d75865 100644
--- a/src/test/run-pass/issue-26709.rs
+++ b/src/test/ui/run-pass/issues/issue-26709.rs
diff --git a/src/test/run-pass/issue-26802.rs b/src/test/ui/run-pass/issues/issue-26802.rs
index 854340b0eae..854340b0eae 100644
--- a/src/test/run-pass/issue-26802.rs
+++ b/src/test/ui/run-pass/issues/issue-26802.rs
diff --git a/src/test/run-pass/issue-26805.rs b/src/test/ui/run-pass/issues/issue-26805.rs
index c996c8f65ac..c996c8f65ac 100644
--- a/src/test/run-pass/issue-26805.rs
+++ b/src/test/ui/run-pass/issues/issue-26805.rs
diff --git a/src/test/run-pass/issue-26873-multifile.rs b/src/test/ui/run-pass/issues/issue-26873-multifile.rs
index 51bf4bfe0e1..51bf4bfe0e1 100644
--- a/src/test/run-pass/issue-26873-multifile.rs
+++ b/src/test/ui/run-pass/issues/issue-26873-multifile.rs
diff --git a/src/test/run-pass/issue-26873-onefile.rs b/src/test/ui/run-pass/issues/issue-26873-onefile.rs
index a9a04fd8894..a9a04fd8894 100644
--- a/src/test/run-pass/issue-26873-onefile.rs
+++ b/src/test/ui/run-pass/issues/issue-26873-onefile.rs
diff --git a/src/test/run-pass/issue-26905.rs b/src/test/ui/run-pass/issues/issue-26905.rs
index 0ad193bb28c..0ad193bb28c 100644
--- a/src/test/run-pass/issue-26905.rs
+++ b/src/test/ui/run-pass/issues/issue-26905.rs
diff --git a/src/test/run-pass/issue-26996.rs b/src/test/ui/run-pass/issues/issue-26996.rs
index e17845a68bc..e17845a68bc 100644
--- a/src/test/run-pass/issue-26996.rs
+++ b/src/test/ui/run-pass/issues/issue-26996.rs
diff --git a/src/test/run-pass/issue-26997.rs b/src/test/ui/run-pass/issues/issue-26997.rs
index e7ecf68f108..e7ecf68f108 100644
--- a/src/test/run-pass/issue-26997.rs
+++ b/src/test/ui/run-pass/issues/issue-26997.rs
diff --git a/src/test/run-pass/issue-27021.rs b/src/test/ui/run-pass/issues/issue-27021.rs
index eb7d529f0ad..eb7d529f0ad 100644
--- a/src/test/run-pass/issue-27021.rs
+++ b/src/test/ui/run-pass/issues/issue-27021.rs
diff --git a/src/test/run-pass/issue-27054-primitive-binary-ops.rs b/src/test/ui/run-pass/issues/issue-27054-primitive-binary-ops.rs
index a97a49a1a4a..a97a49a1a4a 100644
--- a/src/test/run-pass/issue-27054-primitive-binary-ops.rs
+++ b/src/test/ui/run-pass/issues/issue-27054-primitive-binary-ops.rs
diff --git a/src/test/run-pass/issue-27060.rs b/src/test/ui/run-pass/issues/issue-27060.rs
index 809c45466f0..809c45466f0 100644
--- a/src/test/run-pass/issue-27060.rs
+++ b/src/test/ui/run-pass/issues/issue-27060.rs
diff --git a/src/test/run-pass/issue-2708.rs b/src/test/ui/run-pass/issues/issue-2708.rs
index cf565b9f901..cf565b9f901 100644
--- a/src/test/run-pass/issue-2708.rs
+++ b/src/test/ui/run-pass/issues/issue-2708.rs
diff --git a/src/test/run-pass/issue-27105.rs b/src/test/ui/run-pass/issues/issue-27105.rs
index 3836ad089a3..3836ad089a3 100644
--- a/src/test/run-pass/issue-27105.rs
+++ b/src/test/ui/run-pass/issues/issue-27105.rs
diff --git a/src/test/run-pass/issue-2718.rs b/src/test/ui/run-pass/issues/issue-2718.rs
index d59f2956ee4..d59f2956ee4 100644
--- a/src/test/run-pass/issue-2718.rs
+++ b/src/test/ui/run-pass/issues/issue-2718.rs
diff --git a/src/test/run-pass/issue-2723-b.rs b/src/test/ui/run-pass/issues/issue-2723-b.rs
index a6ba957a1b1..a6ba957a1b1 100644
--- a/src/test/run-pass/issue-2723-b.rs
+++ b/src/test/ui/run-pass/issues/issue-2723-b.rs
diff --git a/src/test/run-pass/issue-27240.rs b/src/test/ui/run-pass/issues/issue-27240.rs
index 4e341d31172..4e341d31172 100644
--- a/src/test/run-pass/issue-27240.rs
+++ b/src/test/ui/run-pass/issues/issue-27240.rs
diff --git a/src/test/run-pass/issue-27268.rs b/src/test/ui/run-pass/issues/issue-27268.rs
index 8af850bbada..8af850bbada 100644
--- a/src/test/run-pass/issue-27268.rs
+++ b/src/test/ui/run-pass/issues/issue-27268.rs
diff --git a/src/test/run-pass/issue-27281.rs b/src/test/ui/run-pass/issues/issue-27281.rs
index c84fc0fffe3..c84fc0fffe3 100644
--- a/src/test/run-pass/issue-27281.rs
+++ b/src/test/ui/run-pass/issues/issue-27281.rs
diff --git a/src/test/run-pass/issue-27320.rs b/src/test/ui/run-pass/issues/issue-27320.rs
index e010b162cc4..e010b162cc4 100644
--- a/src/test/run-pass/issue-27320.rs
+++ b/src/test/ui/run-pass/issues/issue-27320.rs
diff --git a/src/test/run-pass/issue-2734.rs b/src/test/ui/run-pass/issues/issue-2734.rs
index 916e3dd689f..916e3dd689f 100644
--- a/src/test/run-pass/issue-2734.rs
+++ b/src/test/ui/run-pass/issues/issue-2734.rs
diff --git a/src/test/run-pass/issue-2735-2.rs b/src/test/ui/run-pass/issues/issue-2735-2.rs
index cdce059ae71..cdce059ae71 100644
--- a/src/test/run-pass/issue-2735-2.rs
+++ b/src/test/ui/run-pass/issues/issue-2735-2.rs
diff --git a/src/test/run-pass/issue-2735-3.rs b/src/test/ui/run-pass/issues/issue-2735-3.rs
index d1e28faba8b..d1e28faba8b 100644
--- a/src/test/run-pass/issue-2735-3.rs
+++ b/src/test/ui/run-pass/issues/issue-2735-3.rs
diff --git a/src/test/run-pass/issue-2735.rs b/src/test/ui/run-pass/issues/issue-2735.rs
index af8eef557f8..af8eef557f8 100644
--- a/src/test/run-pass/issue-2735.rs
+++ b/src/test/ui/run-pass/issues/issue-2735.rs
diff --git a/src/test/run-pass/issue-27401-dropflag-reinit.rs b/src/test/ui/run-pass/issues/issue-27401-dropflag-reinit.rs
index 37dc060d5d6..37dc060d5d6 100644
--- a/src/test/run-pass/issue-27401-dropflag-reinit.rs
+++ b/src/test/ui/run-pass/issues/issue-27401-dropflag-reinit.rs
diff --git a/src/test/run-pass/issue-2748-a.rs b/src/test/ui/run-pass/issues/issue-2748-a.rs
index ac1e65ee776..ac1e65ee776 100644
--- a/src/test/run-pass/issue-2748-a.rs
+++ b/src/test/ui/run-pass/issues/issue-2748-a.rs
diff --git a/src/test/run-pass/issue-2748-b.rs b/src/test/ui/run-pass/issues/issue-2748-b.rs
index f1cbf11a347..f1cbf11a347 100644
--- a/src/test/run-pass/issue-2748-b.rs
+++ b/src/test/ui/run-pass/issues/issue-2748-b.rs
diff --git a/src/test/run-pass/issue-27583.rs b/src/test/ui/run-pass/issues/issue-27583.rs
index df1b2c2cf43..df1b2c2cf43 100644
--- a/src/test/run-pass/issue-27583.rs
+++ b/src/test/ui/run-pass/issues/issue-27583.rs
diff --git a/src/test/run-pass/issue-27639.rs b/src/test/ui/run-pass/issues/issue-27639.rs
index ce1abb163d5..ce1abb163d5 100644
--- a/src/test/run-pass/issue-27639.rs
+++ b/src/test/ui/run-pass/issues/issue-27639.rs
diff --git a/src/test/run-pass/issue-27859.rs b/src/test/ui/run-pass/issues/issue-27859.rs
index d184724cf6f..d184724cf6f 100644
--- a/src/test/run-pass/issue-27859.rs
+++ b/src/test/ui/run-pass/issues/issue-27859.rs
diff --git a/src/test/run-pass/issue-27889.rs b/src/test/ui/run-pass/issues/issue-27889.rs
index 29a5f6dd24b..29a5f6dd24b 100644
--- a/src/test/run-pass/issue-27889.rs
+++ b/src/test/ui/run-pass/issues/issue-27889.rs
diff --git a/src/test/run-pass/issue-27890.rs b/src/test/ui/run-pass/issues/issue-27890.rs
index a33882a8331..a33882a8331 100644
--- a/src/test/run-pass/issue-27890.rs
+++ b/src/test/ui/run-pass/issues/issue-27890.rs
diff --git a/src/test/run-pass/issue-27901.rs b/src/test/ui/run-pass/issues/issue-27901.rs
index b7a9daaf8ab..b7a9daaf8ab 100644
--- a/src/test/run-pass/issue-27901.rs
+++ b/src/test/ui/run-pass/issues/issue-27901.rs
diff --git a/src/test/run-pass/issue-27997.rs b/src/test/ui/run-pass/issues/issue-27997.rs
index 9dba477a7e5..9dba477a7e5 100644
--- a/src/test/run-pass/issue-27997.rs
+++ b/src/test/ui/run-pass/issues/issue-27997.rs
diff --git a/src/test/run-pass/issue-2804-2.rs b/src/test/ui/run-pass/issues/issue-2804-2.rs
index e428ecd4e5b..e428ecd4e5b 100644
--- a/src/test/run-pass/issue-2804-2.rs
+++ b/src/test/ui/run-pass/issues/issue-2804-2.rs
diff --git a/src/test/run-pass/issue-28181.rs b/src/test/ui/run-pass/issues/issue-28181.rs
index f64b92cdbb7..f64b92cdbb7 100644
--- a/src/test/run-pass/issue-28181.rs
+++ b/src/test/ui/run-pass/issues/issue-28181.rs
diff --git a/src/test/run-pass/issue-28279.rs b/src/test/ui/run-pass/issues/issue-28279.rs
index 3165084b9e9..3165084b9e9 100644
--- a/src/test/run-pass/issue-28279.rs
+++ b/src/test/ui/run-pass/issues/issue-28279.rs
diff --git a/src/test/run-pass/issue-28550.rs b/src/test/ui/run-pass/issues/issue-28550.rs
index f44a535e817..f44a535e817 100644
--- a/src/test/run-pass/issue-28550.rs
+++ b/src/test/ui/run-pass/issues/issue-28550.rs
diff --git a/src/test/run-pass/issue-28561.rs b/src/test/ui/run-pass/issues/issue-28561.rs
index e21e487fedd..e21e487fedd 100644
--- a/src/test/run-pass/issue-28561.rs
+++ b/src/test/ui/run-pass/issues/issue-28561.rs
diff --git a/src/test/run-pass/issue-28600.rs b/src/test/ui/run-pass/issues/issue-28600.rs
index bbbdb79a11d..bbbdb79a11d 100644
--- a/src/test/run-pass/issue-28600.rs
+++ b/src/test/ui/run-pass/issues/issue-28600.rs
diff --git a/src/test/run-pass/issue-28676.rs b/src/test/ui/run-pass/issues/issue-28676.rs
index a7bee427a81..a7bee427a81 100644
--- a/src/test/run-pass/issue-28676.rs
+++ b/src/test/ui/run-pass/issues/issue-28676.rs
diff --git a/src/test/run-pass/issue-28777.rs b/src/test/ui/run-pass/issues/issue-28777.rs
index ea5d4e4f3c2..ea5d4e4f3c2 100644
--- a/src/test/run-pass/issue-28777.rs
+++ b/src/test/ui/run-pass/issues/issue-28777.rs
diff --git a/src/test/run-pass/issue-28822.rs b/src/test/ui/run-pass/issues/issue-28822.rs
index 10482139a97..10482139a97 100644
--- a/src/test/run-pass/issue-28822.rs
+++ b/src/test/ui/run-pass/issues/issue-28822.rs
diff --git a/src/test/run-pass/issue-28828.rs b/src/test/ui/run-pass/issues/issue-28828.rs
index 24e4b83e8a6..24e4b83e8a6 100644
--- a/src/test/run-pass/issue-28828.rs
+++ b/src/test/ui/run-pass/issues/issue-28828.rs
diff --git a/src/test/run-pass/issue-28839.rs b/src/test/ui/run-pass/issues/issue-28839.rs
index 2ff4403a42f..2ff4403a42f 100644
--- a/src/test/run-pass/issue-28839.rs
+++ b/src/test/ui/run-pass/issues/issue-28839.rs
diff --git a/src/test/run-pass/issue-28871.rs b/src/test/ui/run-pass/issues/issue-28871.rs
index 92ba98f5062..92ba98f5062 100644
--- a/src/test/run-pass/issue-28871.rs
+++ b/src/test/ui/run-pass/issues/issue-28871.rs
diff --git a/src/test/run-pass/issue-28936.rs b/src/test/ui/run-pass/issues/issue-28936.rs
index 992fbdce268..992fbdce268 100644
--- a/src/test/run-pass/issue-28936.rs
+++ b/src/test/ui/run-pass/issues/issue-28936.rs
diff --git a/src/test/run-pass/issue-2895.rs b/src/test/ui/run-pass/issues/issue-2895.rs
index b0fd0e148c8..b0fd0e148c8 100644
--- a/src/test/run-pass/issue-2895.rs
+++ b/src/test/ui/run-pass/issues/issue-2895.rs
diff --git a/src/test/run-pass/issue-28950.rs b/src/test/ui/run-pass/issues/issue-28950.rs
index 4e4530789c8..4e4530789c8 100644
--- a/src/test/run-pass/issue-28950.rs
+++ b/src/test/ui/run-pass/issues/issue-28950.rs
diff --git a/src/test/run-pass/issue-28983.rs b/src/test/ui/run-pass/issues/issue-28983.rs
index f70f8768766..f70f8768766 100644
--- a/src/test/run-pass/issue-28983.rs
+++ b/src/test/ui/run-pass/issues/issue-28983.rs
diff --git a/src/test/run-pass/issue-28999.rs b/src/test/ui/run-pass/issues/issue-28999.rs
index 87112ef1719..87112ef1719 100644
--- a/src/test/run-pass/issue-28999.rs
+++ b/src/test/ui/run-pass/issues/issue-28999.rs
diff --git a/src/test/run-pass/issue-29030.rs b/src/test/ui/run-pass/issues/issue-29030.rs
index 43de3601df1..43de3601df1 100644
--- a/src/test/run-pass/issue-29030.rs
+++ b/src/test/ui/run-pass/issues/issue-29030.rs
diff --git a/src/test/run-pass/issue-29037.rs b/src/test/ui/run-pass/issues/issue-29037.rs
index dc1d67cc645..dc1d67cc645 100644
--- a/src/test/run-pass/issue-29037.rs
+++ b/src/test/ui/run-pass/issues/issue-29037.rs
diff --git a/src/test/run-pass/issue-2904.rs b/src/test/ui/run-pass/issues/issue-2904.rs
index d82fce97c41..d82fce97c41 100644
--- a/src/test/run-pass/issue-2904.rs
+++ b/src/test/ui/run-pass/issues/issue-2904.rs
diff --git a/src/test/run-pass/issue-29048.rs b/src/test/ui/run-pass/issues/issue-29048.rs
index 48f4327d3e9..48f4327d3e9 100644
--- a/src/test/run-pass/issue-29048.rs
+++ b/src/test/ui/run-pass/issues/issue-29048.rs
diff --git a/src/test/run-pass/issue-29053.rs b/src/test/ui/run-pass/issues/issue-29053.rs
index 72655071e41..72655071e41 100644
--- a/src/test/run-pass/issue-29053.rs
+++ b/src/test/ui/run-pass/issues/issue-29053.rs
diff --git a/src/test/run-pass/issue-29071-2.rs b/src/test/ui/run-pass/issues/issue-29071-2.rs
index 8e69c063f99..8e69c063f99 100644
--- a/src/test/run-pass/issue-29071-2.rs
+++ b/src/test/ui/run-pass/issues/issue-29071-2.rs
diff --git a/src/test/run-pass/issue-29071.rs b/src/test/ui/run-pass/issues/issue-29071.rs
index 09c17a85ab5..09c17a85ab5 100644
--- a/src/test/run-pass/issue-29071.rs
+++ b/src/test/ui/run-pass/issues/issue-29071.rs
diff --git a/src/test/run-pass/issue-29092.rs b/src/test/ui/run-pass/issues/issue-29092.rs
index c55cc91cc92..c55cc91cc92 100644
--- a/src/test/run-pass/issue-29092.rs
+++ b/src/test/ui/run-pass/issues/issue-29092.rs
diff --git a/src/test/run-pass/issue-29147.rs b/src/test/ui/run-pass/issues/issue-29147.rs
index 026b98905d0..026b98905d0 100644
--- a/src/test/run-pass/issue-29147.rs
+++ b/src/test/ui/run-pass/issues/issue-29147.rs
diff --git a/src/test/run-pass/issue-29166.rs b/src/test/ui/run-pass/issues/issue-29166.rs
index 193f977ff99..193f977ff99 100644
--- a/src/test/run-pass/issue-29166.rs
+++ b/src/test/ui/run-pass/issues/issue-29166.rs
diff --git a/src/test/run-pass/issue-29227.rs b/src/test/ui/run-pass/issues/issue-29227.rs
index 7e27f7093ad..7e27f7093ad 100644
--- a/src/test/run-pass/issue-29227.rs
+++ b/src/test/ui/run-pass/issues/issue-29227.rs
diff --git a/src/test/run-pass/issue-29276.rs b/src/test/ui/run-pass/issues/issue-29276.rs
index 393b2226031..393b2226031 100644
--- a/src/test/run-pass/issue-29276.rs
+++ b/src/test/ui/run-pass/issues/issue-29276.rs
diff --git a/src/test/run-pass/issue-2935.rs b/src/test/ui/run-pass/issues/issue-2935.rs
index b2ea183e9f8..b2ea183e9f8 100644
--- a/src/test/run-pass/issue-2935.rs
+++ b/src/test/ui/run-pass/issues/issue-2935.rs
diff --git a/src/test/run-pass/issue-2936.rs b/src/test/ui/run-pass/issues/issue-2936.rs
index c277073a79d..c277073a79d 100644
--- a/src/test/run-pass/issue-2936.rs
+++ b/src/test/ui/run-pass/issues/issue-2936.rs
diff --git a/src/test/run-pass/issue-29466.rs b/src/test/ui/run-pass/issues/issue-29466.rs
index 9e7b7346722..9e7b7346722 100644
--- a/src/test/run-pass/issue-29466.rs
+++ b/src/test/ui/run-pass/issues/issue-29466.rs
diff --git a/src/test/run-pass/issue-29485.rs b/src/test/ui/run-pass/issues/issue-29485.rs
index 828b495d408..828b495d408 100644
--- a/src/test/run-pass/issue-29485.rs
+++ b/src/test/ui/run-pass/issues/issue-29485.rs
diff --git a/src/test/run-pass/issue-29488.rs b/src/test/ui/run-pass/issues/issue-29488.rs
index 17a6e9bd6b2..17a6e9bd6b2 100644
--- a/src/test/run-pass/issue-29488.rs
+++ b/src/test/ui/run-pass/issues/issue-29488.rs
diff --git a/src/test/run-pass/issue-29516.rs b/src/test/ui/run-pass/issues/issue-29516.rs
index 465986583b1..465986583b1 100644
--- a/src/test/run-pass/issue-29516.rs
+++ b/src/test/ui/run-pass/issues/issue-29516.rs
diff --git a/src/test/run-pass/issue-29522.rs b/src/test/ui/run-pass/issues/issue-29522.rs
index de7c7aee055..de7c7aee055 100644
--- a/src/test/run-pass/issue-29522.rs
+++ b/src/test/ui/run-pass/issues/issue-29522.rs
diff --git a/src/test/run-pass/issue-29540.rs b/src/test/ui/run-pass/issues/issue-29540.rs
index 285cf5763cc..285cf5763cc 100644
--- a/src/test/run-pass/issue-29540.rs
+++ b/src/test/ui/run-pass/issues/issue-29540.rs
diff --git a/src/test/run-pass/issue-29663.rs b/src/test/ui/run-pass/issues/issue-29663.rs
index 9a77be049fe..9a77be049fe 100644
--- a/src/test/run-pass/issue-29663.rs
+++ b/src/test/ui/run-pass/issues/issue-29663.rs
diff --git a/src/test/run-pass/issue-29668.rs b/src/test/ui/run-pass/issues/issue-29668.rs
index be785de44d1..be785de44d1 100644
--- a/src/test/run-pass/issue-29668.rs
+++ b/src/test/ui/run-pass/issues/issue-29668.rs
diff --git a/src/test/run-pass/issue-29710.rs b/src/test/ui/run-pass/issues/issue-29710.rs
index f4cfb7e3af8..f4cfb7e3af8 100644
--- a/src/test/run-pass/issue-29710.rs
+++ b/src/test/ui/run-pass/issues/issue-29710.rs
diff --git a/src/test/run-pass/issue-29740.rs b/src/test/ui/run-pass/issues/issue-29740.rs
index eb7b740db6e..eb7b740db6e 100644
--- a/src/test/run-pass/issue-29740.rs
+++ b/src/test/ui/run-pass/issues/issue-29740.rs
diff --git a/src/test/run-pass/issue-29746.rs b/src/test/ui/run-pass/issues/issue-29746.rs
index d4463fed1a6..d4463fed1a6 100644
--- a/src/test/run-pass/issue-29746.rs
+++ b/src/test/ui/run-pass/issues/issue-29746.rs
diff --git a/src/test/run-pass/issue-29844.rs b/src/test/ui/run-pass/issues/issue-29844.rs
index 51df4d60f04..51df4d60f04 100644
--- a/src/test/run-pass/issue-29844.rs
+++ b/src/test/ui/run-pass/issues/issue-29844.rs
diff --git a/src/test/run-pass/issue-2989.rs b/src/test/ui/run-pass/issues/issue-2989.rs
index a4342f33402..a4342f33402 100644
--- a/src/test/run-pass/issue-2989.rs
+++ b/src/test/ui/run-pass/issues/issue-2989.rs
diff --git a/src/test/run-pass/issue-29914-2.rs b/src/test/ui/run-pass/issues/issue-29914-2.rs
index fe0a6cf2880..fe0a6cf2880 100644
--- a/src/test/run-pass/issue-29914-2.rs
+++ b/src/test/ui/run-pass/issues/issue-29914-2.rs
diff --git a/src/test/run-pass/issue-29914-3.rs b/src/test/ui/run-pass/issues/issue-29914-3.rs
index 3a02764164c..3a02764164c 100644
--- a/src/test/run-pass/issue-29914-3.rs
+++ b/src/test/ui/run-pass/issues/issue-29914-3.rs
diff --git a/src/test/run-pass/issue-29914.rs b/src/test/ui/run-pass/issues/issue-29914.rs
index bb933f0e422..bb933f0e422 100644
--- a/src/test/run-pass/issue-29914.rs
+++ b/src/test/ui/run-pass/issues/issue-29914.rs
diff --git a/src/test/run-pass/issue-29927.rs b/src/test/ui/run-pass/issues/issue-29927.rs
index 3079d9de3c2..3079d9de3c2 100644
--- a/src/test/run-pass/issue-29927.rs
+++ b/src/test/ui/run-pass/issues/issue-29927.rs
diff --git a/src/test/run-pass/issue-29948.rs b/src/test/ui/run-pass/issues/issue-29948.rs
index 3a7e9ba93e1..3a7e9ba93e1 100644
--- a/src/test/run-pass/issue-29948.rs
+++ b/src/test/ui/run-pass/issues/issue-29948.rs
diff --git a/src/test/run-pass/issue-30018-nopanic.rs b/src/test/ui/run-pass/issues/issue-30018-nopanic.rs
index 25eff9def9d..25eff9def9d 100644
--- a/src/test/run-pass/issue-30018-nopanic.rs
+++ b/src/test/ui/run-pass/issues/issue-30018-nopanic.rs
diff --git a/src/test/run-pass/issue-30018-panic.rs b/src/test/ui/run-pass/issues/issue-30018-panic.rs
index e39ffb87425..e39ffb87425 100644
--- a/src/test/run-pass/issue-30018-panic.rs
+++ b/src/test/ui/run-pass/issues/issue-30018-panic.rs
diff --git a/src/test/run-pass/issue-30081.rs b/src/test/ui/run-pass/issues/issue-30081.rs
index 13e9daa7883..13e9daa7883 100644
--- a/src/test/run-pass/issue-30081.rs
+++ b/src/test/ui/run-pass/issues/issue-30081.rs
diff --git a/src/test/run-pass/issue-3012-2.rs b/src/test/ui/run-pass/issues/issue-3012-2.rs
index bcf8a918091..bcf8a918091 100644
--- a/src/test/run-pass/issue-3012-2.rs
+++ b/src/test/ui/run-pass/issues/issue-3012-2.rs
diff --git a/src/test/run-pass/issue-30240.rs b/src/test/ui/run-pass/issues/issue-30240.rs
index 3be661ce35e..3be661ce35e 100644
--- a/src/test/run-pass/issue-30240.rs
+++ b/src/test/ui/run-pass/issues/issue-30240.rs
diff --git a/src/test/run-pass/issue-3026.rs b/src/test/ui/run-pass/issues/issue-3026.rs
index 7c0dc8a0048..7c0dc8a0048 100644
--- a/src/test/run-pass/issue-3026.rs
+++ b/src/test/ui/run-pass/issues/issue-3026.rs
diff --git a/src/test/run-pass/issue-3037.rs b/src/test/ui/run-pass/issues/issue-3037.rs
index 83a522a69e3..83a522a69e3 100644
--- a/src/test/run-pass/issue-3037.rs
+++ b/src/test/ui/run-pass/issues/issue-3037.rs
diff --git a/src/test/run-pass/issue-30371.rs b/src/test/ui/run-pass/issues/issue-30371.rs
index a4ab475e9ea..a4ab475e9ea 100644
--- a/src/test/run-pass/issue-30371.rs
+++ b/src/test/ui/run-pass/issues/issue-30371.rs
diff --git a/src/test/run-pass/issue-30490.rs b/src/test/ui/run-pass/issues/issue-30490.rs
index 633bd53864d..633bd53864d 100644
--- a/src/test/run-pass/issue-30490.rs
+++ b/src/test/ui/run-pass/issues/issue-30490.rs
diff --git a/src/test/run-pass/issue-3052.rs b/src/test/ui/run-pass/issues/issue-3052.rs
index 3b56b2e28ff..3b56b2e28ff 100644
--- a/src/test/run-pass/issue-3052.rs
+++ b/src/test/ui/run-pass/issues/issue-3052.rs
diff --git a/src/test/run-pass/issue-30530.rs b/src/test/ui/run-pass/issues/issue-30530.rs
index d5139c908bd..d5139c908bd 100644
--- a/src/test/run-pass/issue-30530.rs
+++ b/src/test/ui/run-pass/issues/issue-30530.rs
diff --git a/src/test/run-pass/issue-30615.rs b/src/test/ui/run-pass/issues/issue-30615.rs
index a26509d1982..a26509d1982 100644
--- a/src/test/run-pass/issue-30615.rs
+++ b/src/test/ui/run-pass/issues/issue-30615.rs
diff --git a/src/test/run-pass/issue-30756.rs b/src/test/ui/run-pass/issues/issue-30756.rs
index 621607e5f6f..621607e5f6f 100644
--- a/src/test/run-pass/issue-30756.rs
+++ b/src/test/ui/run-pass/issues/issue-30756.rs
diff --git a/src/test/run-pass/issue-30891.rs b/src/test/ui/run-pass/issues/issue-30891.rs
index 622e5fa544e..622e5fa544e 100644
--- a/src/test/run-pass/issue-30891.rs
+++ b/src/test/ui/run-pass/issues/issue-30891.rs
diff --git a/src/test/run-pass/issue-3091.rs b/src/test/ui/run-pass/issues/issue-3091.rs
index c67399a89e9..c67399a89e9 100644
--- a/src/test/run-pass/issue-3091.rs
+++ b/src/test/ui/run-pass/issues/issue-3091.rs
diff --git a/src/test/run-pass/issue-3109.rs b/src/test/ui/run-pass/issues/issue-3109.rs
index dc22ebce804..dc22ebce804 100644
--- a/src/test/run-pass/issue-3109.rs
+++ b/src/test/ui/run-pass/issues/issue-3109.rs
diff --git a/src/test/run-pass/issue-3121.rs b/src/test/ui/run-pass/issues/issue-3121.rs
index a0bdcf18ec5..a0bdcf18ec5 100644
--- a/src/test/run-pass/issue-3121.rs
+++ b/src/test/ui/run-pass/issues/issue-3121.rs
diff --git a/src/test/run-pass/issue-31260.rs b/src/test/ui/run-pass/issues/issue-31260.rs
index d21ffb96bef..d21ffb96bef 100644
--- a/src/test/run-pass/issue-31260.rs
+++ b/src/test/ui/run-pass/issues/issue-31260.rs
diff --git a/src/test/run-pass/issue-31267-additional.rs b/src/test/ui/run-pass/issues/issue-31267-additional.rs
index 06ab310f6d2..06ab310f6d2 100644
--- a/src/test/run-pass/issue-31267-additional.rs
+++ b/src/test/ui/run-pass/issues/issue-31267-additional.rs
diff --git a/src/test/run-pass/issue-31267.rs b/src/test/ui/run-pass/issues/issue-31267.rs
index 9cbdde40491..9cbdde40491 100644
--- a/src/test/run-pass/issue-31267.rs
+++ b/src/test/ui/run-pass/issues/issue-31267.rs
diff --git a/src/test/run-pass/issue-31299.rs b/src/test/ui/run-pass/issues/issue-31299.rs
index 6c04e66068e..6c04e66068e 100644
--- a/src/test/run-pass/issue-31299.rs
+++ b/src/test/ui/run-pass/issues/issue-31299.rs
diff --git a/src/test/run-pass/issue-3149.rs b/src/test/ui/run-pass/issues/issue-3149.rs
index fa33bd8fce8..fa33bd8fce8 100644
--- a/src/test/run-pass/issue-3149.rs
+++ b/src/test/ui/run-pass/issues/issue-3149.rs
diff --git a/src/test/run-pass/issue-31597.rs b/src/test/ui/run-pass/issues/issue-31597.rs
index 9acd6384b75..9acd6384b75 100644
--- a/src/test/run-pass/issue-31597.rs
+++ b/src/test/ui/run-pass/issues/issue-31597.rs
diff --git a/src/test/run-pass/issue-31702.rs b/src/test/ui/run-pass/issues/issue-31702.rs
index 334c1b2a28b..334c1b2a28b 100644
--- a/src/test/run-pass/issue-31702.rs
+++ b/src/test/ui/run-pass/issues/issue-31702.rs
diff --git a/src/test/run-pass/issue-31776.rs b/src/test/ui/run-pass/issues/issue-31776.rs
index 0f1f6290a25..0f1f6290a25 100644
--- a/src/test/run-pass/issue-31776.rs
+++ b/src/test/ui/run-pass/issues/issue-31776.rs
diff --git a/src/test/run-pass/issue-32008.rs b/src/test/ui/run-pass/issues/issue-32008.rs
index 95890d2e1b4..95890d2e1b4 100644
--- a/src/test/run-pass/issue-32008.rs
+++ b/src/test/ui/run-pass/issues/issue-32008.rs
diff --git a/src/test/run-pass/issue-3211.rs b/src/test/ui/run-pass/issues/issue-3211.rs
index 28c9bf1e83a..28c9bf1e83a 100644
--- a/src/test/run-pass/issue-3211.rs
+++ b/src/test/ui/run-pass/issues/issue-3211.rs
diff --git a/src/test/run-pass/issue-3220.rs b/src/test/ui/run-pass/issues/issue-3220.rs
index 0a37a013037..0a37a013037 100644
--- a/src/test/run-pass/issue-3220.rs
+++ b/src/test/ui/run-pass/issues/issue-3220.rs
diff --git a/src/test/run-pass/issue-32292.rs b/src/test/ui/run-pass/issues/issue-32292.rs
index ed319b1391d..ed319b1391d 100644
--- a/src/test/run-pass/issue-32292.rs
+++ b/src/test/ui/run-pass/issues/issue-32292.rs
diff --git a/src/test/run-pass/issue-32324.rs b/src/test/ui/run-pass/issues/issue-32324.rs
index ca9dd6ada80..ca9dd6ada80 100644
--- a/src/test/run-pass/issue-32324.rs
+++ b/src/test/ui/run-pass/issues/issue-32324.rs
diff --git a/src/test/run-pass/issue-32389.rs b/src/test/ui/run-pass/issues/issue-32389.rs
index 2f6cfb61205..2f6cfb61205 100644
--- a/src/test/run-pass/issue-32389.rs
+++ b/src/test/ui/run-pass/issues/issue-32389.rs
diff --git a/src/test/run-pass/issue-32518.rs b/src/test/ui/run-pass/issues/issue-32518.rs
index 386d3e6524c..386d3e6524c 100644
--- a/src/test/run-pass/issue-32518.rs
+++ b/src/test/ui/run-pass/issues/issue-32518.rs
diff --git a/src/test/run-pass/issue-32805.rs b/src/test/ui/run-pass/issues/issue-32805.rs
index b7ff63b75ce..b7ff63b75ce 100644
--- a/src/test/run-pass/issue-32805.rs
+++ b/src/test/ui/run-pass/issues/issue-32805.rs
diff --git a/src/test/run-pass/issue-3290.rs b/src/test/ui/run-pass/issues/issue-3290.rs
index 6c775e15fb5..6c775e15fb5 100644
--- a/src/test/run-pass/issue-3290.rs
+++ b/src/test/ui/run-pass/issues/issue-3290.rs
diff --git a/src/test/run-pass/issue-32947.rs b/src/test/ui/run-pass/issues/issue-32947.rs
index d059a46b4df..d059a46b4df 100644
--- a/src/test/run-pass/issue-32947.rs
+++ b/src/test/ui/run-pass/issues/issue-32947.rs
diff --git a/src/test/run-pass/issue-33096.rs b/src/test/ui/run-pass/issues/issue-33096.rs
index c3cf008c825..c3cf008c825 100644
--- a/src/test/run-pass/issue-33096.rs
+++ b/src/test/ui/run-pass/issues/issue-33096.rs
diff --git a/src/test/run-pass/issue-33185.rs b/src/test/ui/run-pass/issues/issue-33185.rs
index f12e65323bc..f12e65323bc 100644
--- a/src/test/run-pass/issue-33185.rs
+++ b/src/test/ui/run-pass/issues/issue-33185.rs
diff --git a/src/test/run-pass/issue-33187.rs b/src/test/ui/run-pass/issues/issue-33187.rs
index 477112ab3c5..477112ab3c5 100644
--- a/src/test/run-pass/issue-33187.rs
+++ b/src/test/ui/run-pass/issues/issue-33187.rs
diff --git a/src/test/run-pass/issue-33202.rs b/src/test/ui/run-pass/issues/issue-33202.rs
index eb4192942f5..eb4192942f5 100644
--- a/src/test/run-pass/issue-33202.rs
+++ b/src/test/ui/run-pass/issues/issue-33202.rs
diff --git a/src/test/run-pass/issue-33264.rs b/src/test/ui/run-pass/issues/issue-33264.rs
index cb4b227548a..cb4b227548a 100644
--- a/src/test/run-pass/issue-33264.rs
+++ b/src/test/ui/run-pass/issues/issue-33264.rs
diff --git a/src/test/run-pass/issue-33287.rs b/src/test/ui/run-pass/issues/issue-33287.rs
index a2021e0e527..a2021e0e527 100644
--- a/src/test/run-pass/issue-33287.rs
+++ b/src/test/ui/run-pass/issues/issue-33287.rs
diff --git a/src/test/run-pass/issue-333.rs b/src/test/ui/run-pass/issues/issue-333.rs
index bdd0a535303..bdd0a535303 100644
--- a/src/test/run-pass/issue-333.rs
+++ b/src/test/ui/run-pass/issues/issue-333.rs
diff --git a/src/test/run-pass/issue-33387.rs b/src/test/ui/run-pass/issues/issue-33387.rs
index d30e88b3968..d30e88b3968 100644
--- a/src/test/run-pass/issue-33387.rs
+++ b/src/test/ui/run-pass/issues/issue-33387.rs
diff --git a/src/test/run-pass/issue-33461.rs b/src/test/ui/run-pass/issues/issue-33461.rs
index ac7f7ff4229..ac7f7ff4229 100644
--- a/src/test/run-pass/issue-33461.rs
+++ b/src/test/ui/run-pass/issues/issue-33461.rs
diff --git a/src/test/run-pass/issue-33498.rs b/src/test/ui/run-pass/issues/issue-33498.rs
index 9b4e1918bae..9b4e1918bae 100644
--- a/src/test/run-pass/issue-33498.rs
+++ b/src/test/ui/run-pass/issues/issue-33498.rs
diff --git a/src/test/run-pass/issue-33537.rs b/src/test/ui/run-pass/issues/issue-33537.rs
index 7be79f3a450..7be79f3a450 100644
--- a/src/test/run-pass/issue-33537.rs
+++ b/src/test/ui/run-pass/issues/issue-33537.rs
diff --git a/src/test/run-pass/issue-33687.rs b/src/test/ui/run-pass/issues/issue-33687.rs
index 59badca065a..59badca065a 100644
--- a/src/test/run-pass/issue-33687.rs
+++ b/src/test/ui/run-pass/issues/issue-33687.rs
diff --git a/src/test/run-pass/issue-33770.rs b/src/test/ui/run-pass/issues/issue-33770.rs
index 7fad2b3e4a2..7fad2b3e4a2 100644
--- a/src/test/run-pass/issue-33770.rs
+++ b/src/test/ui/run-pass/issues/issue-33770.rs
diff --git a/src/test/run-pass/issue-3389.rs b/src/test/ui/run-pass/issues/issue-3389.rs
index 70e3484a0c5..70e3484a0c5 100644
--- a/src/test/run-pass/issue-3389.rs
+++ b/src/test/ui/run-pass/issues/issue-3389.rs
diff --git a/src/test/run-pass/issue-33903.rs b/src/test/ui/run-pass/issues/issue-33903.rs
index 3bc0f7a0fde..3bc0f7a0fde 100644
--- a/src/test/run-pass/issue-33903.rs
+++ b/src/test/ui/run-pass/issues/issue-33903.rs
diff --git a/src/test/run-pass/issue-33992.rs b/src/test/ui/run-pass/issues/issue-33992.rs
index 98da7d46b1a..98da7d46b1a 100644
--- a/src/test/run-pass/issue-33992.rs
+++ b/src/test/ui/run-pass/issues/issue-33992.rs
diff --git a/src/test/run-pass/issue-34053.rs b/src/test/ui/run-pass/issues/issue-34053.rs
index 81c45524147..81c45524147 100644
--- a/src/test/run-pass/issue-34053.rs
+++ b/src/test/ui/run-pass/issues/issue-34053.rs
diff --git a/src/test/run-pass/issue-34074.rs b/src/test/ui/run-pass/issues/issue-34074.rs
index 17d2bee7466..17d2bee7466 100644
--- a/src/test/run-pass/issue-34074.rs
+++ b/src/test/ui/run-pass/issues/issue-34074.rs
diff --git a/src/test/run-pass/issue-34194.rs b/src/test/ui/run-pass/issues/issue-34194.rs
index e1aef899619..e1aef899619 100644
--- a/src/test/run-pass/issue-34194.rs
+++ b/src/test/ui/run-pass/issues/issue-34194.rs
diff --git a/src/test/run-pass/issue-3424.rs b/src/test/ui/run-pass/issues/issue-3424.rs
index 74e58f31e23..74e58f31e23 100644
--- a/src/test/run-pass/issue-3424.rs
+++ b/src/test/ui/run-pass/issues/issue-3424.rs
diff --git a/src/test/run-pass/issue-3429.rs b/src/test/ui/run-pass/issues/issue-3429.rs
index 325a3ec7151..325a3ec7151 100644
--- a/src/test/run-pass/issue-3429.rs
+++ b/src/test/ui/run-pass/issues/issue-3429.rs
diff --git a/src/test/run-pass/issue-34427.rs b/src/test/ui/run-pass/issues/issue-34427.rs
index 6bf8a2ac6a7..6bf8a2ac6a7 100644
--- a/src/test/run-pass/issue-34427.rs
+++ b/src/test/ui/run-pass/issues/issue-34427.rs
diff --git a/src/test/run-pass/issue-3447.rs b/src/test/ui/run-pass/issues/issue-3447.rs
index 1558d94bae7..1558d94bae7 100644
--- a/src/test/run-pass/issue-3447.rs
+++ b/src/test/ui/run-pass/issues/issue-3447.rs
diff --git a/src/test/run-pass/issue-34503.rs b/src/test/ui/run-pass/issues/issue-34503.rs
index e6217243eeb..e6217243eeb 100644
--- a/src/test/run-pass/issue-34503.rs
+++ b/src/test/ui/run-pass/issues/issue-34503.rs
diff --git a/src/test/run-pass/issue-34569.rs b/src/test/ui/run-pass/issues/issue-34569.rs
index 5c7c5a2b3b9..5c7c5a2b3b9 100644
--- a/src/test/run-pass/issue-34569.rs
+++ b/src/test/ui/run-pass/issues/issue-34569.rs
diff --git a/src/test/run-pass/issue-34571.rs b/src/test/ui/run-pass/issues/issue-34571.rs
index 7d804156576..7d804156576 100644
--- a/src/test/run-pass/issue-34571.rs
+++ b/src/test/ui/run-pass/issues/issue-34571.rs
diff --git a/src/test/run-pass/issue-34751.rs b/src/test/ui/run-pass/issues/issue-34751.rs
index d4cea506f73..d4cea506f73 100644
--- a/src/test/run-pass/issue-34751.rs
+++ b/src/test/ui/run-pass/issues/issue-34751.rs
diff --git a/src/test/run-pass/issue-34780.rs b/src/test/ui/run-pass/issues/issue-34780.rs
index eda4ebb7132..eda4ebb7132 100644
--- a/src/test/run-pass/issue-34780.rs
+++ b/src/test/ui/run-pass/issues/issue-34780.rs
diff --git a/src/test/run-pass/issue-34784.rs b/src/test/ui/run-pass/issues/issue-34784.rs
index c9a214e0ced..c9a214e0ced 100644
--- a/src/test/run-pass/issue-34784.rs
+++ b/src/test/ui/run-pass/issues/issue-34784.rs
diff --git a/src/test/run-pass/issue-34796.rs b/src/test/ui/run-pass/issues/issue-34796.rs
index 0fb6ccc0dc8..0fb6ccc0dc8 100644
--- a/src/test/run-pass/issue-34796.rs
+++ b/src/test/ui/run-pass/issues/issue-34796.rs
diff --git a/src/test/run-pass/issue-34798.rs b/src/test/ui/run-pass/issues/issue-34798.rs
index e217d07ed72..e217d07ed72 100644
--- a/src/test/run-pass/issue-34798.rs
+++ b/src/test/ui/run-pass/issues/issue-34798.rs
diff --git a/src/test/run-pass/issue-34932.rs b/src/test/ui/run-pass/issues/issue-34932.rs
index dca387dcc21..dca387dcc21 100644
--- a/src/test/run-pass/issue-34932.rs
+++ b/src/test/ui/run-pass/issues/issue-34932.rs
diff --git a/src/test/run-pass/issue-3500.rs b/src/test/ui/run-pass/issues/issue-3500.rs
index f1d9f888b08..f1d9f888b08 100644
--- a/src/test/run-pass/issue-3500.rs
+++ b/src/test/ui/run-pass/issues/issue-3500.rs
diff --git a/src/test/run-pass/issue-35376.rs b/src/test/ui/run-pass/issues/issue-35376.rs
index 9e4eb84edc6..9e4eb84edc6 100644
--- a/src/test/run-pass/issue-35376.rs
+++ b/src/test/ui/run-pass/issues/issue-35376.rs
diff --git a/src/test/run-pass/issue-35423.rs b/src/test/ui/run-pass/issues/issue-35423.rs
index 34cb2930db0..34cb2930db0 100644
--- a/src/test/run-pass/issue-35423.rs
+++ b/src/test/ui/run-pass/issues/issue-35423.rs
diff --git a/src/test/run-pass/issue-35546.rs b/src/test/ui/run-pass/issues/issue-35546.rs
index e8d14f1d421..e8d14f1d421 100644
--- a/src/test/run-pass/issue-35546.rs
+++ b/src/test/ui/run-pass/issues/issue-35546.rs
diff --git a/src/test/run-pass/issue-3556.rs b/src/test/ui/run-pass/issues/issue-3556.rs
index e6b577ada0c..e6b577ada0c 100644
--- a/src/test/run-pass/issue-3556.rs
+++ b/src/test/ui/run-pass/issues/issue-3556.rs
diff --git a/src/test/run-pass/issue-3559.rs b/src/test/ui/run-pass/issues/issue-3559.rs
index 64f053d9a8c..64f053d9a8c 100644
--- a/src/test/run-pass/issue-3559.rs
+++ b/src/test/ui/run-pass/issues/issue-3559.rs
diff --git a/src/test/run-pass/issue-35600.rs b/src/test/ui/run-pass/issues/issue-35600.rs
index 88358eff08d..88358eff08d 100644
--- a/src/test/run-pass/issue-35600.rs
+++ b/src/test/ui/run-pass/issues/issue-35600.rs
diff --git a/src/test/run-pass/issue-3563-2.rs b/src/test/ui/run-pass/issues/issue-3563-2.rs
index 65c21317cf2..65c21317cf2 100644
--- a/src/test/run-pass/issue-3563-2.rs
+++ b/src/test/ui/run-pass/issues/issue-3563-2.rs
diff --git a/src/test/run-pass/issue-3563-3.rs b/src/test/ui/run-pass/issues/issue-3563-3.rs
index 56208d08779..56208d08779 100644
--- a/src/test/run-pass/issue-3563-3.rs
+++ b/src/test/ui/run-pass/issues/issue-3563-3.rs
diff --git a/src/test/run-pass/issue-3574.rs b/src/test/ui/run-pass/issues/issue-3574.rs
index 9aac52fa2f8..9aac52fa2f8 100644
--- a/src/test/run-pass/issue-3574.rs
+++ b/src/test/ui/run-pass/issues/issue-3574.rs
diff --git a/src/test/run-pass/issue-35815.rs b/src/test/ui/run-pass/issues/issue-35815.rs
index 61954292650..61954292650 100644
--- a/src/test/run-pass/issue-35815.rs
+++ b/src/test/ui/run-pass/issues/issue-35815.rs
diff --git a/src/test/run-pass/issue-36023.rs b/src/test/ui/run-pass/issues/issue-36023.rs
index f6c03b384f2..f6c03b384f2 100644
--- a/src/test/run-pass/issue-36023.rs
+++ b/src/test/ui/run-pass/issues/issue-36023.rs
diff --git a/src/test/run-pass/issue-36036-associated-type-layout.rs b/src/test/ui/run-pass/issues/issue-36036-associated-type-layout.rs
index 4ee3be0eb7b..4ee3be0eb7b 100644
--- a/src/test/run-pass/issue-36036-associated-type-layout.rs
+++ b/src/test/ui/run-pass/issues/issue-36036-associated-type-layout.rs
diff --git a/src/test/run-pass/issue-36053.rs b/src/test/ui/run-pass/issues/issue-36053.rs
index ece58eedc56..ece58eedc56 100644
--- a/src/test/run-pass/issue-36053.rs
+++ b/src/test/ui/run-pass/issues/issue-36053.rs
diff --git a/src/test/run-pass/issue-36075.rs b/src/test/ui/run-pass/issues/issue-36075.rs
index fe399e10c1c..fe399e10c1c 100644
--- a/src/test/run-pass/issue-36075.rs
+++ b/src/test/ui/run-pass/issues/issue-36075.rs
diff --git a/src/test/run-pass/issue-3609.rs b/src/test/ui/run-pass/issues/issue-3609.rs
index f53053f2edc..f53053f2edc 100644
--- a/src/test/run-pass/issue-3609.rs
+++ b/src/test/ui/run-pass/issues/issue-3609.rs
diff --git a/src/test/run-pass/issue-36139-normalize-closure-sig.rs b/src/test/ui/run-pass/issues/issue-36139-normalize-closure-sig.rs
index adde0ed3066..adde0ed3066 100644
--- a/src/test/run-pass/issue-36139-normalize-closure-sig.rs
+++ b/src/test/ui/run-pass/issues/issue-36139-normalize-closure-sig.rs
diff --git a/src/test/run-pass/issue-36260.rs b/src/test/ui/run-pass/issues/issue-36260.rs
index 08dbbb5c9fe..08dbbb5c9fe 100644
--- a/src/test/run-pass/issue-36260.rs
+++ b/src/test/ui/run-pass/issues/issue-36260.rs
diff --git a/src/test/run-pass/issue-36278-prefix-nesting.rs b/src/test/ui/run-pass/issues/issue-36278-prefix-nesting.rs
index 95269d0569d..95269d0569d 100644
--- a/src/test/run-pass/issue-36278-prefix-nesting.rs
+++ b/src/test/ui/run-pass/issues/issue-36278-prefix-nesting.rs
diff --git a/src/test/run-pass/issue-36381.rs b/src/test/ui/run-pass/issues/issue-36381.rs
index 2694c98dd91..2694c98dd91 100644
--- a/src/test/run-pass/issue-36381.rs
+++ b/src/test/ui/run-pass/issues/issue-36381.rs
diff --git a/src/test/run-pass/issue-36401.rs b/src/test/ui/run-pass/issues/issue-36401.rs
index 7b08eba9e49..7b08eba9e49 100644
--- a/src/test/run-pass/issue-36401.rs
+++ b/src/test/ui/run-pass/issues/issue-36401.rs
diff --git a/src/test/run-pass/issue-36474.rs b/src/test/ui/run-pass/issues/issue-36474.rs
index 025244ca664..025244ca664 100644
--- a/src/test/run-pass/issue-36474.rs
+++ b/src/test/ui/run-pass/issues/issue-36474.rs
diff --git a/src/test/run-pass/issue-3656.rs b/src/test/ui/run-pass/issues/issue-3656.rs
index c278dcef9dd..c278dcef9dd 100644
--- a/src/test/run-pass/issue-3656.rs
+++ b/src/test/ui/run-pass/issues/issue-3656.rs
diff --git a/src/test/run-pass/issue-36744-bitcast-args-if-needed.rs b/src/test/ui/run-pass/issues/issue-36744-bitcast-args-if-needed.rs
index 1859cc9ca00..1859cc9ca00 100644
--- a/src/test/run-pass/issue-36744-bitcast-args-if-needed.rs
+++ b/src/test/ui/run-pass/issues/issue-36744-bitcast-args-if-needed.rs
diff --git a/src/test/run-pass/issue-36744-without-calls.rs b/src/test/ui/run-pass/issues/issue-36744-without-calls.rs
index 1766edb06b4..1766edb06b4 100644
--- a/src/test/run-pass/issue-36744-without-calls.rs
+++ b/src/test/ui/run-pass/issues/issue-36744-without-calls.rs
diff --git a/src/test/run-pass/issue-36768.rs b/src/test/ui/run-pass/issues/issue-36768.rs
index bb4d12919a1..bb4d12919a1 100644
--- a/src/test/run-pass/issue-36768.rs
+++ b/src/test/ui/run-pass/issues/issue-36768.rs
diff --git a/src/test/run-pass/issue-36786-resolve-call.rs b/src/test/ui/run-pass/issues/issue-36786-resolve-call.rs
index 0d718c7ba46..0d718c7ba46 100644
--- a/src/test/run-pass/issue-36786-resolve-call.rs
+++ b/src/test/ui/run-pass/issues/issue-36786-resolve-call.rs
diff --git a/src/test/run-pass/issue-36792.rs b/src/test/ui/run-pass/issues/issue-36792.rs
index f2755ec3f84..f2755ec3f84 100644
--- a/src/test/run-pass/issue-36792.rs
+++ b/src/test/ui/run-pass/issues/issue-36792.rs
diff --git a/src/test/run-pass/issue-36816.rs b/src/test/ui/run-pass/issues/issue-36816.rs
index 22f3a52b26e..22f3a52b26e 100644
--- a/src/test/run-pass/issue-36816.rs
+++ b/src/test/ui/run-pass/issues/issue-36816.rs
diff --git a/src/test/run-pass/issue-3683.rs b/src/test/ui/run-pass/issues/issue-3683.rs
index ed9b8066104..ed9b8066104 100644
--- a/src/test/run-pass/issue-3683.rs
+++ b/src/test/ui/run-pass/issues/issue-3683.rs
diff --git a/src/test/run-pass/issue-36856.rs b/src/test/ui/run-pass/issues/issue-36856.rs
index 91a0dadd653..91a0dadd653 100644
--- a/src/test/run-pass/issue-36856.rs
+++ b/src/test/ui/run-pass/issues/issue-36856.rs
diff --git a/src/test/run-pass/issue-36936.rs b/src/test/ui/run-pass/issues/issue-36936.rs
index 34a9c291668..34a9c291668 100644
--- a/src/test/run-pass/issue-36936.rs
+++ b/src/test/ui/run-pass/issues/issue-36936.rs
diff --git a/src/test/run-pass/issue-36954.rs b/src/test/ui/run-pass/issues/issue-36954.rs
index f8330ba99b7..f8330ba99b7 100644
--- a/src/test/run-pass/issue-36954.rs
+++ b/src/test/ui/run-pass/issues/issue-36954.rs
diff --git a/src/test/run-pass/issue-3702.rs b/src/test/ui/run-pass/issues/issue-3702.rs
index 9c09b8cd1c7..9c09b8cd1c7 100644
--- a/src/test/run-pass/issue-3702.rs
+++ b/src/test/ui/run-pass/issues/issue-3702.rs
diff --git a/src/test/run-pass/issue-37109.rs b/src/test/ui/run-pass/issues/issue-37109.rs
index 1c893071d55..1c893071d55 100644
--- a/src/test/run-pass/issue-37109.rs
+++ b/src/test/ui/run-pass/issues/issue-37109.rs
diff --git a/src/test/run-pass/issue-37175.rs b/src/test/ui/run-pass/issues/issue-37175.rs
index 0d3613b573e..0d3613b573e 100644
--- a/src/test/run-pass/issue-37175.rs
+++ b/src/test/ui/run-pass/issues/issue-37175.rs
diff --git a/src/test/run-pass/issue-37222.rs b/src/test/ui/run-pass/issues/issue-37222.rs
index 381a5799cc5..381a5799cc5 100644
--- a/src/test/run-pass/issue-37222.rs
+++ b/src/test/ui/run-pass/issues/issue-37222.rs
diff --git a/src/test/run-pass/issue-37291/auxiliary/lib.rs b/src/test/ui/run-pass/issues/issue-37291/auxiliary/lib.rs
index 67cdea807be..67cdea807be 100644
--- a/src/test/run-pass/issue-37291/auxiliary/lib.rs
+++ b/src/test/ui/run-pass/issues/issue-37291/auxiliary/lib.rs
diff --git a/src/test/run-pass/issue-37291/main.rs b/src/test/ui/run-pass/issues/issue-37291/main.rs
index 2461f7485f2..2461f7485f2 100644
--- a/src/test/run-pass/issue-37291/main.rs
+++ b/src/test/ui/run-pass/issues/issue-37291/main.rs
diff --git a/src/test/run-pass/issue-3743.rs b/src/test/ui/run-pass/issues/issue-3743.rs
index cd62c04a325..cd62c04a325 100644
--- a/src/test/run-pass/issue-3743.rs
+++ b/src/test/ui/run-pass/issues/issue-3743.rs
diff --git a/src/test/run-pass/issue-3753.rs b/src/test/ui/run-pass/issues/issue-3753.rs
index e6eb8efe442..e6eb8efe442 100644
--- a/src/test/run-pass/issue-3753.rs
+++ b/src/test/ui/run-pass/issues/issue-3753.rs
diff --git a/src/test/run-pass/issue-37598.rs b/src/test/ui/run-pass/issues/issue-37598.rs
index e97c8d9f417..e97c8d9f417 100644
--- a/src/test/run-pass/issue-37598.rs
+++ b/src/test/ui/run-pass/issues/issue-37598.rs
diff --git a/src/test/run-pass/issue-37655.rs b/src/test/ui/run-pass/issues/issue-37655.rs
index d229bcacc50..d229bcacc50 100644
--- a/src/test/run-pass/issue-37655.rs
+++ b/src/test/ui/run-pass/issues/issue-37655.rs
diff --git a/src/test/run-pass/issue-37686.rs b/src/test/ui/run-pass/issues/issue-37686.rs
index 47881d4d530..47881d4d530 100644
--- a/src/test/run-pass/issue-37686.rs
+++ b/src/test/ui/run-pass/issues/issue-37686.rs
diff --git a/src/test/run-pass/issue-37725.rs b/src/test/ui/run-pass/issues/issue-37725.rs
index a8fb11f9c62..a8fb11f9c62 100644
--- a/src/test/run-pass/issue-37725.rs
+++ b/src/test/ui/run-pass/issues/issue-37725.rs
diff --git a/src/test/run-pass/issue-37733.rs b/src/test/ui/run-pass/issues/issue-37733.rs
index 358b93254de..358b93254de 100644
--- a/src/test/run-pass/issue-37733.rs
+++ b/src/test/ui/run-pass/issues/issue-37733.rs
diff --git a/src/test/run-pass/issue-3794.rs b/src/test/ui/run-pass/issues/issue-3794.rs
index badb833ee80..badb833ee80 100644
--- a/src/test/run-pass/issue-3794.rs
+++ b/src/test/ui/run-pass/issues/issue-3794.rs
diff --git a/src/test/run-pass/issue-37991.rs b/src/test/ui/run-pass/issues/issue-37991.rs
index 9b3289e6785..9b3289e6785 100644
--- a/src/test/run-pass/issue-37991.rs
+++ b/src/test/ui/run-pass/issues/issue-37991.rs
diff --git a/src/test/run-pass/issue-38002.rs b/src/test/ui/run-pass/issues/issue-38002.rs
index 4eb381b9eac..4eb381b9eac 100644
--- a/src/test/run-pass/issue-38002.rs
+++ b/src/test/ui/run-pass/issues/issue-38002.rs
diff --git a/src/test/run-pass/issue-38033.rs b/src/test/ui/run-pass/issues/issue-38033.rs
index 50549dc8b23..50549dc8b23 100644
--- a/src/test/run-pass/issue-38033.rs
+++ b/src/test/ui/run-pass/issues/issue-38033.rs
diff --git a/src/test/run-pass/issue-38074.rs b/src/test/ui/run-pass/issues/issue-38074.rs
index 2368ba8a110..2368ba8a110 100644
--- a/src/test/run-pass/issue-38074.rs
+++ b/src/test/ui/run-pass/issues/issue-38074.rs
diff --git a/src/test/run-pass/issue-38091.rs b/src/test/ui/run-pass/issues/issue-38091.rs
index 34050242f84..34050242f84 100644
--- a/src/test/run-pass/issue-38091.rs
+++ b/src/test/ui/run-pass/issues/issue-38091.rs
diff --git a/src/test/run-pass/issue-38190.rs b/src/test/ui/run-pass/issues/issue-38190.rs
index ed9bf9e8095..ed9bf9e8095 100644
--- a/src/test/run-pass/issue-38190.rs
+++ b/src/test/ui/run-pass/issues/issue-38190.rs
diff --git a/src/test/run-pass/issue-38226.rs b/src/test/ui/run-pass/issues/issue-38226.rs
index dd9f9be7da7..dd9f9be7da7 100644
--- a/src/test/run-pass/issue-38226.rs
+++ b/src/test/ui/run-pass/issues/issue-38226.rs
diff --git a/src/test/run-pass/issue-38437.rs b/src/test/ui/run-pass/issues/issue-38437.rs
index a6e7df1c010..a6e7df1c010 100644
--- a/src/test/run-pass/issue-38437.rs
+++ b/src/test/ui/run-pass/issues/issue-38437.rs
diff --git a/src/test/run-pass/issue-3847.rs b/src/test/ui/run-pass/issues/issue-3847.rs
index bd3a726991b..bd3a726991b 100644
--- a/src/test/run-pass/issue-3847.rs
+++ b/src/test/ui/run-pass/issues/issue-3847.rs
diff --git a/src/test/run-pass/issue-38556.rs b/src/test/ui/run-pass/issues/issue-38556.rs
index f6f334f650b..f6f334f650b 100644
--- a/src/test/run-pass/issue-38556.rs
+++ b/src/test/ui/run-pass/issues/issue-38556.rs
diff --git a/src/test/run-pass/issue-38715.rs b/src/test/ui/run-pass/issues/issue-38715.rs
index b158234eb11..b158234eb11 100644
--- a/src/test/run-pass/issue-38715.rs
+++ b/src/test/ui/run-pass/issues/issue-38715.rs
diff --git a/src/test/run-pass/issue-38727.rs b/src/test/ui/run-pass/issues/issue-38727.rs
index e60b6a99f92..e60b6a99f92 100644
--- a/src/test/run-pass/issue-38727.rs
+++ b/src/test/ui/run-pass/issues/issue-38727.rs
diff --git a/src/test/run-pass/issue-3874.rs b/src/test/ui/run-pass/issues/issue-3874.rs
index a29a2675865..a29a2675865 100644
--- a/src/test/run-pass/issue-3874.rs
+++ b/src/test/ui/run-pass/issues/issue-3874.rs
diff --git a/src/test/run-pass/issue-38763.rs b/src/test/ui/run-pass/issues/issue-38763.rs
index e038062ff9a..e038062ff9a 100644
--- a/src/test/run-pass/issue-38763.rs
+++ b/src/test/ui/run-pass/issues/issue-38763.rs
diff --git a/src/test/run-pass/issue-3878.rs b/src/test/ui/run-pass/issues/issue-3878.rs
index e0e11b4fd86..e0e11b4fd86 100644
--- a/src/test/run-pass/issue-3878.rs
+++ b/src/test/ui/run-pass/issues/issue-3878.rs
diff --git a/src/test/run-pass/issue-3888-2.rs b/src/test/ui/run-pass/issues/issue-3888-2.rs
index 24c1a5d05c8..24c1a5d05c8 100644
--- a/src/test/run-pass/issue-3888-2.rs
+++ b/src/test/ui/run-pass/issues/issue-3888-2.rs
diff --git a/src/test/run-pass/issue-38942.rs b/src/test/ui/run-pass/issues/issue-38942.rs
index 9c1c999d090..9c1c999d090 100644
--- a/src/test/run-pass/issue-38942.rs
+++ b/src/test/ui/run-pass/issues/issue-38942.rs
diff --git a/src/test/run-pass/issue-3895.rs b/src/test/ui/run-pass/issues/issue-3895.rs
index ffe14dab300..ffe14dab300 100644
--- a/src/test/run-pass/issue-3895.rs
+++ b/src/test/ui/run-pass/issues/issue-3895.rs
diff --git a/src/test/run-pass/issue-38987.rs b/src/test/ui/run-pass/issues/issue-38987.rs
index 31a3b7233d8..31a3b7233d8 100644
--- a/src/test/run-pass/issue-38987.rs
+++ b/src/test/ui/run-pass/issues/issue-38987.rs
diff --git a/src/test/run-pass/issue-3904.rs b/src/test/ui/run-pass/issues/issue-3904.rs
index e917ecc745f..e917ecc745f 100644
--- a/src/test/run-pass/issue-3904.rs
+++ b/src/test/ui/run-pass/issues/issue-3904.rs
diff --git a/src/test/run-pass/issue-39089.rs b/src/test/ui/run-pass/issues/issue-39089.rs
index c3a58844547..c3a58844547 100644
--- a/src/test/run-pass/issue-39089.rs
+++ b/src/test/ui/run-pass/issues/issue-39089.rs
diff --git a/src/test/run-pass/issue-39292.rs b/src/test/ui/run-pass/issues/issue-39292.rs
index dc2b21f3470..dc2b21f3470 100644
--- a/src/test/run-pass/issue-39292.rs
+++ b/src/test/ui/run-pass/issues/issue-39292.rs
diff --git a/src/test/run-pass/issue-3935.rs b/src/test/ui/run-pass/issues/issue-3935.rs
index 45ff20fc0a9..45ff20fc0a9 100644
--- a/src/test/run-pass/issue-3935.rs
+++ b/src/test/ui/run-pass/issues/issue-3935.rs
diff --git a/src/test/run-pass/issue-39367.rs b/src/test/ui/run-pass/issues/issue-39367.rs
index 3e72efada84..3e72efada84 100644
--- a/src/test/run-pass/issue-39367.rs
+++ b/src/test/ui/run-pass/issues/issue-39367.rs
diff --git a/src/test/run-pass/issue-39467.rs b/src/test/ui/run-pass/issues/issue-39467.rs
index 9f94be271ee..9f94be271ee 100644
--- a/src/test/run-pass/issue-39467.rs
+++ b/src/test/ui/run-pass/issues/issue-39467.rs
diff --git a/src/test/run-pass/issue-39548.rs b/src/test/ui/run-pass/issues/issue-39548.rs
index 7da50670d1d..7da50670d1d 100644
--- a/src/test/run-pass/issue-39548.rs
+++ b/src/test/ui/run-pass/issues/issue-39548.rs
diff --git a/src/test/run-pass/issue-39709.rs b/src/test/ui/run-pass/issues/issue-39709.rs
index ebca9312a64..ebca9312a64 100644
--- a/src/test/run-pass/issue-39709.rs
+++ b/src/test/ui/run-pass/issues/issue-39709.rs
diff --git a/src/test/run-pass/issue-39720.rs b/src/test/ui/run-pass/issues/issue-39720.rs
index 9873a8c2bf4..9873a8c2bf4 100644
--- a/src/test/run-pass/issue-39720.rs
+++ b/src/test/ui/run-pass/issues/issue-39720.rs
diff --git a/src/test/run-pass/issue-3979-2.rs b/src/test/ui/run-pass/issues/issue-3979-2.rs
index 4cd3c04bac3..4cd3c04bac3 100644
--- a/src/test/run-pass/issue-3979-2.rs
+++ b/src/test/ui/run-pass/issues/issue-3979-2.rs
diff --git a/src/test/run-pass/issue-3979-generics.rs b/src/test/ui/run-pass/issues/issue-3979-generics.rs
index 2b56799f6b0..2b56799f6b0 100644
--- a/src/test/run-pass/issue-3979-generics.rs
+++ b/src/test/ui/run-pass/issues/issue-3979-generics.rs
diff --git a/src/test/run-pass/issue-3979-xcrate.rs b/src/test/ui/run-pass/issues/issue-3979-xcrate.rs
index acacc488566..acacc488566 100644
--- a/src/test/run-pass/issue-3979-xcrate.rs
+++ b/src/test/ui/run-pass/issues/issue-3979-xcrate.rs
diff --git a/src/test/run-pass/issue-3979.rs b/src/test/ui/run-pass/issues/issue-3979.rs
index 9b5f7296ab5..9b5f7296ab5 100644
--- a/src/test/run-pass/issue-3979.rs
+++ b/src/test/ui/run-pass/issues/issue-3979.rs
diff --git a/src/test/run-pass/issue-39808.rs b/src/test/ui/run-pass/issues/issue-39808.rs
index 91c70d76eef..91c70d76eef 100644
--- a/src/test/run-pass/issue-39808.rs
+++ b/src/test/ui/run-pass/issues/issue-39808.rs
diff --git a/src/test/run-pass/issue-39823.rs b/src/test/ui/run-pass/issues/issue-39823.rs
index 061a55b03b2..061a55b03b2 100644
--- a/src/test/run-pass/issue-39823.rs
+++ b/src/test/ui/run-pass/issues/issue-39823.rs
diff --git a/src/test/run-pass/issue-39827.rs b/src/test/ui/run-pass/issues/issue-39827.rs
index b753cf5844f..b753cf5844f 100644
--- a/src/test/run-pass/issue-39827.rs
+++ b/src/test/ui/run-pass/issues/issue-39827.rs
diff --git a/src/test/run-pass/issue-3991.rs b/src/test/ui/run-pass/issues/issue-3991.rs
index d89cf8c2e10..d89cf8c2e10 100644
--- a/src/test/run-pass/issue-3991.rs
+++ b/src/test/ui/run-pass/issues/issue-3991.rs
diff --git a/src/test/run-pass/issue-39984.rs b/src/test/ui/run-pass/issues/issue-39984.rs
index a0019e7215c..a0019e7215c 100644
--- a/src/test/run-pass/issue-39984.rs
+++ b/src/test/ui/run-pass/issues/issue-39984.rs
diff --git a/src/test/run-pass/issue-40003.rs b/src/test/ui/run-pass/issues/issue-40003.rs
index 103a365af0e..103a365af0e 100644
--- a/src/test/run-pass/issue-40003.rs
+++ b/src/test/ui/run-pass/issues/issue-40003.rs
diff --git a/src/test/run-pass/issue-40085.rs b/src/test/ui/run-pass/issues/issue-40085.rs
index b6d02908a0f..b6d02908a0f 100644
--- a/src/test/run-pass/issue-40085.rs
+++ b/src/test/ui/run-pass/issues/issue-40085.rs
diff --git a/src/test/run-pass/issue-40136.rs b/src/test/ui/run-pass/issues/issue-40136.rs
index 488754af06f..488754af06f 100644
--- a/src/test/run-pass/issue-40136.rs
+++ b/src/test/ui/run-pass/issues/issue-40136.rs
diff --git a/src/test/run-pass/issue-40235.rs b/src/test/ui/run-pass/issues/issue-40235.rs
index 90f170d8e42..90f170d8e42 100644
--- a/src/test/run-pass/issue-40235.rs
+++ b/src/test/ui/run-pass/issues/issue-40235.rs
diff --git a/src/test/run-pass/issue-4025.rs b/src/test/ui/run-pass/issues/issue-4025.rs
index dec148ca0f6..dec148ca0f6 100644
--- a/src/test/run-pass/issue-4025.rs
+++ b/src/test/ui/run-pass/issues/issue-4025.rs
diff --git a/src/test/run-pass/issue-40408.rs b/src/test/ui/run-pass/issues/issue-40408.rs
index a73dc1966b4..a73dc1966b4 100644
--- a/src/test/run-pass/issue-40408.rs
+++ b/src/test/ui/run-pass/issues/issue-40408.rs
diff --git a/src/test/run-pass/issue-40469.rs b/src/test/ui/run-pass/issues/issue-40469.rs
index 30055e532cd..30055e532cd 100644
--- a/src/test/run-pass/issue-40469.rs
+++ b/src/test/ui/run-pass/issues/issue-40469.rs
diff --git a/src/test/run-pass/issue-40770.rs b/src/test/ui/run-pass/issues/issue-40770.rs
index 599d0b273e3..599d0b273e3 100644
--- a/src/test/run-pass/issue-40770.rs
+++ b/src/test/ui/run-pass/issues/issue-40770.rs
diff --git a/src/test/run-pass/issue-40847.rs b/src/test/ui/run-pass/issues/issue-40847.rs
index 2fa99984401..2fa99984401 100644
--- a/src/test/run-pass/issue-40847.rs
+++ b/src/test/ui/run-pass/issues/issue-40847.rs
diff --git a/src/test/run-pass/issue-40883.rs b/src/test/ui/run-pass/issues/issue-40883.rs
index c1f3b2028aa..c1f3b2028aa 100644
--- a/src/test/run-pass/issue-40883.rs
+++ b/src/test/ui/run-pass/issues/issue-40883.rs
diff --git a/src/test/run-pass/issue-40951.rs b/src/test/ui/run-pass/issues/issue-40951.rs
index adc7101b16a..adc7101b16a 100644
--- a/src/test/run-pass/issue-40951.rs
+++ b/src/test/ui/run-pass/issues/issue-40951.rs
diff --git a/src/test/run-pass/issue-40962.rs b/src/test/ui/run-pass/issues/issue-40962.rs
index b35cfa12eab..b35cfa12eab 100644
--- a/src/test/run-pass/issue-40962.rs
+++ b/src/test/ui/run-pass/issues/issue-40962.rs
diff --git a/src/test/run-pass/issue-41053.rs b/src/test/ui/run-pass/issues/issue-41053.rs
index 769d841e364..769d841e364 100644
--- a/src/test/run-pass/issue-41053.rs
+++ b/src/test/ui/run-pass/issues/issue-41053.rs
diff --git a/src/test/run-pass/issue-4107.rs b/src/test/ui/run-pass/issues/issue-4107.rs
index 6c5f4bf36de..6c5f4bf36de 100644
--- a/src/test/run-pass/issue-4107.rs
+++ b/src/test/ui/run-pass/issues/issue-4107.rs
diff --git a/src/test/run-pass/issue-41213.rs b/src/test/ui/run-pass/issues/issue-41213.rs
index d4755020fef..d4755020fef 100644
--- a/src/test/run-pass/issue-41213.rs
+++ b/src/test/ui/run-pass/issues/issue-41213.rs
diff --git a/src/test/run-pass/issue-41272.rs b/src/test/ui/run-pass/issues/issue-41272.rs
index d6a0034690a..d6a0034690a 100644
--- a/src/test/run-pass/issue-41272.rs
+++ b/src/test/ui/run-pass/issues/issue-41272.rs
diff --git a/src/test/run-pass/issue-41298.rs b/src/test/ui/run-pass/issues/issue-41298.rs
index 2b9baa74674..2b9baa74674 100644
--- a/src/test/run-pass/issue-41298.rs
+++ b/src/test/ui/run-pass/issues/issue-41298.rs
diff --git a/src/test/run-pass/issue-41394.rs b/src/test/ui/run-pass/issues/issue-41394.rs
index 798905599a8..798905599a8 100644
--- a/src/test/run-pass/issue-41394.rs
+++ b/src/test/ui/run-pass/issues/issue-41394.rs
diff --git a/src/test/run-pass/issue-41479.rs b/src/test/ui/run-pass/issues/issue-41479.rs
index cc97b3323cf..cc97b3323cf 100644
--- a/src/test/run-pass/issue-41479.rs
+++ b/src/test/ui/run-pass/issues/issue-41479.rs
diff --git a/src/test/run-pass/issue-41498.rs b/src/test/ui/run-pass/issues/issue-41498.rs
index 66fd30bdbbb..66fd30bdbbb 100644
--- a/src/test/run-pass/issue-41498.rs
+++ b/src/test/ui/run-pass/issues/issue-41498.rs
diff --git a/src/test/run-pass/issue-41604.rs b/src/test/ui/run-pass/issues/issue-41604.rs
index 20fb8c7e7d6..20fb8c7e7d6 100644
--- a/src/test/run-pass/issue-41604.rs
+++ b/src/test/ui/run-pass/issues/issue-41604.rs
diff --git a/src/test/run-pass/issue-41628.rs b/src/test/ui/run-pass/issues/issue-41628.rs
index cba47f98441..cba47f98441 100644
--- a/src/test/run-pass/issue-41628.rs
+++ b/src/test/ui/run-pass/issues/issue-41628.rs
diff --git a/src/test/run-pass/issue-41677.rs b/src/test/ui/run-pass/issues/issue-41677.rs
index d014382ca39..d014382ca39 100644
--- a/src/test/run-pass/issue-41677.rs
+++ b/src/test/ui/run-pass/issues/issue-41677.rs
diff --git a/src/test/run-pass/issue-41696.rs b/src/test/ui/run-pass/issues/issue-41696.rs
index 1888be58c57..1888be58c57 100644
--- a/src/test/run-pass/issue-41696.rs
+++ b/src/test/ui/run-pass/issues/issue-41696.rs
diff --git a/src/test/run-pass/issue-41744.rs b/src/test/ui/run-pass/issues/issue-41744.rs
index 276067d7d74..276067d7d74 100644
--- a/src/test/run-pass/issue-41744.rs
+++ b/src/test/ui/run-pass/issues/issue-41744.rs
diff --git a/src/test/run-pass/issue-41803.rs b/src/test/ui/run-pass/issues/issue-41803.rs
index e18b4204584..e18b4204584 100644
--- a/src/test/run-pass/issue-41803.rs
+++ b/src/test/ui/run-pass/issues/issue-41803.rs
diff --git a/src/test/run-pass/issue-41849-variance-req.rs b/src/test/ui/run-pass/issues/issue-41849-variance-req.rs
index 0557a6ef376..0557a6ef376 100644
--- a/src/test/run-pass/issue-41849-variance-req.rs
+++ b/src/test/ui/run-pass/issues/issue-41849-variance-req.rs
diff --git a/src/test/run-pass/issue-41888.rs b/src/test/ui/run-pass/issues/issue-41888.rs
index e145cde039d..e145cde039d 100644
--- a/src/test/run-pass/issue-41888.rs
+++ b/src/test/ui/run-pass/issues/issue-41888.rs
diff --git a/src/test/run-pass/issue-41936-variance-coerce-unsized-cycle.rs b/src/test/ui/run-pass/issues/issue-41936-variance-coerce-unsized-cycle.rs
index bfbead87891..bfbead87891 100644
--- a/src/test/run-pass/issue-41936-variance-coerce-unsized-cycle.rs
+++ b/src/test/ui/run-pass/issues/issue-41936-variance-coerce-unsized-cycle.rs
diff --git a/src/test/run-pass/issue-42007.rs b/src/test/ui/run-pass/issues/issue-42007.rs
index cc7e3bc372c..cc7e3bc372c 100644
--- a/src/test/run-pass/issue-42007.rs
+++ b/src/test/ui/run-pass/issues/issue-42007.rs
diff --git a/src/test/run-pass/issue-4208.rs b/src/test/ui/run-pass/issues/issue-4208.rs
index 52f5d53c046..52f5d53c046 100644
--- a/src/test/run-pass/issue-4208.rs
+++ b/src/test/ui/run-pass/issues/issue-4208.rs
diff --git a/src/test/run-pass/issue-42148.rs b/src/test/ui/run-pass/issues/issue-42148.rs
index 0196649a3f6..0196649a3f6 100644
--- a/src/test/run-pass/issue-42148.rs
+++ b/src/test/ui/run-pass/issues/issue-42148.rs
diff --git a/src/test/run-pass/issue-42210.rs b/src/test/ui/run-pass/issues/issue-42210.rs
index ecdf78cd5bd..ecdf78cd5bd 100644
--- a/src/test/run-pass/issue-42210.rs
+++ b/src/test/ui/run-pass/issues/issue-42210.rs
diff --git a/src/test/run-pass/issue-4228.rs b/src/test/ui/run-pass/issues/issue-4228.rs
index 3d283849b1f..3d283849b1f 100644
--- a/src/test/run-pass/issue-4228.rs
+++ b/src/test/ui/run-pass/issues/issue-4228.rs
diff --git a/src/test/run-pass/issue-42453.rs b/src/test/ui/run-pass/issues/issue-42453.rs
index dfe3a21961e..dfe3a21961e 100644
--- a/src/test/run-pass/issue-42453.rs
+++ b/src/test/ui/run-pass/issues/issue-42453.rs
diff --git a/src/test/run-pass/issue-42463.rs b/src/test/ui/run-pass/issues/issue-42463.rs
index 7182fc213f7..7182fc213f7 100644
--- a/src/test/run-pass/issue-42463.rs
+++ b/src/test/ui/run-pass/issues/issue-42463.rs
diff --git a/src/test/run-pass/issue-42467.rs b/src/test/ui/run-pass/issues/issue-42467.rs
index 1b2ee959b2d..1b2ee959b2d 100644
--- a/src/test/run-pass/issue-42467.rs
+++ b/src/test/ui/run-pass/issues/issue-42467.rs
diff --git a/src/test/run-pass/issue-4252.rs b/src/test/ui/run-pass/issues/issue-4252.rs
index e604141dab8..e604141dab8 100644
--- a/src/test/run-pass/issue-4252.rs
+++ b/src/test/ui/run-pass/issues/issue-4252.rs
diff --git a/src/test/run-pass/issue-42552.rs b/src/test/ui/run-pass/issues/issue-42552.rs
index fd1265b7174..fd1265b7174 100644
--- a/src/test/run-pass/issue-42552.rs
+++ b/src/test/ui/run-pass/issues/issue-42552.rs
diff --git a/src/test/run-pass/issue-42679.rs b/src/test/ui/run-pass/issues/issue-42679.rs
index 312835225ed..312835225ed 100644
--- a/src/test/run-pass/issue-42679.rs
+++ b/src/test/ui/run-pass/issues/issue-42679.rs
diff --git a/src/test/run-pass/issue-42747.rs b/src/test/ui/run-pass/issues/issue-42747.rs
index 05043ae6b21..05043ae6b21 100644
--- a/src/test/run-pass/issue-42747.rs
+++ b/src/test/ui/run-pass/issues/issue-42747.rs
diff --git a/src/test/run-pass/issue-42956.rs b/src/test/ui/run-pass/issues/issue-42956.rs
index 9bda6ee4bcb..9bda6ee4bcb 100644
--- a/src/test/run-pass/issue-42956.rs
+++ b/src/test/ui/run-pass/issues/issue-42956.rs
diff --git a/src/test/run-pass/issue-43057.rs b/src/test/ui/run-pass/issues/issue-43057.rs
index 152ddfb193f..152ddfb193f 100644
--- a/src/test/run-pass/issue-43057.rs
+++ b/src/test/ui/run-pass/issues/issue-43057.rs
diff --git a/src/test/run-pass/issue-43132.rs b/src/test/ui/run-pass/issues/issue-43132.rs
index 64b3b092b89..64b3b092b89 100644
--- a/src/test/run-pass/issue-43132.rs
+++ b/src/test/ui/run-pass/issues/issue-43132.rs
diff --git a/src/test/run-pass/issue-43205.rs b/src/test/ui/run-pass/issues/issue-43205.rs
index 0e613ac0727..0e613ac0727 100644
--- a/src/test/run-pass/issue-43205.rs
+++ b/src/test/ui/run-pass/issues/issue-43205.rs
diff --git a/src/test/run-pass/issue-43291.rs b/src/test/ui/run-pass/issues/issue-43291.rs
index 98de8f78859..98de8f78859 100644
--- a/src/test/run-pass/issue-43291.rs
+++ b/src/test/ui/run-pass/issues/issue-43291.rs
diff --git a/src/test/run-pass/issue-4333.rs b/src/test/ui/run-pass/issues/issue-4333.rs
index a84d7f3fe82..a84d7f3fe82 100644
--- a/src/test/run-pass/issue-4333.rs
+++ b/src/test/ui/run-pass/issues/issue-4333.rs
diff --git a/src/test/run-pass/issue-43357.rs b/src/test/ui/run-pass/issues/issue-43357.rs
index 9a5f65d67b1..9a5f65d67b1 100644
--- a/src/test/run-pass/issue-43357.rs
+++ b/src/test/ui/run-pass/issues/issue-43357.rs
diff --git a/src/test/run-pass/issue-43483.rs b/src/test/ui/run-pass/issues/issue-43483.rs
index 48482af76db..48482af76db 100644
--- a/src/test/run-pass/issue-43483.rs
+++ b/src/test/ui/run-pass/issues/issue-43483.rs
diff --git a/src/test/run-pass/issue-43692.rs b/src/test/ui/run-pass/issues/issue-43692.rs
index 23e96f8c1bf..23e96f8c1bf 100644
--- a/src/test/run-pass/issue-43692.rs
+++ b/src/test/ui/run-pass/issues/issue-43692.rs
diff --git a/src/test/run-pass/issue-43853.rs b/src/test/ui/run-pass/issues/issue-43853.rs
index e9f8d2744a1..e9f8d2744a1 100644
--- a/src/test/run-pass/issue-43853.rs
+++ b/src/test/ui/run-pass/issues/issue-43853.rs
diff --git a/src/test/run-pass/issue-4387.rs b/src/test/ui/run-pass/issues/issue-4387.rs
index 9c4ae04bf7b..9c4ae04bf7b 100644
--- a/src/test/run-pass/issue-4387.rs
+++ b/src/test/ui/run-pass/issues/issue-4387.rs
diff --git a/src/test/run-pass/issue-43910.rs b/src/test/ui/run-pass/issues/issue-43910.rs
index d61ce7f4689..d61ce7f4689 100644
--- a/src/test/run-pass/issue-43910.rs
+++ b/src/test/ui/run-pass/issues/issue-43910.rs
diff --git a/src/test/run-pass/issue-43923.rs b/src/test/ui/run-pass/issues/issue-43923.rs
index e1992e4fc50..e1992e4fc50 100644
--- a/src/test/run-pass/issue-43923.rs
+++ b/src/test/ui/run-pass/issues/issue-43923.rs
diff --git a/src/test/run-pass/issue-44005.rs b/src/test/ui/run-pass/issues/issue-44005.rs
index a53026f36ab..a53026f36ab 100644
--- a/src/test/run-pass/issue-44005.rs
+++ b/src/test/ui/run-pass/issues/issue-44005.rs
diff --git a/src/test/run-pass/issue-4401.rs b/src/test/ui/run-pass/issues/issue-4401.rs
index e4fea724c79..e4fea724c79 100644
--- a/src/test/run-pass/issue-4401.rs
+++ b/src/test/ui/run-pass/issues/issue-4401.rs
diff --git a/src/test/run-pass/issue-44056.rs b/src/test/ui/run-pass/issues/issue-44056.rs
index dcaa0bf8629..dcaa0bf8629 100644
--- a/src/test/run-pass/issue-44056.rs
+++ b/src/test/ui/run-pass/issues/issue-44056.rs
diff --git a/src/test/run-pass/issue-44247.rs b/src/test/ui/run-pass/issues/issue-44247.rs
index 27b0aeaac55..27b0aeaac55 100644
--- a/src/test/run-pass/issue-44247.rs
+++ b/src/test/ui/run-pass/issues/issue-44247.rs
diff --git a/src/test/run-pass/issue-44333.rs b/src/test/ui/run-pass/issues/issue-44333.rs
index 72731f41321..72731f41321 100644
--- a/src/test/run-pass/issue-44333.rs
+++ b/src/test/ui/run-pass/issues/issue-44333.rs
diff --git a/src/test/run-pass/issue-44373.rs b/src/test/ui/run-pass/issues/issue-44373.rs
index d0f8ed96f4c..d0f8ed96f4c 100644
--- a/src/test/run-pass/issue-44373.rs
+++ b/src/test/ui/run-pass/issues/issue-44373.rs
diff --git a/src/test/run-pass/issue-44402.rs b/src/test/ui/run-pass/issues/issue-44402.rs
index 5cbd3446d9b..5cbd3446d9b 100644
--- a/src/test/run-pass/issue-44402.rs
+++ b/src/test/ui/run-pass/issues/issue-44402.rs
diff --git a/src/test/run-pass/issue-4446.rs b/src/test/ui/run-pass/issues/issue-4446.rs
index 5eec800d588..5eec800d588 100644
--- a/src/test/run-pass/issue-4446.rs
+++ b/src/test/ui/run-pass/issues/issue-4446.rs
diff --git a/src/test/run-pass/issue-4448.rs b/src/test/ui/run-pass/issues/issue-4448.rs
index 6f0356b5bfb..6f0356b5bfb 100644
--- a/src/test/run-pass/issue-4448.rs
+++ b/src/test/ui/run-pass/issues/issue-4448.rs
diff --git a/src/test/run-pass/issue-4464.rs b/src/test/ui/run-pass/issues/issue-4464.rs
index 675ca2c3b7e..675ca2c3b7e 100644
--- a/src/test/run-pass/issue-4464.rs
+++ b/src/test/ui/run-pass/issues/issue-4464.rs
diff --git a/src/test/run-pass/issue-44730.rs b/src/test/ui/run-pass/issues/issue-44730.rs
index 6e8aba01255..6e8aba01255 100644
--- a/src/test/run-pass/issue-44730.rs
+++ b/src/test/ui/run-pass/issues/issue-44730.rs
diff --git a/src/test/run-pass/issue-44851.rs b/src/test/ui/run-pass/issues/issue-44851.rs
index 62d675b13be..62d675b13be 100644
--- a/src/test/run-pass/issue-44851.rs
+++ b/src/test/ui/run-pass/issues/issue-44851.rs
diff --git a/src/test/run-pass/issue-45124.rs b/src/test/ui/run-pass/issues/issue-45124.rs
index cb79eda8b07..cb79eda8b07 100644
--- a/src/test/run-pass/issue-45124.rs
+++ b/src/test/ui/run-pass/issues/issue-45124.rs
diff --git a/src/test/run-pass/issue-45152.rs b/src/test/ui/run-pass/issues/issue-45152.rs
index a5c349adb8d..a5c349adb8d 100644
--- a/src/test/run-pass/issue-45152.rs
+++ b/src/test/ui/run-pass/issues/issue-45152.rs
diff --git a/src/test/run-pass/issue-4541.rs b/src/test/ui/run-pass/issues/issue-4541.rs
index 68f6945cd9c..68f6945cd9c 100644
--- a/src/test/run-pass/issue-4541.rs
+++ b/src/test/ui/run-pass/issues/issue-4541.rs
diff --git a/src/test/run-pass/issue-4542.rs b/src/test/ui/run-pass/issues/issue-4542.rs
index 59837e4bd53..59837e4bd53 100644
--- a/src/test/run-pass/issue-4542.rs
+++ b/src/test/ui/run-pass/issues/issue-4542.rs
diff --git a/src/test/run-pass/issue-45425.rs b/src/test/ui/run-pass/issues/issue-45425.rs
index 06ffa6b3dea..06ffa6b3dea 100644
--- a/src/test/run-pass/issue-45425.rs
+++ b/src/test/ui/run-pass/issues/issue-45425.rs
diff --git a/src/test/run-pass/issue-4545.rs b/src/test/ui/run-pass/issues/issue-4545.rs
index 6cb7ccc0e95..6cb7ccc0e95 100644
--- a/src/test/run-pass/issue-4545.rs
+++ b/src/test/ui/run-pass/issues/issue-4545.rs
diff --git a/src/test/run-pass/issue-45731.rs b/src/test/ui/run-pass/issues/issue-45731.rs
index e2c04c964d7..e2c04c964d7 100644
--- a/src/test/run-pass/issue-45731.rs
+++ b/src/test/ui/run-pass/issues/issue-45731.rs
diff --git a/src/test/run-pass/issue-46069.rs b/src/test/ui/run-pass/issues/issue-46069.rs
index 70db20e4a6c..70db20e4a6c 100644
--- a/src/test/run-pass/issue-46069.rs
+++ b/src/test/ui/run-pass/issues/issue-46069.rs
diff --git a/src/test/run-pass/issue-46095.rs b/src/test/ui/run-pass/issues/issue-46095.rs
index 35e51ebe70b..35e51ebe70b 100644
--- a/src/test/run-pass/issue-46095.rs
+++ b/src/test/ui/run-pass/issues/issue-46095.rs
diff --git a/src/test/run-pass/issue-46519.rs b/src/test/ui/run-pass/issues/issue-46519.rs
index 878cae4e387..878cae4e387 100644
--- a/src/test/run-pass/issue-46519.rs
+++ b/src/test/ui/run-pass/issues/issue-46519.rs
diff --git a/src/test/run-pass/issue-46553.rs b/src/test/ui/run-pass/issues/issue-46553.rs
index cf00ae4c467..cf00ae4c467 100644
--- a/src/test/run-pass/issue-46553.rs
+++ b/src/test/ui/run-pass/issues/issue-46553.rs
diff --git a/src/test/run-pass/issue-46845.rs b/src/test/ui/run-pass/issues/issue-46845.rs
index 92f68dcfc34..92f68dcfc34 100644
--- a/src/test/run-pass/issue-46845.rs
+++ b/src/test/ui/run-pass/issues/issue-46845.rs
diff --git a/src/test/run-pass/issue-46855.rs b/src/test/ui/run-pass/issues/issue-46855.rs
index 28aa6c731ec..28aa6c731ec 100644
--- a/src/test/run-pass/issue-46855.rs
+++ b/src/test/ui/run-pass/issues/issue-46855.rs
diff --git a/src/test/run-pass/issue-46920-byte-array-patterns.rs b/src/test/ui/run-pass/issues/issue-46920-byte-array-patterns.rs
index 236f6995c51..236f6995c51 100644
--- a/src/test/run-pass/issue-46920-byte-array-patterns.rs
+++ b/src/test/ui/run-pass/issues/issue-46920-byte-array-patterns.rs
diff --git a/src/test/run-pass/issue-46959.rs b/src/test/ui/run-pass/issues/issue-46959.rs
index 7f050c055b0..7f050c055b0 100644
--- a/src/test/run-pass/issue-46959.rs
+++ b/src/test/ui/run-pass/issues/issue-46959.rs
diff --git a/src/test/run-pass/issue-46964.rs b/src/test/ui/run-pass/issues/issue-46964.rs
index 2a82c6dd438..2a82c6dd438 100644
--- a/src/test/run-pass/issue-46964.rs
+++ b/src/test/ui/run-pass/issues/issue-46964.rs
diff --git a/src/test/run-pass/issue-47139-1.rs b/src/test/ui/run-pass/issues/issue-47139-1.rs
index cb87991a491..cb87991a491 100644
--- a/src/test/run-pass/issue-47139-1.rs
+++ b/src/test/ui/run-pass/issues/issue-47139-1.rs
diff --git a/src/test/run-pass/issue-47139-2.rs b/src/test/ui/run-pass/issues/issue-47139-2.rs
index 08eaee5acd7..08eaee5acd7 100644
--- a/src/test/run-pass/issue-47139-2.rs
+++ b/src/test/ui/run-pass/issues/issue-47139-2.rs
diff --git a/src/test/run-pass/issue-4734.rs b/src/test/ui/run-pass/issues/issue-4734.rs
index 9fb826712ad..9fb826712ad 100644
--- a/src/test/run-pass/issue-4734.rs
+++ b/src/test/ui/run-pass/issues/issue-4734.rs
diff --git a/src/test/run-pass/issue-4735.rs b/src/test/ui/run-pass/issues/issue-4735.rs
index 7eb09e055a2..7eb09e055a2 100644
--- a/src/test/run-pass/issue-4735.rs
+++ b/src/test/ui/run-pass/issues/issue-4735.rs
diff --git a/src/test/run-pass/issue-47364.rs b/src/test/ui/run-pass/issues/issue-47364.rs
index 2847ac2a0ba..2847ac2a0ba 100644
--- a/src/test/run-pass/issue-47364.rs
+++ b/src/test/ui/run-pass/issues/issue-47364.rs
diff --git a/src/test/run-pass/issue-4759-1.rs b/src/test/ui/run-pass/issues/issue-4759-1.rs
index a565460c42e..a565460c42e 100644
--- a/src/test/run-pass/issue-4759-1.rs
+++ b/src/test/ui/run-pass/issues/issue-4759-1.rs
diff --git a/src/test/run-pass/issue-4759.rs b/src/test/ui/run-pass/issues/issue-4759.rs
index 7788a8f3ec2..7788a8f3ec2 100644
--- a/src/test/run-pass/issue-4759.rs
+++ b/src/test/ui/run-pass/issues/issue-4759.rs
diff --git a/src/test/run-pass/issue-47638.rs b/src/test/ui/run-pass/issues/issue-47638.rs
index 6f627b2a3c1..6f627b2a3c1 100644
--- a/src/test/run-pass/issue-47638.rs
+++ b/src/test/ui/run-pass/issues/issue-47638.rs
diff --git a/src/test/run-pass/issue-47673.rs b/src/test/ui/run-pass/issues/issue-47673.rs
index 22f7f169e29..22f7f169e29 100644
--- a/src/test/run-pass/issue-47673.rs
+++ b/src/test/ui/run-pass/issues/issue-47673.rs
diff --git a/src/test/run-pass/issue-47703-1.rs b/src/test/ui/run-pass/issues/issue-47703-1.rs
index facdee5cc17..facdee5cc17 100644
--- a/src/test/run-pass/issue-47703-1.rs
+++ b/src/test/ui/run-pass/issues/issue-47703-1.rs
diff --git a/src/test/run-pass/issue-47703-tuple.rs b/src/test/ui/run-pass/issues/issue-47703-tuple.rs
index 4fec3efc0a0..4fec3efc0a0 100644
--- a/src/test/run-pass/issue-47703-tuple.rs
+++ b/src/test/ui/run-pass/issues/issue-47703-tuple.rs
diff --git a/src/test/run-pass/issue-47703.rs b/src/test/ui/run-pass/issues/issue-47703.rs
index 2146986377a..2146986377a 100644
--- a/src/test/run-pass/issue-47703.rs
+++ b/src/test/ui/run-pass/issues/issue-47703.rs
diff --git a/src/test/run-pass/issue-47722.rs b/src/test/ui/run-pass/issues/issue-47722.rs
index 3b5d808e1f5..3b5d808e1f5 100644
--- a/src/test/run-pass/issue-47722.rs
+++ b/src/test/ui/run-pass/issues/issue-47722.rs
diff --git a/src/test/run-pass/issue-47789.rs b/src/test/ui/run-pass/issues/issue-47789.rs
index 3148939992c..3148939992c 100644
--- a/src/test/run-pass/issue-47789.rs
+++ b/src/test/ui/run-pass/issues/issue-47789.rs
diff --git a/src/test/run-pass/issue-48159.rs b/src/test/ui/run-pass/issues/issue-48159.rs
index ce4585607e9..ce4585607e9 100644
--- a/src/test/run-pass/issue-48159.rs
+++ b/src/test/ui/run-pass/issues/issue-48159.rs
diff --git a/src/test/run-pass/issue-4830.rs b/src/test/ui/run-pass/issues/issue-4830.rs
index f615767c215..f615767c215 100644
--- a/src/test/run-pass/issue-4830.rs
+++ b/src/test/ui/run-pass/issues/issue-4830.rs
diff --git a/src/test/run-pass/issue-48508-aux.rs b/src/test/ui/run-pass/issues/issue-48508-aux.rs
index a00361a2c9d..a00361a2c9d 100644
--- a/src/test/run-pass/issue-48508-aux.rs
+++ b/src/test/ui/run-pass/issues/issue-48508-aux.rs
diff --git a/src/test/run-pass/issue-48508.rs b/src/test/ui/run-pass/issues/issue-48508.rs
index 1b10d873f11..1b10d873f11 100644
--- a/src/test/run-pass/issue-48508.rs
+++ b/src/test/ui/run-pass/issues/issue-48508.rs
diff --git a/src/test/run-pass/issue-48551.rs b/src/test/ui/run-pass/issues/issue-48551.rs
index 93bddbc5335..93bddbc5335 100644
--- a/src/test/run-pass/issue-48551.rs
+++ b/src/test/ui/run-pass/issues/issue-48551.rs
diff --git a/src/test/run-pass/issue-4865-1.rs b/src/test/ui/run-pass/issues/issue-4865-1.rs
index 3c477795130..3c477795130 100644
--- a/src/test/run-pass/issue-4865-1.rs
+++ b/src/test/ui/run-pass/issues/issue-4865-1.rs
diff --git a/src/test/run-pass/issue-4865-2.rs b/src/test/ui/run-pass/issues/issue-4865-2.rs
index 6de2f437b20..6de2f437b20 100644
--- a/src/test/run-pass/issue-4865-2.rs
+++ b/src/test/ui/run-pass/issues/issue-4865-2.rs
diff --git a/src/test/run-pass/issue-4865-3.rs b/src/test/ui/run-pass/issues/issue-4865-3.rs
index d800ea6a665..d800ea6a665 100644
--- a/src/test/run-pass/issue-4865-3.rs
+++ b/src/test/ui/run-pass/issues/issue-4865-3.rs
diff --git a/src/test/run-pass/issue-4875.rs b/src/test/ui/run-pass/issues/issue-4875.rs
index 7ac96c21c62..7ac96c21c62 100644
--- a/src/test/run-pass/issue-4875.rs
+++ b/src/test/ui/run-pass/issues/issue-4875.rs
diff --git a/src/test/run-pass/issue-48962.rs b/src/test/ui/run-pass/issues/issue-48962.rs
index 46aeb329c89..46aeb329c89 100644
--- a/src/test/run-pass/issue-48962.rs
+++ b/src/test/ui/run-pass/issues/issue-48962.rs
diff --git a/src/test/run-pass/issue-48984.rs b/src/test/ui/run-pass/issues/issue-48984.rs
index 227ad4e58f1..227ad4e58f1 100644
--- a/src/test/run-pass/issue-48984.rs
+++ b/src/test/ui/run-pass/issues/issue-48984.rs
diff --git a/src/test/run-pass/issue-49298.rs b/src/test/ui/run-pass/issues/issue-49298.rs
index 0b2169c9476..0b2169c9476 100644
--- a/src/test/run-pass/issue-49298.rs
+++ b/src/test/ui/run-pass/issues/issue-49298.rs
diff --git a/src/test/run-pass/issue-49556.rs b/src/test/ui/run-pass/issues/issue-49556.rs
index 70ccee99f66..70ccee99f66 100644
--- a/src/test/run-pass/issue-49556.rs
+++ b/src/test/ui/run-pass/issues/issue-49556.rs
diff --git a/src/test/run-pass/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs b/src/test/ui/run-pass/issues/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs
index 51b2b5a4f7c..51b2b5a4f7c 100644
--- a/src/test/run-pass/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs
+++ b/src/test/ui/run-pass/issues/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs
diff --git a/src/test/run-pass/issue-49632.rs b/src/test/ui/run-pass/issues/issue-49632.rs
index 8cbb7d21af7..8cbb7d21af7 100644
--- a/src/test/run-pass/issue-49632.rs
+++ b/src/test/ui/run-pass/issues/issue-49632.rs
diff --git a/src/test/run-pass/issue-49685.rs b/src/test/ui/run-pass/issues/issue-49685.rs
index 1e4e7955323..1e4e7955323 100644
--- a/src/test/run-pass/issue-49685.rs
+++ b/src/test/ui/run-pass/issues/issue-49685.rs
diff --git a/src/test/run-pass/issue-49854.rs b/src/test/ui/run-pass/issues/issue-49854.rs
index 5bb80b5e2c6..5bb80b5e2c6 100644
--- a/src/test/run-pass/issue-49854.rs
+++ b/src/test/ui/run-pass/issues/issue-49854.rs
diff --git a/src/test/run-pass/issue-49955-2.rs b/src/test/ui/run-pass/issues/issue-49955-2.rs
index 17e1de95dd3..17e1de95dd3 100644
--- a/src/test/run-pass/issue-49955-2.rs
+++ b/src/test/ui/run-pass/issues/issue-49955-2.rs
diff --git a/src/test/run-pass/issue-49955.rs b/src/test/ui/run-pass/issues/issue-49955.rs
index 57a1264aaee..57a1264aaee 100644
--- a/src/test/run-pass/issue-49955.rs
+++ b/src/test/ui/run-pass/issues/issue-49955.rs
diff --git a/src/test/run-pass/issue-49973.rs b/src/test/ui/run-pass/issues/issue-49973.rs
index 641e9239177..641e9239177 100644
--- a/src/test/run-pass/issue-49973.rs
+++ b/src/test/ui/run-pass/issues/issue-49973.rs
diff --git a/src/test/run-pass/issue-5008-borrowed-traitobject-method-call.rs b/src/test/ui/run-pass/issues/issue-5008-borrowed-traitobject-method-call.rs
index 90900ca46ce..90900ca46ce 100644
--- a/src/test/run-pass/issue-5008-borrowed-traitobject-method-call.rs
+++ b/src/test/ui/run-pass/issues/issue-5008-borrowed-traitobject-method-call.rs
diff --git a/src/test/run-pass/issue-50415.rs b/src/test/ui/run-pass/issues/issue-50415.rs
index aa493ce0321..aa493ce0321 100644
--- a/src/test/run-pass/issue-50415.rs
+++ b/src/test/ui/run-pass/issues/issue-50415.rs
diff --git a/src/test/run-pass/issue-50442.rs b/src/test/ui/run-pass/issues/issue-50442.rs
index 1e43bebf5c3..1e43bebf5c3 100644
--- a/src/test/run-pass/issue-50442.rs
+++ b/src/test/ui/run-pass/issues/issue-50442.rs
diff --git a/src/test/run-pass/issue-5060.rs b/src/test/ui/run-pass/issues/issue-5060.rs
index 21e3343f445..21e3343f445 100644
--- a/src/test/run-pass/issue-5060.rs
+++ b/src/test/ui/run-pass/issues/issue-5060.rs
diff --git a/src/test/run-pass/issue-50689.rs b/src/test/ui/run-pass/issues/issue-50689.rs
index d437b9d88f4..d437b9d88f4 100644
--- a/src/test/run-pass/issue-50689.rs
+++ b/src/test/ui/run-pass/issues/issue-50689.rs
diff --git a/src/test/run-pass/issue-50731.rs b/src/test/ui/run-pass/issues/issue-50731.rs
index 06df2b989af..06df2b989af 100644
--- a/src/test/run-pass/issue-50731.rs
+++ b/src/test/ui/run-pass/issues/issue-50731.rs
diff --git a/src/test/run-pass/issue-50811.rs b/src/test/ui/run-pass/issues/issue-50811.rs
index 05b168d98f1..05b168d98f1 100644
--- a/src/test/run-pass/issue-50811.rs
+++ b/src/test/ui/run-pass/issues/issue-50811.rs
diff --git a/src/test/run-pass/issue-50865-private-impl-trait/auxiliary/lib.rs b/src/test/ui/run-pass/issues/issue-50865-private-impl-trait/auxiliary/lib.rs
index 306256d53d3..306256d53d3 100644
--- a/src/test/run-pass/issue-50865-private-impl-trait/auxiliary/lib.rs
+++ b/src/test/ui/run-pass/issues/issue-50865-private-impl-trait/auxiliary/lib.rs
diff --git a/src/test/run-pass/issue-50865-private-impl-trait/main.rs b/src/test/ui/run-pass/issues/issue-50865-private-impl-trait/main.rs
index bc347edf8a7..bc347edf8a7 100644
--- a/src/test/run-pass/issue-50865-private-impl-trait/main.rs
+++ b/src/test/ui/run-pass/issues/issue-50865-private-impl-trait/main.rs
diff --git a/src/test/run-pass/issue-51185.rs b/src/test/ui/run-pass/issues/issue-51185.rs
index 8e286ad1419..8e286ad1419 100644
--- a/src/test/run-pass/issue-51185.rs
+++ b/src/test/ui/run-pass/issues/issue-51185.rs
diff --git a/src/test/run-pass/issue-51345.rs b/src/test/ui/run-pass/issues/issue-51345.rs
index 7d392944685..7d392944685 100644
--- a/src/test/run-pass/issue-51345.rs
+++ b/src/test/ui/run-pass/issues/issue-51345.rs
diff --git a/src/test/run-pass/issue-51582.rs b/src/test/ui/run-pass/issues/issue-51582.rs
index bca05d83e40..bca05d83e40 100644
--- a/src/test/run-pass/issue-51582.rs
+++ b/src/test/ui/run-pass/issues/issue-51582.rs
diff --git a/src/test/run-pass/issue-51655.rs b/src/test/ui/run-pass/issues/issue-51655.rs
index b5b89ede91b..b5b89ede91b 100644
--- a/src/test/run-pass/issue-51655.rs
+++ b/src/test/ui/run-pass/issues/issue-51655.rs
diff --git a/src/test/run-pass/issue-51907.rs b/src/test/ui/run-pass/issues/issue-51907.rs
index de2a59c5f01..de2a59c5f01 100644
--- a/src/test/run-pass/issue-51907.rs
+++ b/src/test/ui/run-pass/issues/issue-51907.rs
diff --git a/src/test/run-pass/issue-5192.rs b/src/test/ui/run-pass/issues/issue-5192.rs
index 0758ace42da..0758ace42da 100644
--- a/src/test/run-pass/issue-5192.rs
+++ b/src/test/ui/run-pass/issues/issue-5192.rs
diff --git a/src/test/run-pass/issue-52140/auxiliary/some_crate.rs b/src/test/ui/run-pass/issues/issue-52140/auxiliary/some_crate.rs
index bf8dee0863a..bf8dee0863a 100644
--- a/src/test/run-pass/issue-52140/auxiliary/some_crate.rs
+++ b/src/test/ui/run-pass/issues/issue-52140/auxiliary/some_crate.rs
diff --git a/src/test/run-pass/issue-52140/main.rs b/src/test/ui/run-pass/issues/issue-52140/main.rs
index 6fae6adc442..6fae6adc442 100644
--- a/src/test/run-pass/issue-52140/main.rs
+++ b/src/test/ui/run-pass/issues/issue-52140/main.rs
diff --git a/src/test/run-pass/issue-52141/auxiliary/some_crate.rs b/src/test/ui/run-pass/issues/issue-52141/auxiliary/some_crate.rs
index bf8dee0863a..bf8dee0863a 100644
--- a/src/test/run-pass/issue-52141/auxiliary/some_crate.rs
+++ b/src/test/ui/run-pass/issues/issue-52141/auxiliary/some_crate.rs
diff --git a/src/test/run-pass/issue-52141/main.rs b/src/test/ui/run-pass/issues/issue-52141/main.rs
index 8f3fc9f9698..8f3fc9f9698 100644
--- a/src/test/run-pass/issue-52141/main.rs
+++ b/src/test/ui/run-pass/issues/issue-52141/main.rs
diff --git a/src/test/run-pass/issue-52169.rs b/src/test/ui/run-pass/issues/issue-52169.rs
index f2163416922..f2163416922 100644
--- a/src/test/run-pass/issue-52169.rs
+++ b/src/test/ui/run-pass/issues/issue-52169.rs
diff --git a/src/test/run-pass/issue-5239-2.rs b/src/test/ui/run-pass/issues/issue-5239-2.rs
index 406746ab8c5..406746ab8c5 100644
--- a/src/test/run-pass/issue-5239-2.rs
+++ b/src/test/ui/run-pass/issues/issue-5239-2.rs
diff --git a/src/test/run-pass/issue-5243.rs b/src/test/ui/run-pass/issues/issue-5243.rs
index 9bd13c4d3a0..9bd13c4d3a0 100644
--- a/src/test/run-pass/issue-5243.rs
+++ b/src/test/ui/run-pass/issues/issue-5243.rs
diff --git a/src/test/run-pass/issue-52557.rs b/src/test/ui/run-pass/issues/issue-52557.rs
index 2b8dfe162cc..2b8dfe162cc 100644
--- a/src/test/run-pass/issue-52557.rs
+++ b/src/test/ui/run-pass/issues/issue-52557.rs
diff --git a/src/test/run-pass/issue-52705/auxiliary/png2.rs b/src/test/ui/run-pass/issues/issue-52705/auxiliary/png2.rs
index 48d53a2cbac..48d53a2cbac 100644
--- a/src/test/run-pass/issue-52705/auxiliary/png2.rs
+++ b/src/test/ui/run-pass/issues/issue-52705/auxiliary/png2.rs
diff --git a/src/test/run-pass/issue-52705/main.rs b/src/test/ui/run-pass/issues/issue-52705/main.rs
index fb7b2f812c3..fb7b2f812c3 100644
--- a/src/test/run-pass/issue-52705/main.rs
+++ b/src/test/ui/run-pass/issues/issue-52705/main.rs
diff --git a/src/test/run-pass/issue-5280.rs b/src/test/ui/run-pass/issues/issue-5280.rs
index 5e2e4df95b3..5e2e4df95b3 100644
--- a/src/test/run-pass/issue-5280.rs
+++ b/src/test/ui/run-pass/issues/issue-5280.rs
diff --git a/src/test/run-pass/issue-5315.rs b/src/test/ui/run-pass/issues/issue-5315.rs
index b8532c55c4c..b8532c55c4c 100644
--- a/src/test/run-pass/issue-5315.rs
+++ b/src/test/ui/run-pass/issues/issue-5315.rs
diff --git a/src/test/run-pass/issue-5321-immediates-with-bare-self.rs b/src/test/ui/run-pass/issues/issue-5321-immediates-with-bare-self.rs
index dd00fab5020..dd00fab5020 100644
--- a/src/test/run-pass/issue-5321-immediates-with-bare-self.rs
+++ b/src/test/ui/run-pass/issues/issue-5321-immediates-with-bare-self.rs
diff --git a/src/test/run-pass/issue-53333.rs b/src/test/ui/run-pass/issues/issue-53333.rs
index 51b90af7164..51b90af7164 100644
--- a/src/test/run-pass/issue-53333.rs
+++ b/src/test/ui/run-pass/issues/issue-53333.rs
diff --git a/src/test/run-pass/issue-5353.rs b/src/test/ui/run-pass/issues/issue-5353.rs
index 34ef63572ae..34ef63572ae 100644
--- a/src/test/run-pass/issue-5353.rs
+++ b/src/test/ui/run-pass/issues/issue-5353.rs
diff --git a/src/test/run-pass/issue-5518.rs b/src/test/ui/run-pass/issues/issue-5518.rs
index 5981a0148a0..5981a0148a0 100644
--- a/src/test/run-pass/issue-5518.rs
+++ b/src/test/ui/run-pass/issues/issue-5518.rs
diff --git a/src/test/run-pass/issue-5521.rs b/src/test/ui/run-pass/issues/issue-5521.rs
index 136f7aa956c..136f7aa956c 100644
--- a/src/test/run-pass/issue-5521.rs
+++ b/src/test/ui/run-pass/issues/issue-5521.rs
diff --git a/src/test/run-pass/issue-5530.rs b/src/test/ui/run-pass/issues/issue-5530.rs
index bd7d7af71df..bd7d7af71df 100644
--- a/src/test/run-pass/issue-5530.rs
+++ b/src/test/ui/run-pass/issues/issue-5530.rs
diff --git a/src/test/run-pass/issue-5550.rs b/src/test/ui/run-pass/issues/issue-5550.rs
index 91741f938a5..91741f938a5 100644
--- a/src/test/run-pass/issue-5550.rs
+++ b/src/test/ui/run-pass/issues/issue-5550.rs
diff --git a/src/test/run-pass/issue-5554.rs b/src/test/ui/run-pass/issues/issue-5554.rs
index e8190a7245a..e8190a7245a 100644
--- a/src/test/run-pass/issue-5554.rs
+++ b/src/test/ui/run-pass/issues/issue-5554.rs
diff --git a/src/test/run-pass/issue-5572.rs b/src/test/ui/run-pass/issues/issue-5572.rs
index 6ae9dc68a5c..6ae9dc68a5c 100644
--- a/src/test/run-pass/issue-5572.rs
+++ b/src/test/ui/run-pass/issues/issue-5572.rs
diff --git a/src/test/run-pass/issue-5666.rs b/src/test/ui/run-pass/issues/issue-5666.rs
index eba83227f44..eba83227f44 100644
--- a/src/test/run-pass/issue-5666.rs
+++ b/src/test/ui/run-pass/issues/issue-5666.rs
diff --git a/src/test/run-pass/issue-5688.rs b/src/test/ui/run-pass/issues/issue-5688.rs
index 88ff103723c..88ff103723c 100644
--- a/src/test/run-pass/issue-5688.rs
+++ b/src/test/ui/run-pass/issues/issue-5688.rs
diff --git a/src/test/run-pass/issue-5708.rs b/src/test/ui/run-pass/issues/issue-5708.rs
index 6ab33951099..6ab33951099 100644
--- a/src/test/run-pass/issue-5708.rs
+++ b/src/test/ui/run-pass/issues/issue-5708.rs
diff --git a/src/test/run-pass/issue-5718.rs b/src/test/ui/run-pass/issues/issue-5718.rs
index 0bc9a07cb00..0bc9a07cb00 100644
--- a/src/test/run-pass/issue-5718.rs
+++ b/src/test/ui/run-pass/issues/issue-5718.rs
diff --git a/src/test/run-pass/issue-5741.rs b/src/test/ui/run-pass/issues/issue-5741.rs
index 5190bd95ada..5190bd95ada 100644
--- a/src/test/run-pass/issue-5741.rs
+++ b/src/test/ui/run-pass/issues/issue-5741.rs
diff --git a/src/test/run-pass/issue-5754.rs b/src/test/ui/run-pass/issues/issue-5754.rs
index e6bc516acc3..e6bc516acc3 100644
--- a/src/test/run-pass/issue-5754.rs
+++ b/src/test/ui/run-pass/issues/issue-5754.rs
diff --git a/src/test/run-pass/issue-5791.rs b/src/test/ui/run-pass/issues/issue-5791.rs
index 2e93279f756..2e93279f756 100644
--- a/src/test/run-pass/issue-5791.rs
+++ b/src/test/ui/run-pass/issues/issue-5791.rs
diff --git a/src/test/run-pass/issue-5884.rs b/src/test/ui/run-pass/issues/issue-5884.rs
index c3247876c7a..c3247876c7a 100644
--- a/src/test/run-pass/issue-5884.rs
+++ b/src/test/ui/run-pass/issues/issue-5884.rs
diff --git a/src/test/run-pass/issue-5900.rs b/src/test/ui/run-pass/issues/issue-5900.rs
index d3a43b51dcf..d3a43b51dcf 100644
--- a/src/test/run-pass/issue-5900.rs
+++ b/src/test/ui/run-pass/issues/issue-5900.rs
diff --git a/src/test/run-pass/issue-5917.rs b/src/test/ui/run-pass/issues/issue-5917.rs
index 112ad0185d8..112ad0185d8 100644
--- a/src/test/run-pass/issue-5917.rs
+++ b/src/test/ui/run-pass/issues/issue-5917.rs
diff --git a/src/test/run-pass/issue-5950.rs b/src/test/ui/run-pass/issues/issue-5950.rs
index b0e01db14d8..b0e01db14d8 100644
--- a/src/test/run-pass/issue-5950.rs
+++ b/src/test/ui/run-pass/issues/issue-5950.rs
diff --git a/src/test/run-pass/issue-5988.rs b/src/test/ui/run-pass/issues/issue-5988.rs
index 2cf0089c6bb..2cf0089c6bb 100644
--- a/src/test/run-pass/issue-5988.rs
+++ b/src/test/ui/run-pass/issues/issue-5988.rs
diff --git a/src/test/run-pass/issue-5997.rs b/src/test/ui/run-pass/issues/issue-5997.rs
index 0c41acf04aa..0c41acf04aa 100644
--- a/src/test/run-pass/issue-5997.rs
+++ b/src/test/ui/run-pass/issues/issue-5997.rs
diff --git a/src/test/run-pass/issue-6117.rs b/src/test/ui/run-pass/issues/issue-6117.rs
index 55527297402..55527297402 100644
--- a/src/test/run-pass/issue-6117.rs
+++ b/src/test/ui/run-pass/issues/issue-6117.rs
diff --git a/src/test/run-pass/issue-6128.rs b/src/test/ui/run-pass/issues/issue-6128.rs
index b52900746e3..b52900746e3 100644
--- a/src/test/run-pass/issue-6128.rs
+++ b/src/test/ui/run-pass/issues/issue-6128.rs
diff --git a/src/test/run-pass/issue-6130.rs b/src/test/ui/run-pass/issues/issue-6130.rs
index f124b851f09..f124b851f09 100644
--- a/src/test/run-pass/issue-6130.rs
+++ b/src/test/ui/run-pass/issues/issue-6130.rs
diff --git a/src/test/run-pass/issue-6153.rs b/src/test/ui/run-pass/issues/issue-6153.rs
index 1b16418ac42..1b16418ac42 100644
--- a/src/test/run-pass/issue-6153.rs
+++ b/src/test/ui/run-pass/issues/issue-6153.rs
diff --git a/src/test/run-pass/issue-6157.rs b/src/test/ui/run-pass/issues/issue-6157.rs
index 2c5bc48abe8..2c5bc48abe8 100644
--- a/src/test/run-pass/issue-6157.rs
+++ b/src/test/ui/run-pass/issues/issue-6157.rs
diff --git a/src/test/run-pass/issue-6318.rs b/src/test/ui/run-pass/issues/issue-6318.rs
index 69c7ec4cf1f..69c7ec4cf1f 100644
--- a/src/test/run-pass/issue-6318.rs
+++ b/src/test/ui/run-pass/issues/issue-6318.rs
diff --git a/src/test/run-pass/issue-6334.rs b/src/test/ui/run-pass/issues/issue-6334.rs
index fca1c296ddd..fca1c296ddd 100644
--- a/src/test/run-pass/issue-6334.rs
+++ b/src/test/ui/run-pass/issues/issue-6334.rs
diff --git a/src/test/run-pass/issue-6341.rs b/src/test/ui/run-pass/issues/issue-6341.rs
index 41abaa2c8b8..41abaa2c8b8 100644
--- a/src/test/run-pass/issue-6341.rs
+++ b/src/test/ui/run-pass/issues/issue-6341.rs
diff --git a/src/test/run-pass/issue-6344-let.rs b/src/test/ui/run-pass/issues/issue-6344-let.rs
index 8449d9f572b..8449d9f572b 100644
--- a/src/test/run-pass/issue-6344-let.rs
+++ b/src/test/ui/run-pass/issues/issue-6344-let.rs
diff --git a/src/test/run-pass/issue-6344-match.rs b/src/test/ui/run-pass/issues/issue-6344-match.rs
index 4bb23295c85..4bb23295c85 100644
--- a/src/test/run-pass/issue-6344-match.rs
+++ b/src/test/ui/run-pass/issues/issue-6344-match.rs
diff --git a/src/test/run-pass/issue-6449.rs b/src/test/ui/run-pass/issues/issue-6449.rs
index 09a4e288404..09a4e288404 100644
--- a/src/test/run-pass/issue-6449.rs
+++ b/src/test/ui/run-pass/issues/issue-6449.rs
diff --git a/src/test/run-pass/issue-6470.rs b/src/test/ui/run-pass/issues/issue-6470.rs
index 9b5f78a1450..9b5f78a1450 100644
--- a/src/test/run-pass/issue-6470.rs
+++ b/src/test/ui/run-pass/issues/issue-6470.rs
diff --git a/src/test/run-pass/issue-6557.rs b/src/test/ui/run-pass/issues/issue-6557.rs
index 109383b343b..109383b343b 100644
--- a/src/test/run-pass/issue-6557.rs
+++ b/src/test/ui/run-pass/issues/issue-6557.rs
diff --git a/src/test/run-pass/issue-6892.rs b/src/test/ui/run-pass/issues/issue-6892.rs
index 75420ad6ff1..75420ad6ff1 100644
--- a/src/test/run-pass/issue-6892.rs
+++ b/src/test/ui/run-pass/issues/issue-6892.rs
diff --git a/src/test/run-pass/issue-6898.rs b/src/test/ui/run-pass/issues/issue-6898.rs
index e0d2f13ad68..e0d2f13ad68 100644
--- a/src/test/run-pass/issue-6898.rs
+++ b/src/test/ui/run-pass/issues/issue-6898.rs
diff --git a/src/test/run-pass/issue-6919.rs b/src/test/ui/run-pass/issues/issue-6919.rs
index 3495c0eb1ae..3495c0eb1ae 100644
--- a/src/test/run-pass/issue-6919.rs
+++ b/src/test/ui/run-pass/issues/issue-6919.rs
diff --git a/src/test/run-pass/issue-6991.rs b/src/test/ui/run-pass/issues/issue-6991.rs
index 32a9a055d49..32a9a055d49 100644
--- a/src/test/run-pass/issue-6991.rs
+++ b/src/test/ui/run-pass/issues/issue-6991.rs
diff --git a/src/test/run-pass/issue-7012.rs b/src/test/ui/run-pass/issues/issue-7012.rs
index 3a9864f3a76..3a9864f3a76 100644
--- a/src/test/run-pass/issue-7012.rs
+++ b/src/test/ui/run-pass/issues/issue-7012.rs
diff --git a/src/test/run-pass/issue-7178.rs b/src/test/ui/run-pass/issues/issue-7178.rs
index 0882203cb1e..0882203cb1e 100644
--- a/src/test/run-pass/issue-7178.rs
+++ b/src/test/ui/run-pass/issues/issue-7178.rs
diff --git a/src/test/run-pass/issue-7222.rs b/src/test/ui/run-pass/issues/issue-7222.rs
index 3eb39ad6aad..3eb39ad6aad 100644
--- a/src/test/run-pass/issue-7222.rs
+++ b/src/test/ui/run-pass/issues/issue-7222.rs
diff --git a/src/test/run-pass/issue-7268.rs b/src/test/ui/run-pass/issues/issue-7268.rs
index 626adfe292b..626adfe292b 100644
--- a/src/test/run-pass/issue-7268.rs
+++ b/src/test/ui/run-pass/issues/issue-7268.rs
diff --git a/src/test/run-pass/issue-7344.rs b/src/test/ui/run-pass/issues/issue-7344.rs
index fb348fb4538..fb348fb4538 100644
--- a/src/test/run-pass/issue-7344.rs
+++ b/src/test/ui/run-pass/issues/issue-7344.rs
diff --git a/src/test/run-pass/issue-7519-match-unit-in-arg.rs b/src/test/ui/run-pass/issues/issue-7519-match-unit-in-arg.rs
index c5c59407ab2..c5c59407ab2 100644
--- a/src/test/run-pass/issue-7519-match-unit-in-arg.rs
+++ b/src/test/ui/run-pass/issues/issue-7519-match-unit-in-arg.rs
diff --git a/src/test/run-pass/issue-7563.rs b/src/test/ui/run-pass/issues/issue-7563.rs
index 6d2a602fc8d..6d2a602fc8d 100644
--- a/src/test/run-pass/issue-7563.rs
+++ b/src/test/ui/run-pass/issues/issue-7563.rs
diff --git a/src/test/run-pass/issue-7575.rs b/src/test/ui/run-pass/issues/issue-7575.rs
index 508ebf3f69d..508ebf3f69d 100644
--- a/src/test/run-pass/issue-7575.rs
+++ b/src/test/ui/run-pass/issues/issue-7575.rs
diff --git a/src/test/run-pass/issue-7607-2.rs b/src/test/ui/run-pass/issues/issue-7607-2.rs
index 799513e6e4f..799513e6e4f 100644
--- a/src/test/run-pass/issue-7607-2.rs
+++ b/src/test/ui/run-pass/issues/issue-7607-2.rs
diff --git a/src/test/run-pass/issue-7660.rs b/src/test/ui/run-pass/issues/issue-7660.rs
index 3f3e11a2ddb..3f3e11a2ddb 100644
--- a/src/test/run-pass/issue-7660.rs
+++ b/src/test/ui/run-pass/issues/issue-7660.rs
diff --git a/src/test/run-pass/issue-7663.rs b/src/test/ui/run-pass/issues/issue-7663.rs
index 87e0799f634..87e0799f634 100644
--- a/src/test/run-pass/issue-7663.rs
+++ b/src/test/ui/run-pass/issues/issue-7663.rs
diff --git a/src/test/run-pass/issue-7673-cast-generically-implemented-trait.rs b/src/test/ui/run-pass/issues/issue-7673-cast-generically-implemented-trait.rs
index f5acebf3a66..f5acebf3a66 100644
--- a/src/test/run-pass/issue-7673-cast-generically-implemented-trait.rs
+++ b/src/test/ui/run-pass/issues/issue-7673-cast-generically-implemented-trait.rs
diff --git a/src/test/run-pass/issue-7784.rs b/src/test/ui/run-pass/issues/issue-7784.rs
index 8d21594aa12..8d21594aa12 100644
--- a/src/test/run-pass/issue-7784.rs
+++ b/src/test/ui/run-pass/issues/issue-7784.rs
diff --git a/src/test/run-pass/issue-7899.rs b/src/test/ui/run-pass/issues/issue-7899.rs
index a17565fa0ac..a17565fa0ac 100644
--- a/src/test/run-pass/issue-7899.rs
+++ b/src/test/ui/run-pass/issues/issue-7899.rs
diff --git a/src/test/run-pass/issue-7911.rs b/src/test/ui/run-pass/issues/issue-7911.rs
index 764d6fa7918..764d6fa7918 100644
--- a/src/test/run-pass/issue-7911.rs
+++ b/src/test/ui/run-pass/issues/issue-7911.rs
diff --git a/src/test/run-pass/issue-8044.rs b/src/test/ui/run-pass/issues/issue-8044.rs
index 4f72409c36e..4f72409c36e 100644
--- a/src/test/run-pass/issue-8044.rs
+++ b/src/test/ui/run-pass/issues/issue-8044.rs
diff --git a/src/test/run-pass/issue-8171-default-method-self-inherit-builtin-trait.rs b/src/test/ui/run-pass/issues/issue-8171-default-method-self-inherit-builtin-trait.rs
index 92d1c7c5a1c..92d1c7c5a1c 100644
--- a/src/test/run-pass/issue-8171-default-method-self-inherit-builtin-trait.rs
+++ b/src/test/ui/run-pass/issues/issue-8171-default-method-self-inherit-builtin-trait.rs
diff --git a/src/test/run-pass/issue-8248.rs b/src/test/ui/run-pass/issues/issue-8248.rs
index b58be361f15..b58be361f15 100644
--- a/src/test/run-pass/issue-8248.rs
+++ b/src/test/ui/run-pass/issues/issue-8248.rs
diff --git a/src/test/run-pass/issue-8249.rs b/src/test/ui/run-pass/issues/issue-8249.rs
index 3e65bc000ff..3e65bc000ff 100644
--- a/src/test/run-pass/issue-8249.rs
+++ b/src/test/ui/run-pass/issues/issue-8249.rs
diff --git a/src/test/run-pass/issue-8259.rs b/src/test/ui/run-pass/issues/issue-8259.rs
index e7f09789c5b..e7f09789c5b 100644
--- a/src/test/run-pass/issue-8259.rs
+++ b/src/test/ui/run-pass/issues/issue-8259.rs
diff --git a/src/test/run-pass/issue-8351-1.rs b/src/test/ui/run-pass/issues/issue-8351-1.rs
index ed78b37604e..ed78b37604e 100644
--- a/src/test/run-pass/issue-8351-1.rs
+++ b/src/test/ui/run-pass/issues/issue-8351-1.rs
diff --git a/src/test/run-pass/issue-8351-2.rs b/src/test/ui/run-pass/issues/issue-8351-2.rs
index 1ed93915b8a..1ed93915b8a 100644
--- a/src/test/run-pass/issue-8351-2.rs
+++ b/src/test/ui/run-pass/issues/issue-8351-2.rs
diff --git a/src/test/run-pass/issue-8391.rs b/src/test/ui/run-pass/issues/issue-8391.rs
index b832c410443..b832c410443 100644
--- a/src/test/run-pass/issue-8391.rs
+++ b/src/test/ui/run-pass/issues/issue-8391.rs
diff --git a/src/test/run-pass/issue-8398.rs b/src/test/ui/run-pass/issues/issue-8398.rs
index 5c2c03f9857..5c2c03f9857 100644
--- a/src/test/run-pass/issue-8398.rs
+++ b/src/test/ui/run-pass/issues/issue-8398.rs
diff --git a/src/test/run-pass/issue-8401.rs b/src/test/ui/run-pass/issues/issue-8401.rs
index afdd572b129..afdd572b129 100644
--- a/src/test/run-pass/issue-8401.rs
+++ b/src/test/ui/run-pass/issues/issue-8401.rs
diff --git a/src/test/run-pass/issue-8460.rs b/src/test/ui/run-pass/issues/issue-8460.rs
index 17ea5b9a794..17ea5b9a794 100644
--- a/src/test/run-pass/issue-8460.rs
+++ b/src/test/ui/run-pass/issues/issue-8460.rs
diff --git a/src/test/run-pass/issue-8498.rs b/src/test/ui/run-pass/issues/issue-8498.rs
index d57b2a32368..d57b2a32368 100644
--- a/src/test/run-pass/issue-8498.rs
+++ b/src/test/ui/run-pass/issues/issue-8498.rs
diff --git a/src/test/run-pass/issue-8506.rs b/src/test/ui/run-pass/issues/issue-8506.rs
index 24632a0d13a..24632a0d13a 100644
--- a/src/test/run-pass/issue-8506.rs
+++ b/src/test/ui/run-pass/issues/issue-8506.rs
diff --git a/src/test/run-pass/issue-8521.rs b/src/test/ui/run-pass/issues/issue-8521.rs
index ce362c4bcd1..ce362c4bcd1 100644
--- a/src/test/run-pass/issue-8521.rs
+++ b/src/test/ui/run-pass/issues/issue-8521.rs
diff --git a/src/test/run-pass/issue-8578.rs b/src/test/ui/run-pass/issues/issue-8578.rs
index ce392f8d881..ce392f8d881 100644
--- a/src/test/run-pass/issue-8578.rs
+++ b/src/test/ui/run-pass/issues/issue-8578.rs
diff --git a/src/test/run-pass/issue-868.rs b/src/test/ui/run-pass/issues/issue-868.rs
index 64b463ddf5c..64b463ddf5c 100644
--- a/src/test/run-pass/issue-868.rs
+++ b/src/test/ui/run-pass/issues/issue-868.rs
diff --git a/src/test/run-pass/issue-8709.rs b/src/test/ui/run-pass/issues/issue-8709.rs
index 44759cef286..44759cef286 100644
--- a/src/test/run-pass/issue-8709.rs
+++ b/src/test/ui/run-pass/issues/issue-8709.rs
diff --git a/src/test/run-pass/issue-8783.rs b/src/test/ui/run-pass/issues/issue-8783.rs
index 485a76ff7ec..485a76ff7ec 100644
--- a/src/test/run-pass/issue-8783.rs
+++ b/src/test/ui/run-pass/issues/issue-8783.rs
diff --git a/src/test/run-pass/issue-8827.rs b/src/test/ui/run-pass/issues/issue-8827.rs
index 6b573698a36..6b573698a36 100644
--- a/src/test/run-pass/issue-8827.rs
+++ b/src/test/ui/run-pass/issues/issue-8827.rs
diff --git a/src/test/run-pass/issue-8851.rs b/src/test/ui/run-pass/issues/issue-8851.rs
index 2a0c02b23e8..2a0c02b23e8 100644
--- a/src/test/run-pass/issue-8851.rs
+++ b/src/test/ui/run-pass/issues/issue-8851.rs
diff --git a/src/test/run-pass/issue-8860.rs b/src/test/ui/run-pass/issues/issue-8860.rs
index 127f9e355c7..127f9e355c7 100644
--- a/src/test/run-pass/issue-8860.rs
+++ b/src/test/ui/run-pass/issues/issue-8860.rs
diff --git a/src/test/run-pass/issue-8898.rs b/src/test/ui/run-pass/issues/issue-8898.rs
index 065cef2c60d..065cef2c60d 100644
--- a/src/test/run-pass/issue-8898.rs
+++ b/src/test/ui/run-pass/issues/issue-8898.rs
diff --git a/src/test/run-pass/issue-9047.rs b/src/test/ui/run-pass/issues/issue-9047.rs
index aa3e601c3a2..aa3e601c3a2 100644
--- a/src/test/run-pass/issue-9047.rs
+++ b/src/test/ui/run-pass/issues/issue-9047.rs
diff --git a/src/test/run-pass/issue-9110.rs b/src/test/ui/run-pass/issues/issue-9110.rs
index 298ae5e6aac..298ae5e6aac 100644
--- a/src/test/run-pass/issue-9110.rs
+++ b/src/test/ui/run-pass/issues/issue-9110.rs
diff --git a/src/test/run-pass/issue-9123.rs b/src/test/ui/run-pass/issues/issue-9123.rs
index 4da0c22a0b1..4da0c22a0b1 100644
--- a/src/test/run-pass/issue-9123.rs
+++ b/src/test/ui/run-pass/issues/issue-9123.rs
diff --git a/src/test/run-pass/issue-9129.rs b/src/test/ui/run-pass/issues/issue-9129.rs
index 485f10357b3..485f10357b3 100644
--- a/src/test/run-pass/issue-9129.rs
+++ b/src/test/ui/run-pass/issues/issue-9129.rs
diff --git a/src/test/run-pass/issue-9188.rs b/src/test/ui/run-pass/issues/issue-9188.rs
index e2272837efb..e2272837efb 100644
--- a/src/test/run-pass/issue-9188.rs
+++ b/src/test/ui/run-pass/issues/issue-9188.rs
diff --git a/src/test/run-pass/issue-9243.rs b/src/test/ui/run-pass/issues/issue-9243.rs
index b857465aabc..b857465aabc 100644
--- a/src/test/run-pass/issue-9243.rs
+++ b/src/test/ui/run-pass/issues/issue-9243.rs
diff --git a/src/test/run-pass/issue-9249.rs b/src/test/ui/run-pass/issues/issue-9249.rs
index e4d848dbd75..e4d848dbd75 100644
--- a/src/test/run-pass/issue-9249.rs
+++ b/src/test/ui/run-pass/issues/issue-9249.rs
diff --git a/src/test/run-pass/issue-9259.rs b/src/test/ui/run-pass/issues/issue-9259.rs
index 996548de817..996548de817 100644
--- a/src/test/run-pass/issue-9259.rs
+++ b/src/test/ui/run-pass/issues/issue-9259.rs
diff --git a/src/test/run-pass/issue-9382.rs b/src/test/ui/run-pass/issues/issue-9382.rs
index 7538e55fd95..7538e55fd95 100644
--- a/src/test/run-pass/issue-9382.rs
+++ b/src/test/ui/run-pass/issues/issue-9382.rs
diff --git a/src/test/run-pass/issue-9394-inherited-trait-calls.rs b/src/test/ui/run-pass/issues/issue-9394-inherited-trait-calls.rs
index 7d2c435b384..7d2c435b384 100644
--- a/src/test/run-pass/issue-9394-inherited-trait-calls.rs
+++ b/src/test/ui/run-pass/issues/issue-9394-inherited-trait-calls.rs
diff --git a/src/test/run-pass/issue-9396.rs b/src/test/ui/run-pass/issues/issue-9396.rs
index 5af2006f081..5af2006f081 100644
--- a/src/test/run-pass/issue-9396.rs
+++ b/src/test/ui/run-pass/issues/issue-9396.rs
diff --git a/src/test/run-pass/issue-9446.rs b/src/test/ui/run-pass/issues/issue-9446.rs
index a6adb1d369e..a6adb1d369e 100644
--- a/src/test/run-pass/issue-9446.rs
+++ b/src/test/ui/run-pass/issues/issue-9446.rs
diff --git a/src/test/run-pass/issue-9719.rs b/src/test/ui/run-pass/issues/issue-9719.rs
index 108f1a0d73d..108f1a0d73d 100644
--- a/src/test/run-pass/issue-9719.rs
+++ b/src/test/ui/run-pass/issues/issue-9719.rs
diff --git a/src/test/run-pass/issue-9737.rs b/src/test/ui/run-pass/issues/issue-9737.rs
index 5e1fd87b57a..5e1fd87b57a 100644
--- a/src/test/run-pass/issue-9737.rs
+++ b/src/test/ui/run-pass/issues/issue-9737.rs
diff --git a/src/test/run-pass/issue-979.rs b/src/test/ui/run-pass/issues/issue-979.rs
index 43fa9812426..43fa9812426 100644
--- a/src/test/run-pass/issue-979.rs
+++ b/src/test/ui/run-pass/issues/issue-979.rs
diff --git a/src/test/run-pass/issue-9837.rs b/src/test/ui/run-pass/issues/issue-9837.rs
index f887459836c..f887459836c 100644
--- a/src/test/run-pass/issue-9837.rs
+++ b/src/test/ui/run-pass/issues/issue-9837.rs
diff --git a/src/test/run-pass/issue-9906.rs b/src/test/ui/run-pass/issues/issue-9906.rs
index 84f848fc9cd..84f848fc9cd 100644
--- a/src/test/run-pass/issue-9906.rs
+++ b/src/test/ui/run-pass/issues/issue-9906.rs
diff --git a/src/test/run-pass/issue-9918.rs b/src/test/ui/run-pass/issues/issue-9918.rs
index a766e6b707e..a766e6b707e 100644
--- a/src/test/run-pass/issue-9918.rs
+++ b/src/test/ui/run-pass/issues/issue-9918.rs
diff --git a/src/test/run-pass/issue-9942.rs b/src/test/ui/run-pass/issues/issue-9942.rs
index 222eb0c6518..222eb0c6518 100644
--- a/src/test/run-pass/issue-9942.rs
+++ b/src/test/ui/run-pass/issues/issue-9942.rs
diff --git a/src/test/run-pass/issue-9951.rs b/src/test/ui/run-pass/issues/issue-9951.rs
index 63807395fb0..63807395fb0 100644
--- a/src/test/run-pass/issue-9951.rs
+++ b/src/test/ui/run-pass/issues/issue-9951.rs
diff --git a/src/test/run-pass/issue-9968.rs b/src/test/ui/run-pass/issues/issue-9968.rs
index c8af811d13d..c8af811d13d 100644
--- a/src/test/run-pass/issue-9968.rs
+++ b/src/test/ui/run-pass/issues/issue-9968.rs
diff --git a/src/test/run-pass/issue2170exe.rs b/src/test/ui/run-pass/issues/issue2170exe.rs
index d126d1f6ce1..d126d1f6ce1 100644
--- a/src/test/run-pass/issue2170exe.rs
+++ b/src/test/ui/run-pass/issues/issue2170exe.rs
diff --git a/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs b/src/test/ui/run-pass/issues/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs
index f1624fd2e58..f1624fd2e58 100644
--- a/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs
+++ b/src/test/ui/run-pass/issues/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs
diff --git a/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs b/src/test/ui/run-pass/issues/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs
index 8dc243aed7e..8dc243aed7e 100644
--- a/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs
+++ b/src/test/ui/run-pass/issues/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs
diff --git a/src/test/run-pass/issue24687-embed-debuginfo/main.rs b/src/test/ui/run-pass/issues/issue24687-embed-debuginfo/main.rs
index abec252c74e..abec252c74e 100644
--- a/src/test/run-pass/issue24687-embed-debuginfo/main.rs
+++ b/src/test/ui/run-pass/issues/issue24687-embed-debuginfo/main.rs
diff --git a/src/test/run-pass/issue28498-must-work-ex1.rs b/src/test/ui/run-pass/issues/issue28498-must-work-ex1.rs
index 83a978d57b9..83a978d57b9 100644
--- a/src/test/run-pass/issue28498-must-work-ex1.rs
+++ b/src/test/ui/run-pass/issues/issue28498-must-work-ex1.rs
diff --git a/src/test/run-pass/issue28498-must-work-ex2.rs b/src/test/ui/run-pass/issues/issue28498-must-work-ex2.rs
index 93652a1b612..93652a1b612 100644
--- a/src/test/run-pass/issue28498-must-work-ex2.rs
+++ b/src/test/ui/run-pass/issues/issue28498-must-work-ex2.rs
diff --git a/src/test/run-pass/issue28498-ugeh-ex1.rs b/src/test/ui/run-pass/issues/issue28498-ugeh-ex1.rs
index b07831f552c..b07831f552c 100644
--- a/src/test/run-pass/issue28498-ugeh-ex1.rs
+++ b/src/test/ui/run-pass/issues/issue28498-ugeh-ex1.rs
diff --git a/src/test/run-pass/issue28498-ugeh-with-lifetime-param.rs b/src/test/ui/run-pass/issues/issue28498-ugeh-with-lifetime-param.rs
index 19be2568e4f..19be2568e4f 100644
--- a/src/test/run-pass/issue28498-ugeh-with-lifetime-param.rs
+++ b/src/test/ui/run-pass/issues/issue28498-ugeh-with-lifetime-param.rs
diff --git a/src/test/run-pass/issue28498-ugeh-with-passed-to-fn.rs b/src/test/ui/run-pass/issues/issue28498-ugeh-with-passed-to-fn.rs
index bb430ea3e33..bb430ea3e33 100644
--- a/src/test/run-pass/issue28498-ugeh-with-passed-to-fn.rs
+++ b/src/test/ui/run-pass/issues/issue28498-ugeh-with-passed-to-fn.rs
diff --git a/src/test/run-pass/issue28498-ugeh-with-trait-bound.rs b/src/test/ui/run-pass/issues/issue28498-ugeh-with-trait-bound.rs
index 2e9633b3a21..2e9633b3a21 100644
--- a/src/test/run-pass/issue28498-ugeh-with-trait-bound.rs
+++ b/src/test/ui/run-pass/issues/issue28498-ugeh-with-trait-bound.rs
diff --git a/src/test/run-pass/issue29927-1.rs b/src/test/ui/run-pass/issues/issue29927-1.rs
index 488bc6e6927..488bc6e6927 100644
--- a/src/test/run-pass/issue29927-1.rs
+++ b/src/test/ui/run-pass/issues/issue29927-1.rs
diff --git a/src/test/run-pass/issue_26873_multifile/A/B.rs b/src/test/ui/run-pass/issues/issue_26873_multifile/A/B.rs
index 8917a98b8cf..8917a98b8cf 100644
--- a/src/test/run-pass/issue_26873_multifile/A/B.rs
+++ b/src/test/ui/run-pass/issues/issue_26873_multifile/A/B.rs
diff --git a/src/test/run-pass/issue_26873_multifile/A/C.rs b/src/test/ui/run-pass/issues/issue_26873_multifile/A/C.rs
index 64aaf9c2798..64aaf9c2798 100644
--- a/src/test/run-pass/issue_26873_multifile/A/C.rs
+++ b/src/test/ui/run-pass/issues/issue_26873_multifile/A/C.rs
diff --git a/src/test/run-pass/issue_26873_multifile/A/mod.rs b/src/test/ui/run-pass/issues/issue_26873_multifile/A/mod.rs
index a2aeb1cc43f..a2aeb1cc43f 100644
--- a/src/test/run-pass/issue_26873_multifile/A/mod.rs
+++ b/src/test/ui/run-pass/issues/issue_26873_multifile/A/mod.rs
diff --git a/src/test/run-pass/issue_26873_multifile/compiletest-ignore-dir b/src/test/ui/run-pass/issues/issue_26873_multifile/compiletest-ignore-dir
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/run-pass/issue_26873_multifile/compiletest-ignore-dir
+++ b/src/test/ui/run-pass/issues/issue_26873_multifile/compiletest-ignore-dir
diff --git a/src/test/run-pass/issue_26873_multifile/mod.rs b/src/test/ui/run-pass/issues/issue_26873_multifile/mod.rs
index 3643b94e31a..3643b94e31a 100644
--- a/src/test/run-pass/issue_26873_multifile/mod.rs
+++ b/src/test/ui/run-pass/issues/issue_26873_multifile/mod.rs
diff --git a/src/test/run-pass/issue_3136_b.rs b/src/test/ui/run-pass/issues/issue_3136_b.rs
index cffe3f9572b..cffe3f9572b 100644
--- a/src/test/run-pass/issue_3136_b.rs
+++ b/src/test/ui/run-pass/issues/issue_3136_b.rs
diff --git a/src/test/run-pass/issue_9155.rs b/src/test/ui/run-pass/issues/issue_9155.rs
index 9db556bf9a2..9db556bf9a2 100644
--- a/src/test/run-pass/issue_9155.rs
+++ b/src/test/ui/run-pass/issues/issue_9155.rs
diff --git a/src/test/run-pass/into-iterator-type-inference-shift.rs b/src/test/ui/run-pass/iterators/into-iterator-type-inference-shift.rs
index 7ec18ef1276..7ec18ef1276 100644
--- a/src/test/run-pass/into-iterator-type-inference-shift.rs
+++ b/src/test/ui/run-pass/iterators/into-iterator-type-inference-shift.rs
diff --git a/src/test/run-pass/iter-cloned-type-inference.rs b/src/test/ui/run-pass/iterators/iter-cloned-type-inference.rs
index e3351bda335..e3351bda335 100644
--- a/src/test/run-pass/iter-cloned-type-inference.rs
+++ b/src/test/ui/run-pass/iterators/iter-cloned-type-inference.rs
diff --git a/src/test/run-pass/iter-range.rs b/src/test/ui/run-pass/iterators/iter-range.rs
index a6130841b5c..a6130841b5c 100644
--- a/src/test/run-pass/iter-range.rs
+++ b/src/test/ui/run-pass/iterators/iter-range.rs
diff --git a/src/test/run-pass/iter-step-overflow-debug.rs b/src/test/ui/run-pass/iterators/iter-step-overflow-debug.rs
index c45a10eac52..c45a10eac52 100644
--- a/src/test/run-pass/iter-step-overflow-debug.rs
+++ b/src/test/ui/run-pass/iterators/iter-step-overflow-debug.rs
diff --git a/src/test/run-pass/iter-step-overflow-ndebug.rs b/src/test/ui/run-pass/iterators/iter-step-overflow-ndebug.rs
index 8642f1643c1..8642f1643c1 100644
--- a/src/test/run-pass/iter-step-overflow-ndebug.rs
+++ b/src/test/ui/run-pass/iterators/iter-step-overflow-ndebug.rs
diff --git a/src/test/run-pass/iter-sum-overflow-debug.rs b/src/test/ui/run-pass/iterators/iter-sum-overflow-debug.rs
index c640f7cd280..c640f7cd280 100644
--- a/src/test/run-pass/iter-sum-overflow-debug.rs
+++ b/src/test/ui/run-pass/iterators/iter-sum-overflow-debug.rs
diff --git a/src/test/run-pass/iter-sum-overflow-ndebug.rs b/src/test/ui/run-pass/iterators/iter-sum-overflow-ndebug.rs
index 65ac1ef29ed..65ac1ef29ed 100644
--- a/src/test/run-pass/iter-sum-overflow-ndebug.rs
+++ b/src/test/ui/run-pass/iterators/iter-sum-overflow-ndebug.rs
diff --git a/src/test/run-pass/iter-sum-overflow-overflow-checks.rs b/src/test/ui/run-pass/iterators/iter-sum-overflow-overflow-checks.rs
index 517cd139cf3..517cd139cf3 100644
--- a/src/test/run-pass/iter-sum-overflow-overflow-checks.rs
+++ b/src/test/ui/run-pass/iterators/iter-sum-overflow-overflow-checks.rs
diff --git a/src/test/run-pass/iter-zip.rs b/src/test/ui/run-pass/iterators/iter-zip.rs
index b0503bc2048..b0503bc2048 100644
--- a/src/test/run-pass/iter-zip.rs
+++ b/src/test/ui/run-pass/iterators/iter-zip.rs
diff --git a/src/test/run-pass/assert-eq-macro-success.rs b/src/test/ui/run-pass/macros/assert-eq-macro-success.rs
index 3110e22d5da..3110e22d5da 100644
--- a/src/test/run-pass/assert-eq-macro-success.rs
+++ b/src/test/ui/run-pass/macros/assert-eq-macro-success.rs
diff --git a/src/test/run-pass/assert-eq-macro-unsized.rs b/src/test/ui/run-pass/macros/assert-eq-macro-unsized.rs
index e21d3ef0ed0..e21d3ef0ed0 100644
--- a/src/test/run-pass/assert-eq-macro-unsized.rs
+++ b/src/test/ui/run-pass/macros/assert-eq-macro-unsized.rs
diff --git a/src/test/run-pass/assert-ne-macro-success.rs b/src/test/ui/run-pass/macros/assert-ne-macro-success.rs
index ce671d2f1b5..ce671d2f1b5 100644
--- a/src/test/run-pass/assert-ne-macro-success.rs
+++ b/src/test/ui/run-pass/macros/assert-ne-macro-success.rs
diff --git a/src/test/run-pass/assert-ne-macro-unsized.rs b/src/test/ui/run-pass/macros/assert-ne-macro-unsized.rs
index eeac0b6f9f6..eeac0b6f9f6 100644
--- a/src/test/run-pass/assert-ne-macro-unsized.rs
+++ b/src/test/ui/run-pass/macros/assert-ne-macro-unsized.rs
diff --git a/src/test/run-pass/colorful-write-macros.rs b/src/test/ui/run-pass/macros/colorful-write-macros.rs
index 21ff6d6938a..21ff6d6938a 100644
--- a/src/test/run-pass/colorful-write-macros.rs
+++ b/src/test/ui/run-pass/macros/colorful-write-macros.rs
diff --git a/src/test/run-pass/conditional-debug-macro-on.rs b/src/test/ui/run-pass/macros/conditional-debug-macro-on.rs
index 7da33be7a57..7da33be7a57 100644
--- a/src/test/run-pass/conditional-debug-macro-on.rs
+++ b/src/test/ui/run-pass/macros/conditional-debug-macro-on.rs
diff --git a/src/test/run-pass/die-macro.rs b/src/test/ui/run-pass/macros/die-macro.rs
index 0816e258e84..0816e258e84 100644
--- a/src/test/run-pass/die-macro.rs
+++ b/src/test/ui/run-pass/macros/die-macro.rs
diff --git a/src/test/run-pass/log_syntax-trace_macros-macro-locations.rs b/src/test/ui/run-pass/macros/log_syntax-trace_macros-macro-locations.rs
index 49328311867..49328311867 100644
--- a/src/test/run-pass/log_syntax-trace_macros-macro-locations.rs
+++ b/src/test/ui/run-pass/macros/log_syntax-trace_macros-macro-locations.rs
diff --git a/src/test/run-pass/macro-2.rs b/src/test/ui/run-pass/macros/macro-2.rs
index 801d92b6dcb..801d92b6dcb 100644
--- a/src/test/run-pass/macro-2.rs
+++ b/src/test/ui/run-pass/macros/macro-2.rs
diff --git a/src/test/run-pass/macro-at-most-once-rep.rs b/src/test/ui/run-pass/macros/macro-at-most-once-rep.rs
index 61c3e781c08..61c3e781c08 100644
--- a/src/test/run-pass/macro-at-most-once-rep.rs
+++ b/src/test/ui/run-pass/macros/macro-at-most-once-rep.rs
diff --git a/src/test/run-pass/macro-attribute-expansion.rs b/src/test/ui/run-pass/macros/macro-attribute-expansion.rs
index c3de9f736fb..c3de9f736fb 100644
--- a/src/test/run-pass/macro-attribute-expansion.rs
+++ b/src/test/ui/run-pass/macros/macro-attribute-expansion.rs
diff --git a/src/test/run-pass/macro-attributes.rs b/src/test/ui/run-pass/macros/macro-attributes.rs
index 839fee3a2d2..839fee3a2d2 100644
--- a/src/test/run-pass/macro-attributes.rs
+++ b/src/test/ui/run-pass/macros/macro-attributes.rs
diff --git a/src/test/run-pass/macro-block-nonterminal.rs b/src/test/ui/run-pass/macros/macro-block-nonterminal.rs
index 21b284f420f..21b284f420f 100644
--- a/src/test/run-pass/macro-block-nonterminal.rs
+++ b/src/test/ui/run-pass/macros/macro-block-nonterminal.rs
diff --git a/src/test/run-pass/macro-comma-behavior.rs b/src/test/ui/run-pass/macros/macro-comma-behavior.rs
index 2a434009e13..2a434009e13 100644
--- a/src/test/run-pass/macro-comma-behavior.rs
+++ b/src/test/ui/run-pass/macros/macro-comma-behavior.rs
diff --git a/src/test/run-pass/macro-comma-support.rs b/src/test/ui/run-pass/macros/macro-comma-support.rs
index f645849cd51..f645849cd51 100644
--- a/src/test/run-pass/macro-comma-support.rs
+++ b/src/test/ui/run-pass/macros/macro-comma-support.rs
diff --git a/src/test/run-pass/macro-crate-def-only.rs b/src/test/ui/run-pass/macros/macro-crate-def-only.rs
index 28be058b9a3..28be058b9a3 100644
--- a/src/test/run-pass/macro-crate-def-only.rs
+++ b/src/test/ui/run-pass/macros/macro-crate-def-only.rs
diff --git a/src/test/run-pass/macro-crate-nonterminal-renamed.rs b/src/test/ui/run-pass/macros/macro-crate-nonterminal-renamed.rs
index 93f5899e3ac..93f5899e3ac 100644
--- a/src/test/run-pass/macro-crate-nonterminal-renamed.rs
+++ b/src/test/ui/run-pass/macros/macro-crate-nonterminal-renamed.rs
diff --git a/src/test/run-pass/macro-crate-nonterminal.rs b/src/test/ui/run-pass/macros/macro-crate-nonterminal.rs
index 28f9393ab7a..28f9393ab7a 100644
--- a/src/test/run-pass/macro-crate-nonterminal.rs
+++ b/src/test/ui/run-pass/macros/macro-crate-nonterminal.rs
diff --git a/src/test/run-pass/macro-crate-use.rs b/src/test/ui/run-pass/macros/macro-crate-use.rs
index c7255f67fa6..c7255f67fa6 100644
--- a/src/test/run-pass/macro-crate-use.rs
+++ b/src/test/ui/run-pass/macros/macro-crate-use.rs
diff --git a/src/test/run-pass/macro-deep_expansion.rs b/src/test/ui/run-pass/macros/macro-deep_expansion.rs
index 3e8548ff49d..3e8548ff49d 100644
--- a/src/test/run-pass/macro-deep_expansion.rs
+++ b/src/test/ui/run-pass/macros/macro-deep_expansion.rs
diff --git a/src/test/run-pass/macro-delimiter-significance.rs b/src/test/ui/run-pass/macros/macro-delimiter-significance.rs
index a2ae3fbf83b..a2ae3fbf83b 100644
--- a/src/test/run-pass/macro-delimiter-significance.rs
+++ b/src/test/ui/run-pass/macros/macro-delimiter-significance.rs
diff --git a/src/test/run-pass/macro-doc-comments.rs b/src/test/ui/run-pass/macros/macro-doc-comments.rs
index 506813df5b3..506813df5b3 100644
--- a/src/test/run-pass/macro-doc-comments.rs
+++ b/src/test/ui/run-pass/macros/macro-doc-comments.rs
diff --git a/src/test/run-pass/macro-doc-escapes.rs b/src/test/ui/run-pass/macros/macro-doc-escapes.rs
index ea92f0ffebe..ea92f0ffebe 100644
--- a/src/test/run-pass/macro-doc-escapes.rs
+++ b/src/test/ui/run-pass/macros/macro-doc-escapes.rs
diff --git a/src/test/run-pass/macro-doc-raw-str-hashes.rs b/src/test/ui/run-pass/macros/macro-doc-raw-str-hashes.rs
index ffbe237b74e..ffbe237b74e 100644
--- a/src/test/run-pass/macro-doc-raw-str-hashes.rs
+++ b/src/test/ui/run-pass/macros/macro-doc-raw-str-hashes.rs
diff --git a/src/test/run-pass/macro-export-inner-module.rs b/src/test/ui/run-pass/macros/macro-export-inner-module.rs
index e39f81e49d7..e39f81e49d7 100644
--- a/src/test/run-pass/macro-export-inner-module.rs
+++ b/src/test/ui/run-pass/macros/macro-export-inner-module.rs
diff --git a/src/test/run-pass/macro-first-set.rs b/src/test/ui/run-pass/macros/macro-first-set.rs
index 9216040ab6e..9216040ab6e 100644
--- a/src/test/run-pass/macro-first-set.rs
+++ b/src/test/ui/run-pass/macros/macro-first-set.rs
diff --git a/src/test/run-pass/macro-follow.rs b/src/test/ui/run-pass/macros/macro-follow.rs
index dca676f8cf9..dca676f8cf9 100644
--- a/src/test/run-pass/macro-follow.rs
+++ b/src/test/ui/run-pass/macros/macro-follow.rs
diff --git a/src/test/run-pass/macro-followed-by-seq.rs b/src/test/ui/run-pass/macros/macro-followed-by-seq.rs
index 15224930b84..15224930b84 100644
--- a/src/test/run-pass/macro-followed-by-seq.rs
+++ b/src/test/ui/run-pass/macros/macro-followed-by-seq.rs
diff --git a/src/test/run-pass/macro-include-items.rs b/src/test/ui/run-pass/macros/macro-include-items.rs
index f8728ebb915..f8728ebb915 100644
--- a/src/test/run-pass/macro-include-items.rs
+++ b/src/test/ui/run-pass/macros/macro-include-items.rs
diff --git a/src/test/run-pass/macro-interpolation.rs b/src/test/ui/run-pass/macros/macro-interpolation.rs
index 6dcd1538ebc..6dcd1538ebc 100644
--- a/src/test/run-pass/macro-interpolation.rs
+++ b/src/test/ui/run-pass/macros/macro-interpolation.rs
diff --git a/src/test/run-pass/macro-invocation-in-count-expr-fixed-array-type.rs b/src/test/ui/run-pass/macros/macro-invocation-in-count-expr-fixed-array-type.rs
index 9fafeb6531d..9fafeb6531d 100644
--- a/src/test/run-pass/macro-invocation-in-count-expr-fixed-array-type.rs
+++ b/src/test/ui/run-pass/macros/macro-invocation-in-count-expr-fixed-array-type.rs
diff --git a/src/test/run-pass/macro-lifetime-used-with-bound.rs b/src/test/ui/run-pass/macros/macro-lifetime-used-with-bound.rs
index b9e1fde6b1f..b9e1fde6b1f 100644
--- a/src/test/run-pass/macro-lifetime-used-with-bound.rs
+++ b/src/test/ui/run-pass/macros/macro-lifetime-used-with-bound.rs
diff --git a/src/test/run-pass/macro-lifetime-used-with-labels.rs b/src/test/ui/run-pass/macros/macro-lifetime-used-with-labels.rs
index d003d7dcfb6..d003d7dcfb6 100644
--- a/src/test/run-pass/macro-lifetime-used-with-labels.rs
+++ b/src/test/ui/run-pass/macros/macro-lifetime-used-with-labels.rs
diff --git a/src/test/run-pass/macro-lifetime-used-with-static.rs b/src/test/ui/run-pass/macros/macro-lifetime-used-with-static.rs
index 5c1f8683e00..5c1f8683e00 100644
--- a/src/test/run-pass/macro-lifetime-used-with-static.rs
+++ b/src/test/ui/run-pass/macros/macro-lifetime-used-with-static.rs
diff --git a/src/test/run-pass/macro-lifetime.rs b/src/test/ui/run-pass/macros/macro-lifetime.rs
index ff5798ff78d..ff5798ff78d 100644
--- a/src/test/run-pass/macro-lifetime.rs
+++ b/src/test/ui/run-pass/macros/macro-lifetime.rs
diff --git a/src/test/run-pass/macro-literal.rs b/src/test/ui/run-pass/macros/macro-literal.rs
index 6d5e8bc97c0..6d5e8bc97c0 100644
--- a/src/test/run-pass/macro-literal.rs
+++ b/src/test/ui/run-pass/macros/macro-literal.rs
diff --git a/src/test/run-pass/macro-meta-items.rs b/src/test/ui/run-pass/macros/macro-meta-items.rs
index 9c1e1fca341..9c1e1fca341 100644
--- a/src/test/run-pass/macro-meta-items.rs
+++ b/src/test/ui/run-pass/macros/macro-meta-items.rs
diff --git a/src/test/run-pass/macro-method-issue-4621.rs b/src/test/ui/run-pass/macros/macro-method-issue-4621.rs
index 64648cae5e6..64648cae5e6 100644
--- a/src/test/run-pass/macro-method-issue-4621.rs
+++ b/src/test/ui/run-pass/macros/macro-method-issue-4621.rs
diff --git a/src/test/run-pass/macro-multiple-items.rs b/src/test/ui/run-pass/macros/macro-multiple-items.rs
index 190bfc53a9e..190bfc53a9e 100644
--- a/src/test/run-pass/macro-multiple-items.rs
+++ b/src/test/ui/run-pass/macros/macro-multiple-items.rs
diff --git a/src/test/run-pass/macro-named-default.rs b/src/test/ui/run-pass/macros/macro-named-default.rs
index 028d59a19dd..028d59a19dd 100644
--- a/src/test/run-pass/macro-named-default.rs
+++ b/src/test/ui/run-pass/macros/macro-named-default.rs
diff --git a/src/test/run-pass/macro-nested_definition_issue-31946.rs b/src/test/ui/run-pass/macros/macro-nested_definition_issue-31946.rs
index 84ff2dc4d0d..84ff2dc4d0d 100644
--- a/src/test/run-pass/macro-nested_definition_issue-31946.rs
+++ b/src/test/ui/run-pass/macros/macro-nested_definition_issue-31946.rs
diff --git a/src/test/run-pass/macro-nested_expr.rs b/src/test/ui/run-pass/macros/macro-nested_expr.rs
index 993ded60c36..993ded60c36 100644
--- a/src/test/run-pass/macro-nested_expr.rs
+++ b/src/test/ui/run-pass/macros/macro-nested_expr.rs
diff --git a/src/test/run-pass/macro-nested_stmt_macros.rs b/src/test/ui/run-pass/macros/macro-nested_stmt_macros.rs
index 5997a4f18e7..5997a4f18e7 100644
--- a/src/test/run-pass/macro-nested_stmt_macros.rs
+++ b/src/test/ui/run-pass/macros/macro-nested_stmt_macros.rs
diff --git a/src/test/run-pass/macro-nt-list.rs b/src/test/ui/run-pass/macros/macro-nt-list.rs
index f3367ff2b41..f3367ff2b41 100644
--- a/src/test/run-pass/macro-nt-list.rs
+++ b/src/test/ui/run-pass/macros/macro-nt-list.rs
diff --git a/src/test/run-pass/macro-of-higher-order.rs b/src/test/ui/run-pass/macros/macro-of-higher-order.rs
index c982e8ac6f8..c982e8ac6f8 100644
--- a/src/test/run-pass/macro-of-higher-order.rs
+++ b/src/test/ui/run-pass/macros/macro-of-higher-order.rs
diff --git a/src/test/run-pass/macro-pat-follow.rs b/src/test/ui/run-pass/macros/macro-pat-follow.rs
index c1abebd5f90..c1abebd5f90 100644
--- a/src/test/run-pass/macro-pat-follow.rs
+++ b/src/test/ui/run-pass/macros/macro-pat-follow.rs
diff --git a/src/test/run-pass/macro-pat-neg-lit.rs b/src/test/ui/run-pass/macros/macro-pat-neg-lit.rs
index 43ac697edce..43ac697edce 100644
--- a/src/test/run-pass/macro-pat-neg-lit.rs
+++ b/src/test/ui/run-pass/macros/macro-pat-neg-lit.rs
diff --git a/src/test/run-pass/macro-pat.rs b/src/test/ui/run-pass/macros/macro-pat.rs
index 48e521de57e..48e521de57e 100644
--- a/src/test/run-pass/macro-pat.rs
+++ b/src/test/ui/run-pass/macros/macro-pat.rs
diff --git a/src/test/run-pass/macro-path.rs b/src/test/ui/run-pass/macros/macro-path.rs
index 7aecc1dc203..7aecc1dc203 100644
--- a/src/test/run-pass/macro-path.rs
+++ b/src/test/ui/run-pass/macros/macro-path.rs
diff --git a/src/test/run-pass/macro-pub-matcher.rs b/src/test/ui/run-pass/macros/macro-pub-matcher.rs
index db8331358b9..db8331358b9 100644
--- a/src/test/run-pass/macro-pub-matcher.rs
+++ b/src/test/ui/run-pass/macros/macro-pub-matcher.rs
diff --git a/src/test/run-pass/macro-seq-followed-by-seq.rs b/src/test/ui/run-pass/macros/macro-seq-followed-by-seq.rs
index 23c7d2516a2..23c7d2516a2 100644
--- a/src/test/run-pass/macro-seq-followed-by-seq.rs
+++ b/src/test/ui/run-pass/macros/macro-seq-followed-by-seq.rs
diff --git a/src/test/run-pass/macro-stability.rs b/src/test/ui/run-pass/macros/macro-stability.rs
index 9afcd51aa85..9afcd51aa85 100644
--- a/src/test/run-pass/macro-stability.rs
+++ b/src/test/ui/run-pass/macros/macro-stability.rs
diff --git a/src/test/run-pass/macro-stmt.rs b/src/test/ui/run-pass/macros/macro-stmt.rs
index 027df9f93a8..027df9f93a8 100644
--- a/src/test/run-pass/macro-stmt.rs
+++ b/src/test/ui/run-pass/macros/macro-stmt.rs
diff --git a/src/test/run-pass/macro-stmt_macro_in_expr_macro.rs b/src/test/ui/run-pass/macros/macro-stmt_macro_in_expr_macro.rs
index c5badd78a63..c5badd78a63 100644
--- a/src/test/run-pass/macro-stmt_macro_in_expr_macro.rs
+++ b/src/test/ui/run-pass/macros/macro-stmt_macro_in_expr_macro.rs
diff --git a/src/test/run-pass/macro-tt-followed-by-seq.rs b/src/test/ui/run-pass/macros/macro-tt-followed-by-seq.rs
index cdb1f86aea5..cdb1f86aea5 100644
--- a/src/test/run-pass/macro-tt-followed-by-seq.rs
+++ b/src/test/ui/run-pass/macros/macro-tt-followed-by-seq.rs
diff --git a/src/test/run-pass/macro-use-all-and-none.rs b/src/test/ui/run-pass/macros/macro-use-all-and-none.rs
index 60e1d6287f1..60e1d6287f1 100644
--- a/src/test/run-pass/macro-use-all-and-none.rs
+++ b/src/test/ui/run-pass/macros/macro-use-all-and-none.rs
diff --git a/src/test/run-pass/macro-use-all.rs b/src/test/ui/run-pass/macros/macro-use-all.rs
index ca9c0e23e7c..ca9c0e23e7c 100644
--- a/src/test/run-pass/macro-use-all.rs
+++ b/src/test/ui/run-pass/macros/macro-use-all.rs
diff --git a/src/test/run-pass/macro-use-both.rs b/src/test/ui/run-pass/macros/macro-use-both.rs
index 7e0a374ef15..7e0a374ef15 100644
--- a/src/test/run-pass/macro-use-both.rs
+++ b/src/test/ui/run-pass/macros/macro-use-both.rs
diff --git a/src/test/run-pass/macro-use-one.rs b/src/test/ui/run-pass/macros/macro-use-one.rs
index 6a30b3e55ba..6a30b3e55ba 100644
--- a/src/test/run-pass/macro-use-one.rs
+++ b/src/test/ui/run-pass/macros/macro-use-one.rs
diff --git a/src/test/run-pass/macro-with-attrs1.rs b/src/test/ui/run-pass/macros/macro-with-attrs1.rs
index 99bf71b1f01..99bf71b1f01 100644
--- a/src/test/run-pass/macro-with-attrs1.rs
+++ b/src/test/ui/run-pass/macros/macro-with-attrs1.rs
diff --git a/src/test/run-pass/macro-with-attrs2.rs b/src/test/ui/run-pass/macros/macro-with-attrs2.rs
index 062c8d55d52..062c8d55d52 100644
--- a/src/test/run-pass/macro-with-attrs2.rs
+++ b/src/test/ui/run-pass/macros/macro-with-attrs2.rs
diff --git a/src/test/run-pass/macro-with-braces-in-expr-position.rs b/src/test/ui/run-pass/macros/macro-with-braces-in-expr-position.rs
index c3fad3a19f9..c3fad3a19f9 100644
--- a/src/test/run-pass/macro-with-braces-in-expr-position.rs
+++ b/src/test/ui/run-pass/macros/macro-with-braces-in-expr-position.rs
diff --git a/src/test/run-pass/macro_with_super_2.rs b/src/test/ui/run-pass/macros/macro_with_super_2.rs
index 9ecf186d5b1..9ecf186d5b1 100644
--- a/src/test/run-pass/macro_with_super_2.rs
+++ b/src/test/ui/run-pass/macros/macro_with_super_2.rs
diff --git a/src/test/run-pass/macros-in-extern.rs b/src/test/ui/run-pass/macros/macros-in-extern.rs
index d9094934356..d9094934356 100644
--- a/src/test/run-pass/macros-in-extern.rs
+++ b/src/test/ui/run-pass/macros/macros-in-extern.rs
diff --git a/src/test/run-pass/parse-complex-macro-invoc-op.rs b/src/test/ui/run-pass/macros/parse-complex-macro-invoc-op.rs
index e4c9fd9d8ef..e4c9fd9d8ef 100644
--- a/src/test/run-pass/parse-complex-macro-invoc-op.rs
+++ b/src/test/ui/run-pass/macros/parse-complex-macro-invoc-op.rs
diff --git a/src/test/run-pass/paths-in-macro-invocations.rs b/src/test/ui/run-pass/macros/paths-in-macro-invocations.rs
index e860f7021e5..e860f7021e5 100644
--- a/src/test/run-pass/paths-in-macro-invocations.rs
+++ b/src/test/ui/run-pass/macros/paths-in-macro-invocations.rs
diff --git a/src/test/run-pass/pub-item-inside-macro.rs b/src/test/ui/run-pass/macros/pub-item-inside-macro.rs
index d082ca624e0..d082ca624e0 100644
--- a/src/test/run-pass/pub-item-inside-macro.rs
+++ b/src/test/ui/run-pass/macros/pub-item-inside-macro.rs
diff --git a/src/test/run-pass/pub-method-inside-macro.rs b/src/test/ui/run-pass/macros/pub-method-inside-macro.rs
index 2e2e261b6d0..2e2e261b6d0 100644
--- a/src/test/run-pass/pub-method-inside-macro.rs
+++ b/src/test/ui/run-pass/macros/pub-method-inside-macro.rs
diff --git a/src/test/run-pass/semi-after-macro-ty.rs b/src/test/ui/run-pass/macros/semi-after-macro-ty.rs
index 2b4304252a1..2b4304252a1 100644
--- a/src/test/run-pass/semi-after-macro-ty.rs
+++ b/src/test/ui/run-pass/macros/semi-after-macro-ty.rs
diff --git a/src/test/run-pass/stmt_expr_attr_macro_parse.rs b/src/test/ui/run-pass/macros/stmt_expr_attr_macro_parse.rs
index 23559e8789b..23559e8789b 100644
--- a/src/test/run-pass/stmt_expr_attr_macro_parse.rs
+++ b/src/test/ui/run-pass/macros/stmt_expr_attr_macro_parse.rs
diff --git a/src/test/run-pass/syntax-extension-cfg.rs b/src/test/ui/run-pass/macros/syntax-extension-cfg.rs
index c1d8713b20e..c1d8713b20e 100644
--- a/src/test/run-pass/syntax-extension-cfg.rs
+++ b/src/test/ui/run-pass/macros/syntax-extension-cfg.rs
diff --git a/src/test/run-pass/syntax-extension-source-utils.rs b/src/test/ui/run-pass/macros/syntax-extension-source-utils.rs
index 1b2741f14b6..1b2741f14b6 100644
--- a/src/test/run-pass/syntax-extension-source-utils.rs
+++ b/src/test/ui/run-pass/macros/syntax-extension-source-utils.rs
diff --git a/src/test/run-pass/try-macro.rs b/src/test/ui/run-pass/macros/try-macro.rs
index a12e20702d2..a12e20702d2 100644
--- a/src/test/run-pass/try-macro.rs
+++ b/src/test/ui/run-pass/macros/try-macro.rs
diff --git a/src/test/run-pass/two-macro-use.rs b/src/test/ui/run-pass/macros/two-macro-use.rs
index 5df9d0222b4..5df9d0222b4 100644
--- a/src/test/run-pass/two-macro-use.rs
+++ b/src/test/ui/run-pass/macros/two-macro-use.rs
diff --git a/src/test/run-pass/type-macros-hlist.rs b/src/test/ui/run-pass/macros/type-macros-hlist.rs
index 84c0983de80..84c0983de80 100644
--- a/src/test/run-pass/type-macros-hlist.rs
+++ b/src/test/ui/run-pass/macros/type-macros-hlist.rs
diff --git a/src/test/run-pass/type-macros-simple.rs b/src/test/ui/run-pass/macros/type-macros-simple.rs
index 67b1d2c06e3..67b1d2c06e3 100644
--- a/src/test/run-pass/type-macros-simple.rs
+++ b/src/test/ui/run-pass/macros/type-macros-simple.rs
diff --git a/src/test/run-pass/typeck-macro-interaction-issue-8852.rs b/src/test/ui/run-pass/macros/typeck-macro-interaction-issue-8852.rs
index 696e151a80e..696e151a80e 100644
--- a/src/test/run-pass/typeck-macro-interaction-issue-8852.rs
+++ b/src/test/ui/run-pass/macros/typeck-macro-interaction-issue-8852.rs
diff --git a/src/test/run-pass/use-macro-self.rs b/src/test/ui/run-pass/macros/use-macro-self.rs
index 66ab00da7f4..66ab00da7f4 100644
--- a/src/test/run-pass/use-macro-self.rs
+++ b/src/test/ui/run-pass/macros/use-macro-self.rs
diff --git a/src/test/run-pass/method-argument-inference-associated-type.rs b/src/test/ui/run-pass/methods/method-argument-inference-associated-type.rs
index 76b8cf92329..76b8cf92329 100644
--- a/src/test/run-pass/method-argument-inference-associated-type.rs
+++ b/src/test/ui/run-pass/methods/method-argument-inference-associated-type.rs
diff --git a/src/test/run-pass/method-attributes.rs b/src/test/ui/run-pass/methods/method-attributes.rs
index 400ecda411e..400ecda411e 100644
--- a/src/test/run-pass/method-attributes.rs
+++ b/src/test/ui/run-pass/methods/method-attributes.rs
diff --git a/src/test/run-pass/method-early-bound-lifetimes-on-self.rs b/src/test/ui/run-pass/methods/method-early-bound-lifetimes-on-self.rs
index 3babb543bf2..3babb543bf2 100644
--- a/src/test/run-pass/method-early-bound-lifetimes-on-self.rs
+++ b/src/test/ui/run-pass/methods/method-early-bound-lifetimes-on-self.rs
diff --git a/src/test/run-pass/method-mut-self-modifies-mut-slice-lvalue.rs b/src/test/ui/run-pass/methods/method-mut-self-modifies-mut-slice-lvalue.rs
index 220482f57eb..220482f57eb 100644
--- a/src/test/run-pass/method-mut-self-modifies-mut-slice-lvalue.rs
+++ b/src/test/ui/run-pass/methods/method-mut-self-modifies-mut-slice-lvalue.rs
diff --git a/src/test/run-pass/method-normalize-bounds-issue-20604.rs b/src/test/ui/run-pass/methods/method-normalize-bounds-issue-20604.rs
index 3a1ce74a64c..3a1ce74a64c 100644
--- a/src/test/run-pass/method-normalize-bounds-issue-20604.rs
+++ b/src/test/ui/run-pass/methods/method-normalize-bounds-issue-20604.rs
diff --git a/src/test/run-pass/method-projection.rs b/src/test/ui/run-pass/methods/method-projection.rs
index 41d92cc7593..41d92cc7593 100644
--- a/src/test/run-pass/method-projection.rs
+++ b/src/test/ui/run-pass/methods/method-projection.rs
diff --git a/src/test/run-pass/method-recursive-blanket-impl.rs b/src/test/ui/run-pass/methods/method-recursive-blanket-impl.rs
index 6877bf376a6..6877bf376a6 100644
--- a/src/test/run-pass/method-recursive-blanket-impl.rs
+++ b/src/test/ui/run-pass/methods/method-recursive-blanket-impl.rs
diff --git a/src/test/run-pass/method-self-arg-aux1.rs b/src/test/ui/run-pass/methods/method-self-arg-aux1.rs
index 2572baf68fd..2572baf68fd 100644
--- a/src/test/run-pass/method-self-arg-aux1.rs
+++ b/src/test/ui/run-pass/methods/method-self-arg-aux1.rs
diff --git a/src/test/run-pass/method-self-arg-aux2.rs b/src/test/ui/run-pass/methods/method-self-arg-aux2.rs
index 51de69ff01f..51de69ff01f 100644
--- a/src/test/run-pass/method-self-arg-aux2.rs
+++ b/src/test/ui/run-pass/methods/method-self-arg-aux2.rs
diff --git a/src/test/run-pass/method-self-arg-trait.rs b/src/test/ui/run-pass/methods/method-self-arg-trait.rs
index 34e849bd0d2..34e849bd0d2 100644
--- a/src/test/run-pass/method-self-arg-trait.rs
+++ b/src/test/ui/run-pass/methods/method-self-arg-trait.rs
diff --git a/src/test/run-pass/method-self-arg.rs b/src/test/ui/run-pass/methods/method-self-arg.rs
index b7fb2fa138d..b7fb2fa138d 100644
--- a/src/test/run-pass/method-self-arg.rs
+++ b/src/test/ui/run-pass/methods/method-self-arg.rs
diff --git a/src/test/run-pass/method-two-trait-defer-resolution-1.rs b/src/test/ui/run-pass/methods/method-two-trait-defer-resolution-1.rs
index ff80ee19868..ff80ee19868 100644
--- a/src/test/run-pass/method-two-trait-defer-resolution-1.rs
+++ b/src/test/ui/run-pass/methods/method-two-trait-defer-resolution-1.rs
diff --git a/src/test/run-pass/method-two-trait-defer-resolution-2.rs b/src/test/ui/run-pass/methods/method-two-trait-defer-resolution-2.rs
index f403f526039..f403f526039 100644
--- a/src/test/run-pass/method-two-trait-defer-resolution-2.rs
+++ b/src/test/ui/run-pass/methods/method-two-trait-defer-resolution-2.rs
diff --git a/src/test/run-pass/method-two-traits-distinguished-via-where-clause.rs b/src/test/ui/run-pass/methods/method-two-traits-distinguished-via-where-clause.rs
index 3f0f4f35745..3f0f4f35745 100644
--- a/src/test/run-pass/method-two-traits-distinguished-via-where-clause.rs
+++ b/src/test/ui/run-pass/methods/method-two-traits-distinguished-via-where-clause.rs
diff --git a/src/test/run-pass/method-where-clause.rs b/src/test/ui/run-pass/methods/method-where-clause.rs
index 078dbe0e79e..078dbe0e79e 100644
--- a/src/test/run-pass/method-where-clause.rs
+++ b/src/test/ui/run-pass/methods/method-where-clause.rs
diff --git a/src/test/run-pass/mir-inlining/ice-issue-45493.rs b/src/test/ui/run-pass/mir/mir-inlining/ice-issue-45493.rs
index bd178f0e5bd..bd178f0e5bd 100644
--- a/src/test/run-pass/mir-inlining/ice-issue-45493.rs
+++ b/src/test/ui/run-pass/mir/mir-inlining/ice-issue-45493.rs
diff --git a/src/test/run-pass/mir-inlining/ice-issue-45885.rs b/src/test/ui/run-pass/mir/mir-inlining/ice-issue-45885.rs
index 702cb6a9bc1..702cb6a9bc1 100644
--- a/src/test/run-pass/mir-inlining/ice-issue-45885.rs
+++ b/src/test/ui/run-pass/mir/mir-inlining/ice-issue-45885.rs
diff --git a/src/test/run-pass/mir-inlining/no-trait-method-issue-40473.rs b/src/test/ui/run-pass/mir/mir-inlining/no-trait-method-issue-40473.rs
index 11a29d97417..11a29d97417 100644
--- a/src/test/run-pass/mir-inlining/no-trait-method-issue-40473.rs
+++ b/src/test/ui/run-pass/mir/mir-inlining/no-trait-method-issue-40473.rs
diff --git a/src/test/run-pass/mir-typeck-normalize-fn-sig.rs b/src/test/ui/run-pass/mir/mir-typeck-normalize-fn-sig.rs
index 11918d3739d..11918d3739d 100644
--- a/src/test/run-pass/mir-typeck-normalize-fn-sig.rs
+++ b/src/test/ui/run-pass/mir/mir-typeck-normalize-fn-sig.rs
diff --git a/src/test/run-pass/mir_adt_construction.rs b/src/test/ui/run-pass/mir/mir_adt_construction.rs
index eb96d94efec..eb96d94efec 100644
--- a/src/test/run-pass/mir_adt_construction.rs
+++ b/src/test/ui/run-pass/mir/mir_adt_construction.rs
diff --git a/src/test/run-pass/mir_ascription_coercion.rs b/src/test/ui/run-pass/mir/mir_ascription_coercion.rs
index bc1013429aa..bc1013429aa 100644
--- a/src/test/run-pass/mir_ascription_coercion.rs
+++ b/src/test/ui/run-pass/mir/mir_ascription_coercion.rs
diff --git a/src/test/run-pass/mir_augmented_assignments.rs b/src/test/ui/run-pass/mir/mir_augmented_assignments.rs
index bb90f25fce5..bb90f25fce5 100644
--- a/src/test/run-pass/mir_augmented_assignments.rs
+++ b/src/test/ui/run-pass/mir/mir_augmented_assignments.rs
diff --git a/src/test/run-pass/mir_autoderef.rs b/src/test/ui/run-pass/mir/mir_autoderef.rs
index f0032fee283..f0032fee283 100644
--- a/src/test/run-pass/mir_autoderef.rs
+++ b/src/test/ui/run-pass/mir/mir_autoderef.rs
diff --git a/src/test/run-pass/mir_boxing.rs b/src/test/ui/run-pass/mir/mir_boxing.rs
index 1c5134755d7..1c5134755d7 100644
--- a/src/test/run-pass/mir_boxing.rs
+++ b/src/test/ui/run-pass/mir/mir_boxing.rs
diff --git a/src/test/run-pass/mir_build_match_comparisons.rs b/src/test/ui/run-pass/mir/mir_build_match_comparisons.rs
index b195ff63412..b195ff63412 100644
--- a/src/test/run-pass/mir_build_match_comparisons.rs
+++ b/src/test/ui/run-pass/mir/mir_build_match_comparisons.rs
diff --git a/src/test/run-pass/mir_call_with_associated_type.rs b/src/test/ui/run-pass/mir/mir_call_with_associated_type.rs
index 935d0e58985..935d0e58985 100644
--- a/src/test/run-pass/mir_call_with_associated_type.rs
+++ b/src/test/ui/run-pass/mir/mir_call_with_associated_type.rs
diff --git a/src/test/run-pass/mir_calls_to_shims.rs b/src/test/ui/run-pass/mir/mir_calls_to_shims.rs
index 9641ed28293..9641ed28293 100644
--- a/src/test/run-pass/mir_calls_to_shims.rs
+++ b/src/test/ui/run-pass/mir/mir_calls_to_shims.rs
diff --git a/src/test/run-pass/mir_cast_fn_ret.rs b/src/test/ui/run-pass/mir/mir_cast_fn_ret.rs
index 311d5451eb6..311d5451eb6 100644
--- a/src/test/run-pass/mir_cast_fn_ret.rs
+++ b/src/test/ui/run-pass/mir/mir_cast_fn_ret.rs
diff --git a/src/test/run-pass/mir_codegen_array.rs b/src/test/ui/run-pass/mir/mir_codegen_array.rs
index b7f247012ce..b7f247012ce 100644
--- a/src/test/run-pass/mir_codegen_array.rs
+++ b/src/test/ui/run-pass/mir/mir_codegen_array.rs
diff --git a/src/test/run-pass/mir_codegen_array_2.rs b/src/test/ui/run-pass/mir/mir_codegen_array_2.rs
index c7133fb0c0e..c7133fb0c0e 100644
--- a/src/test/run-pass/mir_codegen_array_2.rs
+++ b/src/test/ui/run-pass/mir/mir_codegen_array_2.rs
diff --git a/src/test/run-pass/mir_codegen_call_converging.rs b/src/test/ui/run-pass/mir/mir_codegen_call_converging.rs
index 7d420bb86c6..7d420bb86c6 100644
--- a/src/test/run-pass/mir_codegen_call_converging.rs
+++ b/src/test/ui/run-pass/mir/mir_codegen_call_converging.rs
diff --git a/src/test/run-pass/mir_codegen_calls.rs b/src/test/ui/run-pass/mir/mir_codegen_calls.rs
index d02e3287bc3..d02e3287bc3 100644
--- a/src/test/run-pass/mir_codegen_calls.rs
+++ b/src/test/ui/run-pass/mir/mir_codegen_calls.rs
diff --git a/src/test/run-pass/mir_codegen_calls_variadic.rs b/src/test/ui/run-pass/mir/mir_codegen_calls_variadic.rs
index 7845c9426e2..7845c9426e2 100644
--- a/src/test/run-pass/mir_codegen_calls_variadic.rs
+++ b/src/test/ui/run-pass/mir/mir_codegen_calls_variadic.rs
diff --git a/src/test/run-pass/mir_codegen_critical_edge.rs b/src/test/ui/run-pass/mir/mir_codegen_critical_edge.rs
index c742e71633f..c742e71633f 100644
--- a/src/test/run-pass/mir_codegen_critical_edge.rs
+++ b/src/test/ui/run-pass/mir/mir_codegen_critical_edge.rs
diff --git a/src/test/run-pass/mir_codegen_spike1.rs b/src/test/ui/run-pass/mir/mir_codegen_spike1.rs
index 27e1583af34..27e1583af34 100644
--- a/src/test/run-pass/mir_codegen_spike1.rs
+++ b/src/test/ui/run-pass/mir/mir_codegen_spike1.rs
diff --git a/src/test/run-pass/mir_codegen_switch.rs b/src/test/ui/run-pass/mir/mir_codegen_switch.rs
index b097bf46ad3..b097bf46ad3 100644
--- a/src/test/run-pass/mir_codegen_switch.rs
+++ b/src/test/ui/run-pass/mir/mir_codegen_switch.rs
diff --git a/src/test/run-pass/mir_codegen_switchint.rs b/src/test/ui/run-pass/mir/mir_codegen_switchint.rs
index 537734596a5..537734596a5 100644
--- a/src/test/run-pass/mir_codegen_switchint.rs
+++ b/src/test/ui/run-pass/mir/mir_codegen_switchint.rs
diff --git a/src/test/run-pass/mir_coercion_casts.rs b/src/test/ui/run-pass/mir/mir_coercion_casts.rs
index 2be2854fac9..2be2854fac9 100644
--- a/src/test/run-pass/mir_coercion_casts.rs
+++ b/src/test/ui/run-pass/mir/mir_coercion_casts.rs
diff --git a/src/test/run-pass/mir_coercions.rs b/src/test/ui/run-pass/mir/mir_coercions.rs
index 79d1cfde7cd..79d1cfde7cd 100644
--- a/src/test/run-pass/mir_coercions.rs
+++ b/src/test/ui/run-pass/mir/mir_coercions.rs
diff --git a/src/test/run-pass/mir_constval_adts.rs b/src/test/ui/run-pass/mir/mir_constval_adts.rs
index 696ff8a7e60..696ff8a7e60 100644
--- a/src/test/run-pass/mir_constval_adts.rs
+++ b/src/test/ui/run-pass/mir/mir_constval_adts.rs
diff --git a/src/test/run-pass/mir_drop_order.rs b/src/test/ui/run-pass/mir/mir_drop_order.rs
index 7ab133bbab4..7ab133bbab4 100644
--- a/src/test/run-pass/mir_drop_order.rs
+++ b/src/test/ui/run-pass/mir/mir_drop_order.rs
diff --git a/src/test/run-pass/mir_early_return_scope.rs b/src/test/ui/run-pass/mir/mir_early_return_scope.rs
index c27e57358b0..c27e57358b0 100644
--- a/src/test/run-pass/mir_early_return_scope.rs
+++ b/src/test/ui/run-pass/mir/mir_early_return_scope.rs
diff --git a/src/test/run-pass/mir_fat_ptr.rs b/src/test/ui/run-pass/mir/mir_fat_ptr.rs
index e5c9e3577d1..e5c9e3577d1 100644
--- a/src/test/run-pass/mir_fat_ptr.rs
+++ b/src/test/ui/run-pass/mir/mir_fat_ptr.rs
diff --git a/src/test/run-pass/mir_fat_ptr_drop.rs b/src/test/ui/run-pass/mir/mir_fat_ptr_drop.rs
index 64e68c78c3c..64e68c78c3c 100644
--- a/src/test/run-pass/mir_fat_ptr_drop.rs
+++ b/src/test/ui/run-pass/mir/mir_fat_ptr_drop.rs
diff --git a/src/test/run-pass/mir_heavy_promoted.rs b/src/test/ui/run-pass/mir/mir_heavy_promoted.rs
index b5085217577..b5085217577 100644
--- a/src/test/run-pass/mir_heavy_promoted.rs
+++ b/src/test/ui/run-pass/mir/mir_heavy_promoted.rs
diff --git a/src/test/run-pass/mir_match_arm_guard.rs b/src/test/ui/run-pass/mir/mir_match_arm_guard.rs
index 487999e6ed6..487999e6ed6 100644
--- a/src/test/run-pass/mir_match_arm_guard.rs
+++ b/src/test/ui/run-pass/mir/mir_match_arm_guard.rs
diff --git a/src/test/run-pass/mir_misc_casts.rs b/src/test/ui/run-pass/mir/mir_misc_casts.rs
index 81c8b75fb9b..81c8b75fb9b 100644
--- a/src/test/run-pass/mir_misc_casts.rs
+++ b/src/test/ui/run-pass/mir/mir_misc_casts.rs
diff --git a/src/test/run-pass/mir_overflow_off.rs b/src/test/ui/run-pass/mir/mir_overflow_off.rs
index a2cfca01dac..a2cfca01dac 100644
--- a/src/test/run-pass/mir_overflow_off.rs
+++ b/src/test/ui/run-pass/mir/mir_overflow_off.rs
diff --git a/src/test/run-pass/mir_raw_fat_ptr.rs b/src/test/ui/run-pass/mir/mir_raw_fat_ptr.rs
index 846318ec4fd..846318ec4fd 100644
--- a/src/test/run-pass/mir_raw_fat_ptr.rs
+++ b/src/test/ui/run-pass/mir/mir_raw_fat_ptr.rs
diff --git a/src/test/run-pass/mir_refs_correct.rs b/src/test/ui/run-pass/mir/mir_refs_correct.rs
index df90fe2b791..df90fe2b791 100644
--- a/src/test/run-pass/mir_refs_correct.rs
+++ b/src/test/ui/run-pass/mir/mir_refs_correct.rs
diff --git a/src/test/run-pass/mir_small_agg_arg.rs b/src/test/ui/run-pass/mir/mir_small_agg_arg.rs
index 639a585ae00..639a585ae00 100644
--- a/src/test/run-pass/mir_small_agg_arg.rs
+++ b/src/test/ui/run-pass/mir/mir_small_agg_arg.rs
diff --git a/src/test/run-pass/mir_struct_with_assoc_ty.rs b/src/test/ui/run-pass/mir/mir_struct_with_assoc_ty.rs
index 7b2514c27c8..7b2514c27c8 100644
--- a/src/test/run-pass/mir_struct_with_assoc_ty.rs
+++ b/src/test/ui/run-pass/mir/mir_struct_with_assoc_ty.rs
diff --git a/src/test/run-pass/mir_temp_promotions.rs b/src/test/ui/run-pass/mir/mir_temp_promotions.rs
index 4865e955091..4865e955091 100644
--- a/src/test/run-pass/mir_temp_promotions.rs
+++ b/src/test/ui/run-pass/mir/mir_temp_promotions.rs
diff --git a/src/test/run-pass/mir_void_return.rs b/src/test/ui/run-pass/mir/mir_void_return.rs
index 78cb9fb39d6..78cb9fb39d6 100644
--- a/src/test/run-pass/mir_void_return.rs
+++ b/src/test/ui/run-pass/mir/mir_void_return.rs
diff --git a/src/test/run-pass/mir_void_return_2.rs b/src/test/ui/run-pass/mir/mir_void_return_2.rs
index fc9e3d5e3b5..fc9e3d5e3b5 100644
--- a/src/test/run-pass/mir_void_return_2.rs
+++ b/src/test/ui/run-pass/mir/mir_void_return_2.rs
diff --git a/src/test/run-pass/mod-inside-fn.rs b/src/test/ui/run-pass/modules/mod-inside-fn.rs
index 6b922634aad..6b922634aad 100644
--- a/src/test/run-pass/mod-inside-fn.rs
+++ b/src/test/ui/run-pass/modules/mod-inside-fn.rs
diff --git a/src/test/run-pass/mod-view-items.rs b/src/test/ui/run-pass/modules/mod-view-items.rs
index ba23197b83c..ba23197b83c 100644
--- a/src/test/run-pass/mod-view-items.rs
+++ b/src/test/ui/run-pass/modules/mod-view-items.rs
diff --git a/src/test/run-pass/mod_dir_implicit.rs b/src/test/ui/run-pass/modules/mod_dir_implicit.rs
index f8034f9e073..f8034f9e073 100644
--- a/src/test/run-pass/mod_dir_implicit.rs
+++ b/src/test/ui/run-pass/modules/mod_dir_implicit.rs
diff --git a/src/test/run-pass/mod_dir_implicit_aux/compiletest-ignore-dir b/src/test/ui/run-pass/modules/mod_dir_implicit_aux/compiletest-ignore-dir
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/run-pass/mod_dir_implicit_aux/compiletest-ignore-dir
+++ b/src/test/ui/run-pass/modules/mod_dir_implicit_aux/compiletest-ignore-dir
diff --git a/src/test/run-pass/mod_dir_implicit_aux/mod.rs b/src/test/ui/run-pass/modules/mod_dir_implicit_aux/mod.rs
index 58c1beee3be..58c1beee3be 100644
--- a/src/test/run-pass/mod_dir_implicit_aux/mod.rs
+++ b/src/test/ui/run-pass/modules/mod_dir_implicit_aux/mod.rs
diff --git a/src/test/run-pass/mod_dir_path.rs b/src/test/ui/run-pass/modules/mod_dir_path.rs
index fc91ea870d5..fc91ea870d5 100644
--- a/src/test/run-pass/mod_dir_path.rs
+++ b/src/test/ui/run-pass/modules/mod_dir_path.rs
diff --git a/src/test/run-pass/mod_dir_path2.rs b/src/test/ui/run-pass/modules/mod_dir_path2.rs
index b96c1ae0722..b96c1ae0722 100644
--- a/src/test/run-pass/mod_dir_path2.rs
+++ b/src/test/ui/run-pass/modules/mod_dir_path2.rs
diff --git a/src/test/run-pass/mod_dir_path3.rs b/src/test/ui/run-pass/modules/mod_dir_path3.rs
index 3160064d7c2..3160064d7c2 100644
--- a/src/test/run-pass/mod_dir_path3.rs
+++ b/src/test/ui/run-pass/modules/mod_dir_path3.rs
diff --git a/src/test/run-pass/mod_dir_path_multi.rs b/src/test/ui/run-pass/modules/mod_dir_path_multi.rs
index 12b28cf98af..12b28cf98af 100644
--- a/src/test/run-pass/mod_dir_path_multi.rs
+++ b/src/test/ui/run-pass/modules/mod_dir_path_multi.rs
diff --git a/src/test/run-pass/mod_dir_recursive.rs b/src/test/ui/run-pass/modules/mod_dir_recursive.rs
index 8964d9ccd25..8964d9ccd25 100644
--- a/src/test/run-pass/mod_dir_recursive.rs
+++ b/src/test/ui/run-pass/modules/mod_dir_recursive.rs
diff --git a/src/test/run-pass/mod_dir_simple.rs b/src/test/ui/run-pass/modules/mod_dir_simple.rs
index 429b4ebe639..429b4ebe639 100644
--- a/src/test/run-pass/mod_dir_simple.rs
+++ b/src/test/ui/run-pass/modules/mod_dir_simple.rs
diff --git a/src/test/run-pass/mod_dir_simple/compiletest-ignore-dir b/src/test/ui/run-pass/modules/mod_dir_simple/compiletest-ignore-dir
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/run-pass/mod_dir_simple/compiletest-ignore-dir
+++ b/src/test/ui/run-pass/modules/mod_dir_simple/compiletest-ignore-dir
diff --git a/src/test/run-pass/mod_dir_simple/load_another_mod.rs b/src/test/ui/run-pass/modules/mod_dir_simple/load_another_mod.rs
index ca45864a5a1..ca45864a5a1 100644
--- a/src/test/run-pass/mod_dir_simple/load_another_mod.rs
+++ b/src/test/ui/run-pass/modules/mod_dir_simple/load_another_mod.rs
diff --git a/src/test/run-pass/mod_dir_simple/test.rs b/src/test/ui/run-pass/modules/mod_dir_simple/test.rs
index 58c1beee3be..58c1beee3be 100644
--- a/src/test/run-pass/mod_dir_simple/test.rs
+++ b/src/test/ui/run-pass/modules/mod_dir_simple/test.rs
diff --git a/src/test/run-pass/mod_file.rs b/src/test/ui/run-pass/modules/mod_file.rs
index c18fecd7c56..c18fecd7c56 100644
--- a/src/test/run-pass/mod_file.rs
+++ b/src/test/ui/run-pass/modules/mod_file.rs
diff --git a/src/test/run-pass/mod_file_aux.rs b/src/test/ui/run-pass/modules/mod_file_aux.rs
index b7470811f60..b7470811f60 100644
--- a/src/test/run-pass/mod_file_aux.rs
+++ b/src/test/ui/run-pass/modules/mod_file_aux.rs
diff --git a/src/test/run-pass/mod_file_with_path_attr.rs b/src/test/ui/run-pass/modules/mod_file_with_path_attr.rs
index d9f28ceb0ec..d9f28ceb0ec 100644
--- a/src/test/run-pass/mod_file_with_path_attr.rs
+++ b/src/test/ui/run-pass/modules/mod_file_with_path_attr.rs
diff --git a/src/test/run-pass/module-polymorphism3-files/compiletest-ignore-dir b/src/test/ui/run-pass/modules/module-polymorphism3-files/compiletest-ignore-dir
index e69de29bb2d..e69de29bb2d 100644
--- a/src/test/run-pass/module-polymorphism3-files/compiletest-ignore-dir
+++ b/src/test/ui/run-pass/modules/module-polymorphism3-files/compiletest-ignore-dir
diff --git a/src/test/run-pass/module-polymorphism3-files/float-template/inst_f32.rs b/src/test/ui/run-pass/modules/module-polymorphism3-files/float-template/inst_f32.rs
index 2242daa2d80..2242daa2d80 100644
--- a/src/test/run-pass/module-polymorphism3-files/float-template/inst_f32.rs
+++ b/src/test/ui/run-pass/modules/module-polymorphism3-files/float-template/inst_f32.rs
diff --git a/src/test/run-pass/module-polymorphism3-files/float-template/inst_f64.rs b/src/test/ui/run-pass/modules/module-polymorphism3-files/float-template/inst_f64.rs
index 543d672b0ab..543d672b0ab 100644
--- a/src/test/run-pass/module-polymorphism3-files/float-template/inst_f64.rs
+++ b/src/test/ui/run-pass/modules/module-polymorphism3-files/float-template/inst_f64.rs
diff --git a/src/test/run-pass/module-polymorphism3-files/float-template/inst_float.rs b/src/test/ui/run-pass/modules/module-polymorphism3-files/float-template/inst_float.rs
index 7151796c8ec..7151796c8ec 100644
--- a/src/test/run-pass/module-polymorphism3-files/float-template/inst_float.rs
+++ b/src/test/ui/run-pass/modules/module-polymorphism3-files/float-template/inst_float.rs
diff --git a/src/test/run-pass/move-1-unique.rs b/src/test/ui/run-pass/moves/move-1-unique.rs
index 5c8dd41c646..5c8dd41c646 100644
--- a/src/test/run-pass/move-1-unique.rs
+++ b/src/test/ui/run-pass/moves/move-1-unique.rs
diff --git a/src/test/run-pass/move-2-unique.rs b/src/test/ui/run-pass/moves/move-2-unique.rs
index 0b67e54e234..0b67e54e234 100644
--- a/src/test/run-pass/move-2-unique.rs
+++ b/src/test/ui/run-pass/moves/move-2-unique.rs
diff --git a/src/test/run-pass/move-2.rs b/src/test/ui/run-pass/moves/move-2.rs
index 0fbc2de91e6..0fbc2de91e6 100644
--- a/src/test/run-pass/move-2.rs
+++ b/src/test/ui/run-pass/moves/move-2.rs
diff --git a/src/test/run-pass/move-3-unique.rs b/src/test/ui/run-pass/moves/move-3-unique.rs
index 36ad3a40b3f..36ad3a40b3f 100644
--- a/src/test/run-pass/move-3-unique.rs
+++ b/src/test/ui/run-pass/moves/move-3-unique.rs
diff --git a/src/test/run-pass/move-4-unique.rs b/src/test/ui/run-pass/moves/move-4-unique.rs
index 266e34c98a4..266e34c98a4 100644
--- a/src/test/run-pass/move-4-unique.rs
+++ b/src/test/ui/run-pass/moves/move-4-unique.rs
diff --git a/src/test/run-pass/move-4.rs b/src/test/ui/run-pass/moves/move-4.rs
index 481068869e3..481068869e3 100644
--- a/src/test/run-pass/move-4.rs
+++ b/src/test/ui/run-pass/moves/move-4.rs
diff --git a/src/test/run-pass/move-arg-2-unique.rs b/src/test/ui/run-pass/moves/move-arg-2-unique.rs
index b6e225cc8b7..b6e225cc8b7 100644
--- a/src/test/run-pass/move-arg-2-unique.rs
+++ b/src/test/ui/run-pass/moves/move-arg-2-unique.rs
diff --git a/src/test/run-pass/move-arg-2.rs b/src/test/ui/run-pass/moves/move-arg-2.rs
index 78774854c9f..78774854c9f 100644
--- a/src/test/run-pass/move-arg-2.rs
+++ b/src/test/ui/run-pass/moves/move-arg-2.rs
diff --git a/src/test/run-pass/move-arg.rs b/src/test/ui/run-pass/moves/move-arg.rs
index 1883c66987e..1883c66987e 100644
--- a/src/test/run-pass/move-arg.rs
+++ b/src/test/ui/run-pass/moves/move-arg.rs
diff --git a/src/test/run-pass/move-nullary-fn.rs b/src/test/ui/run-pass/moves/move-nullary-fn.rs
index cec1e439972..cec1e439972 100644
--- a/src/test/run-pass/move-nullary-fn.rs
+++ b/src/test/ui/run-pass/moves/move-nullary-fn.rs
diff --git a/src/test/run-pass/move-out-of-field.rs b/src/test/ui/run-pass/moves/move-out-of-field.rs
index 262add090bd..262add090bd 100644
--- a/src/test/run-pass/move-out-of-field.rs
+++ b/src/test/ui/run-pass/moves/move-out-of-field.rs
diff --git a/src/test/run-pass/move-scalar.rs b/src/test/ui/run-pass/moves/move-scalar.rs
index 798424d107e..798424d107e 100644
--- a/src/test/run-pass/move-scalar.rs
+++ b/src/test/ui/run-pass/moves/move-scalar.rs
diff --git a/src/test/run-pass/moves-based-on-type-capture-clause.rs b/src/test/ui/run-pass/moves/moves-based-on-type-capture-clause.rs
index 548a62f4603..548a62f4603 100644
--- a/src/test/run-pass/moves-based-on-type-capture-clause.rs
+++ b/src/test/ui/run-pass/moves/moves-based-on-type-capture-clause.rs
diff --git a/src/test/run-pass/arith-0.rs b/src/test/ui/run-pass/numbers-arithmetic/arith-0.rs
index a4365efbbbd..a4365efbbbd 100644
--- a/src/test/run-pass/arith-0.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/arith-0.rs
diff --git a/src/test/run-pass/arith-1.rs b/src/test/ui/run-pass/numbers-arithmetic/arith-1.rs
index fd281ea1173..fd281ea1173 100644
--- a/src/test/run-pass/arith-1.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/arith-1.rs
diff --git a/src/test/run-pass/arith-2.rs b/src/test/ui/run-pass/numbers-arithmetic/arith-2.rs
index 48e834cf54d..48e834cf54d 100644
--- a/src/test/run-pass/arith-2.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/arith-2.rs
diff --git a/src/test/run-pass/arith-unsigned.rs b/src/test/ui/run-pass/numbers-arithmetic/arith-unsigned.rs
index e5ff97e3cdb..e5ff97e3cdb 100644
--- a/src/test/run-pass/arith-unsigned.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/arith-unsigned.rs
diff --git a/src/test/run-pass/div-mod.rs b/src/test/ui/run-pass/numbers-arithmetic/div-mod.rs
index b6cae71df86..b6cae71df86 100644
--- a/src/test/run-pass/div-mod.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/div-mod.rs
diff --git a/src/test/run-pass/float-int-invalid-const-cast.rs b/src/test/ui/run-pass/numbers-arithmetic/float-int-invalid-const-cast.rs
index f84432abbfa..f84432abbfa 100644
--- a/src/test/run-pass/float-int-invalid-const-cast.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/float-int-invalid-const-cast.rs
diff --git a/src/test/run-pass/float-literal-inference.rs b/src/test/ui/run-pass/numbers-arithmetic/float-literal-inference.rs
index b7c2c8d4953..b7c2c8d4953 100644
--- a/src/test/run-pass/float-literal-inference.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/float-literal-inference.rs
diff --git a/src/test/run-pass/float-nan.rs b/src/test/ui/run-pass/numbers-arithmetic/float-nan.rs
index 856599431fd..856599431fd 100644
--- a/src/test/run-pass/float-nan.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/float-nan.rs
diff --git a/src/test/run-pass/float-signature.rs b/src/test/ui/run-pass/numbers-arithmetic/float-signature.rs
index 08daf1bd80e..08daf1bd80e 100644
--- a/src/test/run-pass/float-signature.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/float-signature.rs
diff --git a/src/test/run-pass/float.rs b/src/test/ui/run-pass/numbers-arithmetic/float.rs
index 22d54162c43..22d54162c43 100644
--- a/src/test/run-pass/float.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/float.rs
diff --git a/src/test/run-pass/float2.rs b/src/test/ui/run-pass/numbers-arithmetic/float2.rs
index e9f6e0f51b4..e9f6e0f51b4 100644
--- a/src/test/run-pass/float2.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/float2.rs
diff --git a/src/test/run-pass/float_math.rs b/src/test/ui/run-pass/numbers-arithmetic/float_math.rs
index c1b4b55bd37..c1b4b55bd37 100644
--- a/src/test/run-pass/float_math.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/float_math.rs
diff --git a/src/test/run-pass/floatlits.rs b/src/test/ui/run-pass/numbers-arithmetic/floatlits.rs
index d133f3463a3..d133f3463a3 100644
--- a/src/test/run-pass/floatlits.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/floatlits.rs
diff --git a/src/test/run-pass/i128-ffi.rs b/src/test/ui/run-pass/numbers-arithmetic/i128-ffi.rs
index edf278cbf64..edf278cbf64 100644
--- a/src/test/run-pass/i128-ffi.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/i128-ffi.rs
diff --git a/src/test/run-pass/i128.rs b/src/test/ui/run-pass/numbers-arithmetic/i128.rs
index baf3b339984..baf3b339984 100644
--- a/src/test/run-pass/i128.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/i128.rs
diff --git a/src/test/run-pass/i32-sub.rs b/src/test/ui/run-pass/numbers-arithmetic/i32-sub.rs
index 143787a466b..143787a466b 100644
--- a/src/test/run-pass/i32-sub.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/i32-sub.rs
diff --git a/src/test/run-pass/i8-incr.rs b/src/test/ui/run-pass/numbers-arithmetic/i8-incr.rs
index 242cea264af..242cea264af 100644
--- a/src/test/run-pass/i8-incr.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/i8-incr.rs
diff --git a/src/test/run-pass/int-abs-overflow.rs b/src/test/ui/run-pass/numbers-arithmetic/int-abs-overflow.rs
index e17e3a16d68..e17e3a16d68 100644
--- a/src/test/run-pass/int-abs-overflow.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/int-abs-overflow.rs
diff --git a/src/test/run-pass/int.rs b/src/test/ui/run-pass/numbers-arithmetic/int.rs
index 9495552af40..9495552af40 100644
--- a/src/test/run-pass/int.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/int.rs
diff --git a/src/test/run-pass/integer-literal-radix.rs b/src/test/ui/run-pass/numbers-arithmetic/integer-literal-radix.rs
index ba9d22f06a9..ba9d22f06a9 100644
--- a/src/test/run-pass/integer-literal-radix.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/integer-literal-radix.rs
diff --git a/src/test/run-pass/integer-literal-suffix-inference-2.rs b/src/test/ui/run-pass/numbers-arithmetic/integer-literal-suffix-inference-2.rs
index e953cf2fda1..e953cf2fda1 100644
--- a/src/test/run-pass/integer-literal-suffix-inference-2.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/integer-literal-suffix-inference-2.rs
diff --git a/src/test/run-pass/integer-literal-suffix-inference-3.rs b/src/test/ui/run-pass/numbers-arithmetic/integer-literal-suffix-inference-3.rs
index 31aca964def..31aca964def 100644
--- a/src/test/run-pass/integer-literal-suffix-inference-3.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/integer-literal-suffix-inference-3.rs
diff --git a/src/test/run-pass/integer-literal-suffix-inference.rs b/src/test/ui/run-pass/numbers-arithmetic/integer-literal-suffix-inference.rs
index 57f80bb14e2..57f80bb14e2 100644
--- a/src/test/run-pass/integer-literal-suffix-inference.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/integer-literal-suffix-inference.rs
diff --git a/src/test/run-pass/next-power-of-two-overflow-debug.rs b/src/test/ui/run-pass/numbers-arithmetic/next-power-of-two-overflow-debug.rs
index 2135b3f8764..2135b3f8764 100644
--- a/src/test/run-pass/next-power-of-two-overflow-debug.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/next-power-of-two-overflow-debug.rs
diff --git a/src/test/run-pass/next-power-of-two-overflow-ndebug.rs b/src/test/ui/run-pass/numbers-arithmetic/next-power-of-two-overflow-ndebug.rs
index b05c1863d90..b05c1863d90 100644
--- a/src/test/run-pass/next-power-of-two-overflow-ndebug.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/next-power-of-two-overflow-ndebug.rs
diff --git a/src/test/run-pass/num-wrapping.rs b/src/test/ui/run-pass/numbers-arithmetic/num-wrapping.rs
index 20c7f27336e..20c7f27336e 100644
--- a/src/test/run-pass/num-wrapping.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/num-wrapping.rs
diff --git a/src/test/run-pass/numeric-method-autoexport.rs b/src/test/ui/run-pass/numbers-arithmetic/numeric-method-autoexport.rs
index 15ece09abd8..15ece09abd8 100644
--- a/src/test/run-pass/numeric-method-autoexport.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/numeric-method-autoexport.rs
diff --git a/src/test/run-pass/promoted_overflow_opt.rs b/src/test/ui/run-pass/numbers-arithmetic/promoted_overflow_opt.rs
index 6b2f1c6d3c8..6b2f1c6d3c8 100644
--- a/src/test/run-pass/promoted_overflow_opt.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/promoted_overflow_opt.rs
diff --git a/src/test/run-pass/saturating-float-casts.rs b/src/test/ui/run-pass/numbers-arithmetic/saturating-float-casts.rs
index ad3b4b17259..ad3b4b17259 100644
--- a/src/test/run-pass/saturating-float-casts.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/saturating-float-casts.rs
diff --git a/src/test/run-pass/shift-near-oflo.rs b/src/test/ui/run-pass/numbers-arithmetic/shift-near-oflo.rs
index 527ced54c42..527ced54c42 100644
--- a/src/test/run-pass/shift-near-oflo.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/shift-near-oflo.rs
diff --git a/src/test/run-pass/shift-various-types.rs b/src/test/ui/run-pass/numbers-arithmetic/shift-various-types.rs
index 9238112a081..9238112a081 100644
--- a/src/test/run-pass/shift-various-types.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/shift-various-types.rs
diff --git a/src/test/run-pass/shift.rs b/src/test/ui/run-pass/numbers-arithmetic/shift.rs
index 2f417e0e2f4..2f417e0e2f4 100644
--- a/src/test/run-pass/shift.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/shift.rs
diff --git a/src/test/run-pass/signed-shift-const-eval.rs b/src/test/ui/run-pass/numbers-arithmetic/signed-shift-const-eval.rs
index 9ea2dedcba1..9ea2dedcba1 100644
--- a/src/test/run-pass/signed-shift-const-eval.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/signed-shift-const-eval.rs
diff --git a/src/test/run-pass/u128-as-f32.rs b/src/test/ui/run-pass/numbers-arithmetic/u128-as-f32.rs
index 2848fb2d51a..2848fb2d51a 100644
--- a/src/test/run-pass/u128-as-f32.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/u128-as-f32.rs
diff --git a/src/test/run-pass/u128.rs b/src/test/ui/run-pass/numbers-arithmetic/u128.rs
index d649b3b74d3..d649b3b74d3 100644
--- a/src/test/run-pass/u128.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/u128.rs
diff --git a/src/test/run-pass/u32-decr.rs b/src/test/ui/run-pass/numbers-arithmetic/u32-decr.rs
index b56b6f32c02..b56b6f32c02 100644
--- a/src/test/run-pass/u32-decr.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/u32-decr.rs
diff --git a/src/test/run-pass/u8-incr-decr.rs b/src/test/ui/run-pass/numbers-arithmetic/u8-incr-decr.rs
index d35ef015e6f..d35ef015e6f 100644
--- a/src/test/run-pass/u8-incr-decr.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/u8-incr-decr.rs
diff --git a/src/test/run-pass/u8-incr.rs b/src/test/ui/run-pass/numbers-arithmetic/u8-incr.rs
index 9554f9c2dfb..9554f9c2dfb 100644
--- a/src/test/run-pass/u8-incr.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/u8-incr.rs
diff --git a/src/test/run-pass/uint.rs b/src/test/ui/run-pass/numbers-arithmetic/uint.rs
index a894d762979..a894d762979 100644
--- a/src/test/run-pass/uint.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/uint.rs
diff --git a/src/test/run-pass/overloaded-autoderef-count.rs b/src/test/ui/run-pass/overloaded/overloaded-autoderef-count.rs
index 14a9cc4c248..14a9cc4c248 100644
--- a/src/test/run-pass/overloaded-autoderef-count.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-autoderef-count.rs
diff --git a/src/test/run-pass/overloaded-autoderef-indexing.rs b/src/test/ui/run-pass/overloaded/overloaded-autoderef-indexing.rs
index 67b8bc1d157..67b8bc1d157 100644
--- a/src/test/run-pass/overloaded-autoderef-indexing.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-autoderef-indexing.rs
diff --git a/src/test/run-pass/overloaded-autoderef-order.rs b/src/test/ui/run-pass/overloaded/overloaded-autoderef-order.rs
index 8ea8b375b17..8ea8b375b17 100644
--- a/src/test/run-pass/overloaded-autoderef-order.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-autoderef-order.rs
diff --git a/src/test/run-pass/overloaded-autoderef-vtable.rs b/src/test/ui/run-pass/overloaded/overloaded-autoderef-vtable.rs
index 38ed90a4547..38ed90a4547 100644
--- a/src/test/run-pass/overloaded-autoderef-vtable.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-autoderef-vtable.rs
diff --git a/src/test/run-pass/overloaded-autoderef-xcrate.rs b/src/test/ui/run-pass/overloaded/overloaded-autoderef-xcrate.rs
index 174e09cb14c..174e09cb14c 100644
--- a/src/test/run-pass/overloaded-autoderef-xcrate.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-autoderef-xcrate.rs
diff --git a/src/test/run-pass/overloaded-autoderef.rs b/src/test/ui/run-pass/overloaded/overloaded-autoderef.rs
index 759e2aace61..759e2aace61 100644
--- a/src/test/run-pass/overloaded-autoderef.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-autoderef.rs
diff --git a/src/test/run-pass/overloaded-calls-object-one-arg.rs b/src/test/ui/run-pass/overloaded/overloaded-calls-object-one-arg.rs
index ec64f627c94..ec64f627c94 100644
--- a/src/test/run-pass/overloaded-calls-object-one-arg.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-calls-object-one-arg.rs
diff --git a/src/test/run-pass/overloaded-calls-object-two-args.rs b/src/test/ui/run-pass/overloaded/overloaded-calls-object-two-args.rs
index c38a62147a0..c38a62147a0 100644
--- a/src/test/run-pass/overloaded-calls-object-two-args.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-calls-object-two-args.rs
diff --git a/src/test/run-pass/overloaded-calls-object-zero-args.rs b/src/test/ui/run-pass/overloaded/overloaded-calls-object-zero-args.rs
index 08ab465ebb0..08ab465ebb0 100644
--- a/src/test/run-pass/overloaded-calls-object-zero-args.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-calls-object-zero-args.rs
diff --git a/src/test/run-pass/overloaded-calls-param-vtables.rs b/src/test/ui/run-pass/overloaded/overloaded-calls-param-vtables.rs
index c15c6df5fac..c15c6df5fac 100644
--- a/src/test/run-pass/overloaded-calls-param-vtables.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-calls-param-vtables.rs
diff --git a/src/test/run-pass/overloaded-calls-simple.rs b/src/test/ui/run-pass/overloaded/overloaded-calls-simple.rs
index 24a79a26837..24a79a26837 100644
--- a/src/test/run-pass/overloaded-calls-simple.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-calls-simple.rs
diff --git a/src/test/run-pass/overloaded-calls-zero-args.rs b/src/test/ui/run-pass/overloaded/overloaded-calls-zero-args.rs
index 5fd6d5cb10f..5fd6d5cb10f 100644
--- a/src/test/run-pass/overloaded-calls-zero-args.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-calls-zero-args.rs
diff --git a/src/test/run-pass/overloaded-deref-count.rs b/src/test/ui/run-pass/overloaded/overloaded-deref-count.rs
index a8a3b3014e0..a8a3b3014e0 100644
--- a/src/test/run-pass/overloaded-deref-count.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-deref-count.rs
diff --git a/src/test/run-pass/overloaded-deref.rs b/src/test/ui/run-pass/overloaded/overloaded-deref.rs
index 9cdf45b485c..9cdf45b485c 100644
--- a/src/test/run-pass/overloaded-deref.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-deref.rs
diff --git a/src/test/run-pass/overloaded-index-assoc-list.rs b/src/test/ui/run-pass/overloaded/overloaded-index-assoc-list.rs
index 50140d1aab9..50140d1aab9 100644
--- a/src/test/run-pass/overloaded-index-assoc-list.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-index-assoc-list.rs
diff --git a/src/test/run-pass/overloaded-index-autoderef.rs b/src/test/ui/run-pass/overloaded/overloaded-index-autoderef.rs
index 9988599d59d..9988599d59d 100644
--- a/src/test/run-pass/overloaded-index-autoderef.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-index-autoderef.rs
diff --git a/src/test/run-pass/overloaded-index-in-field.rs b/src/test/ui/run-pass/overloaded/overloaded-index-in-field.rs
index 7e2b586631d..7e2b586631d 100644
--- a/src/test/run-pass/overloaded-index-in-field.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-index-in-field.rs
diff --git a/src/test/run-pass/overloaded-index.rs b/src/test/ui/run-pass/overloaded/overloaded-index.rs
index b54a18f722a..b54a18f722a 100644
--- a/src/test/run-pass/overloaded-index.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded-index.rs
diff --git a/src/test/run-pass/overloaded_deref_with_ref_pattern.rs b/src/test/ui/run-pass/overloaded/overloaded_deref_with_ref_pattern.rs
index f72d4964251..f72d4964251 100644
--- a/src/test/run-pass/overloaded_deref_with_ref_pattern.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded_deref_with_ref_pattern.rs
diff --git a/src/test/run-pass/overloaded_deref_with_ref_pattern_issue15609.rs b/src/test/ui/run-pass/overloaded/overloaded_deref_with_ref_pattern_issue15609.rs
index e5eb6ab8f61..e5eb6ab8f61 100644
--- a/src/test/run-pass/overloaded_deref_with_ref_pattern_issue15609.rs
+++ b/src/test/ui/run-pass/overloaded/overloaded_deref_with_ref_pattern_issue15609.rs
diff --git a/src/test/run-pass/packed-struct-borrow-element.rs b/src/test/ui/run-pass/packed/packed-struct-borrow-element.rs
index c8a8643ed6b..c8a8643ed6b 100644
--- a/src/test/run-pass/packed-struct-borrow-element.rs
+++ b/src/test/ui/run-pass/packed/packed-struct-borrow-element.rs
diff --git a/src/test/run-pass/packed-struct-drop-aligned.rs b/src/test/ui/run-pass/packed/packed-struct-drop-aligned.rs
index bbe31a65e86..bbe31a65e86 100644
--- a/src/test/run-pass/packed-struct-drop-aligned.rs
+++ b/src/test/ui/run-pass/packed/packed-struct-drop-aligned.rs
diff --git a/src/test/run-pass/packed-struct-generic-layout.rs b/src/test/ui/run-pass/packed/packed-struct-generic-layout.rs
index b962a5c7933..b962a5c7933 100644
--- a/src/test/run-pass/packed-struct-generic-layout.rs
+++ b/src/test/ui/run-pass/packed/packed-struct-generic-layout.rs
diff --git a/src/test/run-pass/packed-struct-generic-size.rs b/src/test/ui/run-pass/packed/packed-struct-generic-size.rs
index 127d873b2d9..127d873b2d9 100644
--- a/src/test/run-pass/packed-struct-generic-size.rs
+++ b/src/test/ui/run-pass/packed/packed-struct-generic-size.rs
diff --git a/src/test/run-pass/packed-struct-layout.rs b/src/test/ui/run-pass/packed/packed-struct-layout.rs
index a4a0055785f..a4a0055785f 100644
--- a/src/test/run-pass/packed-struct-layout.rs
+++ b/src/test/ui/run-pass/packed/packed-struct-layout.rs
diff --git a/src/test/run-pass/packed-struct-match.rs b/src/test/ui/run-pass/packed/packed-struct-match.rs
index c02d524d763..c02d524d763 100644
--- a/src/test/run-pass/packed-struct-match.rs
+++ b/src/test/ui/run-pass/packed/packed-struct-match.rs
diff --git a/src/test/run-pass/packed-struct-optimized-enum.rs b/src/test/ui/run-pass/packed/packed-struct-optimized-enum.rs
index 9d23a0c7148..9d23a0c7148 100644
--- a/src/test/run-pass/packed-struct-optimized-enum.rs
+++ b/src/test/ui/run-pass/packed/packed-struct-optimized-enum.rs
diff --git a/src/test/run-pass/packed-struct-size-xc.rs b/src/test/ui/run-pass/packed/packed-struct-size-xc.rs
index 48f34554ca1..48f34554ca1 100644
--- a/src/test/run-pass/packed-struct-size-xc.rs
+++ b/src/test/ui/run-pass/packed/packed-struct-size-xc.rs
diff --git a/src/test/run-pass/packed-struct-size.rs b/src/test/ui/run-pass/packed/packed-struct-size.rs
index f8e23610fe2..f8e23610fe2 100644
--- a/src/test/run-pass/packed-struct-size.rs
+++ b/src/test/ui/run-pass/packed/packed-struct-size.rs
diff --git a/src/test/run-pass/packed-struct-vec.rs b/src/test/ui/run-pass/packed/packed-struct-vec.rs
index 9d8b3d0d074..9d8b3d0d074 100644
--- a/src/test/run-pass/packed-struct-vec.rs
+++ b/src/test/ui/run-pass/packed/packed-struct-vec.rs
diff --git a/src/test/run-pass/packed-tuple-struct-layout.rs b/src/test/ui/run-pass/packed/packed-tuple-struct-layout.rs
index 18f7eff280a..18f7eff280a 100644
--- a/src/test/run-pass/packed-tuple-struct-layout.rs
+++ b/src/test/ui/run-pass/packed/packed-tuple-struct-layout.rs
diff --git a/src/test/run-pass/packed-tuple-struct-size.rs b/src/test/ui/run-pass/packed/packed-tuple-struct-size.rs
index 9def6ac28e5..9def6ac28e5 100644
--- a/src/test/run-pass/packed-tuple-struct-size.rs
+++ b/src/test/ui/run-pass/packed/packed-tuple-struct-size.rs
diff --git a/src/test/run-pass/panic-handler-chain.rs b/src/test/ui/run-pass/panics/panic-handler-chain.rs
index e2de795bdb7..e2de795bdb7 100644
--- a/src/test/run-pass/panic-handler-chain.rs
+++ b/src/test/ui/run-pass/panics/panic-handler-chain.rs
diff --git a/src/test/run-pass/panic-handler-flail-wildly.rs b/src/test/ui/run-pass/panics/panic-handler-flail-wildly.rs
index f0c50f842ab..f0c50f842ab 100644
--- a/src/test/run-pass/panic-handler-flail-wildly.rs
+++ b/src/test/ui/run-pass/panics/panic-handler-flail-wildly.rs
diff --git a/src/test/run-pass/panic-handler-set-twice.rs b/src/test/ui/run-pass/panics/panic-handler-set-twice.rs
index 120483ab336..120483ab336 100644
--- a/src/test/run-pass/panic-handler-set-twice.rs
+++ b/src/test/ui/run-pass/panics/panic-handler-set-twice.rs
diff --git a/src/test/run-pass/panic-in-dtor-drops-fields.rs b/src/test/ui/run-pass/panics/panic-in-dtor-drops-fields.rs
index c5f92fbd55a..c5f92fbd55a 100644
--- a/src/test/run-pass/panic-in-dtor-drops-fields.rs
+++ b/src/test/ui/run-pass/panics/panic-in-dtor-drops-fields.rs
diff --git a/src/test/run-pass/panic-recover-propagate.rs b/src/test/ui/run-pass/panics/panic-recover-propagate.rs
index cc2cfb6be96..cc2cfb6be96 100644
--- a/src/test/run-pass/panic-recover-propagate.rs
+++ b/src/test/ui/run-pass/panics/panic-recover-propagate.rs
diff --git a/src/test/run-pass/panic-safe.rs b/src/test/ui/run-pass/panics/panic-safe.rs
index 9bda07f077f..9bda07f077f 100644
--- a/src/test/run-pass/panic-safe.rs
+++ b/src/test/ui/run-pass/panics/panic-safe.rs
diff --git a/src/test/run-pass/priv-impl-prim-ty.rs b/src/test/ui/run-pass/privacy/priv-impl-prim-ty.rs
index aa2db260dd4..aa2db260dd4 100644
--- a/src/test/run-pass/priv-impl-prim-ty.rs
+++ b/src/test/ui/run-pass/privacy/priv-impl-prim-ty.rs
diff --git a/src/test/run-pass/privacy-ns.rs b/src/test/ui/run-pass/privacy/privacy-ns.rs
index 8082816c436..8082816c436 100644
--- a/src/test/run-pass/privacy-ns.rs
+++ b/src/test/ui/run-pass/privacy/privacy-ns.rs
diff --git a/src/test/run-pass/privacy-reexport.rs b/src/test/ui/run-pass/privacy/privacy-reexport.rs
index 15c977afe2a..15c977afe2a 100644
--- a/src/test/run-pass/privacy-reexport.rs
+++ b/src/test/ui/run-pass/privacy/privacy-reexport.rs
diff --git a/src/test/run-pass/privacy1.rs b/src/test/ui/run-pass/privacy/privacy1.rs
index 329c4aaa873..329c4aaa873 100644
--- a/src/test/run-pass/privacy1.rs
+++ b/src/test/ui/run-pass/privacy/privacy1.rs
diff --git a/src/test/run-pass/private-class-field.rs b/src/test/ui/run-pass/privacy/private-class-field.rs
index 8c92a05ba2a..8c92a05ba2a 100644
--- a/src/test/run-pass/private-class-field.rs
+++ b/src/test/ui/run-pass/privacy/private-class-field.rs
diff --git a/src/test/run-pass/private-method.rs b/src/test/ui/run-pass/privacy/private-method.rs
index 0d6e6010c56..0d6e6010c56 100644
--- a/src/test/run-pass/private-method.rs
+++ b/src/test/ui/run-pass/privacy/private-method.rs
diff --git a/src/test/run-pass/pub-extern-privacy.rs b/src/test/ui/run-pass/privacy/pub-extern-privacy.rs
index 1ef804fe8fe..1ef804fe8fe 100644
--- a/src/test/run-pass/pub-extern-privacy.rs
+++ b/src/test/ui/run-pass/privacy/pub-extern-privacy.rs
diff --git a/src/test/run-pass/pub-use-xcrate.rs b/src/test/ui/run-pass/privacy/pub-use-xcrate.rs
index 3318c0380be..3318c0380be 100644
--- a/src/test/run-pass/pub-use-xcrate.rs
+++ b/src/test/ui/run-pass/privacy/pub-use-xcrate.rs
diff --git a/src/test/run-pass/pub_use_mods_xcrate_exe.rs b/src/test/ui/run-pass/privacy/pub_use_mods_xcrate_exe.rs
index 9373b7945d5..9373b7945d5 100644
--- a/src/test/run-pass/pub_use_mods_xcrate_exe.rs
+++ b/src/test/ui/run-pass/privacy/pub_use_mods_xcrate_exe.rs
diff --git a/src/test/run-pass/process-envs.rs b/src/test/ui/run-pass/process/process-envs.rs
index e399bc20d52..e399bc20d52 100644
--- a/src/test/run-pass/process-envs.rs
+++ b/src/test/ui/run-pass/process/process-envs.rs
diff --git a/src/test/run-pass/process-exit.rs b/src/test/ui/run-pass/process/process-exit.rs
index 44ef4a9df71..44ef4a9df71 100644
--- a/src/test/run-pass/process-exit.rs
+++ b/src/test/ui/run-pass/process/process-exit.rs
diff --git a/src/test/run-pass/process-remove-from-env.rs b/src/test/ui/run-pass/process/process-remove-from-env.rs
index 9011ffcf45a..9011ffcf45a 100644
--- a/src/test/run-pass/process-remove-from-env.rs
+++ b/src/test/ui/run-pass/process/process-remove-from-env.rs
diff --git a/src/test/run-pass/process-sigpipe.rs b/src/test/ui/run-pass/process/process-sigpipe.rs
index a436e48ea53..a436e48ea53 100644
--- a/src/test/run-pass/process-sigpipe.rs
+++ b/src/test/ui/run-pass/process/process-sigpipe.rs
diff --git a/src/test/run-pass/process-spawn-nonexistent.rs b/src/test/ui/run-pass/process/process-spawn-nonexistent.rs
index 9219cd625f3..9219cd625f3 100644
--- a/src/test/run-pass/process-spawn-nonexistent.rs
+++ b/src/test/ui/run-pass/process/process-spawn-nonexistent.rs
diff --git a/src/test/run-pass/process-spawn-with-unicode-params.rs b/src/test/ui/run-pass/process/process-spawn-with-unicode-params.rs
index 1e22f17986c..1e22f17986c 100644
--- a/src/test/run-pass/process-spawn-with-unicode-params.rs
+++ b/src/test/ui/run-pass/process/process-spawn-with-unicode-params.rs
diff --git a/src/test/run-pass/process-status-inherits-stdin.rs b/src/test/ui/run-pass/process/process-status-inherits-stdin.rs
index fdf5cf5ad92..fdf5cf5ad92 100644
--- a/src/test/run-pass/process-status-inherits-stdin.rs
+++ b/src/test/ui/run-pass/process/process-status-inherits-stdin.rs
diff --git a/src/test/run-pass/regions-addr-of-interior-of-unique-box.rs b/src/test/ui/run-pass/regions/regions-addr-of-interior-of-unique-box.rs
index 4839067e53d..4839067e53d 100644
--- a/src/test/run-pass/regions-addr-of-interior-of-unique-box.rs
+++ b/src/test/ui/run-pass/regions/regions-addr-of-interior-of-unique-box.rs
diff --git a/src/test/run-pass/regions-addr-of-ret.rs b/src/test/ui/run-pass/regions/regions-addr-of-ret.rs
index 3baf2fa2de5..3baf2fa2de5 100644
--- a/src/test/run-pass/regions-addr-of-ret.rs
+++ b/src/test/ui/run-pass/regions/regions-addr-of-ret.rs
diff --git a/src/test/run-pass/regions-assoc-type-region-bound.rs b/src/test/ui/run-pass/regions/regions-assoc-type-region-bound.rs
index b51d62f490f..b51d62f490f 100644
--- a/src/test/run-pass/regions-assoc-type-region-bound.rs
+++ b/src/test/ui/run-pass/regions/regions-assoc-type-region-bound.rs
diff --git a/src/test/run-pass/regions-assoc-type-static-bound.rs b/src/test/ui/run-pass/regions/regions-assoc-type-static-bound.rs
index 344f707aefc..344f707aefc 100644
--- a/src/test/run-pass/regions-assoc-type-static-bound.rs
+++ b/src/test/ui/run-pass/regions/regions-assoc-type-static-bound.rs
diff --git a/src/test/run-pass/regions-borrow-at.rs b/src/test/ui/run-pass/regions/regions-borrow-at.rs
index abebb670e65..abebb670e65 100644
--- a/src/test/run-pass/regions-borrow-at.rs
+++ b/src/test/ui/run-pass/regions/regions-borrow-at.rs
diff --git a/src/test/run-pass/regions-borrow-evec-fixed.rs b/src/test/ui/run-pass/regions/regions-borrow-evec-fixed.rs
index 6d1f2930abf..6d1f2930abf 100644
--- a/src/test/run-pass/regions-borrow-evec-fixed.rs
+++ b/src/test/ui/run-pass/regions/regions-borrow-evec-fixed.rs
diff --git a/src/test/run-pass/regions-borrow-evec-uniq.rs b/src/test/ui/run-pass/regions/regions-borrow-evec-uniq.rs
index e61a8d14775..e61a8d14775 100644
--- a/src/test/run-pass/regions-borrow-evec-uniq.rs
+++ b/src/test/ui/run-pass/regions/regions-borrow-evec-uniq.rs
diff --git a/src/test/run-pass/regions-borrow-uniq.rs b/src/test/ui/run-pass/regions/regions-borrow-uniq.rs
index 48b09b33851..48b09b33851 100644
--- a/src/test/run-pass/regions-borrow-uniq.rs
+++ b/src/test/ui/run-pass/regions/regions-borrow-uniq.rs
diff --git a/src/test/run-pass/regions-bot.rs b/src/test/ui/run-pass/regions/regions-bot.rs
index 4347cbe2dc9..4347cbe2dc9 100644
--- a/src/test/run-pass/regions-bot.rs
+++ b/src/test/ui/run-pass/regions/regions-bot.rs
diff --git a/src/test/run-pass/regions-bound-lists-feature-gate-2.rs b/src/test/ui/run-pass/regions/regions-bound-lists-feature-gate-2.rs
index 47d2fe363d3..47d2fe363d3 100644
--- a/src/test/run-pass/regions-bound-lists-feature-gate-2.rs
+++ b/src/test/ui/run-pass/regions/regions-bound-lists-feature-gate-2.rs
diff --git a/src/test/run-pass/regions-bound-lists-feature-gate.rs b/src/test/ui/run-pass/regions/regions-bound-lists-feature-gate.rs
index 72db92aa93c..72db92aa93c 100644
--- a/src/test/run-pass/regions-bound-lists-feature-gate.rs
+++ b/src/test/ui/run-pass/regions/regions-bound-lists-feature-gate.rs
diff --git a/src/test/run-pass/regions-close-over-type-parameter-successfully.rs b/src/test/ui/run-pass/regions/regions-close-over-type-parameter-successfully.rs
index 4a24e201b35..4a24e201b35 100644
--- a/src/test/run-pass/regions-close-over-type-parameter-successfully.rs
+++ b/src/test/ui/run-pass/regions/regions-close-over-type-parameter-successfully.rs
diff --git a/src/test/run-pass/regions-copy-closure.rs b/src/test/ui/run-pass/regions/regions-copy-closure.rs
index 371823ece29..371823ece29 100644
--- a/src/test/run-pass/regions-copy-closure.rs
+++ b/src/test/ui/run-pass/regions/regions-copy-closure.rs
diff --git a/src/test/run-pass/regions-creating-enums2.rs b/src/test/ui/run-pass/regions/regions-creating-enums2.rs
index 66d28f5afa1..66d28f5afa1 100644
--- a/src/test/run-pass/regions-creating-enums2.rs
+++ b/src/test/ui/run-pass/regions/regions-creating-enums2.rs
diff --git a/src/test/run-pass/regions-creating-enums5.rs b/src/test/ui/run-pass/regions/regions-creating-enums5.rs
index 4bd12863e2a..4bd12863e2a 100644
--- a/src/test/run-pass/regions-creating-enums5.rs
+++ b/src/test/ui/run-pass/regions/regions-creating-enums5.rs
diff --git a/src/test/run-pass/regions-debruijn-of-object.rs b/src/test/ui/run-pass/regions/regions-debruijn-of-object.rs
index 9f2d27f024b..9f2d27f024b 100644
--- a/src/test/run-pass/regions-debruijn-of-object.rs
+++ b/src/test/ui/run-pass/regions/regions-debruijn-of-object.rs
diff --git a/src/test/run-pass/regions-dependent-addr-of.rs b/src/test/ui/run-pass/regions/regions-dependent-addr-of.rs
index c8b39bbe749..c8b39bbe749 100644
--- a/src/test/run-pass/regions-dependent-addr-of.rs
+++ b/src/test/ui/run-pass/regions/regions-dependent-addr-of.rs
diff --git a/src/test/run-pass/regions-dependent-autofn.rs b/src/test/ui/run-pass/regions/regions-dependent-autofn.rs
index ef05fc595df..ef05fc595df 100644
--- a/src/test/run-pass/regions-dependent-autofn.rs
+++ b/src/test/ui/run-pass/regions/regions-dependent-autofn.rs
diff --git a/src/test/run-pass/regions-dependent-autoslice.rs b/src/test/ui/run-pass/regions/regions-dependent-autoslice.rs
index cd140f7aa59..cd140f7aa59 100644
--- a/src/test/run-pass/regions-dependent-autoslice.rs
+++ b/src/test/ui/run-pass/regions/regions-dependent-autoslice.rs
diff --git a/src/test/run-pass/regions-dependent-let-ref.rs b/src/test/ui/run-pass/regions/regions-dependent-let-ref.rs
index 1b869e462b0..1b869e462b0 100644
--- a/src/test/run-pass/regions-dependent-let-ref.rs
+++ b/src/test/ui/run-pass/regions/regions-dependent-let-ref.rs
diff --git a/src/test/run-pass/regions-early-bound-lifetime-in-assoc-fn.rs b/src/test/ui/run-pass/regions/regions-early-bound-lifetime-in-assoc-fn.rs
index 0ffbc432aae..0ffbc432aae 100644
--- a/src/test/run-pass/regions-early-bound-lifetime-in-assoc-fn.rs
+++ b/src/test/ui/run-pass/regions/regions-early-bound-lifetime-in-assoc-fn.rs
diff --git a/src/test/run-pass/regions-early-bound-trait-param.rs b/src/test/ui/run-pass/regions/regions-early-bound-trait-param.rs
index 75c209a0920..75c209a0920 100644
--- a/src/test/run-pass/regions-early-bound-trait-param.rs
+++ b/src/test/ui/run-pass/regions/regions-early-bound-trait-param.rs
diff --git a/src/test/run-pass/regions-early-bound-used-in-bound-method.rs b/src/test/ui/run-pass/regions/regions-early-bound-used-in-bound-method.rs
index c7bc8dc0a51..c7bc8dc0a51 100644
--- a/src/test/run-pass/regions-early-bound-used-in-bound-method.rs
+++ b/src/test/ui/run-pass/regions/regions-early-bound-used-in-bound-method.rs
diff --git a/src/test/run-pass/regions-early-bound-used-in-bound.rs b/src/test/ui/run-pass/regions/regions-early-bound-used-in-bound.rs
index 3c8c78aa116..3c8c78aa116 100644
--- a/src/test/run-pass/regions-early-bound-used-in-bound.rs
+++ b/src/test/ui/run-pass/regions/regions-early-bound-used-in-bound.rs
diff --git a/src/test/run-pass/regions-early-bound-used-in-type-param.rs b/src/test/ui/run-pass/regions/regions-early-bound-used-in-type-param.rs
index 8d145fad004..8d145fad004 100644
--- a/src/test/run-pass/regions-early-bound-used-in-type-param.rs
+++ b/src/test/ui/run-pass/regions/regions-early-bound-used-in-type-param.rs
diff --git a/src/test/run-pass/regions-escape-into-other-fn.rs b/src/test/ui/run-pass/regions/regions-escape-into-other-fn.rs
index 7cb719cccce..7cb719cccce 100644
--- a/src/test/run-pass/regions-escape-into-other-fn.rs
+++ b/src/test/ui/run-pass/regions/regions-escape-into-other-fn.rs
diff --git a/src/test/run-pass/regions-expl-self.rs b/src/test/ui/run-pass/regions/regions-expl-self.rs
index 7ad3c3f4e17..7ad3c3f4e17 100644
--- a/src/test/run-pass/regions-expl-self.rs
+++ b/src/test/ui/run-pass/regions/regions-expl-self.rs
diff --git a/src/test/run-pass/regions-fn-subtyping-2.rs b/src/test/ui/run-pass/regions/regions-fn-subtyping-2.rs
index 7f2fc11cb8e..7f2fc11cb8e 100644
--- a/src/test/run-pass/regions-fn-subtyping-2.rs
+++ b/src/test/ui/run-pass/regions/regions-fn-subtyping-2.rs
diff --git a/src/test/run-pass/regions-fn-subtyping.rs b/src/test/ui/run-pass/regions/regions-fn-subtyping.rs
index f762b4f41ed..f762b4f41ed 100644
--- a/src/test/run-pass/regions-fn-subtyping.rs
+++ b/src/test/ui/run-pass/regions/regions-fn-subtyping.rs
diff --git a/src/test/run-pass/regions-free-region-outlives-static-outlives-free-region.rs b/src/test/ui/run-pass/regions/regions-free-region-outlives-static-outlives-free-region.rs
index 09c8d1f23a2..09c8d1f23a2 100644
--- a/src/test/run-pass/regions-free-region-outlives-static-outlives-free-region.rs
+++ b/src/test/ui/run-pass/regions/regions-free-region-outlives-static-outlives-free-region.rs
diff --git a/src/test/run-pass/regions-infer-borrow-scope-addr-of.rs b/src/test/ui/run-pass/regions/regions-infer-borrow-scope-addr-of.rs
index 5c80863ce85..5c80863ce85 100644
--- a/src/test/run-pass/regions-infer-borrow-scope-addr-of.rs
+++ b/src/test/ui/run-pass/regions/regions-infer-borrow-scope-addr-of.rs
diff --git a/src/test/run-pass/regions-infer-borrow-scope-view.rs b/src/test/ui/run-pass/regions/regions-infer-borrow-scope-view.rs
index 262e936826e..262e936826e 100644
--- a/src/test/run-pass/regions-infer-borrow-scope-view.rs
+++ b/src/test/ui/run-pass/regions/regions-infer-borrow-scope-view.rs
diff --git a/src/test/run-pass/regions-infer-borrow-scope-within-loop-ok.rs b/src/test/ui/run-pass/regions/regions-infer-borrow-scope-within-loop-ok.rs
index a40ba8382fc..a40ba8382fc 100644
--- a/src/test/run-pass/regions-infer-borrow-scope-within-loop-ok.rs
+++ b/src/test/ui/run-pass/regions/regions-infer-borrow-scope-within-loop-ok.rs
diff --git a/src/test/run-pass/regions-infer-borrow-scope.rs b/src/test/ui/run-pass/regions/regions-infer-borrow-scope.rs
index 72208272df7..72208272df7 100644
--- a/src/test/run-pass/regions-infer-borrow-scope.rs
+++ b/src/test/ui/run-pass/regions/regions-infer-borrow-scope.rs
diff --git a/src/test/run-pass/regions-infer-call-2.rs b/src/test/ui/run-pass/regions/regions-infer-call-2.rs
index b994bc7b855..b994bc7b855 100644
--- a/src/test/run-pass/regions-infer-call-2.rs
+++ b/src/test/ui/run-pass/regions/regions-infer-call-2.rs
diff --git a/src/test/run-pass/regions-infer-call.rs b/src/test/ui/run-pass/regions/regions-infer-call.rs
index 76b93f2356b..76b93f2356b 100644
--- a/src/test/run-pass/regions-infer-call.rs
+++ b/src/test/ui/run-pass/regions/regions-infer-call.rs
diff --git a/src/test/run-pass/regions-infer-contravariance-due-to-ret.rs b/src/test/ui/run-pass/regions/regions-infer-contravariance-due-to-ret.rs
index 3c6bc133999..3c6bc133999 100644
--- a/src/test/run-pass/regions-infer-contravariance-due-to-ret.rs
+++ b/src/test/ui/run-pass/regions/regions-infer-contravariance-due-to-ret.rs
diff --git a/src/test/run-pass/regions-infer-reborrow-ref-mut-recurse.rs b/src/test/ui/run-pass/regions/regions-infer-reborrow-ref-mut-recurse.rs
index 2349b6c3bc1..2349b6c3bc1 100644
--- a/src/test/run-pass/regions-infer-reborrow-ref-mut-recurse.rs
+++ b/src/test/ui/run-pass/regions/regions-infer-reborrow-ref-mut-recurse.rs
diff --git a/src/test/run-pass/regions-infer-region-in-fn-but-not-type.rs b/src/test/ui/run-pass/regions/regions-infer-region-in-fn-but-not-type.rs
index a8418f967fd..a8418f967fd 100644
--- a/src/test/run-pass/regions-infer-region-in-fn-but-not-type.rs
+++ b/src/test/ui/run-pass/regions/regions-infer-region-in-fn-but-not-type.rs
diff --git a/src/test/run-pass/regions-infer-static-from-proc.rs b/src/test/ui/run-pass/regions/regions-infer-static-from-proc.rs
index 403dfbf655f..403dfbf655f 100644
--- a/src/test/run-pass/regions-infer-static-from-proc.rs
+++ b/src/test/ui/run-pass/regions/regions-infer-static-from-proc.rs
diff --git a/src/test/run-pass/regions-issue-21422.rs b/src/test/ui/run-pass/regions/regions-issue-21422.rs
index ecc170a1462..ecc170a1462 100644
--- a/src/test/run-pass/regions-issue-21422.rs
+++ b/src/test/ui/run-pass/regions/regions-issue-21422.rs
diff --git a/src/test/run-pass/regions-issue-22246.rs b/src/test/ui/run-pass/regions/regions-issue-22246.rs
index b6815d92967..b6815d92967 100644
--- a/src/test/run-pass/regions-issue-22246.rs
+++ b/src/test/ui/run-pass/regions/regions-issue-22246.rs
diff --git a/src/test/run-pass/regions-lifetime-nonfree-late-bound.rs b/src/test/ui/run-pass/regions/regions-lifetime-nonfree-late-bound.rs
index 2a20cd2b773..2a20cd2b773 100644
--- a/src/test/run-pass/regions-lifetime-nonfree-late-bound.rs
+++ b/src/test/ui/run-pass/regions/regions-lifetime-nonfree-late-bound.rs
diff --git a/src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.rs b/src/test/ui/run-pass/regions/regions-lifetime-static-items-enclosing-scopes.rs
index df034df7362..df034df7362 100644
--- a/src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.rs
+++ b/src/test/ui/run-pass/regions/regions-lifetime-static-items-enclosing-scopes.rs
diff --git a/src/test/run-pass/regions-link-fn-args.rs b/src/test/ui/run-pass/regions/regions-link-fn-args.rs
index 9e8ce616048..9e8ce616048 100644
--- a/src/test/run-pass/regions-link-fn-args.rs
+++ b/src/test/ui/run-pass/regions/regions-link-fn-args.rs
diff --git a/src/test/run-pass/regions-lub-ref-ref-rc.rs b/src/test/ui/run-pass/regions/regions-lub-ref-ref-rc.rs
index ade742863a9..ade742863a9 100644
--- a/src/test/run-pass/regions-lub-ref-ref-rc.rs
+++ b/src/test/ui/run-pass/regions/regions-lub-ref-ref-rc.rs
diff --git a/src/test/run-pass/regions-mock-codegen.rs b/src/test/ui/run-pass/regions/regions-mock-codegen.rs
index b58e837f3bd..b58e837f3bd 100644
--- a/src/test/run-pass/regions-mock-codegen.rs
+++ b/src/test/ui/run-pass/regions/regions-mock-codegen.rs
diff --git a/src/test/run-pass/regions-no-bound-in-argument-cleanup.rs b/src/test/ui/run-pass/regions/regions-no-bound-in-argument-cleanup.rs
index cdb58d1ba4c..cdb58d1ba4c 100644
--- a/src/test/run-pass/regions-no-bound-in-argument-cleanup.rs
+++ b/src/test/ui/run-pass/regions/regions-no-bound-in-argument-cleanup.rs
diff --git a/src/test/run-pass/regions-no-variance-from-fn-generics.rs b/src/test/ui/run-pass/regions/regions-no-variance-from-fn-generics.rs
index c339be25f8b..c339be25f8b 100644
--- a/src/test/run-pass/regions-no-variance-from-fn-generics.rs
+++ b/src/test/ui/run-pass/regions/regions-no-variance-from-fn-generics.rs
diff --git a/src/test/run-pass/regions-nullary-variant.rs b/src/test/ui/run-pass/regions/regions-nullary-variant.rs
index ae55b97dc93..ae55b97dc93 100644
--- a/src/test/run-pass/regions-nullary-variant.rs
+++ b/src/test/ui/run-pass/regions/regions-nullary-variant.rs
diff --git a/src/test/run-pass/regions-params.rs b/src/test/ui/run-pass/regions/regions-params.rs
index dbd52bd6b60..dbd52bd6b60 100644
--- a/src/test/run-pass/regions-params.rs
+++ b/src/test/ui/run-pass/regions/regions-params.rs
diff --git a/src/test/run-pass/regions-reassign-let-bound-pointer.rs b/src/test/ui/run-pass/regions/regions-reassign-let-bound-pointer.rs
index b29cc8f9036..b29cc8f9036 100644
--- a/src/test/run-pass/regions-reassign-let-bound-pointer.rs
+++ b/src/test/ui/run-pass/regions/regions-reassign-let-bound-pointer.rs
diff --git a/src/test/run-pass/regions-reassign-match-bound-pointer.rs b/src/test/ui/run-pass/regions/regions-reassign-match-bound-pointer.rs
index 58d4f556a79..58d4f556a79 100644
--- a/src/test/run-pass/regions-reassign-match-bound-pointer.rs
+++ b/src/test/ui/run-pass/regions/regions-reassign-match-bound-pointer.rs
diff --git a/src/test/run-pass/regions-refcell.rs b/src/test/ui/run-pass/regions/regions-refcell.rs
index ca6a62c10c2..ca6a62c10c2 100644
--- a/src/test/run-pass/regions-refcell.rs
+++ b/src/test/ui/run-pass/regions/regions-refcell.rs
diff --git a/src/test/run-pass/regions-relate-bound-regions-on-closures-to-inference-variables.rs b/src/test/ui/run-pass/regions/regions-relate-bound-regions-on-closures-to-inference-variables.rs
index 3322fc36fd3..3322fc36fd3 100644
--- a/src/test/run-pass/regions-relate-bound-regions-on-closures-to-inference-variables.rs
+++ b/src/test/ui/run-pass/regions/regions-relate-bound-regions-on-closures-to-inference-variables.rs
diff --git a/src/test/run-pass/regions-return-interior-of-option.rs b/src/test/ui/run-pass/regions/regions-return-interior-of-option.rs
index fe1c68ff428..fe1c68ff428 100644
--- a/src/test/run-pass/regions-return-interior-of-option.rs
+++ b/src/test/ui/run-pass/regions/regions-return-interior-of-option.rs
diff --git a/src/test/run-pass/regions-scope-chain-example.rs b/src/test/ui/run-pass/regions/regions-scope-chain-example.rs
index 185d5db1f51..185d5db1f51 100644
--- a/src/test/run-pass/regions-scope-chain-example.rs
+++ b/src/test/ui/run-pass/regions/regions-scope-chain-example.rs
diff --git a/src/test/run-pass/regions-self-impls.rs b/src/test/ui/run-pass/regions/regions-self-impls.rs
index 26e3fbfab9e..26e3fbfab9e 100644
--- a/src/test/run-pass/regions-self-impls.rs
+++ b/src/test/ui/run-pass/regions/regions-self-impls.rs
diff --git a/src/test/run-pass/regions-self-in-enums.rs b/src/test/ui/run-pass/regions/regions-self-in-enums.rs
index 9ff20e93a0d..9ff20e93a0d 100644
--- a/src/test/run-pass/regions-self-in-enums.rs
+++ b/src/test/ui/run-pass/regions/regions-self-in-enums.rs
diff --git a/src/test/run-pass/regions-simple.rs b/src/test/ui/run-pass/regions/regions-simple.rs
index f4fe73131fe..f4fe73131fe 100644
--- a/src/test/run-pass/regions-simple.rs
+++ b/src/test/ui/run-pass/regions/regions-simple.rs
diff --git a/src/test/run-pass/regions-static-bound.rs b/src/test/ui/run-pass/regions/regions-static-bound.rs
index 1c6411e3b8f..1c6411e3b8f 100644
--- a/src/test/run-pass/regions-static-bound.rs
+++ b/src/test/ui/run-pass/regions/regions-static-bound.rs
diff --git a/src/test/run-pass/regions-static-closure.rs b/src/test/ui/run-pass/regions/regions-static-closure.rs
index fa1c3b230c6..fa1c3b230c6 100644
--- a/src/test/run-pass/regions-static-closure.rs
+++ b/src/test/ui/run-pass/regions/regions-static-closure.rs
diff --git a/src/test/run-pass/regions-trait-object-1.rs b/src/test/ui/run-pass/regions/regions-trait-object-1.rs
index 542dc76061f..542dc76061f 100644
--- a/src/test/run-pass/regions-trait-object-1.rs
+++ b/src/test/ui/run-pass/regions/regions-trait-object-1.rs
diff --git a/src/test/run-pass/regions-variance-contravariant-use-contravariant.rs b/src/test/ui/run-pass/regions/regions-variance-contravariant-use-contravariant.rs
index 5e5be1c2587..5e5be1c2587 100644
--- a/src/test/run-pass/regions-variance-contravariant-use-contravariant.rs
+++ b/src/test/ui/run-pass/regions/regions-variance-contravariant-use-contravariant.rs
diff --git a/src/test/run-pass/regions-variance-covariant-use-covariant.rs b/src/test/ui/run-pass/regions/regions-variance-covariant-use-covariant.rs
index 02562781373..02562781373 100644
--- a/src/test/run-pass/regions-variance-covariant-use-covariant.rs
+++ b/src/test/ui/run-pass/regions/regions-variance-covariant-use-covariant.rs
diff --git a/src/test/run-pass/rfc-1014-2.rs b/src/test/ui/run-pass/rfcs/rfc-1014-2.rs
index 7cdaf278a08..7cdaf278a08 100644
--- a/src/test/run-pass/rfc-1014-2.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-1014-2.rs
diff --git a/src/test/run-pass/rfc-1014.rs b/src/test/ui/run-pass/rfcs/rfc-1014.rs
index 61487b6953d..61487b6953d 100644
--- a/src/test/run-pass/rfc-1014.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-1014.rs
diff --git a/src/test/run-pass/rfc-1789-as-cell/from-mut.rs b/src/test/ui/run-pass/rfcs/rfc-1789-as-cell/from-mut.rs
index 88f7fbc86df..88f7fbc86df 100644
--- a/src/test/run-pass/rfc-1789-as-cell/from-mut.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-1789-as-cell/from-mut.rs
diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
index 183bb553530..183bb553530 100644
--- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-empty.rs b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-empty.rs
index 046d27a9f0f..046d27a9f0f 100644
--- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-empty.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-empty.rs
diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-exitcode.rs b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-exitcode.rs
index 4aa7d8c3a77..4aa7d8c3a77 100644
--- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-exitcode.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-exitcode.rs
diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs
index 5bce3f8045e..5bce3f8045e 100644
--- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs
diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs
index 33686ed0b8f..33686ed0b8f 100644
--- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs
diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result.rs b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-result.rs
index 1c87e31e763..1c87e31e763 100644
--- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-result.rs
diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-str.rs b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-str.rs
index 2023ff75564..2023ff75564 100644
--- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-str.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-str.rs
diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/box.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/box.rs
index 95bce1935e5..95bce1935e5 100644
--- a/src/test/run-pass/rfc-2005-default-binding-mode/box.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/box.rs
diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/constref.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/constref.rs
index af40ef2b1c5..af40ef2b1c5 100644
--- a/src/test/run-pass/rfc-2005-default-binding-mode/constref.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/constref.rs
diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/enum.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/enum.rs
index 4755fc37ef3..4755fc37ef3 100644
--- a/src/test/run-pass/rfc-2005-default-binding-mode/enum.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/enum.rs
diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/for.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/for.rs
index c2467d3f009..c2467d3f009 100644
--- a/src/test/run-pass/rfc-2005-default-binding-mode/for.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/for.rs
diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/general.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/general.rs
index df28046d7d7..df28046d7d7 100644
--- a/src/test/run-pass/rfc-2005-default-binding-mode/general.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/general.rs
diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/lit.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/lit.rs
index 004ea42b65b..004ea42b65b 100644
--- a/src/test/run-pass/rfc-2005-default-binding-mode/lit.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/lit.rs
diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/range.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/range.rs
index f38bd2de869..f38bd2de869 100644
--- a/src/test/run-pass/rfc-2005-default-binding-mode/range.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/range.rs
diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/ref-region.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/ref-region.rs
index bc96853fd94..bc96853fd94 100644
--- a/src/test/run-pass/rfc-2005-default-binding-mode/ref-region.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/ref-region.rs
diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/reset-mode.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/reset-mode.rs
index 1d86a2ecf86..1d86a2ecf86 100644
--- a/src/test/run-pass/rfc-2005-default-binding-mode/reset-mode.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/reset-mode.rs
diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/slice.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/slice.rs
index 0d1d0893c59..0d1d0893c59 100644
--- a/src/test/run-pass/rfc-2005-default-binding-mode/slice.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/slice.rs
diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/struct.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/struct.rs
index 017439b3b14..017439b3b14 100644
--- a/src/test/run-pass/rfc-2005-default-binding-mode/struct.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/struct.rs
diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/tuple-struct.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/tuple-struct.rs
index 3b55405abdd..3b55405abdd 100644
--- a/src/test/run-pass/rfc-2005-default-binding-mode/tuple-struct.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/tuple-struct.rs
diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/tuple.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/tuple.rs
index 966b8e1a812..966b8e1a812 100644
--- a/src/test/run-pass/rfc-2005-default-binding-mode/tuple.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/tuple.rs
diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/enums.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/auxiliary/enums.rs
index 12d1bf9ea91..12d1bf9ea91 100644
--- a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/enums.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/auxiliary/enums.rs
diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/structs.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/auxiliary/structs.rs
index a2c6f8c05e2..a2c6f8c05e2 100644
--- a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/structs.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/auxiliary/structs.rs
diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/variants.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/auxiliary/variants.rs
index d04c1073ad9..d04c1073ad9 100644
--- a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/variants.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/auxiliary/variants.rs
diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/enums.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/enums.rs
index 83fb24cda08..83fb24cda08 100644
--- a/src/test/run-pass/rfc-2008-non-exhaustive/enums.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/enums.rs
diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/enums_same_crate.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/enums_same_crate.rs
index 8f1ba364b0e..8f1ba364b0e 100644
--- a/src/test/run-pass/rfc-2008-non-exhaustive/enums_same_crate.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/enums_same_crate.rs
diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/structs.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/structs.rs
index bb65e10da27..bb65e10da27 100644
--- a/src/test/run-pass/rfc-2008-non-exhaustive/structs.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/structs.rs
diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/structs_same_crate.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/structs_same_crate.rs
index 175782f10fc..175782f10fc 100644
--- a/src/test/run-pass/rfc-2008-non-exhaustive/structs_same_crate.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/structs_same_crate.rs
diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/variants.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/variants.rs
index 2658c59a699..2658c59a699 100644
--- a/src/test/run-pass/rfc-2008-non-exhaustive/variants.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/variants.rs
diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/variants_same_crate.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/variants_same_crate.rs
index a1c376c1798..a1c376c1798 100644
--- a/src/test/run-pass/rfc-2008-non-exhaustive/variants_same_crate.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/variants_same_crate.rs
diff --git a/src/test/run-pass/rfc-2126-crate-paths/crate-path-absolute.rs b/src/test/ui/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute.rs
index 31f683a1735..31f683a1735 100644
--- a/src/test/run-pass/rfc-2126-crate-paths/crate-path-absolute.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute.rs
diff --git a/src/test/run-pass/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs b/src/test/ui/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs
index 4646d81cf51..4646d81cf51 100644
--- a/src/test/run-pass/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs
diff --git a/src/test/run-pass/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs b/src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs
index a5214d796cd..a5214d796cd 100644
--- a/src/test/run-pass/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs
diff --git a/src/test/run-pass/rfc-2126-extern-absolute-paths/basic.rs b/src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/basic.rs
index 93384b81e4a..93384b81e4a 100644
--- a/src/test/run-pass/rfc-2126-extern-absolute-paths/basic.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/basic.rs
diff --git a/src/test/run-pass/rfc-2126-extern-absolute-paths/extern.rs b/src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/extern.rs
index 15b754e1fe6..15b754e1fe6 100644
--- a/src/test/run-pass/rfc-2126-extern-absolute-paths/extern.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/extern.rs
diff --git a/src/test/run-pass/rfc-2126-extern-absolute-paths/test.rs b/src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/test.rs
index cace83d6274..cace83d6274 100644
--- a/src/test/run-pass/rfc-2126-extern-absolute-paths/test.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/test.rs
diff --git a/src/test/run-pass/rfc-2151-raw-identifiers/attr.rs b/src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/attr.rs
index 2ef9fba2076..2ef9fba2076 100644
--- a/src/test/run-pass/rfc-2151-raw-identifiers/attr.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/attr.rs
diff --git a/src/test/run-pass/rfc-2151-raw-identifiers/basic.rs b/src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/basic.rs
index eefce3981be..eefce3981be 100644
--- a/src/test/run-pass/rfc-2151-raw-identifiers/basic.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/basic.rs
diff --git a/src/test/run-pass/rfc-2151-raw-identifiers/items.rs b/src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/items.rs
index 4306ffe2042..4306ffe2042 100644
--- a/src/test/run-pass/rfc-2151-raw-identifiers/items.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/items.rs
diff --git a/src/test/run-pass/rfc-2151-raw-identifiers/macros.rs b/src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/macros.rs
index 9e89b79266c..9e89b79266c 100644
--- a/src/test/run-pass/rfc-2151-raw-identifiers/macros.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/macros.rs
diff --git a/src/test/run-pass/rfc-2175-or-if-while-let/basic.rs b/src/test/ui/run-pass/rfcs/rfc-2175-or-if-while-let/basic.rs
index a516a3e5dcd..a516a3e5dcd 100644
--- a/src/test/run-pass/rfc-2175-or-if-while-let/basic.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2175-or-if-while-let/basic.rs
diff --git a/src/test/run-pass/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs b/src/test/ui/run-pass/rfcs/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs
index 7d8050a07a3..7d8050a07a3 100644
--- a/src/test/run-pass/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs
+++ b/src/test/ui/run-pass/rfcs/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs
diff --git a/src/test/run-pass/rfc1445/eq-allows-match-on-ty-in-macro.rs b/src/test/ui/run-pass/rfcs/rfc1445/eq-allows-match-on-ty-in-macro.rs
index 241fe6c6ab1..241fe6c6ab1 100644
--- a/src/test/run-pass/rfc1445/eq-allows-match-on-ty-in-macro.rs
+++ b/src/test/ui/run-pass/rfcs/rfc1445/eq-allows-match-on-ty-in-macro.rs
diff --git a/src/test/run-pass/rfc1445/eq-allows-match.rs b/src/test/ui/run-pass/rfcs/rfc1445/eq-allows-match.rs
index f02a45625c9..f02a45625c9 100644
--- a/src/test/run-pass/rfc1445/eq-allows-match.rs
+++ b/src/test/ui/run-pass/rfcs/rfc1445/eq-allows-match.rs
diff --git a/src/test/run-pass/rfc1623.rs b/src/test/ui/run-pass/rfcs/rfc1623.rs
index 17453933c8a..17453933c8a 100644
--- a/src/test/run-pass/rfc1623.rs
+++ b/src/test/ui/run-pass/rfcs/rfc1623.rs
diff --git a/src/test/run-pass/rfc1717/auxiliary/clibrary.rs b/src/test/ui/run-pass/rfcs/rfc1717/auxiliary/clibrary.rs
index 7438ba21bfc..7438ba21bfc 100644
--- a/src/test/run-pass/rfc1717/auxiliary/clibrary.rs
+++ b/src/test/ui/run-pass/rfcs/rfc1717/auxiliary/clibrary.rs
diff --git a/src/test/run-pass/rfc1717/library-override.rs b/src/test/ui/run-pass/rfcs/rfc1717/library-override.rs
index c51b33f9c4a..c51b33f9c4a 100644
--- a/src/test/run-pass/rfc1717/library-override.rs
+++ b/src/test/ui/run-pass/rfcs/rfc1717/library-override.rs
diff --git a/src/test/run-pass/rfc1857-drop-order.rs b/src/test/ui/run-pass/rfcs/rfc1857-drop-order.rs
index 94b2a586ddf..94b2a586ddf 100644
--- a/src/test/run-pass/rfc1857-drop-order.rs
+++ b/src/test/ui/run-pass/rfcs/rfc1857-drop-order.rs
diff --git a/src/test/run-pass/arbitrary_self_types_raw_pointer_struct.rs b/src/test/ui/run-pass/self/arbitrary_self_types_raw_pointer_struct.rs
index 8b6941e1c63..8b6941e1c63 100644
--- a/src/test/run-pass/arbitrary_self_types_raw_pointer_struct.rs
+++ b/src/test/ui/run-pass/self/arbitrary_self_types_raw_pointer_struct.rs
diff --git a/src/test/run-pass/arbitrary_self_types_raw_pointer_trait.rs b/src/test/ui/run-pass/self/arbitrary_self_types_raw_pointer_trait.rs
index f70e38a14e4..f70e38a14e4 100644
--- a/src/test/run-pass/arbitrary_self_types_raw_pointer_trait.rs
+++ b/src/test/ui/run-pass/self/arbitrary_self_types_raw_pointer_trait.rs
diff --git a/src/test/run-pass/arbitrary_self_types_silly.rs b/src/test/ui/run-pass/self/arbitrary_self_types_silly.rs
index 755a8d7ea29..755a8d7ea29 100644
--- a/src/test/run-pass/arbitrary_self_types_silly.rs
+++ b/src/test/ui/run-pass/self/arbitrary_self_types_silly.rs
diff --git a/src/test/run-pass/arbitrary_self_types_struct.rs b/src/test/ui/run-pass/self/arbitrary_self_types_struct.rs
index 961717de046..961717de046 100644
--- a/src/test/run-pass/arbitrary_self_types_struct.rs
+++ b/src/test/ui/run-pass/self/arbitrary_self_types_struct.rs
diff --git a/src/test/run-pass/arbitrary_self_types_trait.rs b/src/test/ui/run-pass/self/arbitrary_self_types_trait.rs
index e74d614dd6b..e74d614dd6b 100644
--- a/src/test/run-pass/arbitrary_self_types_trait.rs
+++ b/src/test/ui/run-pass/self/arbitrary_self_types_trait.rs
diff --git a/src/test/run-pass/arbitrary_self_types_unsized_struct.rs b/src/test/ui/run-pass/self/arbitrary_self_types_unsized_struct.rs
index 8dc40e7aab1..8dc40e7aab1 100644
--- a/src/test/run-pass/arbitrary_self_types_unsized_struct.rs
+++ b/src/test/ui/run-pass/self/arbitrary_self_types_unsized_struct.rs
diff --git a/src/test/run-pass/builtin-superkinds-self-type.rs b/src/test/ui/run-pass/self/builtin-superkinds-self-type.rs
index 9b8893b0762..9b8893b0762 100644
--- a/src/test/run-pass/builtin-superkinds-self-type.rs
+++ b/src/test/ui/run-pass/self/builtin-superkinds-self-type.rs
diff --git a/src/test/run-pass/by-value-self-in-mut-slot.rs b/src/test/ui/run-pass/self/by-value-self-in-mut-slot.rs
index 846b695c35b..846b695c35b 100644
--- a/src/test/run-pass/by-value-self-in-mut-slot.rs
+++ b/src/test/ui/run-pass/self/by-value-self-in-mut-slot.rs
diff --git a/src/test/run-pass/explicit-self-closures.rs b/src/test/ui/run-pass/self/explicit-self-closures.rs
index cb3a28d19d2..cb3a28d19d2 100644
--- a/src/test/run-pass/explicit-self-closures.rs
+++ b/src/test/ui/run-pass/self/explicit-self-closures.rs
diff --git a/src/test/run-pass/explicit-self-generic.rs b/src/test/ui/run-pass/self/explicit-self-generic.rs
index d2274ced556..d2274ced556 100644
--- a/src/test/run-pass/explicit-self-generic.rs
+++ b/src/test/ui/run-pass/self/explicit-self-generic.rs
diff --git a/src/test/run-pass/explicit-self-objects-uniq.rs b/src/test/ui/run-pass/self/explicit-self-objects-uniq.rs
index bb7e612a9f2..bb7e612a9f2 100644
--- a/src/test/run-pass/explicit-self-objects-uniq.rs
+++ b/src/test/ui/run-pass/self/explicit-self-objects-uniq.rs
diff --git a/src/test/run-pass/explicit-self.rs b/src/test/ui/run-pass/self/explicit-self.rs
index 11711e6ab74..11711e6ab74 100644
--- a/src/test/run-pass/explicit-self.rs
+++ b/src/test/ui/run-pass/self/explicit-self.rs
diff --git a/src/test/run-pass/explicit_self_xcrate_exe.rs b/src/test/ui/run-pass/self/explicit_self_xcrate_exe.rs
index eaaf92fbea9..eaaf92fbea9 100644
--- a/src/test/run-pass/explicit_self_xcrate_exe.rs
+++ b/src/test/ui/run-pass/self/explicit_self_xcrate_exe.rs
diff --git a/src/test/run-pass/move-self.rs b/src/test/ui/run-pass/self/move-self.rs
index c69cd17864a..c69cd17864a 100644
--- a/src/test/run-pass/move-self.rs
+++ b/src/test/ui/run-pass/self/move-self.rs
diff --git a/src/test/run-pass/object-safety-sized-self-by-value-self.rs b/src/test/ui/run-pass/self/object-safety-sized-self-by-value-self.rs
index 81acd94ebe5..81acd94ebe5 100644
--- a/src/test/run-pass/object-safety-sized-self-by-value-self.rs
+++ b/src/test/ui/run-pass/self/object-safety-sized-self-by-value-self.rs
diff --git a/src/test/run-pass/object-safety-sized-self-generic-method.rs b/src/test/ui/run-pass/self/object-safety-sized-self-generic-method.rs
index 2e84117566e..2e84117566e 100644
--- a/src/test/run-pass/object-safety-sized-self-generic-method.rs
+++ b/src/test/ui/run-pass/self/object-safety-sized-self-generic-method.rs
diff --git a/src/test/run-pass/object-safety-sized-self-return-Self.rs b/src/test/ui/run-pass/self/object-safety-sized-self-return-Self.rs
index eda541262bd..eda541262bd 100644
--- a/src/test/run-pass/object-safety-sized-self-return-Self.rs
+++ b/src/test/ui/run-pass/self/object-safety-sized-self-return-Self.rs
diff --git a/src/test/run-pass/self-impl.rs b/src/test/ui/run-pass/self/self-impl.rs
index fcd233c361b..fcd233c361b 100644
--- a/src/test/run-pass/self-impl.rs
+++ b/src/test/ui/run-pass/self/self-impl.rs
diff --git a/src/test/run-pass/self-in-mut-slot-default-method.rs b/src/test/ui/run-pass/self/self-in-mut-slot-default-method.rs
index 905a23f22a6..905a23f22a6 100644
--- a/src/test/run-pass/self-in-mut-slot-default-method.rs
+++ b/src/test/ui/run-pass/self/self-in-mut-slot-default-method.rs
diff --git a/src/test/run-pass/self-in-mut-slot-immediate-value.rs b/src/test/ui/run-pass/self/self-in-mut-slot-immediate-value.rs
index 24014c289f9..24014c289f9 100644
--- a/src/test/run-pass/self-in-mut-slot-immediate-value.rs
+++ b/src/test/ui/run-pass/self/self-in-mut-slot-immediate-value.rs
diff --git a/src/test/run-pass/self-in-typedefs.rs b/src/test/ui/run-pass/self/self-in-typedefs.rs
index d262e8c60a1..d262e8c60a1 100644
--- a/src/test/run-pass/self-in-typedefs.rs
+++ b/src/test/ui/run-pass/self/self-in-typedefs.rs
diff --git a/src/test/run-pass/self-re-assign.rs b/src/test/ui/run-pass/self/self-re-assign.rs
index 05295aa3309..05295aa3309 100644
--- a/src/test/run-pass/self-re-assign.rs
+++ b/src/test/ui/run-pass/self/self-re-assign.rs
diff --git a/src/test/run-pass/self-shadowing-import.rs b/src/test/ui/run-pass/self/self-shadowing-import.rs
index 5ef6e08f857..5ef6e08f857 100644
--- a/src/test/run-pass/self-shadowing-import.rs
+++ b/src/test/ui/run-pass/self/self-shadowing-import.rs
diff --git a/src/test/run-pass/self-type-param.rs b/src/test/ui/run-pass/self/self-type-param.rs
index ac810606a93..ac810606a93 100644
--- a/src/test/run-pass/self-type-param.rs
+++ b/src/test/ui/run-pass/self/self-type-param.rs
diff --git a/src/test/run-pass/string-self-append.rs b/src/test/ui/run-pass/self/string-self-append.rs
index cef7a93aeed..cef7a93aeed 100644
--- a/src/test/run-pass/string-self-append.rs
+++ b/src/test/ui/run-pass/self/string-self-append.rs
diff --git a/src/test/run-pass/ufcs-explicit-self.rs b/src/test/ui/run-pass/self/ufcs-explicit-self.rs
index b3cbd2c4eb3..b3cbd2c4eb3 100644
--- a/src/test/run-pass/ufcs-explicit-self.rs
+++ b/src/test/ui/run-pass/self/ufcs-explicit-self.rs
diff --git a/src/test/run-pass/uniq-self-in-mut-slot.rs b/src/test/ui/run-pass/self/uniq-self-in-mut-slot.rs
index a4f953ceaf5..a4f953ceaf5 100644
--- a/src/test/run-pass/uniq-self-in-mut-slot.rs
+++ b/src/test/ui/run-pass/self/uniq-self-in-mut-slot.rs
diff --git a/src/test/run-pass/where-for-self.rs b/src/test/ui/run-pass/self/where-for-self.rs
index ee19e76c146..ee19e76c146 100644
--- a/src/test/run-pass/where-for-self.rs
+++ b/src/test/ui/run-pass/self/where-for-self.rs
diff --git a/src/test/run-pass/sepcomp-cci.rs b/src/test/ui/run-pass/sepcomp/sepcomp-cci.rs
index d3d3de0e2c0..d3d3de0e2c0 100644
--- a/src/test/run-pass/sepcomp-cci.rs
+++ b/src/test/ui/run-pass/sepcomp/sepcomp-cci.rs
diff --git a/src/test/run-pass/sepcomp-extern.rs b/src/test/ui/run-pass/sepcomp/sepcomp-extern.rs
index f21b787dab7..f21b787dab7 100644
--- a/src/test/run-pass/sepcomp-extern.rs
+++ b/src/test/ui/run-pass/sepcomp/sepcomp-extern.rs
diff --git a/src/test/run-pass/sepcomp-fns-backwards.rs b/src/test/ui/run-pass/sepcomp/sepcomp-fns-backwards.rs
index 4fea07028b6..4fea07028b6 100644
--- a/src/test/run-pass/sepcomp-fns-backwards.rs
+++ b/src/test/ui/run-pass/sepcomp/sepcomp-fns-backwards.rs
diff --git a/src/test/run-pass/sepcomp-fns.rs b/src/test/ui/run-pass/sepcomp/sepcomp-fns.rs
index a2356cf02a1..a2356cf02a1 100644
--- a/src/test/run-pass/sepcomp-fns.rs
+++ b/src/test/ui/run-pass/sepcomp/sepcomp-fns.rs
diff --git a/src/test/run-pass/sepcomp-lib-lto.rs b/src/test/ui/run-pass/sepcomp/sepcomp-lib-lto.rs
index 8d73f4db7d2..8d73f4db7d2 100644
--- a/src/test/run-pass/sepcomp-lib-lto.rs
+++ b/src/test/ui/run-pass/sepcomp/sepcomp-lib-lto.rs
diff --git a/src/test/run-pass/sepcomp-lib.rs b/src/test/ui/run-pass/sepcomp/sepcomp-lib.rs
index abe842a332d..abe842a332d 100644
--- a/src/test/run-pass/sepcomp-lib.rs
+++ b/src/test/ui/run-pass/sepcomp/sepcomp-lib.rs
diff --git a/src/test/run-pass/sepcomp-statics.rs b/src/test/ui/run-pass/sepcomp/sepcomp-statics.rs
index 8cda469a88b..8cda469a88b 100644
--- a/src/test/run-pass/sepcomp-statics.rs
+++ b/src/test/ui/run-pass/sepcomp/sepcomp-statics.rs
diff --git a/src/test/run-pass/sepcomp-unwind.rs b/src/test/ui/run-pass/sepcomp/sepcomp-unwind.rs
index 3a93845a062..3a93845a062 100644
--- a/src/test/run-pass/sepcomp-unwind.rs
+++ b/src/test/ui/run-pass/sepcomp/sepcomp-unwind.rs
diff --git a/src/test/run-pass/simd-generics.rs b/src/test/ui/run-pass/simd/simd-generics.rs
index ef40a6ce96b..ef40a6ce96b 100644
--- a/src/test/run-pass/simd-generics.rs
+++ b/src/test/ui/run-pass/simd/simd-generics.rs
diff --git a/src/test/run-pass/simd-intrinsic-float-math.rs b/src/test/ui/run-pass/simd/simd-intrinsic-float-math.rs
index 3c7ca21459f..3c7ca21459f 100644
--- a/src/test/run-pass/simd-intrinsic-float-math.rs
+++ b/src/test/ui/run-pass/simd/simd-intrinsic-float-math.rs
diff --git a/src/test/run-pass/simd-intrinsic-float-minmax.rs b/src/test/ui/run-pass/simd/simd-intrinsic-float-minmax.rs
index d35123e2235..d35123e2235 100644
--- a/src/test/run-pass/simd-intrinsic-float-minmax.rs
+++ b/src/test/ui/run-pass/simd/simd-intrinsic-float-minmax.rs
diff --git a/src/test/run-pass/simd-intrinsic-generic-arithmetic.rs b/src/test/ui/run-pass/simd/simd-intrinsic-generic-arithmetic.rs
index ac6d0c697ec..ac6d0c697ec 100644
--- a/src/test/run-pass/simd-intrinsic-generic-arithmetic.rs
+++ b/src/test/ui/run-pass/simd/simd-intrinsic-generic-arithmetic.rs
diff --git a/src/test/run-pass/simd-intrinsic-generic-cast.rs b/src/test/ui/run-pass/simd/simd-intrinsic-generic-cast.rs
index ed2786edf3a..ed2786edf3a 100644
--- a/src/test/run-pass/simd-intrinsic-generic-cast.rs
+++ b/src/test/ui/run-pass/simd/simd-intrinsic-generic-cast.rs
diff --git a/src/test/run-pass/simd-intrinsic-generic-comparison.rs b/src/test/ui/run-pass/simd/simd-intrinsic-generic-comparison.rs
index d27378ba893..d27378ba893 100644
--- a/src/test/run-pass/simd-intrinsic-generic-comparison.rs
+++ b/src/test/ui/run-pass/simd/simd-intrinsic-generic-comparison.rs
diff --git a/src/test/run-pass/simd-intrinsic-generic-elements.rs b/src/test/ui/run-pass/simd/simd-intrinsic-generic-elements.rs
index 72fcef27a66..72fcef27a66 100644
--- a/src/test/run-pass/simd-intrinsic-generic-elements.rs
+++ b/src/test/ui/run-pass/simd/simd-intrinsic-generic-elements.rs
diff --git a/src/test/run-pass/simd-intrinsic-generic-gather.rs b/src/test/ui/run-pass/simd/simd-intrinsic-generic-gather.rs
index 54143739a88..54143739a88 100644
--- a/src/test/run-pass/simd-intrinsic-generic-gather.rs
+++ b/src/test/ui/run-pass/simd/simd-intrinsic-generic-gather.rs
diff --git a/src/test/run-pass/simd-intrinsic-generic-reduction.rs b/src/test/ui/run-pass/simd/simd-intrinsic-generic-reduction.rs
index 8e999b7115e..8e999b7115e 100644
--- a/src/test/run-pass/simd-intrinsic-generic-reduction.rs
+++ b/src/test/ui/run-pass/simd/simd-intrinsic-generic-reduction.rs
diff --git a/src/test/run-pass/simd-intrinsic-generic-select.rs b/src/test/ui/run-pass/simd/simd-intrinsic-generic-select.rs
index 8e94d797e89..8e94d797e89 100644
--- a/src/test/run-pass/simd-intrinsic-generic-select.rs
+++ b/src/test/ui/run-pass/simd/simd-intrinsic-generic-select.rs
diff --git a/src/test/run-pass/simd-size-align.rs b/src/test/ui/run-pass/simd/simd-size-align.rs
index b8d7cd84141..b8d7cd84141 100644
--- a/src/test/run-pass/simd-size-align.rs
+++ b/src/test/ui/run-pass/simd/simd-size-align.rs
diff --git a/src/test/run-pass/simd-target-feature-mixup.rs b/src/test/ui/run-pass/simd/simd-target-feature-mixup.rs
index a7fd9f299c0..a7fd9f299c0 100644
--- a/src/test/run-pass/simd-target-feature-mixup.rs
+++ b/src/test/ui/run-pass/simd/simd-target-feature-mixup.rs
diff --git a/src/test/run-pass/simd-type.rs b/src/test/ui/run-pass/simd/simd-type.rs
index 2883b80a25b..2883b80a25b 100644
--- a/src/test/run-pass/simd-type.rs
+++ b/src/test/ui/run-pass/simd/simd-type.rs
diff --git a/src/test/run-pass/simd-upgraded.rs b/src/test/ui/run-pass/simd/simd-upgraded.rs
index 821a505c138..821a505c138 100644
--- a/src/test/run-pass/simd-upgraded.rs
+++ b/src/test/ui/run-pass/simd/simd-upgraded.rs
diff --git a/src/test/run-pass/static-fn-inline-xc.rs b/src/test/ui/run-pass/statics/static-fn-inline-xc.rs
index 80de65c0e9f..80de65c0e9f 100644
--- a/src/test/run-pass/static-fn-inline-xc.rs
+++ b/src/test/ui/run-pass/statics/static-fn-inline-xc.rs
diff --git a/src/test/run-pass/static-fn-trait-xc.rs b/src/test/ui/run-pass/statics/static-fn-trait-xc.rs
index 550e03c8b12..550e03c8b12 100644
--- a/src/test/run-pass/static-fn-trait-xc.rs
+++ b/src/test/ui/run-pass/statics/static-fn-trait-xc.rs
diff --git a/src/test/run-pass/static-function-pointer-xc.rs b/src/test/ui/run-pass/statics/static-function-pointer-xc.rs
index a09928bd220..a09928bd220 100644
--- a/src/test/run-pass/static-function-pointer-xc.rs
+++ b/src/test/ui/run-pass/statics/static-function-pointer-xc.rs
diff --git a/src/test/run-pass/static-function-pointer.rs b/src/test/ui/run-pass/statics/static-function-pointer.rs
index be297524309..be297524309 100644
--- a/src/test/run-pass/static-function-pointer.rs
+++ b/src/test/ui/run-pass/statics/static-function-pointer.rs
diff --git a/src/test/run-pass/static-impl.rs b/src/test/ui/run-pass/statics/static-impl.rs
index 89fd83ced4c..89fd83ced4c 100644
--- a/src/test/run-pass/static-impl.rs
+++ b/src/test/ui/run-pass/statics/static-impl.rs
diff --git a/src/test/run-pass/static-method-in-trait-with-tps-intracrate.rs b/src/test/ui/run-pass/statics/static-method-in-trait-with-tps-intracrate.rs
index c2b3a9a7228..c2b3a9a7228 100644
--- a/src/test/run-pass/static-method-in-trait-with-tps-intracrate.rs
+++ b/src/test/ui/run-pass/statics/static-method-in-trait-with-tps-intracrate.rs
diff --git a/src/test/run-pass/static-method-xcrate.rs b/src/test/ui/run-pass/statics/static-method-xcrate.rs
index ab6adcbbffe..ab6adcbbffe 100644
--- a/src/test/run-pass/static-method-xcrate.rs
+++ b/src/test/ui/run-pass/statics/static-method-xcrate.rs
diff --git a/src/test/run-pass/static-methods-in-traits.rs b/src/test/ui/run-pass/statics/static-methods-in-traits.rs
index 3fd3bbe936f..3fd3bbe936f 100644
--- a/src/test/run-pass/static-methods-in-traits.rs
+++ b/src/test/ui/run-pass/statics/static-methods-in-traits.rs
diff --git a/src/test/run-pass/static-methods-in-traits2.rs b/src/test/ui/run-pass/statics/static-methods-in-traits2.rs
index cd8406983fb..cd8406983fb 100644
--- a/src/test/run-pass/static-methods-in-traits2.rs
+++ b/src/test/ui/run-pass/statics/static-methods-in-traits2.rs
diff --git a/src/test/run-pass/static-mut-foreign.rs b/src/test/ui/run-pass/statics/static-mut-foreign.rs
index 2b7fa0166a8..2b7fa0166a8 100644
--- a/src/test/run-pass/static-mut-foreign.rs
+++ b/src/test/ui/run-pass/statics/static-mut-foreign.rs
diff --git a/src/test/run-pass/static-mut-xc.rs b/src/test/ui/run-pass/statics/static-mut-xc.rs
index 5911b6cfa85..5911b6cfa85 100644
--- a/src/test/run-pass/static-mut-xc.rs
+++ b/src/test/ui/run-pass/statics/static-mut-xc.rs
diff --git a/src/test/run-pass/static-recursive.rs b/src/test/ui/run-pass/statics/static-recursive.rs
index 4a6ba984eef..4a6ba984eef 100644
--- a/src/test/run-pass/static-recursive.rs
+++ b/src/test/ui/run-pass/statics/static-recursive.rs
diff --git a/src/test/run-pass/align-struct.rs b/src/test/ui/run-pass/structs-enums/align-struct.rs
index 2b6a151574a..2b6a151574a 100644
--- a/src/test/run-pass/align-struct.rs
+++ b/src/test/ui/run-pass/structs-enums/align-struct.rs
diff --git a/src/test/run-pass/borrow-tuple-fields.rs b/src/test/ui/run-pass/structs-enums/borrow-tuple-fields.rs
index f0d09688192..f0d09688192 100644
--- a/src/test/run-pass/borrow-tuple-fields.rs
+++ b/src/test/ui/run-pass/structs-enums/borrow-tuple-fields.rs
diff --git a/src/test/run-pass/class-attributes-1.rs b/src/test/ui/run-pass/structs-enums/class-attributes-1.rs
index 5dc27472184..5dc27472184 100644
--- a/src/test/run-pass/class-attributes-1.rs
+++ b/src/test/ui/run-pass/structs-enums/class-attributes-1.rs
diff --git a/src/test/run-pass/class-attributes-2.rs b/src/test/ui/run-pass/structs-enums/class-attributes-2.rs
index cc1b15bcb81..cc1b15bcb81 100644
--- a/src/test/run-pass/class-attributes-2.rs
+++ b/src/test/ui/run-pass/structs-enums/class-attributes-2.rs
diff --git a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs b/src/test/ui/run-pass/structs-enums/class-cast-to-trait-cross-crate-2.rs
index 04c4b2cb377..04c4b2cb377 100644
--- a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs
+++ b/src/test/ui/run-pass/structs-enums/class-cast-to-trait-cross-crate-2.rs
diff --git a/src/test/run-pass/class-cast-to-trait-multiple-types.rs b/src/test/ui/run-pass/structs-enums/class-cast-to-trait-multiple-types.rs
index e5acad3a3ad..e5acad3a3ad 100644
--- a/src/test/run-pass/class-cast-to-trait-multiple-types.rs
+++ b/src/test/ui/run-pass/structs-enums/class-cast-to-trait-multiple-types.rs
diff --git a/src/test/run-pass/class-cast-to-trait.rs b/src/test/ui/run-pass/structs-enums/class-cast-to-trait.rs
index adb0b6cd0a7..adb0b6cd0a7 100644
--- a/src/test/run-pass/class-cast-to-trait.rs
+++ b/src/test/ui/run-pass/structs-enums/class-cast-to-trait.rs
diff --git a/src/test/run-pass/class-dtor.rs b/src/test/ui/run-pass/structs-enums/class-dtor.rs
index 05ec2bc0ac7..05ec2bc0ac7 100644
--- a/src/test/run-pass/class-dtor.rs
+++ b/src/test/ui/run-pass/structs-enums/class-dtor.rs
diff --git a/src/test/run-pass/class-exports.rs b/src/test/ui/run-pass/structs-enums/class-exports.rs
index 6783609b256..6783609b256 100644
--- a/src/test/run-pass/class-exports.rs
+++ b/src/test/ui/run-pass/structs-enums/class-exports.rs
diff --git a/src/test/run-pass/class-impl-very-parameterized-trait.rs b/src/test/ui/run-pass/structs-enums/class-impl-very-parameterized-trait.rs
index 27a57a88859..27a57a88859 100644
--- a/src/test/run-pass/class-impl-very-parameterized-trait.rs
+++ b/src/test/ui/run-pass/structs-enums/class-impl-very-parameterized-trait.rs
diff --git a/src/test/run-pass/class-implement-trait-cross-crate.rs b/src/test/ui/run-pass/structs-enums/class-implement-trait-cross-crate.rs
index 5a1dc930efa..5a1dc930efa 100644
--- a/src/test/run-pass/class-implement-trait-cross-crate.rs
+++ b/src/test/ui/run-pass/structs-enums/class-implement-trait-cross-crate.rs
diff --git a/src/test/run-pass/class-implement-traits.rs b/src/test/ui/run-pass/structs-enums/class-implement-traits.rs
index 394af6b9ecd..394af6b9ecd 100644
--- a/src/test/run-pass/class-implement-traits.rs
+++ b/src/test/ui/run-pass/structs-enums/class-implement-traits.rs
diff --git a/src/test/run-pass/class-method-cross-crate.rs b/src/test/ui/run-pass/structs-enums/class-method-cross-crate.rs
index 6ab158dc37c..6ab158dc37c 100644
--- a/src/test/run-pass/class-method-cross-crate.rs
+++ b/src/test/ui/run-pass/structs-enums/class-method-cross-crate.rs
diff --git a/src/test/run-pass/class-methods-cross-crate.rs b/src/test/ui/run-pass/structs-enums/class-methods-cross-crate.rs
index 66657100759..66657100759 100644
--- a/src/test/run-pass/class-methods-cross-crate.rs
+++ b/src/test/ui/run-pass/structs-enums/class-methods-cross-crate.rs
diff --git a/src/test/run-pass/class-methods.rs b/src/test/ui/run-pass/structs-enums/class-methods.rs
index 93af906bd5a..93af906bd5a 100644
--- a/src/test/run-pass/class-methods.rs
+++ b/src/test/ui/run-pass/structs-enums/class-methods.rs
diff --git a/src/test/run-pass/class-poly-methods-cross-crate.rs b/src/test/ui/run-pass/structs-enums/class-poly-methods-cross-crate.rs
index 7d266181c9e..7d266181c9e 100644
--- a/src/test/run-pass/class-poly-methods-cross-crate.rs
+++ b/src/test/ui/run-pass/structs-enums/class-poly-methods-cross-crate.rs
diff --git a/src/test/run-pass/class-poly-methods.rs b/src/test/ui/run-pass/structs-enums/class-poly-methods.rs
index 5da858e3c40..5da858e3c40 100644
--- a/src/test/run-pass/class-poly-methods.rs
+++ b/src/test/ui/run-pass/structs-enums/class-poly-methods.rs
diff --git a/src/test/run-pass/class-separate-impl.rs b/src/test/ui/run-pass/structs-enums/class-separate-impl.rs
index 343d414758c..343d414758c 100644
--- a/src/test/run-pass/class-separate-impl.rs
+++ b/src/test/ui/run-pass/structs-enums/class-separate-impl.rs
diff --git a/src/test/run-pass/class-str-field.rs b/src/test/ui/run-pass/structs-enums/class-str-field.rs
index e3b9b56db0b..e3b9b56db0b 100644
--- a/src/test/run-pass/class-str-field.rs
+++ b/src/test/ui/run-pass/structs-enums/class-str-field.rs
diff --git a/src/test/run-pass/class-typarams.rs b/src/test/ui/run-pass/structs-enums/class-typarams.rs
index cc9a118ba19..cc9a118ba19 100644
--- a/src/test/run-pass/class-typarams.rs
+++ b/src/test/ui/run-pass/structs-enums/class-typarams.rs
diff --git a/src/test/run-pass/classes-cross-crate.rs b/src/test/ui/run-pass/structs-enums/classes-cross-crate.rs
index 3d99aa1ef1d..3d99aa1ef1d 100644
--- a/src/test/run-pass/classes-cross-crate.rs
+++ b/src/test/ui/run-pass/structs-enums/classes-cross-crate.rs
diff --git a/src/test/run-pass/classes-self-referential.rs b/src/test/ui/run-pass/structs-enums/classes-self-referential.rs
index 487d20729d4..487d20729d4 100644
--- a/src/test/run-pass/classes-self-referential.rs
+++ b/src/test/ui/run-pass/structs-enums/classes-self-referential.rs
diff --git a/src/test/run-pass/classes-simple-cross-crate.rs b/src/test/ui/run-pass/structs-enums/classes-simple-cross-crate.rs
index db15001c62f..db15001c62f 100644
--- a/src/test/run-pass/classes-simple-cross-crate.rs
+++ b/src/test/ui/run-pass/structs-enums/classes-simple-cross-crate.rs
diff --git a/src/test/run-pass/classes-simple-method.rs b/src/test/ui/run-pass/structs-enums/classes-simple-method.rs
index 64ec2ea7e71..64ec2ea7e71 100644
--- a/src/test/run-pass/classes-simple-method.rs
+++ b/src/test/ui/run-pass/structs-enums/classes-simple-method.rs
diff --git a/src/test/run-pass/classes-simple.rs b/src/test/ui/run-pass/structs-enums/classes-simple.rs
index c475fb2cff9..c475fb2cff9 100644
--- a/src/test/run-pass/classes-simple.rs
+++ b/src/test/ui/run-pass/structs-enums/classes-simple.rs
diff --git a/src/test/run-pass/classes.rs b/src/test/ui/run-pass/structs-enums/classes.rs
index fa0dda11233..fa0dda11233 100644
--- a/src/test/run-pass/classes.rs
+++ b/src/test/ui/run-pass/structs-enums/classes.rs
diff --git a/src/test/run-pass/codegen-tag-static-padding.rs b/src/test/ui/run-pass/structs-enums/codegen-tag-static-padding.rs
index ba01d51dc6a..ba01d51dc6a 100644
--- a/src/test/run-pass/codegen-tag-static-padding.rs
+++ b/src/test/ui/run-pass/structs-enums/codegen-tag-static-padding.rs
diff --git a/src/test/run-pass/compare-generic-enums.rs b/src/test/ui/run-pass/structs-enums/compare-generic-enums.rs
index 228a73326e1..228a73326e1 100644
--- a/src/test/run-pass/compare-generic-enums.rs
+++ b/src/test/ui/run-pass/structs-enums/compare-generic-enums.rs
diff --git a/src/test/run-pass/discrim-explicit-23030.rs b/src/test/ui/run-pass/structs-enums/discrim-explicit-23030.rs
index aed7b1527ce..aed7b1527ce 100644
--- a/src/test/run-pass/discrim-explicit-23030.rs
+++ b/src/test/ui/run-pass/structs-enums/discrim-explicit-23030.rs
diff --git a/src/test/run-pass/empty-struct-braces.rs b/src/test/ui/run-pass/structs-enums/empty-struct-braces.rs
index 7c161ba8dd9..7c161ba8dd9 100644
--- a/src/test/run-pass/empty-struct-braces.rs
+++ b/src/test/ui/run-pass/structs-enums/empty-struct-braces.rs
diff --git a/src/test/run-pass/empty-tag.rs b/src/test/ui/run-pass/structs-enums/empty-tag.rs
index e60cd02ce99..e60cd02ce99 100644
--- a/src/test/run-pass/empty-tag.rs
+++ b/src/test/ui/run-pass/structs-enums/empty-tag.rs
diff --git a/src/test/run-pass/enum-alignment.rs b/src/test/ui/run-pass/structs-enums/enum-alignment.rs
index 827894f8f32..827894f8f32 100644
--- a/src/test/run-pass/enum-alignment.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-alignment.rs
diff --git a/src/test/run-pass/enum-clike-ffi-as-int.rs b/src/test/ui/run-pass/structs-enums/enum-clike-ffi-as-int.rs
index fdaad9e1fab..fdaad9e1fab 100644
--- a/src/test/run-pass/enum-clike-ffi-as-int.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-clike-ffi-as-int.rs
diff --git a/src/test/run-pass/enum-discr.rs b/src/test/ui/run-pass/structs-enums/enum-discr.rs
index fafd8b576ff..fafd8b576ff 100644
--- a/src/test/run-pass/enum-discr.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-discr.rs
diff --git a/src/test/run-pass/enum-discrim-autosizing.rs b/src/test/ui/run-pass/structs-enums/enum-discrim-autosizing.rs
index c85ab535fc1..c85ab535fc1 100644
--- a/src/test/run-pass/enum-discrim-autosizing.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-discrim-autosizing.rs
diff --git a/src/test/run-pass/enum-discrim-manual-sizing.rs b/src/test/ui/run-pass/structs-enums/enum-discrim-manual-sizing.rs
index 8557c065dc6..8557c065dc6 100644
--- a/src/test/run-pass/enum-discrim-manual-sizing.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-discrim-manual-sizing.rs
diff --git a/src/test/run-pass/enum-discrim-range-overflow.rs b/src/test/ui/run-pass/structs-enums/enum-discrim-range-overflow.rs
index f1306b3f08c..f1306b3f08c 100644
--- a/src/test/run-pass/enum-discrim-range-overflow.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-discrim-range-overflow.rs
diff --git a/src/test/run-pass/enum-discrim-width-stuff.rs b/src/test/ui/run-pass/structs-enums/enum-discrim-width-stuff.rs
index 46238c45720..46238c45720 100644
--- a/src/test/run-pass/enum-discrim-width-stuff.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-discrim-width-stuff.rs
diff --git a/src/test/run-pass/enum-disr-val-pretty.rs b/src/test/ui/run-pass/structs-enums/enum-disr-val-pretty.rs
index 425d8f6d651..425d8f6d651 100644
--- a/src/test/run-pass/enum-disr-val-pretty.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-disr-val-pretty.rs
diff --git a/src/test/run-pass/enum-export-inheritance.rs b/src/test/ui/run-pass/structs-enums/enum-export-inheritance.rs
index 4cf8fff2376..4cf8fff2376 100644
--- a/src/test/run-pass/enum-export-inheritance.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-export-inheritance.rs
diff --git a/src/test/run-pass/enum-layout-optimization.rs b/src/test/ui/run-pass/structs-enums/enum-layout-optimization.rs
index a562761cab9..a562761cab9 100644
--- a/src/test/run-pass/enum-layout-optimization.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-layout-optimization.rs
diff --git a/src/test/run-pass/enum-non-c-like-repr-c-and-int.rs b/src/test/ui/run-pass/structs-enums/enum-non-c-like-repr-c-and-int.rs
index 86453fdf6fa..86453fdf6fa 100644
--- a/src/test/run-pass/enum-non-c-like-repr-c-and-int.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-non-c-like-repr-c-and-int.rs
diff --git a/src/test/run-pass/enum-non-c-like-repr-c.rs b/src/test/ui/run-pass/structs-enums/enum-non-c-like-repr-c.rs
index b4e0fe8d457..b4e0fe8d457 100644
--- a/src/test/run-pass/enum-non-c-like-repr-c.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-non-c-like-repr-c.rs
diff --git a/src/test/run-pass/enum-non-c-like-repr-int.rs b/src/test/ui/run-pass/structs-enums/enum-non-c-like-repr-int.rs
index 6e147b00ef9..6e147b00ef9 100644
--- a/src/test/run-pass/enum-non-c-like-repr-int.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-non-c-like-repr-int.rs
diff --git a/src/test/run-pass/enum-null-pointer-opt.rs b/src/test/ui/run-pass/structs-enums/enum-null-pointer-opt.rs
index 34ed589d418..34ed589d418 100644
--- a/src/test/run-pass/enum-null-pointer-opt.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-null-pointer-opt.rs
diff --git a/src/test/run-pass/enum-nullable-const-null-with-fields.rs b/src/test/ui/run-pass/structs-enums/enum-nullable-const-null-with-fields.rs
index 1342c4e104d..1342c4e104d 100644
--- a/src/test/run-pass/enum-nullable-const-null-with-fields.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-nullable-const-null-with-fields.rs
diff --git a/src/test/run-pass/enum-nullable-simplifycfg-misopt.rs b/src/test/ui/run-pass/structs-enums/enum-nullable-simplifycfg-misopt.rs
index b5db8d91320..b5db8d91320 100644
--- a/src/test/run-pass/enum-nullable-simplifycfg-misopt.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-nullable-simplifycfg-misopt.rs
diff --git a/src/test/run-pass/enum-univariant-repr.rs b/src/test/ui/run-pass/structs-enums/enum-univariant-repr.rs
index 17d614b5496..17d614b5496 100644
--- a/src/test/run-pass/enum-univariant-repr.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-univariant-repr.rs
diff --git a/src/test/run-pass/enum-variants.rs b/src/test/ui/run-pass/structs-enums/enum-variants.rs
index 5eb7a243acf..5eb7a243acf 100644
--- a/src/test/run-pass/enum-variants.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-variants.rs
diff --git a/src/test/run-pass/enum-vec-initializer.rs b/src/test/ui/run-pass/structs-enums/enum-vec-initializer.rs
index 037ee5f7777..037ee5f7777 100644
--- a/src/test/run-pass/enum-vec-initializer.rs
+++ b/src/test/ui/run-pass/structs-enums/enum-vec-initializer.rs
diff --git a/src/test/run-pass/export-abstract-tag.rs b/src/test/ui/run-pass/structs-enums/export-abstract-tag.rs
index 7333d739f4b..7333d739f4b 100644
--- a/src/test/run-pass/export-abstract-tag.rs
+++ b/src/test/ui/run-pass/structs-enums/export-abstract-tag.rs
diff --git a/src/test/run-pass/export-tag-variant.rs b/src/test/ui/run-pass/structs-enums/export-tag-variant.rs
index 6257332a665..6257332a665 100644
--- a/src/test/run-pass/export-tag-variant.rs
+++ b/src/test/ui/run-pass/structs-enums/export-tag-variant.rs
diff --git a/src/test/run-pass/expr-if-struct.rs b/src/test/ui/run-pass/structs-enums/expr-if-struct.rs
index e79daed4c33..e79daed4c33 100644
--- a/src/test/run-pass/expr-if-struct.rs
+++ b/src/test/ui/run-pass/structs-enums/expr-if-struct.rs
diff --git a/src/test/run-pass/expr-match-struct.rs b/src/test/ui/run-pass/structs-enums/expr-match-struct.rs
index 2dcb0f833e4..2dcb0f833e4 100644
--- a/src/test/run-pass/expr-match-struct.rs
+++ b/src/test/ui/run-pass/structs-enums/expr-match-struct.rs
diff --git a/src/test/run-pass/field-destruction-order.rs b/src/test/ui/run-pass/structs-enums/field-destruction-order.rs
index 624167db36d..624167db36d 100644
--- a/src/test/run-pass/field-destruction-order.rs
+++ b/src/test/ui/run-pass/structs-enums/field-destruction-order.rs
diff --git a/src/test/run-pass/foreign-struct.rs b/src/test/ui/run-pass/structs-enums/foreign-struct.rs
index 8b48731ee0b..8b48731ee0b 100644
--- a/src/test/run-pass/foreign-struct.rs
+++ b/src/test/ui/run-pass/structs-enums/foreign-struct.rs
diff --git a/src/test/run-pass/functional-struct-upd.rs b/src/test/ui/run-pass/structs-enums/functional-struct-upd.rs
index 240d49d718f..240d49d718f 100644
--- a/src/test/run-pass/functional-struct-upd.rs
+++ b/src/test/ui/run-pass/structs-enums/functional-struct-upd.rs
diff --git a/src/test/run-pass/ivec-tag.rs b/src/test/ui/run-pass/structs-enums/ivec-tag.rs
index 0da1d18afd8..0da1d18afd8 100644
--- a/src/test/run-pass/ivec-tag.rs
+++ b/src/test/ui/run-pass/structs-enums/ivec-tag.rs
diff --git a/src/test/run-pass/module-qualified-struct-destructure.rs b/src/test/ui/run-pass/structs-enums/module-qualified-struct-destructure.rs
index d6844f0f4ab..d6844f0f4ab 100644
--- a/src/test/run-pass/module-qualified-struct-destructure.rs
+++ b/src/test/ui/run-pass/structs-enums/module-qualified-struct-destructure.rs
diff --git a/src/test/run-pass/namespaced-enum-emulate-flat-xc.rs b/src/test/ui/run-pass/structs-enums/namespaced-enum-emulate-flat-xc.rs
index f275e9b7425..f275e9b7425 100644
--- a/src/test/run-pass/namespaced-enum-emulate-flat-xc.rs
+++ b/src/test/ui/run-pass/structs-enums/namespaced-enum-emulate-flat-xc.rs
diff --git a/src/test/run-pass/namespaced-enum-emulate-flat.rs b/src/test/ui/run-pass/structs-enums/namespaced-enum-emulate-flat.rs
index 0f85c20d315..0f85c20d315 100644
--- a/src/test/run-pass/namespaced-enum-emulate-flat.rs
+++ b/src/test/ui/run-pass/structs-enums/namespaced-enum-emulate-flat.rs
diff --git a/src/test/run-pass/namespaced-enum-glob-import-xcrate.rs b/src/test/ui/run-pass/structs-enums/namespaced-enum-glob-import-xcrate.rs
index 7bfe90bad7f..7bfe90bad7f 100644
--- a/src/test/run-pass/namespaced-enum-glob-import-xcrate.rs
+++ b/src/test/ui/run-pass/structs-enums/namespaced-enum-glob-import-xcrate.rs
diff --git a/src/test/run-pass/namespaced-enum-glob-import.rs b/src/test/ui/run-pass/structs-enums/namespaced-enum-glob-import.rs
index f506ea11f84..f506ea11f84 100644
--- a/src/test/run-pass/namespaced-enum-glob-import.rs
+++ b/src/test/ui/run-pass/structs-enums/namespaced-enum-glob-import.rs
diff --git a/src/test/run-pass/namespaced-enums-xcrate.rs b/src/test/ui/run-pass/structs-enums/namespaced-enums-xcrate.rs
index 0046d80e086..0046d80e086 100644
--- a/src/test/run-pass/namespaced-enums-xcrate.rs
+++ b/src/test/ui/run-pass/structs-enums/namespaced-enums-xcrate.rs
diff --git a/src/test/run-pass/namespaced-enums.rs b/src/test/ui/run-pass/structs-enums/namespaced-enums.rs
index 3e72f73bc48..3e72f73bc48 100644
--- a/src/test/run-pass/namespaced-enums.rs
+++ b/src/test/ui/run-pass/structs-enums/namespaced-enums.rs
diff --git a/src/test/run-pass/nested-enum-same-names.rs b/src/test/ui/run-pass/structs-enums/nested-enum-same-names.rs
index c0baab66c59..c0baab66c59 100644
--- a/src/test/run-pass/nested-enum-same-names.rs
+++ b/src/test/ui/run-pass/structs-enums/nested-enum-same-names.rs
diff --git a/src/test/run-pass/newtype-struct-drop-run.rs b/src/test/ui/run-pass/structs-enums/newtype-struct-drop-run.rs
index 6a5d86b522e..6a5d86b522e 100644
--- a/src/test/run-pass/newtype-struct-drop-run.rs
+++ b/src/test/ui/run-pass/structs-enums/newtype-struct-drop-run.rs
diff --git a/src/test/run-pass/newtype-struct-with-dtor.rs b/src/test/ui/run-pass/structs-enums/newtype-struct-with-dtor.rs
index 07c76e27284..07c76e27284 100644
--- a/src/test/run-pass/newtype-struct-with-dtor.rs
+++ b/src/test/ui/run-pass/structs-enums/newtype-struct-with-dtor.rs
diff --git a/src/test/run-pass/newtype-struct-xc-2.rs b/src/test/ui/run-pass/structs-enums/newtype-struct-xc-2.rs
index ac03f65750d..ac03f65750d 100644
--- a/src/test/run-pass/newtype-struct-xc-2.rs
+++ b/src/test/ui/run-pass/structs-enums/newtype-struct-xc-2.rs
diff --git a/src/test/run-pass/newtype-struct-xc.rs b/src/test/ui/run-pass/structs-enums/newtype-struct-xc.rs
index 0cac4530faf..0cac4530faf 100644
--- a/src/test/run-pass/newtype-struct-xc.rs
+++ b/src/test/ui/run-pass/structs-enums/newtype-struct-xc.rs
diff --git a/src/test/run-pass/nonzero-enum.rs b/src/test/ui/run-pass/structs-enums/nonzero-enum.rs
index fc92c9df9f7..fc92c9df9f7 100644
--- a/src/test/run-pass/nonzero-enum.rs
+++ b/src/test/ui/run-pass/structs-enums/nonzero-enum.rs
diff --git a/src/test/run-pass/numeric-fields.rs b/src/test/ui/run-pass/structs-enums/numeric-fields.rs
index 15f054de79d..15f054de79d 100644
--- a/src/test/run-pass/numeric-fields.rs
+++ b/src/test/ui/run-pass/structs-enums/numeric-fields.rs
diff --git a/src/test/run-pass/object-lifetime-default-from-ref-struct.rs b/src/test/ui/run-pass/structs-enums/object-lifetime-default-from-ref-struct.rs
index 6aaf8920971..6aaf8920971 100644
--- a/src/test/run-pass/object-lifetime-default-from-ref-struct.rs
+++ b/src/test/ui/run-pass/structs-enums/object-lifetime-default-from-ref-struct.rs
diff --git a/src/test/run-pass/object-lifetime-default-from-rptr-struct.rs b/src/test/ui/run-pass/structs-enums/object-lifetime-default-from-rptr-struct.rs
index fcff5fd6f17..fcff5fd6f17 100644
--- a/src/test/run-pass/object-lifetime-default-from-rptr-struct.rs
+++ b/src/test/ui/run-pass/structs-enums/object-lifetime-default-from-rptr-struct.rs
diff --git a/src/test/run-pass/rec-align-u32.rs b/src/test/ui/run-pass/structs-enums/rec-align-u32.rs
index 4a115c737da..4a115c737da 100644
--- a/src/test/run-pass/rec-align-u32.rs
+++ b/src/test/ui/run-pass/structs-enums/rec-align-u32.rs
diff --git a/src/test/run-pass/rec-align-u64.rs b/src/test/ui/run-pass/structs-enums/rec-align-u64.rs
index 85c1b2adb79..85c1b2adb79 100644
--- a/src/test/run-pass/rec-align-u64.rs
+++ b/src/test/ui/run-pass/structs-enums/rec-align-u64.rs
diff --git a/src/test/run-pass/rec-auto.rs b/src/test/ui/run-pass/structs-enums/rec-auto.rs
index 18431bc5379..18431bc5379 100644
--- a/src/test/run-pass/rec-auto.rs
+++ b/src/test/ui/run-pass/structs-enums/rec-auto.rs
diff --git a/src/test/run-pass/rec-extend.rs b/src/test/ui/run-pass/structs-enums/rec-extend.rs
index ffef77a4b8d..ffef77a4b8d 100644
--- a/src/test/run-pass/rec-extend.rs
+++ b/src/test/ui/run-pass/structs-enums/rec-extend.rs
diff --git a/src/test/run-pass/rec-tup.rs b/src/test/ui/run-pass/structs-enums/rec-tup.rs
index 810888b0d8e..810888b0d8e 100644
--- a/src/test/run-pass/rec-tup.rs
+++ b/src/test/ui/run-pass/structs-enums/rec-tup.rs
diff --git a/src/test/run-pass/rec.rs b/src/test/ui/run-pass/structs-enums/rec.rs
index b47bda0931f..b47bda0931f 100644
--- a/src/test/run-pass/rec.rs
+++ b/src/test/ui/run-pass/structs-enums/rec.rs
diff --git a/src/test/run-pass/record-pat.rs b/src/test/ui/run-pass/structs-enums/record-pat.rs
index 99bec7ab7d1..99bec7ab7d1 100644
--- a/src/test/run-pass/record-pat.rs
+++ b/src/test/ui/run-pass/structs-enums/record-pat.rs
diff --git a/src/test/run-pass/resource-in-struct.rs b/src/test/ui/run-pass/structs-enums/resource-in-struct.rs
index 2914127246a..2914127246a 100644
--- a/src/test/run-pass/resource-in-struct.rs
+++ b/src/test/ui/run-pass/structs-enums/resource-in-struct.rs
diff --git a/src/test/run-pass/simple-generic-tag.rs b/src/test/ui/run-pass/structs-enums/simple-generic-tag.rs
index 2e8d8f61bc8..2e8d8f61bc8 100644
--- a/src/test/run-pass/simple-generic-tag.rs
+++ b/src/test/ui/run-pass/structs-enums/simple-generic-tag.rs
diff --git a/src/test/run-pass/simple-match-generic-tag.rs b/src/test/ui/run-pass/structs-enums/simple-match-generic-tag.rs
index 52989b36669..52989b36669 100644
--- a/src/test/run-pass/simple-match-generic-tag.rs
+++ b/src/test/ui/run-pass/structs-enums/simple-match-generic-tag.rs
diff --git a/src/test/run-pass/small-enum-range-edge.rs b/src/test/ui/run-pass/structs-enums/small-enum-range-edge.rs
index 7b6f0a7c9ab..7b6f0a7c9ab 100644
--- a/src/test/run-pass/small-enum-range-edge.rs
+++ b/src/test/ui/run-pass/structs-enums/small-enum-range-edge.rs
diff --git a/src/test/run-pass/small-enums-with-fields.rs b/src/test/ui/run-pass/structs-enums/small-enums-with-fields.rs
index 86eed715f32..86eed715f32 100644
--- a/src/test/run-pass/small-enums-with-fields.rs
+++ b/src/test/ui/run-pass/structs-enums/small-enums-with-fields.rs
diff --git a/src/test/run-pass/struct-aliases-xcrate.rs b/src/test/ui/run-pass/structs-enums/struct-aliases-xcrate.rs
index 2ca9d599d84..2ca9d599d84 100644
--- a/src/test/run-pass/struct-aliases-xcrate.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-aliases-xcrate.rs
diff --git a/src/test/run-pass/struct-aliases.rs b/src/test/ui/run-pass/structs-enums/struct-aliases.rs
index f1337a5b079..f1337a5b079 100644
--- a/src/test/run-pass/struct-aliases.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-aliases.rs
diff --git a/src/test/run-pass/struct-destructuring-cross-crate.rs b/src/test/ui/run-pass/structs-enums/struct-destructuring-cross-crate.rs
index 63e8d694ddb..63e8d694ddb 100644
--- a/src/test/run-pass/struct-destructuring-cross-crate.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-destructuring-cross-crate.rs
diff --git a/src/test/run-pass/struct-field-shorthand.rs b/src/test/ui/run-pass/structs-enums/struct-field-shorthand.rs
index b61e232200c..b61e232200c 100644
--- a/src/test/run-pass/struct-field-shorthand.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-field-shorthand.rs
diff --git a/src/test/run-pass/struct-like-variant-construct.rs b/src/test/ui/run-pass/structs-enums/struct-like-variant-construct.rs
index a55e5143a0b..a55e5143a0b 100644
--- a/src/test/run-pass/struct-like-variant-construct.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-like-variant-construct.rs
diff --git a/src/test/run-pass/struct-like-variant-match.rs b/src/test/ui/run-pass/structs-enums/struct-like-variant-match.rs
index 175090eadd9..175090eadd9 100644
--- a/src/test/run-pass/struct-like-variant-match.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-like-variant-match.rs
diff --git a/src/test/run-pass/struct-lit-functional-no-fields.rs b/src/test/ui/run-pass/structs-enums/struct-lit-functional-no-fields.rs
index c3b1ff0f057..c3b1ff0f057 100644
--- a/src/test/run-pass/struct-lit-functional-no-fields.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-lit-functional-no-fields.rs
diff --git a/src/test/run-pass/struct-literal-dtor.rs b/src/test/ui/run-pass/structs-enums/struct-literal-dtor.rs
index 61607cffc47..61607cffc47 100644
--- a/src/test/run-pass/struct-literal-dtor.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-literal-dtor.rs
diff --git a/src/test/run-pass/struct-new-as-field-name.rs b/src/test/ui/run-pass/structs-enums/struct-new-as-field-name.rs
index 7fb3a64e02b..7fb3a64e02b 100644
--- a/src/test/run-pass/struct-new-as-field-name.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-new-as-field-name.rs
diff --git a/src/test/run-pass/struct-order-of-eval-1.rs b/src/test/ui/run-pass/structs-enums/struct-order-of-eval-1.rs
index b5e4011bbea..b5e4011bbea 100644
--- a/src/test/run-pass/struct-order-of-eval-1.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-order-of-eval-1.rs
diff --git a/src/test/run-pass/struct-order-of-eval-2.rs b/src/test/ui/run-pass/structs-enums/struct-order-of-eval-2.rs
index 7ec28f597ed..7ec28f597ed 100644
--- a/src/test/run-pass/struct-order-of-eval-2.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-order-of-eval-2.rs
diff --git a/src/test/run-pass/struct-order-of-eval-3.rs b/src/test/ui/run-pass/structs-enums/struct-order-of-eval-3.rs
index 3059c8e9e89..3059c8e9e89 100644
--- a/src/test/run-pass/struct-order-of-eval-3.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-order-of-eval-3.rs
diff --git a/src/test/run-pass/struct-order-of-eval-4.rs b/src/test/ui/run-pass/structs-enums/struct-order-of-eval-4.rs
index 2ae9ebc34e1..2ae9ebc34e1 100644
--- a/src/test/run-pass/struct-order-of-eval-4.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-order-of-eval-4.rs
diff --git a/src/test/run-pass/struct-partial-move-1.rs b/src/test/ui/run-pass/structs-enums/struct-partial-move-1.rs
index 3b04bfc1acc..3b04bfc1acc 100644
--- a/src/test/run-pass/struct-partial-move-1.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-partial-move-1.rs
diff --git a/src/test/run-pass/struct-partial-move-2.rs b/src/test/ui/run-pass/structs-enums/struct-partial-move-2.rs
index b9c697c71ea..b9c697c71ea 100644
--- a/src/test/run-pass/struct-partial-move-2.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-partial-move-2.rs
diff --git a/src/test/run-pass/struct-path-associated-type.rs b/src/test/ui/run-pass/structs-enums/struct-path-associated-type.rs
index b033ed5c802..b033ed5c802 100644
--- a/src/test/run-pass/struct-path-associated-type.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-path-associated-type.rs
diff --git a/src/test/run-pass/struct-path-self.rs b/src/test/ui/run-pass/structs-enums/struct-path-self.rs
index c7a282c2a2f..c7a282c2a2f 100644
--- a/src/test/run-pass/struct-path-self.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-path-self.rs
diff --git a/src/test/run-pass/struct-pattern-matching.rs b/src/test/ui/run-pass/structs-enums/struct-pattern-matching.rs
index 9c3ce54f369..9c3ce54f369 100644
--- a/src/test/run-pass/struct-pattern-matching.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-pattern-matching.rs
diff --git a/src/test/run-pass/struct-return.rs b/src/test/ui/run-pass/structs-enums/struct-return.rs
index 61a2bcb3a9b..61a2bcb3a9b 100644
--- a/src/test/run-pass/struct-return.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-return.rs
diff --git a/src/test/run-pass/struct-variant-field-visibility.rs b/src/test/ui/run-pass/structs-enums/struct-variant-field-visibility.rs
index b6e7846e96d..b6e7846e96d 100644
--- a/src/test/run-pass/struct-variant-field-visibility.rs
+++ b/src/test/ui/run-pass/structs-enums/struct-variant-field-visibility.rs
diff --git a/src/test/run-pass/struct_variant_xc.rs b/src/test/ui/run-pass/structs-enums/struct_variant_xc.rs
index 602650e4e06..602650e4e06 100644
--- a/src/test/run-pass/struct_variant_xc.rs
+++ b/src/test/ui/run-pass/structs-enums/struct_variant_xc.rs
diff --git a/src/test/run-pass/struct_variant_xc_match.rs b/src/test/ui/run-pass/structs-enums/struct_variant_xc_match.rs
index 3ceb65bcfde..3ceb65bcfde 100644
--- a/src/test/run-pass/struct_variant_xc_match.rs
+++ b/src/test/ui/run-pass/structs-enums/struct_variant_xc_match.rs
diff --git a/src/test/run-pass/tag-align-dyn-u64.rs b/src/test/ui/run-pass/structs-enums/tag-align-dyn-u64.rs
index aaac1869af5..aaac1869af5 100644
--- a/src/test/run-pass/tag-align-dyn-u64.rs
+++ b/src/test/ui/run-pass/structs-enums/tag-align-dyn-u64.rs
diff --git a/src/test/run-pass/tag-align-dyn-variants.rs b/src/test/ui/run-pass/structs-enums/tag-align-dyn-variants.rs
index 1c3fb209e35..1c3fb209e35 100644
--- a/src/test/run-pass/tag-align-dyn-variants.rs
+++ b/src/test/ui/run-pass/structs-enums/tag-align-dyn-variants.rs
diff --git a/src/test/run-pass/tag-align-shape.rs b/src/test/ui/run-pass/structs-enums/tag-align-shape.rs
index 5db886c815b..5db886c815b 100644
--- a/src/test/run-pass/tag-align-shape.rs
+++ b/src/test/ui/run-pass/structs-enums/tag-align-shape.rs
diff --git a/src/test/run-pass/tag-align-u64.rs b/src/test/ui/run-pass/structs-enums/tag-align-u64.rs
index 43485a5bfcb..43485a5bfcb 100644
--- a/src/test/run-pass/tag-align-u64.rs
+++ b/src/test/ui/run-pass/structs-enums/tag-align-u64.rs
diff --git a/src/test/run-pass/tag-disr-val-shape.rs b/src/test/ui/run-pass/structs-enums/tag-disr-val-shape.rs
index fba3f9fb0d0..fba3f9fb0d0 100644
--- a/src/test/run-pass/tag-disr-val-shape.rs
+++ b/src/test/ui/run-pass/structs-enums/tag-disr-val-shape.rs
diff --git a/src/test/run-pass/tag-exports.rs b/src/test/ui/run-pass/structs-enums/tag-exports.rs
index d797fd2e54f..d797fd2e54f 100644
--- a/src/test/run-pass/tag-exports.rs
+++ b/src/test/ui/run-pass/structs-enums/tag-exports.rs
diff --git a/src/test/run-pass/tag-in-block.rs b/src/test/ui/run-pass/structs-enums/tag-in-block.rs
index f1a820c8d81..f1a820c8d81 100644
--- a/src/test/run-pass/tag-in-block.rs
+++ b/src/test/ui/run-pass/structs-enums/tag-in-block.rs
diff --git a/src/test/run-pass/tag-variant-disr-type-mismatch.rs b/src/test/ui/run-pass/structs-enums/tag-variant-disr-type-mismatch.rs
index d31eacc9976..d31eacc9976 100644
--- a/src/test/run-pass/tag-variant-disr-type-mismatch.rs
+++ b/src/test/ui/run-pass/structs-enums/tag-variant-disr-type-mismatch.rs
diff --git a/src/test/run-pass/tag-variant-disr-val.rs b/src/test/ui/run-pass/structs-enums/tag-variant-disr-val.rs
index 9a2b3b1ff00..9a2b3b1ff00 100644
--- a/src/test/run-pass/tag-variant-disr-val.rs
+++ b/src/test/ui/run-pass/structs-enums/tag-variant-disr-val.rs
diff --git a/src/test/run-pass/tag.rs b/src/test/ui/run-pass/structs-enums/tag.rs
index e3cfceb0d42..e3cfceb0d42 100644
--- a/src/test/run-pass/tag.rs
+++ b/src/test/ui/run-pass/structs-enums/tag.rs
diff --git a/src/test/run-pass/tuple-struct-construct.rs b/src/test/ui/run-pass/structs-enums/tuple-struct-construct.rs
index c40adf2260d..c40adf2260d 100644
--- a/src/test/run-pass/tuple-struct-construct.rs
+++ b/src/test/ui/run-pass/structs-enums/tuple-struct-construct.rs
diff --git a/src/test/run-pass/tuple-struct-constructor-pointer.rs b/src/test/ui/run-pass/structs-enums/tuple-struct-constructor-pointer.rs
index 90cf94666de..90cf94666de 100644
--- a/src/test/run-pass/tuple-struct-constructor-pointer.rs
+++ b/src/test/ui/run-pass/structs-enums/tuple-struct-constructor-pointer.rs
diff --git a/src/test/run-pass/tuple-struct-destructuring.rs b/src/test/ui/run-pass/structs-enums/tuple-struct-destructuring.rs
index 4b0eb26cf94..4b0eb26cf94 100644
--- a/src/test/run-pass/tuple-struct-destructuring.rs
+++ b/src/test/ui/run-pass/structs-enums/tuple-struct-destructuring.rs
diff --git a/src/test/run-pass/tuple-struct-matching.rs b/src/test/ui/run-pass/structs-enums/tuple-struct-matching.rs
index b37302fce08..b37302fce08 100644
--- a/src/test/run-pass/tuple-struct-matching.rs
+++ b/src/test/ui/run-pass/structs-enums/tuple-struct-matching.rs
diff --git a/src/test/run-pass/tuple-struct-trivial.rs b/src/test/ui/run-pass/structs-enums/tuple-struct-trivial.rs
index fa2c9768fcb..fa2c9768fcb 100644
--- a/src/test/run-pass/tuple-struct-trivial.rs
+++ b/src/test/ui/run-pass/structs-enums/tuple-struct-trivial.rs
diff --git a/src/test/run-pass/uninstantiable-struct.rs b/src/test/ui/run-pass/structs-enums/uninstantiable-struct.rs
index d9740171576..d9740171576 100644
--- a/src/test/run-pass/uninstantiable-struct.rs
+++ b/src/test/ui/run-pass/structs-enums/uninstantiable-struct.rs
diff --git a/src/test/run-pass/unit-like-struct-drop-run.rs b/src/test/ui/run-pass/structs-enums/unit-like-struct-drop-run.rs
index ec37be9420d..ec37be9420d 100644
--- a/src/test/run-pass/unit-like-struct-drop-run.rs
+++ b/src/test/ui/run-pass/structs-enums/unit-like-struct-drop-run.rs
diff --git a/src/test/run-pass/unit-like-struct.rs b/src/test/ui/run-pass/structs-enums/unit-like-struct.rs
index 849b5810c5f..849b5810c5f 100644
--- a/src/test/run-pass/unit-like-struct.rs
+++ b/src/test/ui/run-pass/structs-enums/unit-like-struct.rs
diff --git a/src/test/run-pass/variant-structs-trivial.rs b/src/test/ui/run-pass/structs-enums/variant-structs-trivial.rs
index 6961cd4977d..6961cd4977d 100644
--- a/src/test/run-pass/variant-structs-trivial.rs
+++ b/src/test/ui/run-pass/structs-enums/variant-structs-trivial.rs
diff --git a/src/test/run-pass/comm.rs b/src/test/ui/run-pass/threads-sendsync/comm.rs
index 7c78cbdce08..7c78cbdce08 100644
--- a/src/test/run-pass/comm.rs
+++ b/src/test/ui/run-pass/threads-sendsync/comm.rs
diff --git a/src/test/run-pass/send-is-not-static-par-for.rs b/src/test/ui/run-pass/threads-sendsync/send-is-not-static-par-for.rs
index 356a3be3927..356a3be3927 100644
--- a/src/test/run-pass/send-is-not-static-par-for.rs
+++ b/src/test/ui/run-pass/threads-sendsync/send-is-not-static-par-for.rs
diff --git a/src/test/run-pass/send-resource.rs b/src/test/ui/run-pass/threads-sendsync/send-resource.rs
index 59332d6b65e..59332d6b65e 100644
--- a/src/test/run-pass/send-resource.rs
+++ b/src/test/ui/run-pass/threads-sendsync/send-resource.rs
diff --git a/src/test/run-pass/send-type-inference.rs b/src/test/ui/run-pass/threads-sendsync/send-type-inference.rs
index 84d491d0524..84d491d0524 100644
--- a/src/test/run-pass/send-type-inference.rs
+++ b/src/test/ui/run-pass/threads-sendsync/send-type-inference.rs
diff --git a/src/test/run-pass/send_str_hashmap.rs b/src/test/ui/run-pass/threads-sendsync/send_str_hashmap.rs
index 2ff2d5a8aa5..2ff2d5a8aa5 100644
--- a/src/test/run-pass/send_str_hashmap.rs
+++ b/src/test/ui/run-pass/threads-sendsync/send_str_hashmap.rs
diff --git a/src/test/run-pass/send_str_treemap.rs b/src/test/ui/run-pass/threads-sendsync/send_str_treemap.rs
index 3178dc94598..3178dc94598 100644
--- a/src/test/run-pass/send_str_treemap.rs
+++ b/src/test/ui/run-pass/threads-sendsync/send_str_treemap.rs
diff --git a/src/test/run-pass/sendable-class.rs b/src/test/ui/run-pass/threads-sendsync/sendable-class.rs
index 4fb1c32952f..4fb1c32952f 100644
--- a/src/test/run-pass/sendable-class.rs
+++ b/src/test/ui/run-pass/threads-sendsync/sendable-class.rs
diff --git a/src/test/run-pass/sendfn-is-a-block.rs b/src/test/ui/run-pass/threads-sendsync/sendfn-is-a-block.rs
index 162b05f0bb3..162b05f0bb3 100644
--- a/src/test/run-pass/sendfn-is-a-block.rs
+++ b/src/test/ui/run-pass/threads-sendsync/sendfn-is-a-block.rs
diff --git a/src/test/run-pass/sendfn-spawn-with-fn-arg.rs b/src/test/ui/run-pass/threads-sendsync/sendfn-spawn-with-fn-arg.rs
index ecd0bfb1440..ecd0bfb1440 100644
--- a/src/test/run-pass/sendfn-spawn-with-fn-arg.rs
+++ b/src/test/ui/run-pass/threads-sendsync/sendfn-spawn-with-fn-arg.rs
diff --git a/src/test/run-pass/spawn-fn.rs b/src/test/ui/run-pass/threads-sendsync/spawn-fn.rs
index 751d833ff9c..751d833ff9c 100644
--- a/src/test/run-pass/spawn-fn.rs
+++ b/src/test/ui/run-pass/threads-sendsync/spawn-fn.rs
diff --git a/src/test/run-pass/spawn-types.rs b/src/test/ui/run-pass/threads-sendsync/spawn-types.rs
index cab190d025f..cab190d025f 100644
--- a/src/test/run-pass/spawn-types.rs
+++ b/src/test/ui/run-pass/threads-sendsync/spawn-types.rs
diff --git a/src/test/run-pass/spawn.rs b/src/test/ui/run-pass/threads-sendsync/spawn.rs
index c9a030cf053..c9a030cf053 100644
--- a/src/test/run-pass/spawn.rs
+++ b/src/test/ui/run-pass/threads-sendsync/spawn.rs
diff --git a/src/test/run-pass/spawn2.rs b/src/test/ui/run-pass/threads-sendsync/spawn2.rs
index 2a5fab8a209..2a5fab8a209 100644
--- a/src/test/run-pass/spawn2.rs
+++ b/src/test/ui/run-pass/threads-sendsync/spawn2.rs
diff --git a/src/test/run-pass/spawning-with-debug.rs b/src/test/ui/run-pass/threads-sendsync/spawning-with-debug.rs
index c09ddf52966..c09ddf52966 100644
--- a/src/test/run-pass/spawning-with-debug.rs
+++ b/src/test/ui/run-pass/threads-sendsync/spawning-with-debug.rs
diff --git a/src/test/run-pass/std-sync-right-kind-impls.rs b/src/test/ui/run-pass/threads-sendsync/std-sync-right-kind-impls.rs
index 1ad04493528..1ad04493528 100644
--- a/src/test/run-pass/std-sync-right-kind-impls.rs
+++ b/src/test/ui/run-pass/threads-sendsync/std-sync-right-kind-impls.rs
diff --git a/src/test/run-pass/sync-send-atomics.rs b/src/test/ui/run-pass/threads-sendsync/sync-send-atomics.rs
index 1ead6268d0c..1ead6268d0c 100644
--- a/src/test/run-pass/sync-send-atomics.rs
+++ b/src/test/ui/run-pass/threads-sendsync/sync-send-atomics.rs
diff --git a/src/test/run-pass/sync-send-in-std.rs b/src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs
index 335a9c0d8be..335a9c0d8be 100644
--- a/src/test/run-pass/sync-send-in-std.rs
+++ b/src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs
diff --git a/src/test/run-pass/sync-send-iterators-in-libcollections.rs b/src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcollections.rs
index e9584e12b2e..e9584e12b2e 100644
--- a/src/test/run-pass/sync-send-iterators-in-libcollections.rs
+++ b/src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcollections.rs
diff --git a/src/test/run-pass/sync-send-iterators-in-libcore.rs b/src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcore.rs
index 55269a28666..55269a28666 100644
--- a/src/test/run-pass/sync-send-iterators-in-libcore.rs
+++ b/src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcore.rs
diff --git a/src/test/run-pass/task-comm-0.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-0.rs
index 01e6d4cf7de..01e6d4cf7de 100644
--- a/src/test/run-pass/task-comm-0.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-comm-0.rs
diff --git a/src/test/run-pass/task-comm-1.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-1.rs
index 3295e68ac4e..3295e68ac4e 100644
--- a/src/test/run-pass/task-comm-1.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-comm-1.rs
diff --git a/src/test/run-pass/task-comm-10.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-10.rs
index a69bba82ff0..a69bba82ff0 100644
--- a/src/test/run-pass/task-comm-10.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-comm-10.rs
diff --git a/src/test/run-pass/task-comm-11.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-11.rs
index c7beeb53850..c7beeb53850 100644
--- a/src/test/run-pass/task-comm-11.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-comm-11.rs
diff --git a/src/test/run-pass/task-comm-12.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-12.rs
index 23594cebf31..23594cebf31 100644
--- a/src/test/run-pass/task-comm-12.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-comm-12.rs
diff --git a/src/test/run-pass/task-comm-13.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-13.rs
index b4829970376..b4829970376 100644
--- a/src/test/run-pass/task-comm-13.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-comm-13.rs
diff --git a/src/test/run-pass/task-comm-14.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-14.rs
index a03ff8719bb..a03ff8719bb 100644
--- a/src/test/run-pass/task-comm-14.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-comm-14.rs
diff --git a/src/test/run-pass/task-comm-15.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-15.rs
index fc5a891d1d6..fc5a891d1d6 100644
--- a/src/test/run-pass/task-comm-15.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-comm-15.rs
diff --git a/src/test/run-pass/task-comm-16.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-16.rs
index 0caf21ead39..0caf21ead39 100644
--- a/src/test/run-pass/task-comm-16.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-comm-16.rs
diff --git a/src/test/run-pass/task-comm-17.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-17.rs
index ca6f5c164ed..ca6f5c164ed 100644
--- a/src/test/run-pass/task-comm-17.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-comm-17.rs
diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-3.rs
index 8d2d3afc787..8d2d3afc787 100644
--- a/src/test/run-pass/task-comm-3.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-comm-3.rs
diff --git a/src/test/run-pass/task-comm-4.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-4.rs
index e70a00591d6..e70a00591d6 100644
--- a/src/test/run-pass/task-comm-4.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-comm-4.rs
diff --git a/src/test/run-pass/task-comm-5.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-5.rs
index cd5cb677d46..cd5cb677d46 100644
--- a/src/test/run-pass/task-comm-5.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-comm-5.rs
diff --git a/src/test/run-pass/task-comm-6.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-6.rs
index b8b5773ade5..b8b5773ade5 100644
--- a/src/test/run-pass/task-comm-6.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-comm-6.rs
diff --git a/src/test/run-pass/task-comm-7.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-7.rs
index 7ab267ea66c..7ab267ea66c 100644
--- a/src/test/run-pass/task-comm-7.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-comm-7.rs
diff --git a/src/test/run-pass/task-comm-9.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-9.rs
index 1f0eebf1f71..1f0eebf1f71 100644
--- a/src/test/run-pass/task-comm-9.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-comm-9.rs
diff --git a/src/test/run-pass/task-comm-chan-nil.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-chan-nil.rs
index 3b9ec421691..3b9ec421691 100644
--- a/src/test/run-pass/task-comm-chan-nil.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-comm-chan-nil.rs
diff --git a/src/test/run-pass/task-life-0.rs b/src/test/ui/run-pass/threads-sendsync/task-life-0.rs
index 34ea43ca827..34ea43ca827 100644
--- a/src/test/run-pass/task-life-0.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-life-0.rs
diff --git a/src/test/run-pass/task-spawn-move-and-copy.rs b/src/test/ui/run-pass/threads-sendsync/task-spawn-move-and-copy.rs
index 94b69a1c3e4..94b69a1c3e4 100644
--- a/src/test/run-pass/task-spawn-move-and-copy.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-spawn-move-and-copy.rs
diff --git a/src/test/run-pass/task-stderr.rs b/src/test/ui/run-pass/threads-sendsync/task-stderr.rs
index 13d5cc989e9..13d5cc989e9 100644
--- a/src/test/run-pass/task-stderr.rs
+++ b/src/test/ui/run-pass/threads-sendsync/task-stderr.rs
diff --git a/src/test/run-pass/thread-local-extern-static.rs b/src/test/ui/run-pass/threads-sendsync/thread-local-extern-static.rs
index 09c8b64776c..09c8b64776c 100644
--- a/src/test/run-pass/thread-local-extern-static.rs
+++ b/src/test/ui/run-pass/threads-sendsync/thread-local-extern-static.rs
diff --git a/src/test/run-pass/thread-local-syntax.rs b/src/test/ui/run-pass/threads-sendsync/thread-local-syntax.rs
index 373824122fd..373824122fd 100644
--- a/src/test/run-pass/thread-local-syntax.rs
+++ b/src/test/ui/run-pass/threads-sendsync/thread-local-syntax.rs
diff --git a/src/test/run-pass/threads.rs b/src/test/ui/run-pass/threads-sendsync/threads.rs
index f193598975a..f193598975a 100644
--- a/src/test/run-pass/threads.rs
+++ b/src/test/ui/run-pass/threads-sendsync/threads.rs
diff --git a/src/test/run-pass/tls-dtors-are-run-in-a-static-binary.rs b/src/test/ui/run-pass/threads-sendsync/tls-dtors-are-run-in-a-static-binary.rs
index 82e586196e3..82e586196e3 100644
--- a/src/test/run-pass/tls-dtors-are-run-in-a-static-binary.rs
+++ b/src/test/ui/run-pass/threads-sendsync/tls-dtors-are-run-in-a-static-binary.rs
diff --git a/src/test/run-pass/tls-init-on-init.rs b/src/test/ui/run-pass/threads-sendsync/tls-init-on-init.rs
index 48a0d4a99ec..48a0d4a99ec 100644
--- a/src/test/run-pass/tls-init-on-init.rs
+++ b/src/test/ui/run-pass/threads-sendsync/tls-init-on-init.rs
diff --git a/src/test/run-pass/tls-try-with.rs b/src/test/ui/run-pass/threads-sendsync/tls-try-with.rs
index 552f4c5e829..552f4c5e829 100644
--- a/src/test/run-pass/tls-try-with.rs
+++ b/src/test/ui/run-pass/threads-sendsync/tls-try-with.rs
diff --git a/src/test/run-pass/anon-trait-static-method.rs b/src/test/ui/run-pass/traits/anon-trait-static-method.rs
index 5889bfce3c4..5889bfce3c4 100644
--- a/src/test/run-pass/anon-trait-static-method.rs
+++ b/src/test/ui/run-pass/traits/anon-trait-static-method.rs
diff --git a/src/test/run-pass/anon_trait_static_method_exe.rs b/src/test/ui/run-pass/traits/anon_trait_static_method_exe.rs
index f420460a412..f420460a412 100644
--- a/src/test/run-pass/anon_trait_static_method_exe.rs
+++ b/src/test/ui/run-pass/traits/anon_trait_static_method_exe.rs
diff --git a/src/test/run-pass/assignability-trait.rs b/src/test/ui/run-pass/traits/assignability-trait.rs
index bc95d96a8cc..bc95d96a8cc 100644
--- a/src/test/run-pass/assignability-trait.rs
+++ b/src/test/ui/run-pass/traits/assignability-trait.rs
diff --git a/src/test/run-pass/astconv-cycle-between-trait-and-type.rs b/src/test/ui/run-pass/traits/astconv-cycle-between-trait-and-type.rs
index ef2dc48fe13..ef2dc48fe13 100644
--- a/src/test/run-pass/astconv-cycle-between-trait-and-type.rs
+++ b/src/test/ui/run-pass/traits/astconv-cycle-between-trait-and-type.rs
diff --git a/src/test/run-pass/augmented-assignments-trait.rs b/src/test/ui/run-pass/traits/augmented-assignments-trait.rs
index f1cb2c56dbc..f1cb2c56dbc 100644
--- a/src/test/run-pass/augmented-assignments-trait.rs
+++ b/src/test/ui/run-pass/traits/augmented-assignments-trait.rs
diff --git a/src/test/run-pass/auto-traits.rs b/src/test/ui/run-pass/traits/auto-traits.rs
index 2a18b402bc6..2a18b402bc6 100644
--- a/src/test/run-pass/auto-traits.rs
+++ b/src/test/ui/run-pass/traits/auto-traits.rs
diff --git a/src/test/run-pass/conservative_impl_trait.rs b/src/test/ui/run-pass/traits/conservative_impl_trait.rs
index 14e1ca612c0..14e1ca612c0 100644
--- a/src/test/run-pass/conservative_impl_trait.rs
+++ b/src/test/ui/run-pass/traits/conservative_impl_trait.rs
diff --git a/src/test/run-pass/cycle-trait-type-trait.rs b/src/test/ui/run-pass/traits/cycle-trait-type-trait.rs
index 4ae5c599b43..4ae5c599b43 100644
--- a/src/test/run-pass/cycle-trait-type-trait.rs
+++ b/src/test/ui/run-pass/traits/cycle-trait-type-trait.rs
diff --git a/src/test/run-pass/default-method-supertrait-vtable.rs b/src/test/ui/run-pass/traits/default-method-supertrait-vtable.rs
index 0d45a5d5212..0d45a5d5212 100644
--- a/src/test/run-pass/default-method-supertrait-vtable.rs
+++ b/src/test/ui/run-pass/traits/default-method-supertrait-vtable.rs
diff --git a/src/test/run-pass/dyn-trait.rs b/src/test/ui/run-pass/traits/dyn-trait.rs
index 01066794242..01066794242 100644
--- a/src/test/run-pass/dyn-trait.rs
+++ b/src/test/ui/run-pass/traits/dyn-trait.rs
diff --git a/src/test/run-pass/fmt-pointer-trait.rs b/src/test/ui/run-pass/traits/fmt-pointer-trait.rs
index 4ecb9da4eb9..4ecb9da4eb9 100644
--- a/src/test/run-pass/fmt-pointer-trait.rs
+++ b/src/test/ui/run-pass/traits/fmt-pointer-trait.rs
diff --git a/src/test/run-pass/impl-implicit-trait.rs b/src/test/ui/run-pass/traits/impl-implicit-trait.rs
index 7f1d576e099..7f1d576e099 100644
--- a/src/test/run-pass/impl-implicit-trait.rs
+++ b/src/test/ui/run-pass/traits/impl-implicit-trait.rs
diff --git a/src/test/run-pass/impl-inherent-prefer-over-trait.rs b/src/test/ui/run-pass/traits/impl-inherent-prefer-over-trait.rs
index f0195976aa8..f0195976aa8 100644
--- a/src/test/run-pass/impl-inherent-prefer-over-trait.rs
+++ b/src/test/ui/run-pass/traits/impl-inherent-prefer-over-trait.rs
diff --git a/src/test/run-pass/infer-from-object-trait-issue-26952.rs b/src/test/ui/run-pass/traits/infer-from-object-trait-issue-26952.rs
index d5ca90c1a28..d5ca90c1a28 100644
--- a/src/test/run-pass/infer-from-object-trait-issue-26952.rs
+++ b/src/test/ui/run-pass/traits/infer-from-object-trait-issue-26952.rs
diff --git a/src/test/run-pass/inherent-trait-method-order.rs b/src/test/ui/run-pass/traits/inherent-trait-method-order.rs
index 5489a61f7d0..5489a61f7d0 100644
--- a/src/test/run-pass/inherent-trait-method-order.rs
+++ b/src/test/ui/run-pass/traits/inherent-trait-method-order.rs
diff --git a/src/test/run-pass/kindck-owned-trait-contains-1.rs b/src/test/ui/run-pass/traits/kindck-owned-trait-contains-1.rs
index 9b56666fd46..9b56666fd46 100644
--- a/src/test/run-pass/kindck-owned-trait-contains-1.rs
+++ b/src/test/ui/run-pass/traits/kindck-owned-trait-contains-1.rs
diff --git a/src/test/run-pass/multiple-trait-bounds.rs b/src/test/ui/run-pass/traits/multiple-trait-bounds.rs
index 2746205b637..2746205b637 100644
--- a/src/test/run-pass/multiple-trait-bounds.rs
+++ b/src/test/ui/run-pass/traits/multiple-trait-bounds.rs
diff --git a/src/test/run-pass/object-one-type-two-traits.rs b/src/test/ui/run-pass/traits/object-one-type-two-traits.rs
index 284beccdb29..284beccdb29 100644
--- a/src/test/run-pass/object-one-type-two-traits.rs
+++ b/src/test/ui/run-pass/traits/object-one-type-two-traits.rs
diff --git a/src/test/run-pass/overlap-permitted-for-marker-traits-neg.rs b/src/test/ui/run-pass/traits/overlap-permitted-for-marker-traits-neg.rs
index 740d5d22ab5..740d5d22ab5 100644
--- a/src/test/run-pass/overlap-permitted-for-marker-traits-neg.rs
+++ b/src/test/ui/run-pass/traits/overlap-permitted-for-marker-traits-neg.rs
diff --git a/src/test/run-pass/overlap-permitted-for-marker-traits.rs b/src/test/ui/run-pass/traits/overlap-permitted-for-marker-traits.rs
index 11a46299d8c..11a46299d8c 100644
--- a/src/test/run-pass/overlap-permitted-for-marker-traits.rs
+++ b/src/test/ui/run-pass/traits/overlap-permitted-for-marker-traits.rs
diff --git a/src/test/run-pass/parameterized-trait-with-bounds.rs b/src/test/ui/run-pass/traits/parameterized-trait-with-bounds.rs
index 3e74341d819..3e74341d819 100644
--- a/src/test/run-pass/parameterized-trait-with-bounds.rs
+++ b/src/test/ui/run-pass/traits/parameterized-trait-with-bounds.rs
diff --git a/src/test/run-pass/supertrait-default-generics.rs b/src/test/ui/run-pass/traits/supertrait-default-generics.rs
index 8351cc50fd8..8351cc50fd8 100644
--- a/src/test/run-pass/supertrait-default-generics.rs
+++ b/src/test/ui/run-pass/traits/supertrait-default-generics.rs
diff --git a/src/test/run-pass/syntax-trait-polarity.rs b/src/test/ui/run-pass/traits/syntax-trait-polarity.rs
index f69b857981d..f69b857981d 100644
--- a/src/test/run-pass/syntax-trait-polarity.rs
+++ b/src/test/ui/run-pass/traits/syntax-trait-polarity.rs
diff --git a/src/test/run-pass/trait-bounds-basic.rs b/src/test/ui/run-pass/traits/trait-bounds-basic.rs
index 558e69664ec..558e69664ec 100644
--- a/src/test/run-pass/trait-bounds-basic.rs
+++ b/src/test/ui/run-pass/traits/trait-bounds-basic.rs
diff --git a/src/test/run-pass/trait-bounds-impl-comparison-duplicates.rs b/src/test/ui/run-pass/traits/trait-bounds-impl-comparison-duplicates.rs
index 33bfbc39603..33bfbc39603 100644
--- a/src/test/run-pass/trait-bounds-impl-comparison-duplicates.rs
+++ b/src/test/ui/run-pass/traits/trait-bounds-impl-comparison-duplicates.rs
diff --git a/src/test/run-pass/trait-bounds-in-arc.rs b/src/test/ui/run-pass/traits/trait-bounds-in-arc.rs
index 7b57d66ef21..7b57d66ef21 100644
--- a/src/test/run-pass/trait-bounds-in-arc.rs
+++ b/src/test/ui/run-pass/traits/trait-bounds-in-arc.rs
diff --git a/src/test/run-pass/trait-bounds-on-structs-and-enums.rs b/src/test/ui/run-pass/traits/trait-bounds-on-structs-and-enums.rs
index 6f088e15b35..6f088e15b35 100644
--- a/src/test/run-pass/trait-bounds-on-structs-and-enums.rs
+++ b/src/test/ui/run-pass/traits/trait-bounds-on-structs-and-enums.rs
diff --git a/src/test/run-pass/trait-bounds-recursion.rs b/src/test/ui/run-pass/traits/trait-bounds-recursion.rs
index d984e9cdc99..d984e9cdc99 100644
--- a/src/test/run-pass/trait-bounds-recursion.rs
+++ b/src/test/ui/run-pass/traits/trait-bounds-recursion.rs
diff --git a/src/test/run-pass/trait-bounds.rs b/src/test/ui/run-pass/traits/trait-bounds.rs
index d501fef122c..d501fef122c 100644
--- a/src/test/run-pass/trait-bounds.rs
+++ b/src/test/ui/run-pass/traits/trait-bounds.rs
diff --git a/src/test/run-pass/trait-cache-issue-18209.rs b/src/test/ui/run-pass/traits/trait-cache-issue-18209.rs
index 9cc2b2fadc6..9cc2b2fadc6 100644
--- a/src/test/run-pass/trait-cache-issue-18209.rs
+++ b/src/test/ui/run-pass/traits/trait-cache-issue-18209.rs
diff --git a/src/test/run-pass/trait-coercion-generic.rs b/src/test/ui/run-pass/traits/trait-coercion-generic.rs
index 40453262ddf..40453262ddf 100644
--- a/src/test/run-pass/trait-coercion-generic.rs
+++ b/src/test/ui/run-pass/traits/trait-coercion-generic.rs
diff --git a/src/test/run-pass/trait-coercion.rs b/src/test/ui/run-pass/traits/trait-coercion.rs
index 130c6ee7521..130c6ee7521 100644
--- a/src/test/run-pass/trait-coercion.rs
+++ b/src/test/ui/run-pass/traits/trait-coercion.rs
diff --git a/src/test/run-pass/trait-composition-trivial.rs b/src/test/ui/run-pass/traits/trait-composition-trivial.rs
index 4138413c5b5..4138413c5b5 100644
--- a/src/test/run-pass/trait-composition-trivial.rs
+++ b/src/test/ui/run-pass/traits/trait-composition-trivial.rs
diff --git a/src/test/run-pass/trait-copy-guessing.rs b/src/test/ui/run-pass/traits/trait-copy-guessing.rs
index 71cd3c9441e..71cd3c9441e 100644
--- a/src/test/run-pass/trait-copy-guessing.rs
+++ b/src/test/ui/run-pass/traits/trait-copy-guessing.rs
diff --git a/src/test/run-pass/trait-default-method-bound-subst.rs b/src/test/ui/run-pass/traits/trait-default-method-bound-subst.rs
index b9936bcadd4..b9936bcadd4 100644
--- a/src/test/run-pass/trait-default-method-bound-subst.rs
+++ b/src/test/ui/run-pass/traits/trait-default-method-bound-subst.rs
diff --git a/src/test/run-pass/trait-default-method-bound-subst2.rs b/src/test/ui/run-pass/traits/trait-default-method-bound-subst2.rs
index 92b9449461b..92b9449461b 100644
--- a/src/test/run-pass/trait-default-method-bound-subst2.rs
+++ b/src/test/ui/run-pass/traits/trait-default-method-bound-subst2.rs
diff --git a/src/test/run-pass/trait-default-method-bound-subst3.rs b/src/test/ui/run-pass/traits/trait-default-method-bound-subst3.rs
index af7e8830332..af7e8830332 100644
--- a/src/test/run-pass/trait-default-method-bound-subst3.rs
+++ b/src/test/ui/run-pass/traits/trait-default-method-bound-subst3.rs
diff --git a/src/test/run-pass/trait-default-method-bound-subst4.rs b/src/test/ui/run-pass/traits/trait-default-method-bound-subst4.rs
index 581a54e57f4..581a54e57f4 100644
--- a/src/test/run-pass/trait-default-method-bound-subst4.rs
+++ b/src/test/ui/run-pass/traits/trait-default-method-bound-subst4.rs
diff --git a/src/test/run-pass/trait-default-method-bound.rs b/src/test/ui/run-pass/traits/trait-default-method-bound.rs
index e0ea9651f61..e0ea9651f61 100644
--- a/src/test/run-pass/trait-default-method-bound.rs
+++ b/src/test/ui/run-pass/traits/trait-default-method-bound.rs
diff --git a/src/test/run-pass/trait-default-method-xc-2.rs b/src/test/ui/run-pass/traits/trait-default-method-xc-2.rs
index 833063d2a2d..833063d2a2d 100644
--- a/src/test/run-pass/trait-default-method-xc-2.rs
+++ b/src/test/ui/run-pass/traits/trait-default-method-xc-2.rs
diff --git a/src/test/run-pass/trait-default-method-xc.rs b/src/test/ui/run-pass/traits/trait-default-method-xc.rs
index 72e3fb256ca..72e3fb256ca 100644
--- a/src/test/run-pass/trait-default-method-xc.rs
+++ b/src/test/ui/run-pass/traits/trait-default-method-xc.rs
diff --git a/src/test/run-pass/trait-false-ambiguity-where-clause-builtin-bound.rs b/src/test/ui/run-pass/traits/trait-false-ambiguity-where-clause-builtin-bound.rs
index b9ca8971d38..b9ca8971d38 100644
--- a/src/test/run-pass/trait-false-ambiguity-where-clause-builtin-bound.rs
+++ b/src/test/ui/run-pass/traits/trait-false-ambiguity-where-clause-builtin-bound.rs
diff --git a/src/test/run-pass/trait-generic.rs b/src/test/ui/run-pass/traits/trait-generic.rs
index eadda5dfe29..eadda5dfe29 100644
--- a/src/test/run-pass/trait-generic.rs
+++ b/src/test/ui/run-pass/traits/trait-generic.rs
diff --git a/src/test/run-pass/trait-impl-2.rs b/src/test/ui/run-pass/traits/trait-impl-2.rs
index c94b517f6a7..c94b517f6a7 100644
--- a/src/test/run-pass/trait-impl-2.rs
+++ b/src/test/ui/run-pass/traits/trait-impl-2.rs
diff --git a/src/test/run-pass/trait-impl.rs b/src/test/ui/run-pass/traits/trait-impl.rs
index e940f6c2126..e940f6c2126 100644
--- a/src/test/run-pass/trait-impl.rs
+++ b/src/test/ui/run-pass/traits/trait-impl.rs
diff --git a/src/test/run-pass/trait-inheritance-auto-xc-2.rs b/src/test/ui/run-pass/traits/trait-inheritance-auto-xc-2.rs
index 270cf652ed7..270cf652ed7 100644
--- a/src/test/run-pass/trait-inheritance-auto-xc-2.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-auto-xc-2.rs
diff --git a/src/test/run-pass/trait-inheritance-auto-xc.rs b/src/test/ui/run-pass/traits/trait-inheritance-auto-xc.rs
index eaca60c935a..eaca60c935a 100644
--- a/src/test/run-pass/trait-inheritance-auto-xc.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-auto-xc.rs
diff --git a/src/test/run-pass/trait-inheritance-auto.rs b/src/test/ui/run-pass/traits/trait-inheritance-auto.rs
index 75c48d51712..75c48d51712 100644
--- a/src/test/run-pass/trait-inheritance-auto.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-auto.rs
diff --git a/src/test/run-pass/trait-inheritance-call-bound-inherited.rs b/src/test/ui/run-pass/traits/trait-inheritance-call-bound-inherited.rs
index 2fb2b9274c6..2fb2b9274c6 100644
--- a/src/test/run-pass/trait-inheritance-call-bound-inherited.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-call-bound-inherited.rs
diff --git a/src/test/run-pass/trait-inheritance-call-bound-inherited2.rs b/src/test/ui/run-pass/traits/trait-inheritance-call-bound-inherited2.rs
index 87dc04f1c66..87dc04f1c66 100644
--- a/src/test/run-pass/trait-inheritance-call-bound-inherited2.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-call-bound-inherited2.rs
diff --git a/src/test/run-pass/trait-inheritance-cast-without-call-to-supertrait.rs b/src/test/ui/run-pass/traits/trait-inheritance-cast-without-call-to-supertrait.rs
index dd61dc0f9fb..dd61dc0f9fb 100644
--- a/src/test/run-pass/trait-inheritance-cast-without-call-to-supertrait.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-cast-without-call-to-supertrait.rs
diff --git a/src/test/run-pass/trait-inheritance-cast.rs b/src/test/ui/run-pass/traits/trait-inheritance-cast.rs
index 0de2c586930..0de2c586930 100644
--- a/src/test/run-pass/trait-inheritance-cast.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-cast.rs
diff --git a/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs b/src/test/ui/run-pass/traits/trait-inheritance-cross-trait-call-xc.rs
index 3e68bea57c6..3e68bea57c6 100644
--- a/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-cross-trait-call-xc.rs
diff --git a/src/test/run-pass/trait-inheritance-cross-trait-call.rs b/src/test/ui/run-pass/traits/trait-inheritance-cross-trait-call.rs
index 27b0f66603f..27b0f66603f 100644
--- a/src/test/run-pass/trait-inheritance-cross-trait-call.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-cross-trait-call.rs
diff --git a/src/test/run-pass/trait-inheritance-diamond.rs b/src/test/ui/run-pass/traits/trait-inheritance-diamond.rs
index 43151bb0f99..43151bb0f99 100644
--- a/src/test/run-pass/trait-inheritance-diamond.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-diamond.rs
diff --git a/src/test/run-pass/trait-inheritance-multiple-inheritors.rs b/src/test/ui/run-pass/traits/trait-inheritance-multiple-inheritors.rs
index 8125ce20912..8125ce20912 100644
--- a/src/test/run-pass/trait-inheritance-multiple-inheritors.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-multiple-inheritors.rs
diff --git a/src/test/run-pass/trait-inheritance-multiple-params.rs b/src/test/ui/run-pass/traits/trait-inheritance-multiple-params.rs
index c0f7a9d9c25..c0f7a9d9c25 100644
--- a/src/test/run-pass/trait-inheritance-multiple-params.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-multiple-params.rs
diff --git a/src/test/run-pass/trait-inheritance-num.rs b/src/test/ui/run-pass/traits/trait-inheritance-num.rs
index e5390ac8a62..e5390ac8a62 100644
--- a/src/test/run-pass/trait-inheritance-num.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-num.rs
diff --git a/src/test/run-pass/trait-inheritance-num0.rs b/src/test/ui/run-pass/traits/trait-inheritance-num0.rs
index 9f5c7cf6036..9f5c7cf6036 100644
--- a/src/test/run-pass/trait-inheritance-num0.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-num0.rs
diff --git a/src/test/run-pass/trait-inheritance-num1.rs b/src/test/ui/run-pass/traits/trait-inheritance-num1.rs
index e21abdae730..e21abdae730 100644
--- a/src/test/run-pass/trait-inheritance-num1.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-num1.rs
diff --git a/src/test/run-pass/trait-inheritance-num2.rs b/src/test/ui/run-pass/traits/trait-inheritance-num2.rs
index 5f8541a6da1..5f8541a6da1 100644
--- a/src/test/run-pass/trait-inheritance-num2.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-num2.rs
diff --git a/src/test/run-pass/trait-inheritance-num3.rs b/src/test/ui/run-pass/traits/trait-inheritance-num3.rs
index fb56ae82b30..fb56ae82b30 100644
--- a/src/test/run-pass/trait-inheritance-num3.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-num3.rs
diff --git a/src/test/run-pass/trait-inheritance-num5.rs b/src/test/ui/run-pass/traits/trait-inheritance-num5.rs
index bd442629243..bd442629243 100644
--- a/src/test/run-pass/trait-inheritance-num5.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-num5.rs
diff --git a/src/test/run-pass/trait-inheritance-overloading-simple.rs b/src/test/ui/run-pass/traits/trait-inheritance-overloading-simple.rs
index 9c1f585fe45..9c1f585fe45 100644
--- a/src/test/run-pass/trait-inheritance-overloading-simple.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-overloading-simple.rs
diff --git a/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs b/src/test/ui/run-pass/traits/trait-inheritance-overloading-xc-exe.rs
index 21d6c53a465..21d6c53a465 100644
--- a/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-overloading-xc-exe.rs
diff --git a/src/test/run-pass/trait-inheritance-overloading.rs b/src/test/ui/run-pass/traits/trait-inheritance-overloading.rs
index b7d0400dd89..b7d0400dd89 100644
--- a/src/test/run-pass/trait-inheritance-overloading.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-overloading.rs
diff --git a/src/test/run-pass/trait-inheritance-self-in-supertype.rs b/src/test/ui/run-pass/traits/trait-inheritance-self-in-supertype.rs
index e353be16b45..e353be16b45 100644
--- a/src/test/run-pass/trait-inheritance-self-in-supertype.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-self-in-supertype.rs
diff --git a/src/test/run-pass/trait-inheritance-self.rs b/src/test/ui/run-pass/traits/trait-inheritance-self.rs
index a025be5d651..a025be5d651 100644
--- a/src/test/run-pass/trait-inheritance-self.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-self.rs
diff --git a/src/test/run-pass/trait-inheritance-simple.rs b/src/test/ui/run-pass/traits/trait-inheritance-simple.rs
index 917e520339a..917e520339a 100644
--- a/src/test/run-pass/trait-inheritance-simple.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-simple.rs
diff --git a/src/test/run-pass/trait-inheritance-static.rs b/src/test/ui/run-pass/traits/trait-inheritance-static.rs
index aae6b76087f..aae6b76087f 100644
--- a/src/test/run-pass/trait-inheritance-static.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-static.rs
diff --git a/src/test/run-pass/trait-inheritance-static2.rs b/src/test/ui/run-pass/traits/trait-inheritance-static2.rs
index dd942fbfa08..dd942fbfa08 100644
--- a/src/test/run-pass/trait-inheritance-static2.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-static2.rs
diff --git a/src/test/run-pass/trait-inheritance-subst.rs b/src/test/ui/run-pass/traits/trait-inheritance-subst.rs
index 73bb4bacf64..73bb4bacf64 100644
--- a/src/test/run-pass/trait-inheritance-subst.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-subst.rs
diff --git a/src/test/run-pass/trait-inheritance-subst2.rs b/src/test/ui/run-pass/traits/trait-inheritance-subst2.rs
index 7d3ebc19e8f..7d3ebc19e8f 100644
--- a/src/test/run-pass/trait-inheritance-subst2.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-subst2.rs
diff --git a/src/test/run-pass/trait-inheritance-visibility.rs b/src/test/ui/run-pass/traits/trait-inheritance-visibility.rs
index f00a4f2ecb6..f00a4f2ecb6 100644
--- a/src/test/run-pass/trait-inheritance-visibility.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance-visibility.rs
diff --git a/src/test/run-pass/trait-inheritance2.rs b/src/test/ui/run-pass/traits/trait-inheritance2.rs
index 2161c0f894f..2161c0f894f 100644
--- a/src/test/run-pass/trait-inheritance2.rs
+++ b/src/test/ui/run-pass/traits/trait-inheritance2.rs
diff --git a/src/test/run-pass/trait-item-inside-macro.rs b/src/test/ui/run-pass/traits/trait-item-inside-macro.rs
index 7c13576120b..7c13576120b 100644
--- a/src/test/run-pass/trait-item-inside-macro.rs
+++ b/src/test/ui/run-pass/traits/trait-item-inside-macro.rs
diff --git a/src/test/run-pass/trait-object-auto-dedup.rs b/src/test/ui/run-pass/traits/trait-object-auto-dedup.rs
index 9f5845f6d77..9f5845f6d77 100644
--- a/src/test/run-pass/trait-object-auto-dedup.rs
+++ b/src/test/ui/run-pass/traits/trait-object-auto-dedup.rs
diff --git a/src/test/run-pass/trait-object-exclusion.rs b/src/test/ui/run-pass/traits/trait-object-exclusion.rs
index 13b725b7c9e..13b725b7c9e 100644
--- a/src/test/run-pass/trait-object-exclusion.rs
+++ b/src/test/ui/run-pass/traits/trait-object-exclusion.rs
diff --git a/src/test/run-pass/trait-object-generics.rs b/src/test/ui/run-pass/traits/trait-object-generics.rs
index 4b14ac2f76f..4b14ac2f76f 100644
--- a/src/test/run-pass/trait-object-generics.rs
+++ b/src/test/ui/run-pass/traits/trait-object-generics.rs
diff --git a/src/test/run-pass/trait-object-lifetime-first.rs b/src/test/ui/run-pass/traits/trait-object-lifetime-first.rs
index f269fe90d4b..f269fe90d4b 100644
--- a/src/test/run-pass/trait-object-lifetime-first.rs
+++ b/src/test/ui/run-pass/traits/trait-object-lifetime-first.rs
diff --git a/src/test/run-pass/trait-object-with-lifetime-bound.rs b/src/test/ui/run-pass/traits/trait-object-with-lifetime-bound.rs
index 21b84221d06..21b84221d06 100644
--- a/src/test/run-pass/trait-object-with-lifetime-bound.rs
+++ b/src/test/ui/run-pass/traits/trait-object-with-lifetime-bound.rs
diff --git a/src/test/run-pass/trait-region-pointer-simple.rs b/src/test/ui/run-pass/traits/trait-region-pointer-simple.rs
index 95311e62e63..95311e62e63 100644
--- a/src/test/run-pass/trait-region-pointer-simple.rs
+++ b/src/test/ui/run-pass/traits/trait-region-pointer-simple.rs
diff --git a/src/test/run-pass/trait-safety-ok-cc.rs b/src/test/ui/run-pass/traits/trait-safety-ok-cc.rs
index abbc556f34e..abbc556f34e 100644
--- a/src/test/run-pass/trait-safety-ok-cc.rs
+++ b/src/test/ui/run-pass/traits/trait-safety-ok-cc.rs
diff --git a/src/test/run-pass/trait-safety-ok.rs b/src/test/ui/run-pass/traits/trait-safety-ok.rs
index 0ccc6cd152d..0ccc6cd152d 100644
--- a/src/test/run-pass/trait-safety-ok.rs
+++ b/src/test/ui/run-pass/traits/trait-safety-ok.rs
diff --git a/src/test/run-pass/trait-static-method-overwriting.rs b/src/test/ui/run-pass/traits/trait-static-method-overwriting.rs
index 31968da6ee3..31968da6ee3 100644
--- a/src/test/run-pass/trait-static-method-overwriting.rs
+++ b/src/test/ui/run-pass/traits/trait-static-method-overwriting.rs
diff --git a/src/test/run-pass/trait-to-str.rs b/src/test/ui/run-pass/traits/trait-to-str.rs
index 9671e31d7e4..9671e31d7e4 100644
--- a/src/test/run-pass/trait-to-str.rs
+++ b/src/test/ui/run-pass/traits/trait-to-str.rs
diff --git a/src/test/run-pass/trait-where-clause-vs-impl.rs b/src/test/ui/run-pass/traits/trait-where-clause-vs-impl.rs
index f3dcb51f97a..f3dcb51f97a 100644
--- a/src/test/run-pass/trait-where-clause-vs-impl.rs
+++ b/src/test/ui/run-pass/traits/trait-where-clause-vs-impl.rs
diff --git a/src/test/run-pass/trait-with-bounds-default.rs b/src/test/ui/run-pass/traits/trait-with-bounds-default.rs
index 6b0faa2207b..6b0faa2207b 100644
--- a/src/test/run-pass/trait-with-bounds-default.rs
+++ b/src/test/ui/run-pass/traits/trait-with-bounds-default.rs
diff --git a/src/test/run-pass/traits-assoc-type-in-supertrait.rs b/src/test/ui/run-pass/traits/traits-assoc-type-in-supertrait.rs
index 5cecacafc74..5cecacafc74 100644
--- a/src/test/run-pass/traits-assoc-type-in-supertrait.rs
+++ b/src/test/ui/run-pass/traits/traits-assoc-type-in-supertrait.rs
diff --git a/src/test/run-pass/traits-conditional-dispatch.rs b/src/test/ui/run-pass/traits/traits-conditional-dispatch.rs
index 53457d85e01..53457d85e01 100644
--- a/src/test/run-pass/traits-conditional-dispatch.rs
+++ b/src/test/ui/run-pass/traits/traits-conditional-dispatch.rs
diff --git a/src/test/run-pass/traits-conditional-model-fn.rs b/src/test/ui/run-pass/traits/traits-conditional-model-fn.rs
index d19f7143ed2..d19f7143ed2 100644
--- a/src/test/run-pass/traits-conditional-model-fn.rs
+++ b/src/test/ui/run-pass/traits/traits-conditional-model-fn.rs
diff --git a/src/test/run-pass/traits-default-method-macro.rs b/src/test/ui/run-pass/traits/traits-default-method-macro.rs
index 193038d9e50..193038d9e50 100644
--- a/src/test/run-pass/traits-default-method-macro.rs
+++ b/src/test/ui/run-pass/traits/traits-default-method-macro.rs
diff --git a/src/test/run-pass/traits-default-method-mut.rs b/src/test/ui/run-pass/traits/traits-default-method-mut.rs
index bcdadb1d90d..bcdadb1d90d 100644
--- a/src/test/run-pass/traits-default-method-mut.rs
+++ b/src/test/ui/run-pass/traits/traits-default-method-mut.rs
diff --git a/src/test/run-pass/traits-default-method-self.rs b/src/test/ui/run-pass/traits/traits-default-method-self.rs
index 36b0eb527b6..36b0eb527b6 100644
--- a/src/test/run-pass/traits-default-method-self.rs
+++ b/src/test/ui/run-pass/traits/traits-default-method-self.rs
diff --git a/src/test/run-pass/traits-default-method-trivial.rs b/src/test/ui/run-pass/traits/traits-default-method-trivial.rs
index a2e7f54bba6..a2e7f54bba6 100644
--- a/src/test/run-pass/traits-default-method-trivial.rs
+++ b/src/test/ui/run-pass/traits/traits-default-method-trivial.rs
diff --git a/src/test/run-pass/traits-elaborate-type-region.rs b/src/test/ui/run-pass/traits/traits-elaborate-type-region.rs
index 4621c2ca4be..4621c2ca4be 100644
--- a/src/test/run-pass/traits-elaborate-type-region.rs
+++ b/src/test/ui/run-pass/traits/traits-elaborate-type-region.rs
diff --git a/src/test/run-pass/traits-impl-object-overlap-issue-23853.rs b/src/test/ui/run-pass/traits/traits-impl-object-overlap-issue-23853.rs
index b9b2b506137..b9b2b506137 100644
--- a/src/test/run-pass/traits-impl-object-overlap-issue-23853.rs
+++ b/src/test/ui/run-pass/traits/traits-impl-object-overlap-issue-23853.rs
diff --git a/src/test/run-pass/traits-issue-22019.rs b/src/test/ui/run-pass/traits/traits-issue-22019.rs
index 2f3e0c64f6c..2f3e0c64f6c 100644
--- a/src/test/run-pass/traits-issue-22019.rs
+++ b/src/test/ui/run-pass/traits/traits-issue-22019.rs
diff --git a/src/test/run-pass/traits-issue-22110.rs b/src/test/ui/run-pass/traits/traits-issue-22110.rs
index 3da8c253978..3da8c253978 100644
--- a/src/test/run-pass/traits-issue-22110.rs
+++ b/src/test/ui/run-pass/traits/traits-issue-22110.rs
diff --git a/src/test/run-pass/traits-issue-22655.rs b/src/test/ui/run-pass/traits/traits-issue-22655.rs
index ded17422c49..ded17422c49 100644
--- a/src/test/run-pass/traits-issue-22655.rs
+++ b/src/test/ui/run-pass/traits/traits-issue-22655.rs
diff --git a/src/test/run-pass/traits-issue-23003.rs b/src/test/ui/run-pass/traits/traits-issue-23003.rs
index 46cd22f22ba..46cd22f22ba 100644
--- a/src/test/run-pass/traits-issue-23003.rs
+++ b/src/test/ui/run-pass/traits/traits-issue-23003.rs
diff --git a/src/test/run-pass/traits-issue-26339.rs b/src/test/ui/run-pass/traits/traits-issue-26339.rs
index f2cf1779d62..f2cf1779d62 100644
--- a/src/test/run-pass/traits-issue-26339.rs
+++ b/src/test/ui/run-pass/traits/traits-issue-26339.rs
diff --git a/src/test/run-pass/traits-multidispatch-infer-convert-target.rs b/src/test/ui/run-pass/traits/traits-multidispatch-infer-convert-target.rs
index 6634c1ad0a2..6634c1ad0a2 100644
--- a/src/test/run-pass/traits-multidispatch-infer-convert-target.rs
+++ b/src/test/ui/run-pass/traits/traits-multidispatch-infer-convert-target.rs
diff --git a/src/test/run-pass/traits-negative-impls.rs b/src/test/ui/run-pass/traits/traits-negative-impls.rs
index 09c7d077705..09c7d077705 100644
--- a/src/test/run-pass/traits-negative-impls.rs
+++ b/src/test/ui/run-pass/traits/traits-negative-impls.rs
diff --git a/src/test/run-pass/traits-repeated-supertrait.rs b/src/test/ui/run-pass/traits/traits-repeated-supertrait.rs
index b059945ef74..b059945ef74 100644
--- a/src/test/run-pass/traits-repeated-supertrait.rs
+++ b/src/test/ui/run-pass/traits/traits-repeated-supertrait.rs
diff --git a/src/test/run-pass/ufcs-trait-object.rs b/src/test/ui/run-pass/traits/ufcs-trait-object.rs
index 457beeb3f37..457beeb3f37 100644
--- a/src/test/run-pass/ufcs-trait-object.rs
+++ b/src/test/ui/run-pass/traits/ufcs-trait-object.rs
diff --git a/src/test/run-pass/use-trait-before-def.rs b/src/test/ui/run-pass/traits/use-trait-before-def.rs
index 38952334e4d..38952334e4d 100644
--- a/src/test/run-pass/use-trait-before-def.rs
+++ b/src/test/ui/run-pass/traits/use-trait-before-def.rs
diff --git a/src/test/run-pass/unboxed-closures-all-traits.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-all-traits.rs
index 201500d0c62..201500d0c62 100644
--- a/src/test/run-pass/unboxed-closures-all-traits.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-all-traits.rs
diff --git a/src/test/run-pass/unboxed-closures-blanket-fn-mut.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-blanket-fn-mut.rs
index 23ec0cb5f60..23ec0cb5f60 100644
--- a/src/test/run-pass/unboxed-closures-blanket-fn-mut.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-blanket-fn-mut.rs
diff --git a/src/test/run-pass/unboxed-closures-blanket-fn.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-blanket-fn.rs
index 2aa48e7d2ad..2aa48e7d2ad 100644
--- a/src/test/run-pass/unboxed-closures-blanket-fn.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-blanket-fn.rs
diff --git a/src/test/run-pass/unboxed-closures-boxed.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-boxed.rs
index 72d5a1dc043..72d5a1dc043 100644
--- a/src/test/run-pass/unboxed-closures-boxed.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-boxed.rs
diff --git a/src/test/run-pass/unboxed-closures-by-ref.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-by-ref.rs
index b251215909a..b251215909a 100644
--- a/src/test/run-pass/unboxed-closures-by-ref.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-by-ref.rs
diff --git a/src/test/run-pass/unboxed-closures-call-fn-autoderef.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-fn-autoderef.rs
index 56c53bcafce..56c53bcafce 100644
--- a/src/test/run-pass/unboxed-closures-call-fn-autoderef.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-fn-autoderef.rs
diff --git a/src/test/run-pass/unboxed-closures-call-sugar-autoderef.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-sugar-autoderef.rs
index 63667ec11d6..63667ec11d6 100644
--- a/src/test/run-pass/unboxed-closures-call-sugar-autoderef.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-sugar-autoderef.rs
diff --git a/src/test/run-pass/unboxed-closures-call-sugar-object-autoderef.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-sugar-object-autoderef.rs
index f4453f1bb8a..f4453f1bb8a 100644
--- a/src/test/run-pass/unboxed-closures-call-sugar-object-autoderef.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-sugar-object-autoderef.rs
diff --git a/src/test/run-pass/unboxed-closures-call-sugar-object.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-sugar-object.rs
index 2fdb9e9b346..2fdb9e9b346 100644
--- a/src/test/run-pass/unboxed-closures-call-sugar-object.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-sugar-object.rs
diff --git a/src/test/run-pass/unboxed-closures-counter-not-moved.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-counter-not-moved.rs
index 300a0ee63f8..300a0ee63f8 100644
--- a/src/test/run-pass/unboxed-closures-counter-not-moved.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-counter-not-moved.rs
diff --git a/src/test/run-pass/unboxed-closures-cross-crate.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-cross-crate.rs
index 37dc760cedc..37dc760cedc 100644
--- a/src/test/run-pass/unboxed-closures-cross-crate.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-cross-crate.rs
diff --git a/src/test/run-pass/unboxed-closures-direct-sugary-call.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-direct-sugary-call.rs
index c8da4a6992a..c8da4a6992a 100644
--- a/src/test/run-pass/unboxed-closures-direct-sugary-call.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-direct-sugary-call.rs
diff --git a/src/test/run-pass/unboxed-closures-drop.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-drop.rs
index 57f2f87e246..57f2f87e246 100644
--- a/src/test/run-pass/unboxed-closures-drop.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-drop.rs
diff --git a/src/test/run-pass/unboxed-closures-extern-fn-hr.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-extern-fn-hr.rs
index 75cd61b9cf0..75cd61b9cf0 100644
--- a/src/test/run-pass/unboxed-closures-extern-fn-hr.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-extern-fn-hr.rs
diff --git a/src/test/run-pass/unboxed-closures-extern-fn.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-extern-fn.rs
index eddb6080d17..eddb6080d17 100644
--- a/src/test/run-pass/unboxed-closures-extern-fn.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-extern-fn.rs
diff --git a/src/test/run-pass/unboxed-closures-fn-as-fnmut-and-fnonce.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-fn-as-fnmut-and-fnonce.rs
index f90aced3dbe..f90aced3dbe 100644
--- a/src/test/run-pass/unboxed-closures-fn-as-fnmut-and-fnonce.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-fn-as-fnmut-and-fnonce.rs
diff --git a/src/test/run-pass/unboxed-closures-fnmut-as-fnonce.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-fnmut-as-fnonce.rs
index 0a977cef442..0a977cef442 100644
--- a/src/test/run-pass/unboxed-closures-fnmut-as-fnonce.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-fnmut-as-fnonce.rs
diff --git a/src/test/run-pass/unboxed-closures-generic.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-generic.rs
index 01c81ef98d5..01c81ef98d5 100644
--- a/src/test/run-pass/unboxed-closures-generic.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-generic.rs
diff --git a/src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-bound.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-bound.rs
index c4944548e17..c4944548e17 100644
--- a/src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-bound.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-bound.rs
diff --git a/src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-object-type.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-object-type.rs
index 9cad7d61e32..9cad7d61e32 100644
--- a/src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-object-type.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-object-type.rs
diff --git a/src/test/run-pass/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs
index bdd1932182b..bdd1932182b 100644
--- a/src/test/run-pass/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs
diff --git a/src/test/run-pass/unboxed-closures-infer-explicit-call-early.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-explicit-call-early.rs
index 028f2e9375b..028f2e9375b 100644
--- a/src/test/run-pass/unboxed-closures-infer-explicit-call-early.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-explicit-call-early.rs
diff --git a/src/test/run-pass/unboxed-closures-infer-fnmut-calling-fnmut.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut.rs
index 17833033492..17833033492 100644
--- a/src/test/run-pass/unboxed-closures-infer-fnmut-calling-fnmut.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut.rs
diff --git a/src/test/run-pass/unboxed-closures-infer-fnmut-move.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnmut-move.rs
index 794527249bf..794527249bf 100644
--- a/src/test/run-pass/unboxed-closures-infer-fnmut-move.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnmut-move.rs
diff --git a/src/test/run-pass/unboxed-closures-infer-fnmut.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnmut.rs
index 67f36b9a920..67f36b9a920 100644
--- a/src/test/run-pass/unboxed-closures-infer-fnmut.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnmut.rs
diff --git a/src/test/run-pass/unboxed-closures-infer-fnonce-move.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnonce-move.rs
index 449f533103a..449f533103a 100644
--- a/src/test/run-pass/unboxed-closures-infer-fnonce-move.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnonce-move.rs
diff --git a/src/test/run-pass/unboxed-closures-infer-fnonce.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnonce.rs
index 79a1aff8535..79a1aff8535 100644
--- a/src/test/run-pass/unboxed-closures-infer-fnonce.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnonce.rs
diff --git a/src/test/run-pass/unboxed-closures-infer-kind.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-kind.rs
index c04df7ed5f8..c04df7ed5f8 100644
--- a/src/test/run-pass/unboxed-closures-infer-kind.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-kind.rs
diff --git a/src/test/run-pass/unboxed-closures-infer-recursive-fn.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-recursive-fn.rs
index ac303e3a090..ac303e3a090 100644
--- a/src/test/run-pass/unboxed-closures-infer-recursive-fn.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-recursive-fn.rs
diff --git a/src/test/run-pass/unboxed-closures-infer-upvar.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-upvar.rs
index 1401fe7470b..1401fe7470b 100644
--- a/src/test/run-pass/unboxed-closures-infer-upvar.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-upvar.rs
diff --git a/src/test/run-pass/unboxed-closures-manual-impl.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-manual-impl.rs
index e2d05884f3a..e2d05884f3a 100644
--- a/src/test/run-pass/unboxed-closures-manual-impl.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-manual-impl.rs
diff --git a/src/test/run-pass/unboxed-closures-monomorphization.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-monomorphization.rs
index d0d36d969b7..d0d36d969b7 100644
--- a/src/test/run-pass/unboxed-closures-monomorphization.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-monomorphization.rs
diff --git a/src/test/run-pass/unboxed-closures-move-from-projection-issue-30046.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-move-from-projection-issue-30046.rs
index d902ebc9dc9..d902ebc9dc9 100644
--- a/src/test/run-pass/unboxed-closures-move-from-projection-issue-30046.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-move-from-projection-issue-30046.rs
diff --git a/src/test/run-pass/unboxed-closures-move-mutable.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-move-mutable.rs
index a55b0a0185e..a55b0a0185e 100644
--- a/src/test/run-pass/unboxed-closures-move-mutable.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-move-mutable.rs
diff --git a/src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-move-some-upvars-in-by-ref-closure.rs
index b9a16535c42..b9a16535c42 100644
--- a/src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-move-some-upvars-in-by-ref-closure.rs
diff --git a/src/test/run-pass/unboxed-closures-prelude.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-prelude.rs
index f82b04f37c5..f82b04f37c5 100644
--- a/src/test/run-pass/unboxed-closures-prelude.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-prelude.rs
diff --git a/src/test/run-pass/unboxed-closures-simple.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-simple.rs
index 429afb95248..429afb95248 100644
--- a/src/test/run-pass/unboxed-closures-simple.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-simple.rs
diff --git a/src/test/run-pass/unboxed-closures-single-word-env.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-single-word-env.rs
index 3ed055a7884..3ed055a7884 100644
--- a/src/test/run-pass/unboxed-closures-single-word-env.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-single-word-env.rs
diff --git a/src/test/run-pass/unboxed-closures-static-call-fn-once.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-static-call-fn-once.rs
index c13e9513ce3..c13e9513ce3 100644
--- a/src/test/run-pass/unboxed-closures-static-call-fn-once.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-static-call-fn-once.rs
diff --git a/src/test/run-pass/unboxed-closures-sugar-object.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-sugar-object.rs
index b7d367f2353..b7d367f2353 100644
--- a/src/test/run-pass/unboxed-closures-sugar-object.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-sugar-object.rs
diff --git a/src/test/run-pass/unboxed-closures-unique-type-id.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-unique-type-id.rs
index c95885518ea..c95885518ea 100644
--- a/src/test/run-pass/unboxed-closures-unique-type-id.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-unique-type-id.rs
diff --git a/src/test/run-pass/unboxed-closures-zero-args.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-zero-args.rs
index 9e6a7cce1fd..9e6a7cce1fd 100644
--- a/src/test/run-pass/unboxed-closures-zero-args.rs
+++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-zero-args.rs
diff --git a/src/test/run-pass/unique-assign-copy.rs b/src/test/ui/run-pass/unique/unique-assign-copy.rs
index 1e36f5287a7..1e36f5287a7 100644
--- a/src/test/run-pass/unique-assign-copy.rs
+++ b/src/test/ui/run-pass/unique/unique-assign-copy.rs
diff --git a/src/test/run-pass/unique-assign-drop.rs b/src/test/ui/run-pass/unique/unique-assign-drop.rs
index 1227c14ec02..1227c14ec02 100644
--- a/src/test/run-pass/unique-assign-drop.rs
+++ b/src/test/ui/run-pass/unique/unique-assign-drop.rs
diff --git a/src/test/run-pass/unique-assign-generic.rs b/src/test/ui/run-pass/unique/unique-assign-generic.rs
index 1abc8203305..1abc8203305 100644
--- a/src/test/run-pass/unique-assign-generic.rs
+++ b/src/test/ui/run-pass/unique/unique-assign-generic.rs
diff --git a/src/test/run-pass/unique-assign.rs b/src/test/ui/run-pass/unique/unique-assign.rs
index 66b78d27c59..66b78d27c59 100644
--- a/src/test/run-pass/unique-assign.rs
+++ b/src/test/ui/run-pass/unique/unique-assign.rs
diff --git a/src/test/run-pass/unique-autoderef-field.rs b/src/test/ui/run-pass/unique/unique-autoderef-field.rs
index 4ad465abc48..4ad465abc48 100644
--- a/src/test/run-pass/unique-autoderef-field.rs
+++ b/src/test/ui/run-pass/unique/unique-autoderef-field.rs
diff --git a/src/test/run-pass/unique-autoderef-index.rs b/src/test/ui/run-pass/unique/unique-autoderef-index.rs
index b0abcfab78e..b0abcfab78e 100644
--- a/src/test/run-pass/unique-autoderef-index.rs
+++ b/src/test/ui/run-pass/unique/unique-autoderef-index.rs
diff --git a/src/test/run-pass/unique-cmp.rs b/src/test/ui/run-pass/unique/unique-cmp.rs
index e949215396c..e949215396c 100644
--- a/src/test/run-pass/unique-cmp.rs
+++ b/src/test/ui/run-pass/unique/unique-cmp.rs
diff --git a/src/test/run-pass/unique-containing-tag.rs b/src/test/ui/run-pass/unique/unique-containing-tag.rs
index 94f523eb396..94f523eb396 100644
--- a/src/test/run-pass/unique-containing-tag.rs
+++ b/src/test/ui/run-pass/unique/unique-containing-tag.rs
diff --git a/src/test/run-pass/unique-create.rs b/src/test/ui/run-pass/unique/unique-create.rs
index 5ebabf0c29a..5ebabf0c29a 100644
--- a/src/test/run-pass/unique-create.rs
+++ b/src/test/ui/run-pass/unique/unique-create.rs
diff --git a/src/test/run-pass/unique-decl-init-copy.rs b/src/test/ui/run-pass/unique/unique-decl-init-copy.rs
index 71197b9d02f..71197b9d02f 100644
--- a/src/test/run-pass/unique-decl-init-copy.rs
+++ b/src/test/ui/run-pass/unique/unique-decl-init-copy.rs
diff --git a/src/test/run-pass/unique-decl-init.rs b/src/test/ui/run-pass/unique/unique-decl-init.rs
index 2501caddb46..2501caddb46 100644
--- a/src/test/run-pass/unique-decl-init.rs
+++ b/src/test/ui/run-pass/unique/unique-decl-init.rs
diff --git a/src/test/run-pass/unique-decl-move.rs b/src/test/ui/run-pass/unique/unique-decl-move.rs
index fc6421e2e08..fc6421e2e08 100644
--- a/src/test/run-pass/unique-decl-move.rs
+++ b/src/test/ui/run-pass/unique/unique-decl-move.rs
diff --git a/src/test/run-pass/unique-decl.rs b/src/test/ui/run-pass/unique/unique-decl.rs
index bbf9b2f47a7..bbf9b2f47a7 100644
--- a/src/test/run-pass/unique-decl.rs
+++ b/src/test/ui/run-pass/unique/unique-decl.rs
diff --git a/src/test/run-pass/unique-deref.rs b/src/test/ui/run-pass/unique/unique-deref.rs
index 8c008683ef3..8c008683ef3 100644
--- a/src/test/run-pass/unique-deref.rs
+++ b/src/test/ui/run-pass/unique/unique-deref.rs
diff --git a/src/test/run-pass/unique-destructure.rs b/src/test/ui/run-pass/unique/unique-destructure.rs
index 70b4af1886f..70b4af1886f 100644
--- a/src/test/run-pass/unique-destructure.rs
+++ b/src/test/ui/run-pass/unique/unique-destructure.rs
diff --git a/src/test/run-pass/unique-drop-complex.rs b/src/test/ui/run-pass/unique/unique-drop-complex.rs
index bcfb65769da..bcfb65769da 100644
--- a/src/test/run-pass/unique-drop-complex.rs
+++ b/src/test/ui/run-pass/unique/unique-drop-complex.rs
diff --git a/src/test/run-pass/unique-ffi-symbols.rs b/src/test/ui/run-pass/unique/unique-ffi-symbols.rs
index 81563f40e94..81563f40e94 100644
--- a/src/test/run-pass/unique-ffi-symbols.rs
+++ b/src/test/ui/run-pass/unique/unique-ffi-symbols.rs
diff --git a/src/test/run-pass/unique-fn-arg-move.rs b/src/test/ui/run-pass/unique/unique-fn-arg-move.rs
index 45cc530659f..45cc530659f 100644
--- a/src/test/run-pass/unique-fn-arg-move.rs
+++ b/src/test/ui/run-pass/unique/unique-fn-arg-move.rs
diff --git a/src/test/run-pass/unique-fn-arg-mut.rs b/src/test/ui/run-pass/unique/unique-fn-arg-mut.rs
index 77c4fa29558..77c4fa29558 100644
--- a/src/test/run-pass/unique-fn-arg-mut.rs
+++ b/src/test/ui/run-pass/unique/unique-fn-arg-mut.rs
diff --git a/src/test/run-pass/unique-fn-arg.rs b/src/test/ui/run-pass/unique/unique-fn-arg.rs
index 20a0008ef56..20a0008ef56 100644
--- a/src/test/run-pass/unique-fn-arg.rs
+++ b/src/test/ui/run-pass/unique/unique-fn-arg.rs
diff --git a/src/test/run-pass/unique-fn-ret.rs b/src/test/ui/run-pass/unique/unique-fn-ret.rs
index 7d88176828e..7d88176828e 100644
--- a/src/test/run-pass/unique-fn-ret.rs
+++ b/src/test/ui/run-pass/unique/unique-fn-ret.rs
diff --git a/src/test/run-pass/unique-generic-assign.rs b/src/test/ui/run-pass/unique/unique-generic-assign.rs
index 2da3b9f05f6..2da3b9f05f6 100644
--- a/src/test/run-pass/unique-generic-assign.rs
+++ b/src/test/ui/run-pass/unique/unique-generic-assign.rs
diff --git a/src/test/run-pass/unique-in-tag.rs b/src/test/ui/run-pass/unique/unique-in-tag.rs
index 517cdd02535..517cdd02535 100644
--- a/src/test/run-pass/unique-in-tag.rs
+++ b/src/test/ui/run-pass/unique/unique-in-tag.rs
diff --git a/src/test/run-pass/unique-in-vec-copy.rs b/src/test/ui/run-pass/unique/unique-in-vec-copy.rs
index a460aa6ec10..a460aa6ec10 100644
--- a/src/test/run-pass/unique-in-vec-copy.rs
+++ b/src/test/ui/run-pass/unique/unique-in-vec-copy.rs
diff --git a/src/test/run-pass/unique-in-vec.rs b/src/test/ui/run-pass/unique/unique-in-vec.rs
index a7edc9cc710..a7edc9cc710 100644
--- a/src/test/run-pass/unique-in-vec.rs
+++ b/src/test/ui/run-pass/unique/unique-in-vec.rs
diff --git a/src/test/run-pass/unique-init.rs b/src/test/ui/run-pass/unique/unique-init.rs
index 768614b1e3c..768614b1e3c 100644
--- a/src/test/run-pass/unique-init.rs
+++ b/src/test/ui/run-pass/unique/unique-init.rs
diff --git a/src/test/run-pass/unique-kinds.rs b/src/test/ui/run-pass/unique/unique-kinds.rs
index 80364114bce..80364114bce 100644
--- a/src/test/run-pass/unique-kinds.rs
+++ b/src/test/ui/run-pass/unique/unique-kinds.rs
diff --git a/src/test/run-pass/unique-log.rs b/src/test/ui/run-pass/unique/unique-log.rs
index 0c17acb3d89..0c17acb3d89 100644
--- a/src/test/run-pass/unique-log.rs
+++ b/src/test/ui/run-pass/unique/unique-log.rs
diff --git a/src/test/run-pass/unique-match-discrim.rs b/src/test/ui/run-pass/unique/unique-match-discrim.rs
index 1b0392341e7..1b0392341e7 100644
--- a/src/test/run-pass/unique-match-discrim.rs
+++ b/src/test/ui/run-pass/unique/unique-match-discrim.rs
diff --git a/src/test/run-pass/unique-move-drop.rs b/src/test/ui/run-pass/unique/unique-move-drop.rs
index ba865abc371..ba865abc371 100644
--- a/src/test/run-pass/unique-move-drop.rs
+++ b/src/test/ui/run-pass/unique/unique-move-drop.rs
diff --git a/src/test/run-pass/unique-move-temp.rs b/src/test/ui/run-pass/unique/unique-move-temp.rs
index 8c1178b9a7e..8c1178b9a7e 100644
--- a/src/test/run-pass/unique-move-temp.rs
+++ b/src/test/ui/run-pass/unique/unique-move-temp.rs
diff --git a/src/test/run-pass/unique-move.rs b/src/test/ui/run-pass/unique/unique-move.rs
index e731ca818fe..e731ca818fe 100644
--- a/src/test/run-pass/unique-move.rs
+++ b/src/test/ui/run-pass/unique/unique-move.rs
diff --git a/src/test/run-pass/unique-mutable.rs b/src/test/ui/run-pass/unique/unique-mutable.rs
index 48006010300..48006010300 100644
--- a/src/test/run-pass/unique-mutable.rs
+++ b/src/test/ui/run-pass/unique/unique-mutable.rs
diff --git a/src/test/run-pass/unique-object-move.rs b/src/test/ui/run-pass/unique/unique-object-move.rs
index d93df4e96f9..d93df4e96f9 100644
--- a/src/test/run-pass/unique-object-move.rs
+++ b/src/test/ui/run-pass/unique/unique-object-move.rs
diff --git a/src/test/run-pass/unique-pat-2.rs b/src/test/ui/run-pass/unique/unique-pat-2.rs
index 12e81a202e9..12e81a202e9 100644
--- a/src/test/run-pass/unique-pat-2.rs
+++ b/src/test/ui/run-pass/unique/unique-pat-2.rs
diff --git a/src/test/run-pass/unique-pat-3.rs b/src/test/ui/run-pass/unique/unique-pat-3.rs
index 9f361d460e0..9f361d460e0 100644
--- a/src/test/run-pass/unique-pat-3.rs
+++ b/src/test/ui/run-pass/unique/unique-pat-3.rs
diff --git a/src/test/run-pass/unique-pat.rs b/src/test/ui/run-pass/unique/unique-pat.rs
index 8af160b1f56..8af160b1f56 100644
--- a/src/test/run-pass/unique-pat.rs
+++ b/src/test/ui/run-pass/unique/unique-pat.rs
diff --git a/src/test/run-pass/unique-rec.rs b/src/test/ui/run-pass/unique/unique-rec.rs
index aa3fc8f5bb5..aa3fc8f5bb5 100644
--- a/src/test/run-pass/unique-rec.rs
+++ b/src/test/ui/run-pass/unique/unique-rec.rs
diff --git a/src/test/run-pass/unique-send-2.rs b/src/test/ui/run-pass/unique/unique-send-2.rs
index 7a0e585e8b0..7a0e585e8b0 100644
--- a/src/test/run-pass/unique-send-2.rs
+++ b/src/test/ui/run-pass/unique/unique-send-2.rs
diff --git a/src/test/run-pass/unique-send.rs b/src/test/ui/run-pass/unique/unique-send.rs
index 7644da08e4a..7644da08e4a 100644
--- a/src/test/run-pass/unique-send.rs
+++ b/src/test/ui/run-pass/unique/unique-send.rs
diff --git a/src/test/run-pass/unique-swap.rs b/src/test/ui/run-pass/unique/unique-swap.rs
index 6e6fe4e420b..6e6fe4e420b 100644
--- a/src/test/run-pass/unique-swap.rs
+++ b/src/test/ui/run-pass/unique/unique-swap.rs
diff --git a/src/test/run-pass/where-clause-bounds-inconsistency.rs b/src/test/ui/run-pass/where-clauses/where-clause-bounds-inconsistency.rs
index fa07861d799..fa07861d799 100644
--- a/src/test/run-pass/where-clause-bounds-inconsistency.rs
+++ b/src/test/ui/run-pass/where-clauses/where-clause-bounds-inconsistency.rs
diff --git a/src/test/run-pass/where-clause-early-bound-lifetimes.rs b/src/test/ui/run-pass/where-clauses/where-clause-early-bound-lifetimes.rs
index b9f605ec548..b9f605ec548 100644
--- a/src/test/run-pass/where-clause-early-bound-lifetimes.rs
+++ b/src/test/ui/run-pass/where-clauses/where-clause-early-bound-lifetimes.rs
diff --git a/src/test/run-pass/where-clause-method-substituion.rs b/src/test/ui/run-pass/where-clauses/where-clause-method-substituion.rs
index d7aaa0b2f9c..d7aaa0b2f9c 100644
--- a/src/test/run-pass/where-clause-method-substituion.rs
+++ b/src/test/ui/run-pass/where-clauses/where-clause-method-substituion.rs
diff --git a/src/test/run-pass/where-clause-region-outlives.rs b/src/test/ui/run-pass/where-clauses/where-clause-region-outlives.rs
index 60df52bfeb9..60df52bfeb9 100644
--- a/src/test/run-pass/where-clause-region-outlives.rs
+++ b/src/test/ui/run-pass/where-clauses/where-clause-region-outlives.rs
diff --git a/src/test/run-pass/where-clauses-cross-crate.rs b/src/test/ui/run-pass/where-clauses/where-clauses-cross-crate.rs
index 1b349b25ef3..1b349b25ef3 100644
--- a/src/test/run-pass/where-clauses-cross-crate.rs
+++ b/src/test/ui/run-pass/where-clauses/where-clauses-cross-crate.rs
diff --git a/src/test/run-pass/where-clauses-lifetimes.rs b/src/test/ui/run-pass/where-clauses/where-clauses-lifetimes.rs
index bba20e8e92e..bba20e8e92e 100644
--- a/src/test/run-pass/where-clauses-lifetimes.rs
+++ b/src/test/ui/run-pass/where-clauses/where-clauses-lifetimes.rs
diff --git a/src/test/run-pass/where-clauses-method.rs b/src/test/ui/run-pass/where-clauses/where-clauses-method.rs
index 29efe727276..29efe727276 100644
--- a/src/test/run-pass/where-clauses-method.rs
+++ b/src/test/ui/run-pass/where-clauses/where-clauses-method.rs
diff --git a/src/test/run-pass/where-clauses-unboxed-closures.rs b/src/test/ui/run-pass/where-clauses/where-clauses-unboxed-closures.rs
index 8a775caaac6..8a775caaac6 100644
--- a/src/test/run-pass/where-clauses-unboxed-closures.rs
+++ b/src/test/ui/run-pass/where-clauses/where-clauses-unboxed-closures.rs
diff --git a/src/test/run-pass/where-clauses.rs b/src/test/ui/run-pass/where-clauses/where-clauses.rs
index ab1f30c3d14..ab1f30c3d14 100644
--- a/src/test/run-pass/where-clauses.rs
+++ b/src/test/ui/run-pass/where-clauses/where-clauses.rs
diff --git a/src/test/run-pass/zero-size-type-destructors.rs b/src/test/ui/run-pass/zero-sized/zero-size-type-destructors.rs
index 18b6c372a5e..18b6c372a5e 100644
--- a/src/test/run-pass/zero-size-type-destructors.rs
+++ b/src/test/ui/run-pass/zero-sized/zero-size-type-destructors.rs
diff --git a/src/test/run-pass/zero-sized-binary-heap-push.rs b/src/test/ui/run-pass/zero-sized/zero-sized-binary-heap-push.rs
index 0866a767934..0866a767934 100644
--- a/src/test/run-pass/zero-sized-binary-heap-push.rs
+++ b/src/test/ui/run-pass/zero-sized/zero-sized-binary-heap-push.rs
diff --git a/src/test/run-pass/zero-sized-btreemap-insert.rs b/src/test/ui/run-pass/zero-sized/zero-sized-btreemap-insert.rs
index aff124c30ec..aff124c30ec 100644
--- a/src/test/run-pass/zero-sized-btreemap-insert.rs
+++ b/src/test/ui/run-pass/zero-sized/zero-sized-btreemap-insert.rs
diff --git a/src/test/run-pass/zero-sized-linkedlist-push.rs b/src/test/ui/run-pass/zero-sized/zero-sized-linkedlist-push.rs
index 9c424854d48..9c424854d48 100644
--- a/src/test/run-pass/zero-sized-linkedlist-push.rs
+++ b/src/test/ui/run-pass/zero-sized/zero-sized-linkedlist-push.rs
diff --git a/src/test/run-pass/zero-sized-tuple-struct.rs b/src/test/ui/run-pass/zero-sized/zero-sized-tuple-struct.rs
index 9625d6a88ac..9625d6a88ac 100644
--- a/src/test/run-pass/zero-sized-tuple-struct.rs
+++ b/src/test/ui/run-pass/zero-sized/zero-sized-tuple-struct.rs
diff --git a/src/test/run-pass/zero-sized-vec-deque-push.rs b/src/test/ui/run-pass/zero-sized/zero-sized-vec-deque-push.rs
index d7c7cd28ee4..d7c7cd28ee4 100644
--- a/src/test/run-pass/zero-sized-vec-deque-push.rs
+++ b/src/test/ui/run-pass/zero-sized/zero-sized-vec-deque-push.rs
diff --git a/src/test/run-pass/zero-sized-vec-push.rs b/src/test/ui/run-pass/zero-sized/zero-sized-vec-push.rs
index e472e9380a3..e472e9380a3 100644
--- a/src/test/run-pass/zero-sized-vec-push.rs
+++ b/src/test/ui/run-pass/zero-sized/zero-sized-vec-push.rs