Removed -base from run-make-fulldeps/coverage-*-base

In preparation for removing the -deadcode variants
rust-lang · Dec 3, 2020 · f6c9c1a · f6c9c1a
1 parent c45ee4b
commit f6c9c1a
Show file tree

Hide file tree

Showing 236 changed files with 161 additions and 161 deletions.
diff --git a/src/test/run-make-fulldeps/coverage-llvmir-deadcode/Makefile b/src/test/run-make-fulldeps/coverage-llvmir-deadcode/Makefile
@@ -4,7 +4,7 @@
 # LINK_DEAD_CODE requires ignore-msvc due to Issue #76038
 LINK_DEAD_CODE=yes
 
--include ../coverage-llvmir-base/Makefile
+-include ../coverage-llvmir/Makefile
 
 # ISSUE(76038): When targeting MSVC, Rust binaries built with both `-Z instrument-coverage` and
 # `-C link-dead-code` typically crash (with a seg-fault) or at best generate an empty `*.profraw`.

diff --git a/...ke-fulldeps/coverage-llvmir-base/Makefile → ...un-make-fulldeps/coverage-llvmir/Makefile b/...ke-fulldeps/coverage-llvmir-base/Makefile → ...un-make-fulldeps/coverage-llvmir/Makefile
@@ -6,7 +6,7 @@
 
 -include ../coverage/coverage_tools.mk
 
-BASEDIR=../coverage-llvmir-base
+BASEDIR=../coverage-llvmir
 
 ifeq ($(UNAME),Darwin)
 	INSTR_PROF_DATA_SUFFIX=,regular,live_support

diff --git a/...verage-llvmir-base/filecheck.testprog.txt → ...ps/coverage-llvmir/filecheck.testprog.txt b/...verage-llvmir-base/filecheck.testprog.txt → ...ps/coverage-llvmir/filecheck.testprog.txt
diff --git a/...fulldeps/coverage-llvmir-base/testprog.rs → ...make-fulldeps/coverage-llvmir/testprog.rs b/...fulldeps/coverage-llvmir-base/testprog.rs → ...make-fulldeps/coverage-llvmir/testprog.rs
diff --git a/src/test/run-make-fulldeps/coverage-reports-deadcode/Makefile b/src/test/run-make-fulldeps/coverage-reports-deadcode/Makefile
@@ -8,7 +8,7 @@
 # LINK_DEAD_CODE requires ignore-msvc due to Issue #76038
 LINK_DEAD_CODE=yes
 
--include ../coverage-reports-base/Makefile
+-include ../coverage-reports/Makefile
 
 # ISSUE(76038): When targeting MSVC, Rust binaries built with both `-Z instrument-coverage` and
 # `-C link-dead-code` typically crash (with a seg-fault) or at best generate an empty `*.profraw`.

diff --git a/...e-fulldeps/coverage-reports-base/Makefile → ...n-make-fulldeps/coverage-reports/Makefile b/...e-fulldeps/coverage-reports-base/Makefile → ...n-make-fulldeps/coverage-reports/Makefile
@@ -10,7 +10,7 @@
 
 -include ../coverage/coverage_tools.mk
 
-BASEDIR=../coverage-reports-base
+BASEDIR=../coverage-reports
 SOURCEDIR=../coverage
 
 # The `llvm-cov show` flag `--debug`, used to generate the `counters` output files, is only enabled

