From e9d04c5e2444526ffde83662f2d57fa35c772891 Mon Sep 17 00:00:00 2001
From: Zalathar <Zalathar@users.noreply.github.com>
Date: Wed, 1 Nov 2023 21:26:53 +1100
Subject: [PATCH] coverage: Migrate `tests/run-coverage` into `tests/coverage`

---
 src/bootstrap/src/core/build_steps/test.rs       | 16 +++++++---------
 tests/{run-coverage => coverage}/abort.coverage  |  0
 tests/{run-coverage => coverage}/abort.rs        |  0
 tests/{run-coverage => coverage}/assert.coverage |  0
 tests/{run-coverage => coverage}/assert.rs       |  0
 tests/{run-coverage => coverage}/async.coverage  |  0
 tests/{run-coverage => coverage}/async.rs        |  0
 tests/{run-coverage => coverage}/async2.coverage |  0
 tests/{run-coverage => coverage}/async2.rs       |  0
 .../auxiliary/inline_always_with_dead_code.rs    |  0
 .../auxiliary/unused_mod_helper.rs               |  0
 .../auxiliary/used_crate.rs                      |  0
 .../auxiliary/used_inline_crate.rs               |  0
 .../bad_counter_ids.coverage                     |  0
 .../bad_counter_ids.rs                           |  0
 .../{run-coverage => coverage}/closure.coverage  |  0
 tests/{run-coverage => coverage}/closure.rs      |  0
 .../closure_bug.coverage                         |  0
 tests/{run-coverage => coverage}/closure_bug.rs  |  0
 .../closure_macro.coverage                       |  0
 .../{run-coverage => coverage}/closure_macro.rs  |  0
 .../closure_macro_async.coverage                 |  0
 .../closure_macro_async.rs                       |  0
 .../conditions.coverage                          |  0
 tests/{run-coverage => coverage}/conditions.rs   |  0
 .../{run-coverage => coverage}/continue.coverage |  0
 tests/{run-coverage => coverage}/continue.rs     |  0
 .../coroutine.coverage                           |  0
 tests/{run-coverage => coverage}/coroutine.rs    |  0
 .../dead_code.coverage                           |  0
 tests/{run-coverage => coverage}/dead_code.rs    |  0
 .../drop_trait.coverage                          |  0
 tests/{run-coverage => coverage}/drop_trait.rs   |  0
 .../fn_sig_into_try.coverage                     |  0
 .../fn_sig_into_try.rs                           |  0
 .../{run-coverage => coverage}/generics.coverage |  0
 tests/{run-coverage => coverage}/generics.rs     |  0
 tests/{run-coverage => coverage}/if.coverage     |  0
 tests/{run-coverage => coverage}/if.rs           |  0
 .../{run-coverage => coverage}/if_else.coverage  |  0
 tests/{run-coverage => coverage}/if_else.rs      |  0
 .../inline-dead.coverage                         |  0
 tests/{run-coverage => coverage}/inline-dead.rs  |  0
 tests/{run-coverage => coverage}/inline.coverage |  0
 tests/{run-coverage => coverage}/inline.rs       |  0
 .../inner_items.coverage                         |  0
 tests/{run-coverage => coverage}/inner_items.rs  |  0
 .../issue-83601.coverage                         |  0
 tests/{run-coverage => coverage}/issue-83601.rs  |  0
 .../issue-84561.coverage                         |  0
 tests/{run-coverage => coverage}/issue-84561.rs  |  0
 .../issue-85461.coverage                         |  0
 tests/{run-coverage => coverage}/issue-85461.rs  |  0
 .../issue-93054.coverage                         |  0
 tests/{run-coverage => coverage}/issue-93054.rs  |  0
 .../lazy_boolean.coverage                        |  0
 tests/{run-coverage => coverage}/lazy_boolean.rs |  0
 .../long_and_wide.coverage                       |  0
 .../{run-coverage => coverage}/long_and_wide.rs  |  0
 .../loop_break_value.coverage                    |  0
 .../loop_break_value.rs                          |  0
 .../loops_branches.coverage                      |  0
 .../{run-coverage => coverage}/loops_branches.rs |  0
 .../match_or_pattern.coverage                    |  0
 .../match_or_pattern.rs                          |  0
 .../nested_loops.coverage                        |  0
 tests/{run-coverage => coverage}/nested_loops.rs |  0
 .../no_cov_crate.coverage                        |  0
 tests/{run-coverage => coverage}/no_cov_crate.rs |  0
 .../{run-coverage => coverage}/overflow.coverage |  0
 tests/{run-coverage => coverage}/overflow.rs     |  0
 .../panic_unwind.coverage                        |  0
 tests/{run-coverage => coverage}/panic_unwind.rs |  0
 .../partial_eq.coverage                          |  0
 tests/{run-coverage => coverage}/partial_eq.rs   |  0
 .../simple_loop.coverage                         |  0
 tests/{run-coverage => coverage}/simple_loop.rs  |  0
 .../simple_match.coverage                        |  0
 tests/{run-coverage => coverage}/simple_match.rs |  0
 .../sort_groups.coverage                         |  0
 tests/{run-coverage => coverage}/sort_groups.rs  |  0
 .../test_harness.coverage                        |  0
 tests/{run-coverage => coverage}/test_harness.rs |  0
 .../tight_inf_loop.coverage                      |  0
 .../{run-coverage => coverage}/tight_inf_loop.rs |  0
 .../{run-coverage => coverage}/trivial.coverage  |  0
 tests/{run-coverage => coverage}/trivial.rs      |  0
 .../try_error_result.coverage                    |  0
 .../try_error_result.rs                          |  0
 .../unreachable.coverage                         |  0
 tests/{run-coverage => coverage}/unreachable.rs  |  0
 tests/{run-coverage => coverage}/unused.coverage |  0
 tests/{run-coverage => coverage}/unused.rs       |  0
 .../unused_mod.coverage                          |  0
 tests/{run-coverage => coverage}/unused_mod.rs   |  0
 .../uses_crate.coverage                          |  0
 tests/{run-coverage => coverage}/uses_crate.rs   |  0
 .../uses_inline_crate.coverage                   |  0
 .../uses_inline_crate.rs                         |  0
 tests/{run-coverage => coverage}/while.coverage  |  0
 tests/{run-coverage => coverage}/while.rs        |  0
 .../while_early_ret.coverage                     |  0
 .../while_early_ret.rs                           |  0
 tests/{run-coverage => coverage}/yield.coverage  |  0
 tests/{run-coverage => coverage}/yield.rs        |  0
 105 files changed, 7 insertions(+), 9 deletions(-)
 rename tests/{run-coverage => coverage}/abort.coverage (100%)
 rename tests/{run-coverage => coverage}/abort.rs (100%)
 rename tests/{run-coverage => coverage}/assert.coverage (100%)
 rename tests/{run-coverage => coverage}/assert.rs (100%)
 rename tests/{run-coverage => coverage}/async.coverage (100%)
 rename tests/{run-coverage => coverage}/async.rs (100%)
 rename tests/{run-coverage => coverage}/async2.coverage (100%)
 rename tests/{run-coverage => coverage}/async2.rs (100%)
 rename tests/{run-coverage => coverage}/auxiliary/inline_always_with_dead_code.rs (100%)
 rename tests/{run-coverage => coverage}/auxiliary/unused_mod_helper.rs (100%)
 rename tests/{run-coverage => coverage}/auxiliary/used_crate.rs (100%)
 rename tests/{run-coverage => coverage}/auxiliary/used_inline_crate.rs (100%)
 rename tests/{run-coverage => coverage}/bad_counter_ids.coverage (100%)
 rename tests/{run-coverage => coverage}/bad_counter_ids.rs (100%)
 rename tests/{run-coverage => coverage}/closure.coverage (100%)
 rename tests/{run-coverage => coverage}/closure.rs (100%)
 rename tests/{run-coverage => coverage}/closure_bug.coverage (100%)
 rename tests/{run-coverage => coverage}/closure_bug.rs (100%)
 rename tests/{run-coverage => coverage}/closure_macro.coverage (100%)
 rename tests/{run-coverage => coverage}/closure_macro.rs (100%)
 rename tests/{run-coverage => coverage}/closure_macro_async.coverage (100%)
 rename tests/{run-coverage => coverage}/closure_macro_async.rs (100%)
 rename tests/{run-coverage => coverage}/conditions.coverage (100%)
 rename tests/{run-coverage => coverage}/conditions.rs (100%)
 rename tests/{run-coverage => coverage}/continue.coverage (100%)
 rename tests/{run-coverage => coverage}/continue.rs (100%)
 rename tests/{run-coverage => coverage}/coroutine.coverage (100%)
 rename tests/{run-coverage => coverage}/coroutine.rs (100%)
 rename tests/{run-coverage => coverage}/dead_code.coverage (100%)
 rename tests/{run-coverage => coverage}/dead_code.rs (100%)
 rename tests/{run-coverage => coverage}/drop_trait.coverage (100%)
 rename tests/{run-coverage => coverage}/drop_trait.rs (100%)
 rename tests/{run-coverage => coverage}/fn_sig_into_try.coverage (100%)
 rename tests/{run-coverage => coverage}/fn_sig_into_try.rs (100%)
 rename tests/{run-coverage => coverage}/generics.coverage (100%)
 rename tests/{run-coverage => coverage}/generics.rs (100%)
 rename tests/{run-coverage => coverage}/if.coverage (100%)
 rename tests/{run-coverage => coverage}/if.rs (100%)
 rename tests/{run-coverage => coverage}/if_else.coverage (100%)
 rename tests/{run-coverage => coverage}/if_else.rs (100%)
 rename tests/{run-coverage => coverage}/inline-dead.coverage (100%)
 rename tests/{run-coverage => coverage}/inline-dead.rs (100%)
 rename tests/{run-coverage => coverage}/inline.coverage (100%)
 rename tests/{run-coverage => coverage}/inline.rs (100%)
 rename tests/{run-coverage => coverage}/inner_items.coverage (100%)
 rename tests/{run-coverage => coverage}/inner_items.rs (100%)
 rename tests/{run-coverage => coverage}/issue-83601.coverage (100%)
 rename tests/{run-coverage => coverage}/issue-83601.rs (100%)
 rename tests/{run-coverage => coverage}/issue-84561.coverage (100%)
 rename tests/{run-coverage => coverage}/issue-84561.rs (100%)
 rename tests/{run-coverage => coverage}/issue-85461.coverage (100%)
 rename tests/{run-coverage => coverage}/issue-85461.rs (100%)
 rename tests/{run-coverage => coverage}/issue-93054.coverage (100%)
 rename tests/{run-coverage => coverage}/issue-93054.rs (100%)
 rename tests/{run-coverage => coverage}/lazy_boolean.coverage (100%)
 rename tests/{run-coverage => coverage}/lazy_boolean.rs (100%)
 rename tests/{run-coverage => coverage}/long_and_wide.coverage (100%)
 rename tests/{run-coverage => coverage}/long_and_wide.rs (100%)
 rename tests/{run-coverage => coverage}/loop_break_value.coverage (100%)
 rename tests/{run-coverage => coverage}/loop_break_value.rs (100%)
 rename tests/{run-coverage => coverage}/loops_branches.coverage (100%)
 rename tests/{run-coverage => coverage}/loops_branches.rs (100%)
 rename tests/{run-coverage => coverage}/match_or_pattern.coverage (100%)
 rename tests/{run-coverage => coverage}/match_or_pattern.rs (100%)
 rename tests/{run-coverage => coverage}/nested_loops.coverage (100%)
 rename tests/{run-coverage => coverage}/nested_loops.rs (100%)
 rename tests/{run-coverage => coverage}/no_cov_crate.coverage (100%)
 rename tests/{run-coverage => coverage}/no_cov_crate.rs (100%)
 rename tests/{run-coverage => coverage}/overflow.coverage (100%)
 rename tests/{run-coverage => coverage}/overflow.rs (100%)
 rename tests/{run-coverage => coverage}/panic_unwind.coverage (100%)
 rename tests/{run-coverage => coverage}/panic_unwind.rs (100%)
 rename tests/{run-coverage => coverage}/partial_eq.coverage (100%)
 rename tests/{run-coverage => coverage}/partial_eq.rs (100%)
 rename tests/{run-coverage => coverage}/simple_loop.coverage (100%)
 rename tests/{run-coverage => coverage}/simple_loop.rs (100%)
 rename tests/{run-coverage => coverage}/simple_match.coverage (100%)
 rename tests/{run-coverage => coverage}/simple_match.rs (100%)
 rename tests/{run-coverage => coverage}/sort_groups.coverage (100%)
 rename tests/{run-coverage => coverage}/sort_groups.rs (100%)
 rename tests/{run-coverage => coverage}/test_harness.coverage (100%)
 rename tests/{run-coverage => coverage}/test_harness.rs (100%)
 rename tests/{run-coverage => coverage}/tight_inf_loop.coverage (100%)
 rename tests/{run-coverage => coverage}/tight_inf_loop.rs (100%)
 rename tests/{run-coverage => coverage}/trivial.coverage (100%)
 rename tests/{run-coverage => coverage}/trivial.rs (100%)
 rename tests/{run-coverage => coverage}/try_error_result.coverage (100%)
 rename tests/{run-coverage => coverage}/try_error_result.rs (100%)
 rename tests/{run-coverage => coverage}/unreachable.coverage (100%)
 rename tests/{run-coverage => coverage}/unreachable.rs (100%)
 rename tests/{run-coverage => coverage}/unused.coverage (100%)
 rename tests/{run-coverage => coverage}/unused.rs (100%)
 rename tests/{run-coverage => coverage}/unused_mod.coverage (100%)
 rename tests/{run-coverage => coverage}/unused_mod.rs (100%)
 rename tests/{run-coverage => coverage}/uses_crate.coverage (100%)
 rename tests/{run-coverage => coverage}/uses_crate.rs (100%)
 rename tests/{run-coverage => coverage}/uses_inline_crate.coverage (100%)
 rename tests/{run-coverage => coverage}/uses_inline_crate.rs (100%)
 rename tests/{run-coverage => coverage}/while.coverage (100%)
 rename tests/{run-coverage => coverage}/while.rs (100%)
 rename tests/{run-coverage => coverage}/while_early_ret.coverage (100%)
 rename tests/{run-coverage => coverage}/while_early_ret.rs (100%)
 rename tests/{run-coverage => coverage}/yield.coverage (100%)
 rename tests/{run-coverage => coverage}/yield.rs (100%)

diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
index 758a801f8a76c..11c9e1c7bc25b 100644
--- a/src/bootstrap/src/core/build_steps/test.rs
+++ b/src/bootstrap/src/core/build_steps/test.rs
@@ -1441,14 +1441,7 @@ impl Step for Coverage {
             path: "tests/coverage-map",
             compare_mode: None,
         });
-        builder.ensure(Compiletest {
-            compiler: self.compiler,
-            target: self.target,
-            mode: "run-coverage",
-            suite: "run-coverage",
-            path: "tests/run-coverage",
-            compare_mode: None,
-        });
+        self.run_unified_suite(builder, RunCoverage::MODE);
     }
 }
 
@@ -1458,7 +1451,12 @@ default_test!(CoverageMap {
     suite: "coverage-map"
 });
 
-host_test!(RunCoverage { path: "tests/run-coverage", mode: "run-coverage", suite: "run-coverage" });
+coverage_test_alias!(RunCoverage {
+    alias_and_mode: "run-coverage",
+    default: true,
+    only_hosts: true,
+});
+
 host_test!(RunCoverageRustdoc {
     path: "tests/run-coverage-rustdoc",
     mode: "run-coverage",
diff --git a/tests/run-coverage/abort.coverage b/tests/coverage/abort.coverage
similarity index 100%
rename from tests/run-coverage/abort.coverage
rename to tests/coverage/abort.coverage
diff --git a/tests/run-coverage/abort.rs b/tests/coverage/abort.rs
similarity index 100%
rename from tests/run-coverage/abort.rs
rename to tests/coverage/abort.rs
diff --git a/tests/run-coverage/assert.coverage b/tests/coverage/assert.coverage
similarity index 100%
rename from tests/run-coverage/assert.coverage
rename to tests/coverage/assert.coverage
diff --git a/tests/run-coverage/assert.rs b/tests/coverage/assert.rs
similarity index 100%
rename from tests/run-coverage/assert.rs
rename to tests/coverage/assert.rs
diff --git a/tests/run-coverage/async.coverage b/tests/coverage/async.coverage
similarity index 100%
rename from tests/run-coverage/async.coverage
rename to tests/coverage/async.coverage
diff --git a/tests/run-coverage/async.rs b/tests/coverage/async.rs
similarity index 100%
rename from tests/run-coverage/async.rs
rename to tests/coverage/async.rs
diff --git a/tests/run-coverage/async2.coverage b/tests/coverage/async2.coverage
similarity index 100%
rename from tests/run-coverage/async2.coverage
rename to tests/coverage/async2.coverage
diff --git a/tests/run-coverage/async2.rs b/tests/coverage/async2.rs
similarity index 100%
rename from tests/run-coverage/async2.rs
rename to tests/coverage/async2.rs
diff --git a/tests/run-coverage/auxiliary/inline_always_with_dead_code.rs b/tests/coverage/auxiliary/inline_always_with_dead_code.rs
similarity index 100%
rename from tests/run-coverage/auxiliary/inline_always_with_dead_code.rs
rename to tests/coverage/auxiliary/inline_always_with_dead_code.rs
diff --git a/tests/run-coverage/auxiliary/unused_mod_helper.rs b/tests/coverage/auxiliary/unused_mod_helper.rs
similarity index 100%
rename from tests/run-coverage/auxiliary/unused_mod_helper.rs
rename to tests/coverage/auxiliary/unused_mod_helper.rs
diff --git a/tests/run-coverage/auxiliary/used_crate.rs b/tests/coverage/auxiliary/used_crate.rs
similarity index 100%
rename from tests/run-coverage/auxiliary/used_crate.rs
rename to tests/coverage/auxiliary/used_crate.rs
diff --git a/tests/run-coverage/auxiliary/used_inline_crate.rs b/tests/coverage/auxiliary/used_inline_crate.rs
similarity index 100%
rename from tests/run-coverage/auxiliary/used_inline_crate.rs
rename to tests/coverage/auxiliary/used_inline_crate.rs
diff --git a/tests/run-coverage/bad_counter_ids.coverage b/tests/coverage/bad_counter_ids.coverage
similarity index 100%
rename from tests/run-coverage/bad_counter_ids.coverage
rename to tests/coverage/bad_counter_ids.coverage
diff --git a/tests/run-coverage/bad_counter_ids.rs b/tests/coverage/bad_counter_ids.rs
similarity index 100%
rename from tests/run-coverage/bad_counter_ids.rs
rename to tests/coverage/bad_counter_ids.rs
diff --git a/tests/run-coverage/closure.coverage b/tests/coverage/closure.coverage
similarity index 100%
rename from tests/run-coverage/closure.coverage
rename to tests/coverage/closure.coverage
diff --git a/tests/run-coverage/closure.rs b/tests/coverage/closure.rs
similarity index 100%
rename from tests/run-coverage/closure.rs
rename to tests/coverage/closure.rs
diff --git a/tests/run-coverage/closure_bug.coverage b/tests/coverage/closure_bug.coverage
similarity index 100%
rename from tests/run-coverage/closure_bug.coverage
rename to tests/coverage/closure_bug.coverage
diff --git a/tests/run-coverage/closure_bug.rs b/tests/coverage/closure_bug.rs
similarity index 100%
rename from tests/run-coverage/closure_bug.rs
rename to tests/coverage/closure_bug.rs
diff --git a/tests/run-coverage/closure_macro.coverage b/tests/coverage/closure_macro.coverage
similarity index 100%
rename from tests/run-coverage/closure_macro.coverage
rename to tests/coverage/closure_macro.coverage
diff --git a/tests/run-coverage/closure_macro.rs b/tests/coverage/closure_macro.rs
similarity index 100%
rename from tests/run-coverage/closure_macro.rs
rename to tests/coverage/closure_macro.rs
diff --git a/tests/run-coverage/closure_macro_async.coverage b/tests/coverage/closure_macro_async.coverage
similarity index 100%
rename from tests/run-coverage/closure_macro_async.coverage
rename to tests/coverage/closure_macro_async.coverage
diff --git a/tests/run-coverage/closure_macro_async.rs b/tests/coverage/closure_macro_async.rs
similarity index 100%
rename from tests/run-coverage/closure_macro_async.rs
rename to tests/coverage/closure_macro_async.rs
diff --git a/tests/run-coverage/conditions.coverage b/tests/coverage/conditions.coverage
similarity index 100%
rename from tests/run-coverage/conditions.coverage
rename to tests/coverage/conditions.coverage
diff --git a/tests/run-coverage/conditions.rs b/tests/coverage/conditions.rs
similarity index 100%
rename from tests/run-coverage/conditions.rs
rename to tests/coverage/conditions.rs
diff --git a/tests/run-coverage/continue.coverage b/tests/coverage/continue.coverage
similarity index 100%
rename from tests/run-coverage/continue.coverage
rename to tests/coverage/continue.coverage
diff --git a/tests/run-coverage/continue.rs b/tests/coverage/continue.rs
similarity index 100%
rename from tests/run-coverage/continue.rs
rename to tests/coverage/continue.rs
diff --git a/tests/run-coverage/coroutine.coverage b/tests/coverage/coroutine.coverage
similarity index 100%
rename from tests/run-coverage/coroutine.coverage
rename to tests/coverage/coroutine.coverage
diff --git a/tests/run-coverage/coroutine.rs b/tests/coverage/coroutine.rs
similarity index 100%
rename from tests/run-coverage/coroutine.rs
rename to tests/coverage/coroutine.rs
diff --git a/tests/run-coverage/dead_code.coverage b/tests/coverage/dead_code.coverage
similarity index 100%
rename from tests/run-coverage/dead_code.coverage
rename to tests/coverage/dead_code.coverage
diff --git a/tests/run-coverage/dead_code.rs b/tests/coverage/dead_code.rs
similarity index 100%
rename from tests/run-coverage/dead_code.rs
rename to tests/coverage/dead_code.rs
diff --git a/tests/run-coverage/drop_trait.coverage b/tests/coverage/drop_trait.coverage
similarity index 100%
rename from tests/run-coverage/drop_trait.coverage
rename to tests/coverage/drop_trait.coverage
diff --git a/tests/run-coverage/drop_trait.rs b/tests/coverage/drop_trait.rs
similarity index 100%
rename from tests/run-coverage/drop_trait.rs
rename to tests/coverage/drop_trait.rs
diff --git a/tests/run-coverage/fn_sig_into_try.coverage b/tests/coverage/fn_sig_into_try.coverage
similarity index 100%
rename from tests/run-coverage/fn_sig_into_try.coverage
rename to tests/coverage/fn_sig_into_try.coverage
diff --git a/tests/run-coverage/fn_sig_into_try.rs b/tests/coverage/fn_sig_into_try.rs
similarity index 100%
rename from tests/run-coverage/fn_sig_into_try.rs
rename to tests/coverage/fn_sig_into_try.rs
diff --git a/tests/run-coverage/generics.coverage b/tests/coverage/generics.coverage
similarity index 100%
rename from tests/run-coverage/generics.coverage
rename to tests/coverage/generics.coverage
diff --git a/tests/run-coverage/generics.rs b/tests/coverage/generics.rs
similarity index 100%
rename from tests/run-coverage/generics.rs
rename to tests/coverage/generics.rs
diff --git a/tests/run-coverage/if.coverage b/tests/coverage/if.coverage
similarity index 100%
rename from tests/run-coverage/if.coverage
rename to tests/coverage/if.coverage
diff --git a/tests/run-coverage/if.rs b/tests/coverage/if.rs
similarity index 100%
rename from tests/run-coverage/if.rs
rename to tests/coverage/if.rs
diff --git a/tests/run-coverage/if_else.coverage b/tests/coverage/if_else.coverage
similarity index 100%
rename from tests/run-coverage/if_else.coverage
rename to tests/coverage/if_else.coverage
diff --git a/tests/run-coverage/if_else.rs b/tests/coverage/if_else.rs
similarity index 100%
rename from tests/run-coverage/if_else.rs
rename to tests/coverage/if_else.rs
diff --git a/tests/run-coverage/inline-dead.coverage b/tests/coverage/inline-dead.coverage
similarity index 100%
rename from tests/run-coverage/inline-dead.coverage
rename to tests/coverage/inline-dead.coverage
diff --git a/tests/run-coverage/inline-dead.rs b/tests/coverage/inline-dead.rs
similarity index 100%
rename from tests/run-coverage/inline-dead.rs
rename to tests/coverage/inline-dead.rs
diff --git a/tests/run-coverage/inline.coverage b/tests/coverage/inline.coverage
similarity index 100%
rename from tests/run-coverage/inline.coverage
rename to tests/coverage/inline.coverage
diff --git a/tests/run-coverage/inline.rs b/tests/coverage/inline.rs
similarity index 100%
rename from tests/run-coverage/inline.rs
rename to tests/coverage/inline.rs
diff --git a/tests/run-coverage/inner_items.coverage b/tests/coverage/inner_items.coverage
similarity index 100%
rename from tests/run-coverage/inner_items.coverage
rename to tests/coverage/inner_items.coverage
diff --git a/tests/run-coverage/inner_items.rs b/tests/coverage/inner_items.rs
similarity index 100%
rename from tests/run-coverage/inner_items.rs
rename to tests/coverage/inner_items.rs
diff --git a/tests/run-coverage/issue-83601.coverage b/tests/coverage/issue-83601.coverage
similarity index 100%
rename from tests/run-coverage/issue-83601.coverage
rename to tests/coverage/issue-83601.coverage
diff --git a/tests/run-coverage/issue-83601.rs b/tests/coverage/issue-83601.rs
similarity index 100%
rename from tests/run-coverage/issue-83601.rs
rename to tests/coverage/issue-83601.rs
diff --git a/tests/run-coverage/issue-84561.coverage b/tests/coverage/issue-84561.coverage
similarity index 100%
rename from tests/run-coverage/issue-84561.coverage
rename to tests/coverage/issue-84561.coverage
diff --git a/tests/run-coverage/issue-84561.rs b/tests/coverage/issue-84561.rs
similarity index 100%
rename from tests/run-coverage/issue-84561.rs
rename to tests/coverage/issue-84561.rs
diff --git a/tests/run-coverage/issue-85461.coverage b/tests/coverage/issue-85461.coverage
similarity index 100%
rename from tests/run-coverage/issue-85461.coverage
rename to tests/coverage/issue-85461.coverage
diff --git a/tests/run-coverage/issue-85461.rs b/tests/coverage/issue-85461.rs
similarity index 100%
rename from tests/run-coverage/issue-85461.rs
rename to tests/coverage/issue-85461.rs
diff --git a/tests/run-coverage/issue-93054.coverage b/tests/coverage/issue-93054.coverage
similarity index 100%
rename from tests/run-coverage/issue-93054.coverage
rename to tests/coverage/issue-93054.coverage
diff --git a/tests/run-coverage/issue-93054.rs b/tests/coverage/issue-93054.rs
similarity index 100%
rename from tests/run-coverage/issue-93054.rs
rename to tests/coverage/issue-93054.rs
diff --git a/tests/run-coverage/lazy_boolean.coverage b/tests/coverage/lazy_boolean.coverage
similarity index 100%
rename from tests/run-coverage/lazy_boolean.coverage
rename to tests/coverage/lazy_boolean.coverage
diff --git a/tests/run-coverage/lazy_boolean.rs b/tests/coverage/lazy_boolean.rs
similarity index 100%
rename from tests/run-coverage/lazy_boolean.rs
rename to tests/coverage/lazy_boolean.rs
diff --git a/tests/run-coverage/long_and_wide.coverage b/tests/coverage/long_and_wide.coverage
similarity index 100%
rename from tests/run-coverage/long_and_wide.coverage
rename to tests/coverage/long_and_wide.coverage
diff --git a/tests/run-coverage/long_and_wide.rs b/tests/coverage/long_and_wide.rs
similarity index 100%
rename from tests/run-coverage/long_and_wide.rs
rename to tests/coverage/long_and_wide.rs
diff --git a/tests/run-coverage/loop_break_value.coverage b/tests/coverage/loop_break_value.coverage
similarity index 100%
rename from tests/run-coverage/loop_break_value.coverage
rename to tests/coverage/loop_break_value.coverage
diff --git a/tests/run-coverage/loop_break_value.rs b/tests/coverage/loop_break_value.rs
similarity index 100%
rename from tests/run-coverage/loop_break_value.rs
rename to tests/coverage/loop_break_value.rs
diff --git a/tests/run-coverage/loops_branches.coverage b/tests/coverage/loops_branches.coverage
similarity index 100%
rename from tests/run-coverage/loops_branches.coverage
rename to tests/coverage/loops_branches.coverage
diff --git a/tests/run-coverage/loops_branches.rs b/tests/coverage/loops_branches.rs
similarity index 100%
rename from tests/run-coverage/loops_branches.rs
rename to tests/coverage/loops_branches.rs
diff --git a/tests/run-coverage/match_or_pattern.coverage b/tests/coverage/match_or_pattern.coverage
similarity index 100%
rename from tests/run-coverage/match_or_pattern.coverage
rename to tests/coverage/match_or_pattern.coverage
diff --git a/tests/run-coverage/match_or_pattern.rs b/tests/coverage/match_or_pattern.rs
similarity index 100%
rename from tests/run-coverage/match_or_pattern.rs
rename to tests/coverage/match_or_pattern.rs
diff --git a/tests/run-coverage/nested_loops.coverage b/tests/coverage/nested_loops.coverage
similarity index 100%
rename from tests/run-coverage/nested_loops.coverage
rename to tests/coverage/nested_loops.coverage
diff --git a/tests/run-coverage/nested_loops.rs b/tests/coverage/nested_loops.rs
similarity index 100%
rename from tests/run-coverage/nested_loops.rs
rename to tests/coverage/nested_loops.rs
diff --git a/tests/run-coverage/no_cov_crate.coverage b/tests/coverage/no_cov_crate.coverage
similarity index 100%
rename from tests/run-coverage/no_cov_crate.coverage
rename to tests/coverage/no_cov_crate.coverage
diff --git a/tests/run-coverage/no_cov_crate.rs b/tests/coverage/no_cov_crate.rs
similarity index 100%
rename from tests/run-coverage/no_cov_crate.rs
rename to tests/coverage/no_cov_crate.rs
diff --git a/tests/run-coverage/overflow.coverage b/tests/coverage/overflow.coverage
similarity index 100%
rename from tests/run-coverage/overflow.coverage
rename to tests/coverage/overflow.coverage
diff --git a/tests/run-coverage/overflow.rs b/tests/coverage/overflow.rs
similarity index 100%
rename from tests/run-coverage/overflow.rs
rename to tests/coverage/overflow.rs
diff --git a/tests/run-coverage/panic_unwind.coverage b/tests/coverage/panic_unwind.coverage
similarity index 100%
rename from tests/run-coverage/panic_unwind.coverage
rename to tests/coverage/panic_unwind.coverage
diff --git a/tests/run-coverage/panic_unwind.rs b/tests/coverage/panic_unwind.rs
similarity index 100%
rename from tests/run-coverage/panic_unwind.rs
rename to tests/coverage/panic_unwind.rs
diff --git a/tests/run-coverage/partial_eq.coverage b/tests/coverage/partial_eq.coverage
similarity index 100%
rename from tests/run-coverage/partial_eq.coverage
rename to tests/coverage/partial_eq.coverage
diff --git a/tests/run-coverage/partial_eq.rs b/tests/coverage/partial_eq.rs
similarity index 100%
rename from tests/run-coverage/partial_eq.rs
rename to tests/coverage/partial_eq.rs
diff --git a/tests/run-coverage/simple_loop.coverage b/tests/coverage/simple_loop.coverage
similarity index 100%
rename from tests/run-coverage/simple_loop.coverage
rename to tests/coverage/simple_loop.coverage
diff --git a/tests/run-coverage/simple_loop.rs b/tests/coverage/simple_loop.rs
similarity index 100%
rename from tests/run-coverage/simple_loop.rs
rename to tests/coverage/simple_loop.rs
diff --git a/tests/run-coverage/simple_match.coverage b/tests/coverage/simple_match.coverage
similarity index 100%
rename from tests/run-coverage/simple_match.coverage
rename to tests/coverage/simple_match.coverage
diff --git a/tests/run-coverage/simple_match.rs b/tests/coverage/simple_match.rs
similarity index 100%
rename from tests/run-coverage/simple_match.rs
rename to tests/coverage/simple_match.rs
diff --git a/tests/run-coverage/sort_groups.coverage b/tests/coverage/sort_groups.coverage
similarity index 100%
rename from tests/run-coverage/sort_groups.coverage
rename to tests/coverage/sort_groups.coverage
diff --git a/tests/run-coverage/sort_groups.rs b/tests/coverage/sort_groups.rs
similarity index 100%
rename from tests/run-coverage/sort_groups.rs
rename to tests/coverage/sort_groups.rs
diff --git a/tests/run-coverage/test_harness.coverage b/tests/coverage/test_harness.coverage
similarity index 100%
rename from tests/run-coverage/test_harness.coverage
rename to tests/coverage/test_harness.coverage
diff --git a/tests/run-coverage/test_harness.rs b/tests/coverage/test_harness.rs
similarity index 100%
rename from tests/run-coverage/test_harness.rs
rename to tests/coverage/test_harness.rs
diff --git a/tests/run-coverage/tight_inf_loop.coverage b/tests/coverage/tight_inf_loop.coverage
similarity index 100%
rename from tests/run-coverage/tight_inf_loop.coverage
rename to tests/coverage/tight_inf_loop.coverage
diff --git a/tests/run-coverage/tight_inf_loop.rs b/tests/coverage/tight_inf_loop.rs
similarity index 100%
rename from tests/run-coverage/tight_inf_loop.rs
rename to tests/coverage/tight_inf_loop.rs
diff --git a/tests/run-coverage/trivial.coverage b/tests/coverage/trivial.coverage
similarity index 100%
rename from tests/run-coverage/trivial.coverage
rename to tests/coverage/trivial.coverage
diff --git a/tests/run-coverage/trivial.rs b/tests/coverage/trivial.rs
similarity index 100%
rename from tests/run-coverage/trivial.rs
rename to tests/coverage/trivial.rs
diff --git a/tests/run-coverage/try_error_result.coverage b/tests/coverage/try_error_result.coverage
similarity index 100%
rename from tests/run-coverage/try_error_result.coverage
rename to tests/coverage/try_error_result.coverage
diff --git a/tests/run-coverage/try_error_result.rs b/tests/coverage/try_error_result.rs
similarity index 100%
rename from tests/run-coverage/try_error_result.rs
rename to tests/coverage/try_error_result.rs
diff --git a/tests/run-coverage/unreachable.coverage b/tests/coverage/unreachable.coverage
similarity index 100%
rename from tests/run-coverage/unreachable.coverage
rename to tests/coverage/unreachable.coverage
diff --git a/tests/run-coverage/unreachable.rs b/tests/coverage/unreachable.rs
similarity index 100%
rename from tests/run-coverage/unreachable.rs
rename to tests/coverage/unreachable.rs
diff --git a/tests/run-coverage/unused.coverage b/tests/coverage/unused.coverage
similarity index 100%
rename from tests/run-coverage/unused.coverage
rename to tests/coverage/unused.coverage
diff --git a/tests/run-coverage/unused.rs b/tests/coverage/unused.rs
similarity index 100%
rename from tests/run-coverage/unused.rs
rename to tests/coverage/unused.rs
diff --git a/tests/run-coverage/unused_mod.coverage b/tests/coverage/unused_mod.coverage
similarity index 100%
rename from tests/run-coverage/unused_mod.coverage
rename to tests/coverage/unused_mod.coverage
diff --git a/tests/run-coverage/unused_mod.rs b/tests/coverage/unused_mod.rs
similarity index 100%
rename from tests/run-coverage/unused_mod.rs
rename to tests/coverage/unused_mod.rs
diff --git a/tests/run-coverage/uses_crate.coverage b/tests/coverage/uses_crate.coverage
similarity index 100%
rename from tests/run-coverage/uses_crate.coverage
rename to tests/coverage/uses_crate.coverage
diff --git a/tests/run-coverage/uses_crate.rs b/tests/coverage/uses_crate.rs
similarity index 100%
rename from tests/run-coverage/uses_crate.rs
rename to tests/coverage/uses_crate.rs
diff --git a/tests/run-coverage/uses_inline_crate.coverage b/tests/coverage/uses_inline_crate.coverage
similarity index 100%
rename from tests/run-coverage/uses_inline_crate.coverage
rename to tests/coverage/uses_inline_crate.coverage
diff --git a/tests/run-coverage/uses_inline_crate.rs b/tests/coverage/uses_inline_crate.rs
similarity index 100%
rename from tests/run-coverage/uses_inline_crate.rs
rename to tests/coverage/uses_inline_crate.rs
diff --git a/tests/run-coverage/while.coverage b/tests/coverage/while.coverage
similarity index 100%
rename from tests/run-coverage/while.coverage
rename to tests/coverage/while.coverage
diff --git a/tests/run-coverage/while.rs b/tests/coverage/while.rs
similarity index 100%
rename from tests/run-coverage/while.rs
rename to tests/coverage/while.rs
diff --git a/tests/run-coverage/while_early_ret.coverage b/tests/coverage/while_early_ret.coverage
similarity index 100%
rename from tests/run-coverage/while_early_ret.coverage
rename to tests/coverage/while_early_ret.coverage
diff --git a/tests/run-coverage/while_early_ret.rs b/tests/coverage/while_early_ret.rs
similarity index 100%
rename from tests/run-coverage/while_early_ret.rs
rename to tests/coverage/while_early_ret.rs
diff --git a/tests/run-coverage/yield.coverage b/tests/coverage/yield.coverage
similarity index 100%
rename from tests/run-coverage/yield.coverage
rename to tests/coverage/yield.coverage
diff --git a/tests/run-coverage/yield.rs b/tests/coverage/yield.rs
similarity index 100%
rename from tests/run-coverage/yield.rs
rename to tests/coverage/yield.rs