diff --git a/...-base/expected_export_coverage.abort.json → ...ports/expected_export_coverage.abort.json b/...-base/expected_export_coverage.abort.json → ...ports/expected_export_coverage.abort.json
diff --git a/...base/expected_export_coverage.assert.json → ...orts/expected_export_coverage.assert.json b/...base/expected_export_coverage.assert.json → ...orts/expected_export_coverage.assert.json
diff --git a/...-base/expected_export_coverage.async.json → ...ports/expected_export_coverage.async.json b/...-base/expected_export_coverage.async.json → ...ports/expected_export_coverage.async.json
diff --git a/...ase/expected_export_coverage.closure.json → ...rts/expected_export_coverage.closure.json b/...ase/expected_export_coverage.closure.json → ...rts/expected_export_coverage.closure.json
diff --git a/.../expected_export_coverage.conditions.json → .../expected_export_coverage.conditions.json b/.../expected_export_coverage.conditions.json → .../expected_export_coverage.conditions.json
diff --git a/.../expected_export_coverage.drop_trait.json → .../expected_export_coverage.drop_trait.json b/.../expected_export_coverage.drop_trait.json → .../expected_export_coverage.drop_trait.json
diff --git a/...se/expected_export_coverage.generics.json → ...ts/expected_export_coverage.generics.json b/...se/expected_export_coverage.generics.json → ...ts/expected_export_coverage.generics.json
diff --git a/...rts-base/expected_export_coverage.if.json → ...-reports/expected_export_coverage.if.json b/...rts-base/expected_export_coverage.if.json → ...-reports/expected_export_coverage.if.json
diff --git a/...ase/expected_export_coverage.if_else.json → ...rts/expected_export_coverage.if_else.json b/...ase/expected_export_coverage.if_else.json → ...rts/expected_export_coverage.if_else.json
diff --git a/...expected_export_coverage.inner_items.json → ...expected_export_coverage.inner_items.json b/...expected_export_coverage.inner_items.json → ...expected_export_coverage.inner_items.json
diff --git a/...xpected_export_coverage.lazy_boolean.json → ...xpected_export_coverage.lazy_boolean.json b/...xpected_export_coverage.lazy_boolean.json → ...xpected_export_coverage.lazy_boolean.json
diff --git a/...ted_export_coverage.loop_break_value.json → ...ted_export_coverage.loop_break_value.json b/...ted_export_coverage.loop_break_value.json → ...ted_export_coverage.loop_break_value.json
diff --git a/...ected_export_coverage.loops_branches.json → ...ected_export_coverage.loops_branches.json b/...ected_export_coverage.loops_branches.json → ...ected_export_coverage.loops_branches.json
diff --git a/...xpected_export_coverage.nested_loops.json → ...xpected_export_coverage.nested_loops.json b/...xpected_export_coverage.nested_loops.json → ...xpected_export_coverage.nested_loops.json
diff --git a/...se/expected_export_coverage.overflow.json → ...ts/expected_export_coverage.overflow.json b/...se/expected_export_coverage.overflow.json → ...ts/expected_export_coverage.overflow.json
diff --git a/...xpected_export_coverage.panic_unwind.json → ...xpected_export_coverage.panic_unwind.json b/...xpected_export_coverage.panic_unwind.json → ...xpected_export_coverage.panic_unwind.json
diff --git a/.../expected_export_coverage.partial_eq.json → .../expected_export_coverage.partial_eq.json b/.../expected_export_coverage.partial_eq.json → .../expected_export_coverage.partial_eq.json
diff --git a/...expected_export_coverage.simple_loop.json → ...expected_export_coverage.simple_loop.json b/...expected_export_coverage.simple_loop.json → ...expected_export_coverage.simple_loop.json
diff --git a/...xpected_export_coverage.simple_match.json → ...xpected_export_coverage.simple_match.json b/...xpected_export_coverage.simple_match.json → ...xpected_export_coverage.simple_match.json
diff --git a/...ected_export_coverage.tight_inf_loop.json → ...ected_export_coverage.tight_inf_loop.json b/...ected_export_coverage.tight_inf_loop.json → ...ected_export_coverage.tight_inf_loop.json
diff --git a/...ted_export_coverage.try_error_result.json → ...ted_export_coverage.try_error_result.json b/...ted_export_coverage.try_error_result.json → ...ted_export_coverage.try_error_result.json
diff --git a/...-base/expected_export_coverage.while.json → ...ports/expected_export_coverage.while.json b/...-base/expected_export_coverage.while.json → ...ports/expected_export_coverage.while.json
diff --git a/...cted_export_coverage.while_early_ret.json → ...cted_export_coverage.while_early_ret.json b/...cted_export_coverage.while_early_ret.json → ...cted_export_coverage.while_early_ret.json
diff --git a/...-base/expected_export_coverage.yield.json → ...ports/expected_export_coverage.yield.json b/...-base/expected_export_coverage.yield.json → ...ports/expected_export_coverage.yield.json
diff --git a/...rts-base/expected_show_coverage.abort.txt → ...-reports/expected_show_coverage.abort.txt b/...rts-base/expected_show_coverage.abort.txt → ...-reports/expected_show_coverage.abort.txt
diff --git a/...ts-base/expected_show_coverage.assert.txt → ...reports/expected_show_coverage.assert.txt b/...ts-base/expected_show_coverage.assert.txt → ...reports/expected_show_coverage.assert.txt
diff --git a/...rts-base/expected_show_coverage.async.txt → ...-reports/expected_show_coverage.async.txt b/...rts-base/expected_show_coverage.async.txt → ...-reports/expected_show_coverage.async.txt
diff --git a/...s-base/expected_show_coverage.closure.txt → ...eports/expected_show_coverage.closure.txt b/...s-base/expected_show_coverage.closure.txt → ...eports/expected_show_coverage.closure.txt
diff --git a/...ase/expected_show_coverage.conditions.txt → ...rts/expected_show_coverage.conditions.txt b/...ase/expected_show_coverage.conditions.txt → ...rts/expected_show_coverage.conditions.txt
diff --git a/...ase/expected_show_coverage.drop_trait.txt → ...rts/expected_show_coverage.drop_trait.txt b/...ase/expected_show_coverage.drop_trait.txt → ...rts/expected_show_coverage.drop_trait.txt
diff --git a/...-base/expected_show_coverage.generics.txt → ...ports/expected_show_coverage.generics.txt b/...-base/expected_show_coverage.generics.txt → ...ports/expected_show_coverage.generics.txt
diff --git a/...eports-base/expected_show_coverage.if.txt → ...age-reports/expected_show_coverage.if.txt b/...eports-base/expected_show_coverage.if.txt → ...age-reports/expected_show_coverage.if.txt
diff --git a/...s-base/expected_show_coverage.if_else.txt → ...eports/expected_show_coverage.if_else.txt b/...s-base/expected_show_coverage.if_else.txt → ...eports/expected_show_coverage.if_else.txt
diff --git a/...se/expected_show_coverage.inner_items.txt → ...ts/expected_show_coverage.inner_items.txt b/...se/expected_show_coverage.inner_items.txt → ...ts/expected_show_coverage.inner_items.txt
diff --git a/...e/expected_show_coverage.lazy_boolean.txt → ...s/expected_show_coverage.lazy_boolean.txt b/...e/expected_show_coverage.lazy_boolean.txt → ...s/expected_show_coverage.lazy_boolean.txt
diff --git a/...pected_show_coverage.loop_break_value.txt → ...pected_show_coverage.loop_break_value.txt b/...pected_show_coverage.loop_break_value.txt → ...pected_show_coverage.loop_break_value.txt
diff --git a/...expected_show_coverage.loops_branches.txt → ...expected_show_coverage.loops_branches.txt b/...expected_show_coverage.loops_branches.txt → ...expected_show_coverage.loops_branches.txt
diff --git a/...e/expected_show_coverage.nested_loops.txt → ...s/expected_show_coverage.nested_loops.txt b/...e/expected_show_coverage.nested_loops.txt → ...s/expected_show_coverage.nested_loops.txt
diff --git a/...-base/expected_show_coverage.overflow.txt → ...ports/expected_show_coverage.overflow.txt b/...-base/expected_show_coverage.overflow.txt → ...ports/expected_show_coverage.overflow.txt
diff --git a/...e/expected_show_coverage.panic_unwind.txt → ...s/expected_show_coverage.panic_unwind.txt b/...e/expected_show_coverage.panic_unwind.txt → ...s/expected_show_coverage.panic_unwind.txt
diff --git a/...ase/expected_show_coverage.partial_eq.txt → ...rts/expected_show_coverage.partial_eq.txt b/...ase/expected_show_coverage.partial_eq.txt → ...rts/expected_show_coverage.partial_eq.txt
diff --git a/...se/expected_show_coverage.simple_loop.txt → ...ts/expected_show_coverage.simple_loop.txt b/...se/expected_show_coverage.simple_loop.txt → ...ts/expected_show_coverage.simple_loop.txt
diff --git a/...e/expected_show_coverage.simple_match.txt → ...s/expected_show_coverage.simple_match.txt b/...e/expected_show_coverage.simple_match.txt → ...s/expected_show_coverage.simple_match.txt
diff --git a/...expected_show_coverage.tight_inf_loop.txt → ...expected_show_coverage.tight_inf_loop.txt b/...expected_show_coverage.tight_inf_loop.txt → ...expected_show_coverage.tight_inf_loop.txt
diff --git a/...pected_show_coverage.try_error_result.txt → ...pected_show_coverage.try_error_result.txt b/...pected_show_coverage.try_error_result.txt → ...pected_show_coverage.try_error_result.txt
diff --git a/...rts-base/expected_show_coverage.while.txt → ...-reports/expected_show_coverage.while.txt b/...rts-base/expected_show_coverage.while.txt → ...-reports/expected_show_coverage.while.txt
diff --git a/...xpected_show_coverage.while_early_ret.txt → ...xpected_show_coverage.while_early_ret.txt b/...xpected_show_coverage.while_early_ret.txt → ...xpected_show_coverage.while_early_ret.txt
diff --git a/...rts-base/expected_show_coverage.yield.txt → ...-reports/expected_show_coverage.yield.txt b/...rts-base/expected_show_coverage.yield.txt → ...-reports/expected_show_coverage.yield.txt
diff --git a/...expected_show_coverage_counters.abort.txt → ...expected_show_coverage_counters.abort.txt b/...expected_show_coverage_counters.abort.txt → ...expected_show_coverage_counters.abort.txt
diff --git a/...xpected_show_coverage_counters.assert.txt → ...xpected_show_coverage_counters.assert.txt b/...xpected_show_coverage_counters.assert.txt → ...xpected_show_coverage_counters.assert.txt
diff --git a/...expected_show_coverage_counters.async.txt → ...expected_show_coverage_counters.async.txt b/...expected_show_coverage_counters.async.txt → ...expected_show_coverage_counters.async.txt
diff --git a/...pected_show_coverage_counters.closure.txt → ...pected_show_coverage_counters.closure.txt b/...pected_show_coverage_counters.closure.txt → ...pected_show_coverage_counters.closure.txt
diff --git a/...ted_show_coverage_counters.conditions.txt → ...ted_show_coverage_counters.conditions.txt b/...ted_show_coverage_counters.conditions.txt → ...ted_show_coverage_counters.conditions.txt
diff --git a/...ted_show_coverage_counters.drop_trait.txt → ...ted_show_coverage_counters.drop_trait.txt b/...ted_show_coverage_counters.drop_trait.txt → ...ted_show_coverage_counters.drop_trait.txt
diff --git a/...ected_show_coverage_counters.generics.txt → ...ected_show_coverage_counters.generics.txt b/...ected_show_coverage_counters.generics.txt → ...ected_show_coverage_counters.generics.txt
diff --git a/...se/expected_show_coverage_counters.if.txt → ...ts/expected_show_coverage_counters.if.txt b/...se/expected_show_coverage_counters.if.txt → ...ts/expected_show_coverage_counters.if.txt
diff --git a/...pected_show_coverage_counters.if_else.txt → ...pected_show_coverage_counters.if_else.txt b/...pected_show_coverage_counters.if_else.txt → ...pected_show_coverage_counters.if_else.txt
diff --git a/...ed_show_coverage_counters.inner_items.txt → ...ed_show_coverage_counters.inner_items.txt b/...ed_show_coverage_counters.inner_items.txt → ...ed_show_coverage_counters.inner_items.txt
diff --git a/...d_show_coverage_counters.lazy_boolean.txt → ...d_show_coverage_counters.lazy_boolean.txt b/...d_show_coverage_counters.lazy_boolean.txt → ...d_show_coverage_counters.lazy_boolean.txt
diff --git a/...ow_coverage_counters.loop_break_value.txt → ...ow_coverage_counters.loop_break_value.txt b/...ow_coverage_counters.loop_break_value.txt → ...ow_coverage_counters.loop_break_value.txt
diff --git a/...show_coverage_counters.loops_branches.txt → ...show_coverage_counters.loops_branches.txt b/...show_coverage_counters.loops_branches.txt → ...show_coverage_counters.loops_branches.txt
diff --git a/...d_show_coverage_counters.nested_loops.txt → ...d_show_coverage_counters.nested_loops.txt b/...d_show_coverage_counters.nested_loops.txt → ...d_show_coverage_counters.nested_loops.txt
diff --git a/...ected_show_coverage_counters.overflow.txt → ...ected_show_coverage_counters.overflow.txt b/...ected_show_coverage_counters.overflow.txt → ...ected_show_coverage_counters.overflow.txt
diff --git a/...d_show_coverage_counters.panic_unwind.txt → ...d_show_coverage_counters.panic_unwind.txt b/...d_show_coverage_counters.panic_unwind.txt → ...d_show_coverage_counters.panic_unwind.txt
diff --git a/...ted_show_coverage_counters.partial_eq.txt → ...ted_show_coverage_counters.partial_eq.txt b/...ted_show_coverage_counters.partial_eq.txt → ...ted_show_coverage_counters.partial_eq.txt
diff --git a/...ed_show_coverage_counters.simple_loop.txt → ...ed_show_coverage_counters.simple_loop.txt b/...ed_show_coverage_counters.simple_loop.txt → ...ed_show_coverage_counters.simple_loop.txt
diff --git a/...d_show_coverage_counters.simple_match.txt → ...d_show_coverage_counters.simple_match.txt b/...d_show_coverage_counters.simple_match.txt → ...d_show_coverage_counters.simple_match.txt
diff --git a/...show_coverage_counters.tight_inf_loop.txt → ...show_coverage_counters.tight_inf_loop.txt b/...show_coverage_counters.tight_inf_loop.txt → ...show_coverage_counters.tight_inf_loop.txt
diff --git a/...ow_coverage_counters.try_error_result.txt → ...ow_coverage_counters.try_error_result.txt b/...ow_coverage_counters.try_error_result.txt → ...ow_coverage_counters.try_error_result.txt
diff --git a/...expected_show_coverage_counters.while.txt → ...expected_show_coverage_counters.while.txt b/...expected_show_coverage_counters.while.txt → ...expected_show_coverage_counters.while.txt
diff --git a/...how_coverage_counters.while_early_ret.txt → ...how_coverage_counters.while_early_ret.txt b/...how_coverage_counters.while_early_ret.txt → ...how_coverage_counters.while_early_ret.txt
diff --git a/...expected_show_coverage_counters.yield.txt → ...expected_show_coverage_counters.yield.txt b/...expected_show_coverage_counters.yield.txt → ...expected_show_coverage_counters.yield.txt
diff --git a/...ps/coverage-reports-base/prettify_json.py → ...ulldeps/coverage-reports/prettify_json.py b/...ps/coverage-reports-base/prettify_json.py → ...ulldeps/coverage-reports/prettify_json.py
diff --git a/src/test/run-make-fulldeps/coverage-spanview-deadcode/Makefile b/src/test/run-make-fulldeps/coverage-spanview-deadcode/Makefile
@@ -4,7 +4,7 @@
 # LINK_DEAD_CODE requires ignore-msvc due to Issue #76038
 LINK_DEAD_CODE=yes
 
--include ../coverage-spanview-base/Makefile
+-include ../coverage-spanview/Makefile
 
 # ISSUE(76038): When targeting MSVC, Rust binaries built with both `-Z instrument-coverage` and
 # `-C link-dead-code` typically crash (with a seg-fault) or at best generate an empty `*.profraw`.

diff --git a/...ge-spanview-deadcode/expected_mir_dump.abort/abort.main.-------.InstrumentCoverage.0.html b/...ge-spanview-deadcode/expected_mir_dump.abort/abort.main.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.abort/abort.main.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.abort/abort.main.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...view-deadcode/expected_mir_dump.abort/abort.might_abort.-------.InstrumentCoverage.0.html b/...view-deadcode/expected_mir_dump.abort/abort.might_abort.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.abort/abort.might_abort.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.abort/abort.might_abort.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...-spanview-deadcode/expected_mir_dump.assert/assert.main.-------.InstrumentCoverage.0.html b/...-spanview-deadcode/expected_mir_dump.assert/assert.main.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.assert/assert.main.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.main.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...dcode/expected_mir_dump.assert/assert.might_fail_assert.-------.InstrumentCoverage.0.html b/...dcode/expected_mir_dump.assert/assert.might_fail_assert.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.assert/assert.might_fail_assert.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.might_fail_assert.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...r_dump.async/async.executor-block_on-VTABLE-{closure#0}.-------.InstrumentCoverage.0.html b/...r_dump.async/async.executor-block_on-VTABLE-{closure#0}.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.async/async.executor-block_on-VTABLE-%7Bclosure%230%7D.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-%7Bclosure%230%7D.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...r_dump.async/async.executor-block_on-VTABLE-{closure#1}.-------.InstrumentCoverage.0.html b/...r_dump.async/async.executor-block_on-VTABLE-{closure#1}.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.async/async.executor-block_on-VTABLE-%7Bclosure%231%7D.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-%7Bclosure%231%7D.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...r_dump.async/async.executor-block_on-VTABLE-{closure#2}.-------.InstrumentCoverage.0.html b/...r_dump.async/async.executor-block_on-VTABLE-{closure#2}.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.async/async.executor-block_on-VTABLE-%7Bclosure%232%7D.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-%7Bclosure%232%7D.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...r_dump.async/async.executor-block_on-VTABLE-{closure#3}.-------.InstrumentCoverage.0.html b/...r_dump.async/async.executor-block_on-VTABLE-{closure#3}.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.async/async.executor-block_on-VTABLE-%7Bclosure%233%7D.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-%7Bclosure%233%7D.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...eadcode/expected_mir_dump.async/async.executor-block_on.-------.InstrumentCoverage.0.html b/...eadcode/expected_mir_dump.async/async.executor-block_on.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.async/async.executor-block_on.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...ew-deadcode/expected_mir_dump.async/async.f-{closure#0}.-------.InstrumentCoverage.0.html b/...ew-deadcode/expected_mir_dump.async/async.f-{closure#0}.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.async/async.f-%7Bclosure%230%7D.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.f-%7Bclosure%230%7D.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...erage-spanview-deadcode/expected_mir_dump.async/async.f.-------.InstrumentCoverage.0.html b/...erage-spanview-deadcode/expected_mir_dump.async/async.f.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.async/async.f.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.f.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...-deadcode/expected_mir_dump.async/async.foo-{closure#0}.-------.InstrumentCoverage.0.html b/...-deadcode/expected_mir_dump.async/async.foo-{closure#0}.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.async/async.foo-%7Bclosure%230%7D.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.foo-%7Bclosure%230%7D.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...age-spanview-deadcode/expected_mir_dump.async/async.foo.-------.InstrumentCoverage.0.html b/...age-spanview-deadcode/expected_mir_dump.async/async.foo.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.async/async.foo.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.foo.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...ew-deadcode/expected_mir_dump.async/async.g-{closure#0}.-------.InstrumentCoverage.0.html b/...ew-deadcode/expected_mir_dump.async/async.g-{closure#0}.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.async/async.g-%7Bclosure%230%7D.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.g-%7Bclosure%230%7D.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...erage-spanview-deadcode/expected_mir_dump.async/async.g.-------.InstrumentCoverage.0.html b/...erage-spanview-deadcode/expected_mir_dump.async/async.g.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.async/async.g.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.g.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...ew-deadcode/expected_mir_dump.async/async.h-{closure#0}.-------.InstrumentCoverage.0.html b/...ew-deadcode/expected_mir_dump.async/async.h-{closure#0}.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.async/async.h-%7Bclosure%230%7D.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.h-%7Bclosure%230%7D.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...erage-spanview-deadcode/expected_mir_dump.async/async.h.-------.InstrumentCoverage.0.html b/...erage-spanview-deadcode/expected_mir_dump.async/async.h.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.async/async.h.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.h.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...ew-deadcode/expected_mir_dump.async/async.i-{closure#0}.-------.InstrumentCoverage.0.html b/...ew-deadcode/expected_mir_dump.async/async.i-{closure#0}.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.async/async.i-%7Bclosure%230%7D.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.i-%7Bclosure%230%7D.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...erage-spanview-deadcode/expected_mir_dump.async/async.i.-------.InstrumentCoverage.0.html b/...erage-spanview-deadcode/expected_mir_dump.async/async.i.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.async/async.i.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.i.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...ge-spanview-deadcode/expected_mir_dump.async/async.main.-------.InstrumentCoverage.0.html b/...ge-spanview-deadcode/expected_mir_dump.async/async.main.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.async/async.main.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.main.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...code/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html b/...code/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.closure/closure.main-%7Bclosure%230%7D.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-%7Bclosure%230%7D.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...code/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html b/...code/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.closure/closure.main-%7Bclosure%231%7D.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-%7Bclosure%231%7D.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...code/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html b/...code/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.closure/closure.main-%7Bclosure%232%7D.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-%7Bclosure%232%7D.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...code/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html b/...code/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.closure/closure.main-%7Bclosure%233%7D.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-%7Bclosure%233%7D.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...panview-deadcode/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html b/...panview-deadcode/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...w-deadcode/expected_mir_dump.conditions/conditions.main.-------.InstrumentCoverage.0.html b/...w-deadcode/expected_mir_dump.conditions/conditions.main.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.conditions/conditions.main.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.conditions/conditions.main.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...w-deadcode/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html b/...w-deadcode/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...e/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html b/...e/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.drop_trait/drop_trait.%7Bimpl%230%7D-drop.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.drop_trait/drop_trait.%7Bimpl%230%7D-drop.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...nview-deadcode/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html b/...nview-deadcode/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...pected_mir_dump.generics/generics.{impl#0}-set_strength.-------.InstrumentCoverage.0.html b/...pected_mir_dump.generics/generics.{impl#0}-set_strength.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.generics/generics.%7Bimpl%230%7D-set_strength.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.%7Bimpl%230%7D-set_strength.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author

diff --git a/...dcode/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html b/...dcode/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html
@@ -2,7 +2,7 @@
 <!--
 
 Preview this file as rendered HTML from the github source at:
-https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.generics/generics.%7Bimpl%231%7D-drop.-------.InstrumentCoverage.0.html
+https://htmlpreview.github.io/?https://github.com/rust-lang/rust/blob/master/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.%7Bimpl%231%7D-drop.-------.InstrumentCoverage.0.html
 
 For revisions in Pull Requests (PR):
   * Replace "rust-lang" with the github PR author