diff --git a/src/test/run-make-fulldeps/coverage-reports/Makefile b/src/test/run-make-fulldeps/coverage-reports/Makefile
index dd5e28b449cd4..d3d398f1fac29 100644
--- a/src/test/run-make-fulldeps/coverage-reports/Makefile
+++ b/src/test/run-make-fulldeps/coverage-reports/Makefile
@@ -61,13 +61,6 @@ endif
LLVM_COV_IGNORE_FILES=\
--ignore-filename-regex='(uses_crate.rs|uses_inline_crate.rs)'
-# When generating `expected_*` results (using `x.py test --bless`), the `--debug` flag is forced.
-# If assertions are disabled, the command will fail with an error, rather than attempt to generate
-# only partial results.
-ifdef RUSTC_BLESS_TEST
-DEBUG_FLAG=--debug
-endif
-
all: $(patsubst $(SOURCEDIR)/lib/%.rs,%,$(wildcard $(SOURCEDIR)/lib/*.rs)) $(patsubst $(SOURCEDIR)/%.rs,%,$(wildcard $(SOURCEDIR)/*.rs))
# Ensure there are no `expected` results for tests that may have been removed or renamed
@@ -177,76 +170,3 @@ else
false \
)
endif
-
-####################################################################################################
-
-# The following Makefile content was used to copy the generated `counters` files
-# to `expected_` files (when `--bless`ed) and to compare them via `diff`; but for
-# multiple reasons, these files cannot easily be used for test validation:
-#
-# * Output lines can be produced in non-deterministic order (depending on the
-# target platform, and sometimes on unrelated codegen changes).
-# * Some lines include demangled function names, making them more challenging
-# to interpret and compare.
-#
-# The files are still generated (in `$(TMPDIR)`) to support developers wanting
-# to inspect the counters, for debugging purposes.
-#
-# ifdef RUSTC_BLESS_TEST
-# cp "$(TMPDIR)"/actual_show_coverage_counters.$@.txt \
-# expected_show_coverage_counters.$@.txt
-# else
-#
-# ifdef DEBUG_FLAG
-# $(DIFF) expected_show_coverage_counters.$@.txt "$(TMPDIR)"/actual_show_coverage_counters.$@.txt || \
-# ( grep -q '^\/\/ ignore-llvm-cov-show-diffs' $(SOURCEDIR)/$@.rs && \
-# >&2 echo 'diff failed, but suppressed with `// ignore-llvm-cov-show-diffs` in $(SOURCEDIR)/$@.rs' \
-# ) || \
-# ( >&2 echo 'diff failed, and not suppressed without `// ignore-llvm-cov-show-diffs` in $(SOURCEDIR)/$@.rs'; \
-# >&2 echo '(Ignore anyway until mangled function names in "counters" files are demangled.)' \
-# )
-# endif
-#
-# endif
-
-####################################################################################################
-
-# The following Makefile content, and short JSON script, were used to generate
-# coverage reports in JSON when the `llvm-cov show` reports were less reliable for
-# testing. At the present time, however, the `llvm-cov show` results, and methods
-# for comparing them, are working for all tests, making the JSON reports redundant.
-#
-# If this changes in the future, the scripts are left here, commented out, but can
-# be resurrected if desired. This could be used to compare *only* the JSON files;
-# and in that case, the `llvm-cov show` reports can be ignored by inserting
-# `// ignore-llvm-cov-show-diffs` at the top of the source file.
-#
-# # Generate a coverage report in JSON, using `llvm-cov export`, and fail if
-# # there are differences from the expected output.
-# "$(LLVM_BIN_DIR)"/llvm-cov export \
-# $(LLVM_COV_IGNORE_FILES) \
-# --summary-only \
-# --instr-profile="$(TMPDIR)"/$@.profdata \
-# $(call BIN,"$(TMPDIR)"/$@) \
-# | "$(PYTHON)" $(BASEDIR)/prettify_json.py \
-# > "$(TMPDIR)"/actual_export_coverage.$@.json
-#
-# ifdef RUSTC_BLESS_TEST
-# cp "$(TMPDIR)"/actual_export_coverage.$@.json expected_export_coverage.$@.json
-# else
-# # Check that exported JSON coverage data matches what we expect (`--bless` refreshes `expected`)
-# $(DIFF) expected_export_coverage.$@.json "$(TMPDIR)"/actual_export_coverage.$@.json
-# endif
-#
-# # # If generating coverage reports in JSON, this Makefile is accompanied by
-# # # a Python script, `prettify_json.py`, which is defined:
-# #
-# # #!/usr/bin/env python
-# #
-# # import sys
-# # import json
-# #
-# # # Try to decode line in order to ensure it is a valid JSON document
-# # for line in sys.stdin:
-# # parsed = json.loads(line)
-# # print (json.dumps(parsed, indent=2, separators=(',', ': '), sort_keys=True))
diff --git a/src/test/run-make-fulldeps/coverage-spanview/Makefile b/src/test/run-make-fulldeps/coverage-spanview/Makefile
deleted file mode 100644
index b3d1009dbd092..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-# needs-profiler-support
-# min-llvm-version: 11.0
-
--include ../coverage/coverage_tools.mk
-
-BASEDIR=../coverage-spanview
-SOURCEDIR=../coverage
-
-define SPANVIEW_HEADER
-
-
-endef
-export SPANVIEW_HEADER
-
-all: $(patsubst $(SOURCEDIR)/lib/%.rs,%,$(wildcard $(SOURCEDIR)/lib/*.rs)) $(patsubst $(SOURCEDIR)/%.rs,%,$(wildcard $(SOURCEDIR)/*.rs))
-
-# Ensure there are no `expected` results for tests that may have been removed or renamed
-.PHONY: clear_expected_if_blessed
-clear_expected_if_blessed:
-ifdef RUSTC_BLESS_TEST
- rm -rf expected_mir_dump.*/
-endif
-
--include clear_expected_if_blessed
-
-# FIXME(richkadel): The actions for these two types of targets (libraries and binaries) should be
-# combined.
-
-%: $(SOURCEDIR)/lib/%.rs
- # Compile the test library with coverage instrumentation
- $(RUSTC) $(SOURCEDIR)/lib/$@.rs \
- $$( sed -n 's/^\/\/ compile-flags: \([^#]*\).*/\1/p' $(SOURCEDIR)/lib/$@.rs ) \
- --crate-type rlib \
- -Ztrim-diagnostic-paths=no \
- -Zdump-mir=InstrumentCoverage -Zdump-mir-spanview -Zdump-mir-dir="$(TMPDIR)"/mir_dump.$@ \
- -Zinstrument-coverage
-
- for path in "$(TMPDIR)"/mir_dump.$@/*; do \
- file="$$(basename "$$path")"; \
- urlescaped="$$("$(PYTHON)" $(BASEDIR)/escape_url.py $$file)" || exit $$?; \
- printf "$$SPANVIEW_HEADER\n" "$@" "$$urlescaped" > "$$path".modified; \
- tail -n +2 "$$path" >> "$$path".modified; \
- mv "$$path".modified "$$path"; \
- done && true # for/done ends in non-zero status
-
-ifdef RUSTC_BLESS_TEST
- mkdir -p expected_mir_dump.$@
- cp "$(TMPDIR)"/mir_dump.$@/*InstrumentCoverage.0.html expected_mir_dump.$@/
-else
- # Check that the selected `mir_dump` files match what we expect (`--bless` refreshes `expected`)
- mkdir -p "$(TMPDIR)"/actual_mir_dump.$@
- rm -f "$(TMPDIR)"/actual_mir_dump.$@/*
- cp "$(TMPDIR)"/mir_dump.$@/*InstrumentCoverage.0.html "$(TMPDIR)"/actual_mir_dump.$@/
- $(DIFF) -r expected_mir_dump.$@/ "$(TMPDIR)"/actual_mir_dump.$@/
-endif
-
-%: $(SOURCEDIR)/%.rs
- # Compile the test program with coverage instrumentation
- $(RUSTC) $(SOURCEDIR)/$@.rs \
- $$( sed -n 's/^\/\/ compile-flags: \([^#]*\).*/\1/p' $(SOURCEDIR)/$@.rs ) \
- -L "$(TMPDIR)" \
- -Ztrim-diagnostic-paths=no \
- -Zdump-mir=InstrumentCoverage -Zdump-mir-spanview -Zdump-mir-dir="$(TMPDIR)"/mir_dump.$@ \
- -Zinstrument-coverage
-
- for path in "$(TMPDIR)"/mir_dump.$@/*; do \
- file="$$(basename "$$path")"; \
- urlescaped="$$("$(PYTHON)" $(BASEDIR)/escape_url.py $$file)" || exit $$?; \
- printf "$$SPANVIEW_HEADER\n" "$@" "$$urlescaped" > "$$path".modified; \
- tail -n +2 "$$path" >> "$$path".modified; \
- mv "$$path".modified "$$path"; \
- done && true # for/done ends in non-zero status
-
-ifdef RUSTC_BLESS_TEST
- mkdir -p expected_mir_dump.$@
- cp "$(TMPDIR)"/mir_dump.$@/*InstrumentCoverage.0.html expected_mir_dump.$@/
-else
- # Check that the selected `mir_dump` files match what we expect (`--bless` refreshes `expected`)
- mkdir -p "$(TMPDIR)"/actual_mir_dump.$@
- rm -f "$(TMPDIR)"/actual_mir_dump.$@/*
- cp "$(TMPDIR)"/mir_dump.$@/*InstrumentCoverage.0.html "$(TMPDIR)"/actual_mir_dump.$@/
- $(DIFF) -r expected_mir_dump.$@/ "$(TMPDIR)"/actual_mir_dump.$@/
-endif
diff --git a/src/test/run-make-fulldeps/coverage-spanview/escape_url.py b/src/test/run-make-fulldeps/coverage-spanview/escape_url.py
deleted file mode 100644
index b725ed4630302..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/escape_url.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-
-# Support python 2 or 3
-try:
- from urllib.parse import quote
-except ImportError:
- from urllib import quote
-
-# Converts the input string into a valid URL parameter string.
-print (quote(' '.join(sys.argv[1:])))
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.abort/abort.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.abort/abort.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 176587af25be0..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.abort/abort.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-abort.main - Coverage Spans
-
-
-
-@0⦊fn main() -> Result<(), u8> {
- let mut countdown = 10⦉@0;
- while @1,2⦊countdown > 0⦉@1,2 {
- if @3,5⦊countdown < 5⦉@3,5 @6,8⦊{
- might_abort(false);
- }⦉@6,8@7⦊‸⦉@7
- // See discussion (below the `Notes` section) on coverage results for the closing brace.
- if @9⦊countdown < 5⦉@9 @10,12⦊{ might_abort(false); }⦉@10,12@11⦊‸⦉@11 // Counts for different regions on one line.
- // For the following example, the closing brace is the last character on the line.
- // This shows the character after the closing brace is highlighted, even if that next
- // character is a newline.
- if @13⦊countdown < 5⦉@13 @14,16⦊{ might_abort(false); }⦉@14,16@15⦊‸⦉@15
- @17,18⦊countdown -= 1⦉@17,18;
- }
- @4⦊Ok(())
-}⦉@4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.abort/abort.might_abort.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.abort/abort.might_abort.-------.InstrumentCoverage.0.html
deleted file mode 100644
index a302b974ae1d2..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.abort/abort.might_abort.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
-abort.might_abort - Coverage Spans
-
-
-
-@0⦊fn might_abort(should_abort: bool) ⦉@0{
- if @0⦊should_abort⦉@0 {
- @1,3,4⦊println!("aborting...");
- panic!("panics and aborts");⦉@1,3,4
- } else @2,5,6⦊{
- println!("Don't Panic");
- }
-}⦉@2,5,6
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 365e94cd31e50..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-assert.main - Coverage Spans
-
-
-
-@0⦊fn main() -> Result<(),u8> {
- let mut countdown = 10⦉@0;
- while @1,2⦊countdown > 0⦉@1,2 {
- if @3,5⦊countdown == 1⦉@3,5 @6,8⦊{
- might_fail_assert(3);
- }⦉@6,8 else if @7⦊countdown < 5⦉@7 @9,11⦊{
- might_fail_assert(2);
- }⦉@9,11@10⦊‸⦉@10
- @13,14⦊countdown -= 1⦉@13,14;
- }
- @4⦊Ok(())
-}⦉@4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.might_fail_assert.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.might_fail_assert.-------.InstrumentCoverage.0.html
deleted file mode 100644
index db72a5306ff70..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.might_fail_assert.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
-assert.might_fail_assert - Coverage Spans
-
-
-
-@0,1,2,3,4⦊fn might_fail_assert(one_plus_one: u32) ⦉@0,1,2,3,4{
- @0,1,2,3,4⦊println!("does 1 + 1 = {}?", one_plus_one);⦉@0,1,2,3,4
- assert_eq!(@0,1,2,3,4⦊1 + 1⦉@0,1,2,3,4, one_plus_one, @5,7⦊"the argument was wrong"⦉@5,7);
-}@6⦊‸⦉@6
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.c-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.c-{closure#0}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 21bfce701fe6e..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.c-{closure#0}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-async.c-{closure#0} - Coverage Spans
-
-
-
- @0⦊{
- if x == 8⦉@0 {
- @1⦊1⦉@1
- } else {
- @2⦊0⦉@2
- }
-}@3⦊‸⦉@3
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.c.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.c.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 3eee0dd4100ed..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.c.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-async.c - Coverage Spans
-
-
-
-@0,1⦊async fn c(x: u8) -> u8 ⦉@0,1{
- if x == 8 {
- 1
- } else {
- 0
- }
-}
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.d-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.d-{closure#0}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 7cf34f077954f..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.d-{closure#0}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-async.d-{closure#0} - Coverage Spans
-
-
-
- @0⦊‸⦉@0{ 1 }
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.d.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.d.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 5c7f6e00224a0..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.d.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-async.d - Coverage Spans
-
-
-
-@0,1⦊async fn d() -> u8 ⦉@0,1{ 1 }
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.e-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.e-{closure#0}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 1f95a7d35af88..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.e-{closure#0}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-async.e-{closure#0} - Coverage Spans
-
-
-
- @0⦊‸⦉@0{ 1 }
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.e.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.e.-------.InstrumentCoverage.0.html
deleted file mode 100644
index ee3b7b1d7ffc7..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.e.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-async.e - Coverage Spans
-
-
-
-@0,1⦊async fn e() -> u8 ⦉@0,1{ 1 }
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#0}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 64fc1568b0085..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#0}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-async.executor-block_on-VTABLE-{closure#0} - Coverage Spans
-
-
-
- @0,1,2,3⦊‸⦉@0,1,2,3$crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+))
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#1}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#1}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 1bbcfa5744b6b..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#1}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-async.executor-block_on-VTABLE-{closure#1} - Coverage Spans
-
-
-
- @0,1,2,3⦊‸⦉@0,1,2,3$crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+))
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#2}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#2}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 14cb98d20c988..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#2}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-async.executor-block_on-VTABLE-{closure#2} - Coverage Spans
-
-
-
- @0,1,2,3⦊‸⦉@0,1,2,3$crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+))
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#3}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#3}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index ef2fe7d06825d..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#3}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-async.executor-block_on-VTABLE-{closure#3} - Coverage Spans
-
-
-
- |_| @0⦊()⦉@0
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 9a5bd6e42cd37..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,239 +0,0 @@
-
-
-
-
-async.executor-block_on - Coverage Spans
-
-
-
- @0,1,2,3,4,5⦊pub fn block_on<F: Future>(mut future: F) -> F::Output {
- let mut future = unsafe { Pin::new_unchecked(&mut future) };
-
- static VTABLE: RawWakerVTable = RawWakerVTable::new(
- |_| unimplemented!("clone"),
- |_| unimplemented!("wake"),
- |_| unimplemented!("wake_by_ref"),
- |_| (),
- );
- let waker = unsafe { Waker::from_raw(RawWaker::new(core::ptr::null(), &VTABLE)) };
- let mut context = Context::from_waker(&waker)⦉@0,1,2,3,4,5;
-
- loop {
- if let Poll::Ready(@10,12,14,15,16,17⦊val⦉@10,12,14,15,16,17) = @6,7,8,9⦊future.as_mut().poll(&mut context)⦉@6,7,8,9 {
- break @10,12,14,15,16,17⦊val⦉@10,12,14,15,16,17;
- }@11,13⦊‸⦉@11,13
- }
- }@10,12,14,15,16,17⦊‸⦉@10,12,14,15,16,17
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.f-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.f-{closure#0}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 74b62673ac94b..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.f-{closure#0}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-async.f-{closure#0} - Coverage Spans
-
-
-
- @0⦊‸⦉@0{ 1 }
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.f.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.f.-------.InstrumentCoverage.0.html
deleted file mode 100644
index a31bca54df2e5..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.f.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-async.f - Coverage Spans
-
-
-
-@0,1⦊async fn f() -> u8 ⦉@0,1{ 1 }
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.foo-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.foo-{closure#0}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index b8c53cccabda1..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.foo-{closure#0}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-async.foo-{closure#0} - Coverage Spans
-
-
-
- @0⦊‸⦉@0{ [false; 10] }
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.foo.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.foo.-------.InstrumentCoverage.0.html
deleted file mode 100644
index cf72a9d532c79..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.foo.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-async.foo - Coverage Spans
-
-
-
-@0,1⦊async fn foo() -> [bool; 10] ⦉@0,1{ [false; 10] }
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.g-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.g-{closure#0}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index b10012621b7dd..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.g-{closure#0}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-async.g-{closure#0} - Coverage Spans
-
-
-
- @0,3,4⦊{
- match x⦉@0,3,4 {
- @17⦊y⦉@17 if @0,3,4⦊e()⦉@0,3,4.await == @10,13,15,16⦊y⦉@10,13,15,16 => @17⦊()⦉@17,
- @33⦊y⦉@33 if @1,19,20⦊f()⦉@1,19,20.await == @26,29,31,32⦊y⦉@26,29,31,32 => @33⦊()⦉@33,
- _ => @2⦊()⦉@2,
- }
-}@35,36⦊‸⦉@35,36
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.g.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.g.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 973995477b9aa..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.g.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-async.g - Coverage Spans
-
-
-
-@0,1⦊pub async fn g(x: u8) ⦉@0,1{
- match x {
- y if e().await == y => (),
- y if f().await == y => (),
- _ => (),
- }
-}
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.h-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.h-{closure#0}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 6b4b43f836580..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.h-{closure#0}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-async.h-{closure#0} - Coverage Spans
-
-
-
- @0,2,3⦊{ // The function signature is counted when called, but the body is not
- // executed (not awaited) so the open brace has a `0` count (at least when
- // displayed with `llvm-cov show` in color-mode).
- match x⦉@0,2,3 {
- @17⦊y⦉@17 if @0,2,3⦊foo()⦉@0,2,3.await[@9,12,14,15,16⦊y⦉@9,12,14,15,16] => @17⦊()⦉@17,
- _ => @1⦊()⦉@1,
- }
-}@19,20⦊‸⦉@19,20
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.h.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.h.-------.InstrumentCoverage.0.html
deleted file mode 100644
index f2ea01281fe1e..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.h.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
-async.h - Coverage Spans
-
-
-
-@0,1⦊async fn h(x: usize) ⦉@0,1{ // The function signature is counted when called, but the body is not
- // executed (not awaited) so the open brace has a `0` count (at least when
- // displayed with `llvm-cov show` in color-mode).
- match x {
- y if foo().await[y] => (),
- _ => (),
- }
-}
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.i-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.i-{closure#0}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 1c63875a8be9b..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.i-{closure#0}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-async.i-{closure#0} - Coverage Spans
-
-
-
- @0,3,4⦊{ // line coverage is 1, but there are 2 regions:
- // (a) the function signature, counted when the function is called; and
- // (b) the open brace for the function body, counted once when the body is
- // executed asynchronously.
- match x⦉@0,3,4 {
- @17,19⦊y⦉@17,19 if @0,3,4⦊c(x)⦉@0,3,4.await == @10,13,15,16⦊y + 1⦉@10,13,15,16 => { @17,19⦊d()⦉@17,19.await; }
- @46⦊y⦉@46 if @1,32,33⦊f()⦉@1,32,33.await == @39,42,44,45⦊y + 1⦉@39,42,44,45 => @46⦊()⦉@46,
- _ => @2⦊()⦉@2,
- }
-}@48,49⦊‸⦉@48,49
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.i.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.i.-------.InstrumentCoverage.0.html
deleted file mode 100644
index e5dc6ecd4eb63..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.i.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-async.i - Coverage Spans
-
-
-
-@0,1⦊async fn i(x: u8) ⦉@0,1{ // line coverage is 1, but there are 2 regions:
- // (a) the function signature, counted when the function is called; and
- // (b) the open brace for the function body, counted once when the body is
- // executed asynchronously.
- match x {
- y if c(x).await == y + 1 => { d().await; }
- y if f().await == y + 1 => (),
- _ => (),
- }
-}
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.j-c.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.j-c.-------.InstrumentCoverage.0.html
deleted file mode 100644
index e6384b7598fc2..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.j-c.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
-async.j-c - Coverage Spans
-
-
-
- @0⦊fn c(x: u8) -> u8 {
- if x == 8⦉@0 {
- @1⦊1⦉@1 // This line appears covered, but the 1-character expression span covering the `1`
- // is not executed. (`llvm-cov show` displays a `^0` below the `1` ). This is because
- // `fn j()` executes the open brace for the funciton body, followed by the function's
- // first executable statement, `match x`. Inner function declarations are not
- // "visible" to the MIR for `j()`, so the code region counts all lines between the
- // open brace and the first statement as executed, which is, in a sense, true.
- // `llvm-cov show` overcomes this kind of situation by showing the actual counts
- // of the enclosed coverages, (that is, the `1` expression was not executed, and
- // accurately displays a `0`).
- } else {
- @2⦊0⦉@2
- }
- }@3⦊‸⦉@3
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.j-d.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.j-d.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 4eed8ee60dd64..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.j-d.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-async.j-d - Coverage Spans
-
-
-
- @0⦊fn d() -> u8 { 1 }⦉@0
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.j-f.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.j-f.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 6e80c8c786ecb..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.j-f.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-async.j-f - Coverage Spans
-
-
-
- @0⦊fn f() -> u8 { 1 }⦉@0
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.j.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.j.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 2b43c7bd25d90..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.j.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-async.j - Coverage Spans
-
-
-
-@0,3,4⦊fn j(x: u8) {
- // non-async versions of `c()`, `d()`, and `f()` to make it similar to async `i()`.
- fn c(x: u8) -> u8 {
- if x == 8 {
- 1 // This line appears covered, but the 1-character expression span covering the `1`
- // is not executed. (`llvm-cov show` displays a `^0` below the `1` ). This is because
- // `fn j()` executes the open brace for the funciton body, followed by the function's
- // first executable statement, `match x`. Inner function declarations are not
- // "visible" to the MIR for `j()`, so the code region counts all lines between the
- // open brace and the first statement as executed, which is, in a sense, true.
- // `llvm-cov show` overcomes this kind of situation by showing the actual counts
- // of the enclosed coverages, (that is, the `1` expression was not executed, and
- // accurately displays a `0`).
- } else {
- 0
- }
- }
- fn d() -> u8 { 1 }
- fn f() -> u8 { 1 }
- match x⦉@0,3,4 {
- @5,7⦊y⦉@5,7 if @0,3,4⦊c(x) == y + 1⦉@0,3,4 => @5,7⦊{ d(); }⦉@5,7
- @10⦊y⦉@10 if @1,8,9⦊f() == y + 1⦉@1,8,9 => @10⦊()⦉@10,
- _ => @2⦊()⦉@2,
- }
-}@12⦊‸⦉@12
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.k.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.k.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 5792521bb2c57..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.k.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-async.k - Coverage Spans
-
-
-
-@0⦊fn k(x: u8) { // unused function
- match x⦉@0 {
- 1 => @1,4⦊()⦉@1,4,
- 2 => @2,5⦊()⦉@2,5,
- _ => @3⦊()⦉@3,
- }
-}@6⦊‸⦉@6
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.l.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.l.-------.InstrumentCoverage.0.html
deleted file mode 100644
index cd92b88c24cbb..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.l.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-async.l - Coverage Spans
-
-
-
-@0⦊fn l(x: u8) {
- match x⦉@0 {
- 1 => @1,4⦊()⦉@1,4,
- 2 => @2,5⦊()⦉@2,5,
- _ => @3⦊()⦉@3,
- }
-}@6⦊‸⦉@6
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.m-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.m-{closure#0}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 5cec484a964da..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.m-{closure#0}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-async.m-{closure#0} - Coverage Spans
-
-
-
- @0⦊{ x - 1 }⦉@0
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.m.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.m.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 04412c1d99427..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.m.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-async.m - Coverage Spans
-
-
-
-@0,1⦊async fn m(x: u8) -> u8 ⦉@0,1{ x - 1 }
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index b892af0ed37d5..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,190 +0,0 @@
-
-
-
-
-async.main - Coverage Spans
-
-
-
-@0,1,2,3,4,5,6,7,8,9,10,11,12,13⦊fn main() {
- let _ = g(10);
- let _ = h(9);
- let mut future = Box::pin(i(8));
- j(7);
- l(6);
- let _ = m(5);
- executor::block_on(future.as_mut());
-}⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 3998295a0525e..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-closure.main-{closure#0} - Coverage Spans
-
-
-
- ||
- @0⦊{
- let mut countdown = 0;
- if is_false⦉@0 @1⦊{
- countdown = 10;
- }⦉@1@2⦊‸⦉@2
- @3,4⦊"alt string 2".to_owned()
- }⦉@3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#10}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#10}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 3bdfe71b48c27..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#10}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-closure.main-{closure#10} - Coverage Spans
-
-
-
- ||
- @0⦊{
- let mut countdown = 0;
- if is_false⦉@0 @1⦊{
- countdown = 10;
- }⦉@1@2⦊‸⦉@2
- @3,4⦊"alt string 1".to_owned()
- }⦉@3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#11}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#11}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 4b3f04b5a0c7e..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#11}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-closure.main-{closure#11} - Coverage Spans
-
-
-
- ||
- @0⦊{
- let mut countdown = 0;
- if is_false⦉@0 @1⦊{
- countdown = 10;
- }⦉@1@2⦊‸⦉@2
- @3,4⦊"alt string 3".to_owned()
- }⦉@3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 8ae494178f70b..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-closure.main-{closure#1} - Coverage Spans
-
-
-
- ||
- @0⦊{
- let mut countdown = 0;
- if is_false⦉@0 @1⦊{
- countdown = 10;
- }⦉@1@2⦊‸⦉@2
- @3,4⦊"alt string 4".to_owned()
- }⦉@3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index ad40ba57d69be..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
-
-closure.main-{closure#2} - Coverage Spans
-
-
-
- |val|
- @0⦊{
- let mut countdown = 0;
- if is_false⦉@0 @1⦊{
- countdown = 10;
- }⦉@1@2⦊‸⦉@2
- @3,4,5,6,7⦊format!("'{}'", val)
- }⦉@3,4,5,6,7
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 23101d76a8ef4..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
-closure.main-{closure#3} - Coverage Spans
-
-
-
- |
- mut countdown
- |
- @0⦊{
- if is_false⦉@0 @1⦊{
- countdown = 10;
- }⦉@1@2⦊‸⦉@2
- @3,4⦊"closure should be unused".to_owned()
- }⦉@3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#4}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#4}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 420135e143dbf..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#4}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-closure.main-{closure#4} - Coverage Spans
-
-
-
- | _unused_arg: u8 | @0⦊countdown += 1⦉@0
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#5}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#5}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 1c19aa8eeefaa..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#5}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-closure.main-{closure#5} - Coverage Spans
-
-
-
- @0,1,2⦊{
- $crate::io::_print($crate::format_args_nl!($($arg)*));
- }⦉@0,1,2
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#6}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#6}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 74c75c6c46ca2..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#6}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-closure.main-{closure#6} - Coverage Spans
-
-
-
- | _unused_arg: u8 | @0,1,2⦊{ println!("not called") }⦉@0,1,2
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#7}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#7}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 386fb1b9e6f95..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#7}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-closure.main-{closure#7} - Coverage Spans
-
-
-
- | _unused_arg: u8 | @0,1,2⦊{
- println!("not called")
- }⦉@0,1,2
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#8}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#8}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index f9da6ac9dfc34..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#8}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-closure.main-{closure#8} - Coverage Spans
-
-
-
- |
- _unused_arg: u8
- | @0,1,2⦊{ println!("not called") }⦉@0,1,2
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#9}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#9}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index e259fc9bb67e7..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#9}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-closure.main-{closure#9} - Coverage Spans
-
-
-
- |
- _unused_arg: u8
- | @0,1,2⦊{ println!("not called") }⦉@0,1,2
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index a7d1728114ec9..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,10921 +0,0 @@
-
-
-
-
-closure.main - Coverage Spans
-
-
-
-@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊fn main() {
- // Initialize test constants in a way that cannot be determined at compile time, to ensure
- // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
- // dependent conditions.
- let is_true = std::env::args().len() == 1;
- let is_false = ! is_true;
-
- let mut some_string = Some(String::from("the string content"));
- println!(
- "The string or alt: {}"
- ,
- some_string
- .
- unwrap_or_else
- (
- ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42||
- {
- let mut countdown = 0;
- if is_false {
- countdown = 10;
- }
- "alt string 1".to_owned()
- }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊
- )
- );
-
- some_string = Some(String::from("the string content"));
- let
- a
- =
- ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42||
- {
- let mut countdown = 0;
- if is_false {
- countdown = 10;
- }
- "alt string 2".to_owned()
- }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊;
- println!(
- "The string or alt: {}"
- ,
- some_string
- .
- unwrap_or_else
- (
- a
- )
- );
-
- some_string = None;
- println!(
- "The string or alt: {}"
- ,
- some_string
- .
- unwrap_or_else
- (
- ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42||
- {
- let mut countdown = 0;
- if is_false {
- countdown = 10;
- }
- "alt string 3".to_owned()
- }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊
- )
- );
-
- some_string = None;
- let
- a
- =
- ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42||
- {
- let mut countdown = 0;
- if is_false {
- countdown = 10;
- }
- "alt string 4".to_owned()
- }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊;
- println!(
- "The string or alt: {}"
- ,
- some_string
- .
- unwrap_or_else
- (
- a
- )
- );
-
- let
- quote_closure
- =
- ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42|val|
- {
- let mut countdown = 0;
- if is_false {
- countdown = 10;
- }
- format!("'{}'", val)
- }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊;
- println!(
- "Repeated, quoted string: {:?}"
- ,
- std::iter::repeat("repeat me")
- .take(5)
- .map
- (
- quote_closure
- )
- .collect::<Vec<_>>()
- );
-
- let
- _unused_closure
- =
- ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42|
- mut countdown
- |
- {
- if is_false {
- countdown = 10;
- }
- "closure should be unused".to_owned()
- }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊;
-
- let mut countdown = 10;
- let _short_unused_closure = ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42| _unused_arg: u8 | countdown += 1@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊;
-
- // Macros can sometimes confuse the coverage results. Compare this next assignment, with an
- // unused closure that invokes the `println!()` macro, with the closure assignment above, that
- // does not use a macro. The closure above correctly shows `0` executions.
- let _short_unused_closure = ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42| _unused_arg: u8 | println!("not called")@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊;
- // The closure assignment above is executed, with a line count of `1`, but the `println!()`
- // could not have been called, and yet, there is no indication that it wasn't...
-
- // ...but adding block braces gives the expected result, showing the block was not executed.
- let _short_unused_closure_block = ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42| _unused_arg: u8 | { println!("not called") }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊;
-
- let _shortish_unused_closure = ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42| _unused_arg: u8 | {
- println!("not called")
- }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊;
-
- let _as_short_unused_closure = ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42|
- _unused_arg: u8
- | { println!("not called") }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊;
-
- let _almost_as_short_unused_closure = ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42|
- _unused_arg: u8
- | { println!("not called") }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊
- ;
-}⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.conditions/conditions.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.conditions/conditions.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 3d1b737ec2d7e..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.conditions/conditions.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,307 +0,0 @@
-
-
-
-
-conditions.main - Coverage Spans
-
-
-
-@0⦊fn main() ⦉@0{
- let @0⦊mut countdown = 0;
- if true⦉@0 @1⦊{
- countdown = 10;
- }⦉@1@2⦊‸⦉@2
-
- const B: u32 = 100;
- let @19⦊x⦉@19 = if @3⦊countdown > 7⦉@3 {
- @4,6⦊countdown -= 4;
- B⦉@4,6
- } else if @5⦊countdown > 2⦉@5 {
- if @7⦊countdown < 1⦉@7 || @13⦊countdown > 5⦉@13 || @10⦊countdown != 9⦉@10 @15⦊{
- countdown = 0;
- }⦉@15@16⦊‸⦉@16
- @17,18⦊countdown -= 5;
- countdown⦉@17,18
- } else {
- @8⦊return⦉@8;
- };
-
- let @19⦊mut countdown = 0;
- if true⦉@19 @20⦊{
- countdown = 10;
- }⦉@20@21⦊‸⦉@21
-
- if @22⦊countdown > 7⦉@22 @23,25⦊{
- countdown -= 4;
- }⦉@23,25 else if @24⦊countdown > 2⦉@24 {
- if @26⦊countdown < 1⦉@26 || @32⦊countdown > 5⦉@32 || @29⦊countdown != 9⦉@29 @34⦊{
- countdown = 0;
- }⦉@34@35⦊‸⦉@35
- @36,37⦊countdown -= 5⦉@36,37;
- } else {
- @27⦊return⦉@27;
- }
-
- if @38⦊true⦉@38 {
- let @39⦊mut countdown = 0;
- if true⦉@39 @41⦊{
- countdown = 10;
- }⦉@41@42⦊‸⦉@42
-
- if @43⦊countdown > 7⦉@43 @44,46⦊{
- countdown -= 4;
- }⦉@44,46
- else if @45⦊countdown > 2⦉@45 {
- if @47⦊countdown < 1⦉@47 || @53⦊countdown > 5⦉@53 || @50⦊countdown != 9⦉@50 @55⦊{
- countdown = 0;
- }⦉@55@56⦊‸⦉@56
- @57,58⦊countdown -= 5⦉@57,58;
- } else {
- @48⦊return⦉@48;
- }
- }@40⦊‸⦉@40 // Note: closing brace shows uncovered (vs. `0` for implicit else) because condition literal
- // `true` was const-evaluated. The compiler knows the `if` block will be executed.
-
- let @60⦊mut countdown = 0;
- if true⦉@60 @61⦊{
- countdown = 1;
- }⦉@61@62⦊‸⦉@62
-
- let @81⦊z⦉@81 = if @63⦊countdown > 7⦉@63 @64,66⦊{
- countdown -= 4;
- }⦉@64,66 else if @65⦊countdown > 2⦉@65 {
- if @67⦊countdown < 1⦉@67 || @73⦊countdown > 5⦉@73 || @70⦊countdown != 9⦉@70 @75⦊{
- countdown = 0;
- }⦉@75@76⦊‸⦉@76
- @77,78⦊countdown -= 5⦉@77,78;
- } else {
- let @68,79,80⦊should_be_reachable = countdown;
- println!("reached");
- return⦉@68,79,80;
- };
-
- let @97⦊w⦉@97 = if @81⦊countdown > 7⦉@81 @82,84⦊{
- countdown -= 4;
- }⦉@82,84 else if @83⦊countdown > 2⦉@83 {
- if @85⦊countdown < 1⦉@85 || @91⦊countdown > 5⦉@91 || @88⦊countdown != 9⦉@88 @93⦊{
- countdown = 0;
- }⦉@93@94⦊‸⦉@94
- @95,96⦊countdown -= 5⦉@95,96;
- } else {
- @86⦊return⦉@86;
- };
-}@101⦊‸⦉@101
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.dead_code/dead_code.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.dead_code/dead_code.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index be06ddd126da9..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.dead_code/dead_code.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,143 +0,0 @@
-
-
-
-
-dead_code.main - Coverage Spans
-
-
-
-@0,1,2,3⦊fn main() {
- // Initialize test constants in a way that cannot be determined at compile time, to ensure
- // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
- // dependent conditions.
- let is_true = std::env::args().len() == 1;
-
- let mut countdown = 0;
- if is_true⦉@0,1,2,3 @4⦊{
- countdown = 10;
- }⦉@4@5⦊‸⦉@5
-}@6⦊‸⦉@6
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.dead_code/dead_code.unused_fn.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.dead_code/dead_code.unused_fn.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 7f2d8d3c8ec1e..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.dead_code/dead_code.unused_fn.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,143 +0,0 @@
-
-
-
-
-dead_code.unused_fn - Coverage Spans
-
-
-
-@0,1,2,3⦊fn unused_fn() {
- // Initialize test constants in a way that cannot be determined at compile time, to ensure
- // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
- // dependent conditions.
- let is_true = std::env::args().len() == 1;
-
- let mut countdown = 0;
- if is_true⦉@0,1,2,3 @4⦊{
- countdown = 10;
- }⦉@4@5⦊‸⦉@5
-}@6⦊‸⦉@6
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.dead_code/dead_code.unused_pub_fn_not_in_library.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.dead_code/dead_code.unused_pub_fn_not_in_library.-------.InstrumentCoverage.0.html
deleted file mode 100644
index be44f71348c17..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.dead_code/dead_code.unused_pub_fn_not_in_library.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,143 +0,0 @@
-
-
-
-
-dead_code.unused_pub_fn_not_in_library - Coverage Spans
-
-
-
-@0,1,2,3⦊pub fn unused_pub_fn_not_in_library() {
- // Initialize test constants in a way that cannot be determined at compile time, to ensure
- // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
- // dependent conditions.
- let is_true = std::env::args().len() == 1;
-
- let mut countdown = 0;
- if is_true⦉@0,1,2,3 @4⦊{
- countdown = 10;
- }⦉@4@5⦊‸⦉@5
-}@6⦊‸⦉@6
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.doctest/doctest.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.doctest/doctest.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 95813decf9f6a..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.doctest/doctest.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-doctest.main - Coverage Spans
-
-
-
-@0⦊fn main() ⦉@0{
- if @0⦊true⦉@0 {
- @4⦊@3⦊assert_eq!(1, 1);⦉@3⦉@4
- } else {
- @6⦊@5⦊assert_eq!(1, 2);⦉@5⦉@6
- }
-}@7⦊‸⦉@7
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.doctest_crate/doctest_crate.fn_run_in_doctests.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.doctest_crate/doctest_crate.fn_run_in_doctests.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 3a41d3482b0b9..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.doctest_crate/doctest_crate.fn_run_in_doctests.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
-doctest_crate.fn_run_in_doctests - Coverage Spans
-
-
-
-@0⦊pub fn fn_run_in_doctests(conditional: usize) ⦉@0{
- match @0⦊conditional⦉@0 {
- 1 => @7⦊@6⦊assert_eq!(1, 1)⦉@6⦉@7, // this is run,
- 2 => @10⦊@9⦊assert_eq!(1, 1)⦉@9⦉@10, // this,
- 3 => @13⦊@12⦊assert_eq!(1, 1)⦉@12⦉@13, // and this too
- _ => @15⦊@14⦊assert_eq!(1, 2)⦉@14⦉@15, // however this is not
- }
-}@16⦊‸⦉@16
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 66a6e776a0622..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
-
-
-drop_trait.main - Coverage Spans
-
-
-
-@0⦊fn main() -> Result<(),u8> {
- let _firecracker = Firework { strength: 1 };
-
- let _tnt = Firework { strength: 100 };
-
- if true⦉@0 {
- @1,3,4,8,9⦊println!("Exiting with error...");
- return Err(1)⦉@1,3,4,8,9;
- }@2,5,6,7⦊
-
- let _ = Firework { strength: 1000 };
-
- Ok(())⦉@2,5,6,7
-}@10⦊‸⦉@10
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 57d56c5cf7369..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-drop_trait.{impl#0}-drop - Coverage Spans
-
-
-
- @0,1,2,3⦊fn drop(&mut self) {
- println!("BOOM times {}!!!", self.strength);
- }⦉@0,1,2,3
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 098c140425160..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,237 +0,0 @@
-
-
-
-
-generics.main - Coverage Spans
-
-
-
-@0,1,2,3⦊fn main() -> Result<(),u8> {
- let mut firecracker = Firework { strength: 1 };
- firecracker.set_strength(2);
-
- let mut tnt = Firework { strength: 100.1 };
- tnt.set_strength(200.1);
- tnt.set_strength(300.3);
-
- if true⦉@0,1,2,3 {
- @4,6,7,11,12⦊println!("Exiting with error...");
- return Err(1)⦉@4,6,7,11,12;
- }@5,8,9,10⦊ // The remaining lines below have no coverage because `if true` (with the constant literal
- // `true`) is guaranteed to execute the `then` block, which is also guaranteed to `return`.
- // Thankfully, in the normal case, conditions are not guaranteed ahead of time, and as shown
- // in other tests, the lines below would have coverage (which would show they had `0`
- // executions, assuming the condition still evaluated to `true`).
-
- let _ = Firework { strength: 1000 };
-
- Ok(())⦉@5,8,9,10
-}@13⦊‸⦉@13
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.{impl#0}-set_strength.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.{impl#0}-set_strength.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 329641d47bdbc..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.{impl#0}-set_strength.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
-generics.{impl#0}-set_strength - Coverage Spans
-
-
-
- @0⦊fn set_strength(&mut self, new_strength: T) {
- self.strength = new_strength;
- }⦉@0
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 4908bc7b4a772..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-generics.{impl#1}-drop - Coverage Spans
-
-
-
- @0,1,2,3⦊fn drop(&mut self) {
- println!("BOOM times {}!!!", self.strength);
- }⦉@0,1,2,3
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.if/if.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.if/if.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index d6eccf57846ef..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.if/if.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,238 +0,0 @@
-
-
-
-
-if.main - Coverage Spans
-
-
-
-@0,1,2,3⦊fn main() {
- // Initialize test constants in a way that cannot be determined at compile time, to ensure
- // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
- // dependent conditions.
- let
- is_true
- =
- std::env::args().len()
- ==
- 1
- ;
- let
- mut
- countdown
- =
- 0
- ;
- if
- is_true⦉@0,1,2,3
- @4⦊{
- countdown
- =
- 10
- ;
- }⦉@4@5⦊‸⦉@5
-}@6⦊‸⦉@6
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.if_else/if_else.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.if_else/if_else.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index e0f0ac4020594..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.if_else/if_else.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,195 +0,0 @@
-
-
-
-
-if_else.main - Coverage Spans
-
-
-
-@0,1,2,3⦊fn main() {
- // Initialize test constants in a way that cannot be determined at compile time, to ensure
- // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
- // dependent conditions.
- let is_true = std::env::args().len() == 1;
-
- let mut countdown = 0;
- if
- is_true⦉@0,1,2,3
- @4⦊{
- countdown
- =
- 10
- ;
- }⦉@4
- else // Note coverage region difference without semicolon
- {
- @5⦊countdown
- =
- 100⦉@5
- }
-
- if
- @6⦊is_true⦉@6
- @7⦊{
- countdown
- =
- 10
- ;
- }⦉@7
- else
- @8⦊{
- countdown
- =
- 100
- ;
- }⦉@8
-}@9⦊‸⦉@9
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.display.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.display.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 6287516636ea9..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.display.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
-inline.display - Coverage Spans
-
-
-
-@0,1⦊fn display<T: Display>(xs: &[T]) ⦉@0,1{
- for @6,8,9,10,11⦊x⦉@6,8,9,10,11 in @6,8,9,10,11⦊xs {
- print!("{}", x);
- }⦉@6,8,9,10,11
- @5,12,13⦊println!();
-}⦉@5,12,13
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.error.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.error.-------.InstrumentCoverage.0.html
deleted file mode 100644
index bbf19c3e446f9..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.error.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-inline.error - Coverage Spans
-
-
-
-@0,1⦊fn error() {
- panic!("error");
-}⦉@0,1
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.length.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.length.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 8e8efb6d9f6b1..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.length.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-inline.length - Coverage Spans
-
-
-
-@0,1⦊fn length<T>(xs: &[T]) -> usize {
- xs.len()
-}⦉@0,1
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 4ec2e9beede30..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
-
-inline.main - Coverage Spans
-
-
-
-@0,1⦊fn main() {
- permutations(&['a', 'b', 'c']);
-}⦉@0,1
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.permutate.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.permutate.-------.InstrumentCoverage.0.html
deleted file mode 100644
index fd72973ccd076..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.permutate.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
-
-
-inline.permutate - Coverage Spans
-
-
-
-@0,1⦊fn permutate<T: Copy + Display>(xs: &mut [T], k: usize) {
- let n = length(xs);
- if k == n⦉@0,1 @2,4⦊{
- display(xs);
- }⦉@2,4 else if @3⦊k < n⦉@3 {
- for @12,14,15,16,17,18⦊i⦉@12,14,15,16,17,18 in @5,7⦊k..n⦉@5,7 @12,14,15,16,17,18⦊{
- swap(xs, i, k);
- permutate(xs, k + 1);
- swap(xs, i, k);
- }⦉@12,14,15,16,17,18
- } else @6,19⦊{
- error();
- }⦉@6,19
-}@21⦊‸⦉@21
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.permutations.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.permutations.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 4bfd22f3cd903..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.permutations.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
-inline.permutations - Coverage Spans
-
-
-
-@0,1,2,3,4⦊fn permutations<T: Copy + Display>(xs: &[T]) {
- let mut ys = xs.to_owned();
- permutate(&mut ys, 0);
-}⦉@0,1,2,3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.swap.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.swap.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 4c3f63093d30e..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inline/inline.swap.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,173 +0,0 @@
-
-
-
-
-inline.swap - Coverage Spans
-
-
-
-@0,1,2,3,4⦊fn swap<T: Copy>(xs: &mut [T], i: usize, j: usize) {
- let t = xs[i];
- xs[i] = xs[j];
- xs[j] = t;
-}⦉@0,1,2,3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main-InTrait-default_trait_func.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main-InTrait-default_trait_func.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 1dc5bb64e0bc3..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main-InTrait-default_trait_func.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-
-inner_items.main-InTrait-default_trait_func - Coverage Spans
-
-
-
- @0,1,2⦊fn default_trait_func(&mut self) {
- in_func(IN_CONST);
- self.trait_func(IN_CONST);
- }⦉@0,1,2
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main-in_func.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main-in_func.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 82724e5e86517..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main-in_func.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,203 +0,0 @@
-
-
-
-
-inner_items.main-in_func - Coverage Spans
-
-
-
- @0,1,2,3,4⦊fn in_func(a: u32) {
- let b = 1;
- let c = a + b;
- println!("c = {}", c)
- }⦉@0,1,2,3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main-{impl#0}-trait_func.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main-{impl#0}-trait_func.-------.InstrumentCoverage.0.html
deleted file mode 100644
index b00a781a0a74c..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main-{impl#0}-trait_func.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
-inner_items.main-{impl#0}-trait_func - Coverage Spans
-
-
-
- @0,1,2⦊fn trait_func(&mut self, incr: u32) {
- self.in_struct_field += incr;
- in_func(self.in_struct_field);
- }⦉@0,1,2
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 4a1003dfbed32..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,189 +0,0 @@
-
-
-
-
-inner_items.main - Coverage Spans
-
-
-
-@0,1,2,3⦊fn main() ⦉@0,1,2,3{
- // Initialize test constants in a way that cannot be determined at compile time, to ensure
- // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
- // dependent conditions.
- let @0,1,2,3⦊is_true = std::env::args().len() == 1;
-
- let mut countdown = 0;
- if is_true⦉@0,1,2,3 @4⦊{
- countdown = 10;
- }⦉@4@5⦊‸⦉@5
-
- mod in_mod {
- const IN_MOD_CONST: u32 = 1000;
- }
-
- fn in_func(a: u32) {
- let b = 1;
- let c = a + b;
- println!("c = {}", c)
- }
-
- struct InStruct {
- in_struct_field: u32,
- }
-
- const IN_CONST: u32 = 1234;
-
- trait InTrait {
- fn trait_func(&mut self, incr: u32);
-
- fn default_trait_func(&mut self) {
- in_func(IN_CONST);
- self.trait_func(IN_CONST);
- }
- }
-
- impl InTrait for InStruct {
- fn trait_func(&mut self, incr: u32) {
- self.in_struct_field += incr;
- in_func(self.in_struct_field);
- }
- }
-
- type InType = String;
-
- if @6⦊is_true⦉@6 @7,9⦊{
- in_func(countdown);
- }⦉@7,9@8⦊‸⦉@8
-
- let @10,11⦊mut val = InStruct {
- in_struct_field: 101,
- };
-
- val.default_trait_func();
-}⦉@10,11
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.lazy_boolean/lazy_boolean.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.lazy_boolean/lazy_boolean.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index a6f8d500065fa..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.lazy_boolean/lazy_boolean.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,259 +0,0 @@
-
-
-
-
-lazy_boolean.main - Coverage Spans
-
-
-
-@0,1,2,3⦊fn main() {
- // Initialize test constants in a way that cannot be determined at compile time, to ensure
- // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
- // dependent conditions.
- let is_true = std::env::args().len() == 1;
-
- let (mut a, mut b, mut c) = (0, 0, 0);
- if is_true⦉@0,1,2,3 @4⦊{
- a = 1;
- b = 10;
- c = 100;
- }⦉@4@5⦊‸⦉@5
- let
- @9⦊somebool⦉@9
- =
- @6⦊a < b⦉@6
- ||
- @8⦊b < c⦉@8
- ;
- let
- @12⦊somebool⦉@12
- =
- @9⦊b < a⦉@9
- ||
- @11⦊b < c⦉@11
- ;
- let @15⦊somebool⦉@15 = @12⦊a < b⦉@12 && @14⦊b < c⦉@14;
- let @18⦊somebool⦉@18 = @15⦊b < a⦉@15 && @17⦊b < c⦉@17;
-
- if
- @18⦊!
- is_true⦉@18
- @19⦊{
- a = 2
- ;
- }⦉@19@20⦊‸⦉@20
-
- if
- @21⦊is_true⦉@21
- @22⦊{
- b = 30
- ;
- }⦉@22
- else
- @23⦊{
- c = 400
- ;
- }⦉@23
-
- if @24⦊!is_true⦉@24 @25⦊{
- a = 2;
- }⦉@25@26⦊‸⦉@26
-
- if @27⦊is_true⦉@27 @28⦊{
- b = 30;
- }⦉@28 else @29⦊{
- c = 400;
- }⦉@29
-}@30⦊‸⦉@30
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.loop_break_value/loop_break_value.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.loop_break_value/loop_break_value.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 076d036c2aff7..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.loop_break_value/loop_break_value.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
-
-loop_break_value.main - Coverage Spans
-
-
-
-@0,1⦊fn main() {
- let result
- =
- loop
- {
- break
- 10
- ;
- }
- ;
-}⦉@0,1
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.loops_branches/loops_branches.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.loops_branches/loops_branches.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 95e8f0b71eab8..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.loops_branches/loops_branches.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
-loops_branches.main - Coverage Spans
-
-
-
-@0,1,2,3⦊fn main() {
- let debug_test = DebugTest;
- println!("{:?}", debug_test);
-}⦉@0,1,2,3
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.loops_branches/loops_branches.{impl#0}-fmt.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.loops_branches/loops_branches.{impl#0}-fmt.-------.InstrumentCoverage.0.html
deleted file mode 100644
index f6f08b6a7704b..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.loops_branches/loops_branches.{impl#0}-fmt.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
-loops_branches.{impl#0}-fmt - Coverage Spans
-
-
-
- @0⦊fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
- if true⦉@0 {
- if @1⦊false⦉@1 {
- while @4,5⦊true⦉@4,5 @6,8⦊{
- }⦉@6,8
- }@3⦊‸⦉@3
- @9,10,11,12⦊write!(f, "error")⦉@9,10,11,12@14,16,17,18⦊?⦉@14,16,17,18;
- } else @2⦊{
- }⦉@2
- @19⦊Ok(())⦉@19
- }@20⦊‸⦉@20
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.match_or_pattern/match_or_pattern.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.match_or_pattern/match_or_pattern.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 013c292ce9a43..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.match_or_pattern/match_or_pattern.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,259 +0,0 @@
-
-
-
-
-match_or_pattern.main - Coverage Spans
-
-
-
-@0,1,2,3⦊fn main() {
- // Initialize test constants in a way that cannot be determined at compile time, to ensure
- // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
- // dependent conditions.
- let is_true = std::env::args().len() == 1;
-
- let mut a: u8 = 0;
- let mut b: u8 = 0;
- if is_true⦉@0,1,2,3 @4⦊{
- a = 2;
- b = 0;
- }⦉@4@5⦊‸⦉@5
- match @6⦊(a, b)⦉@6 {
- // Or patterns generate MIR `SwitchInt` with multiple targets to the same `BasicBlock`.
- // This test confirms a fix for Issue #79569.
- (0 | 1, 2 | 3) => @9,10⦊{}⦉@9,10
- _ => @7⦊{}⦉@7
- }
- if @11⦊is_true⦉@11 @12⦊{
- a = 0;
- b = 0;
- }⦉@12@13⦊‸⦉@13
- match @14⦊(a, b)⦉@14 {
- (0 | 1, 2 | 3) => @17,18⦊{}⦉@17,18
- _ => @15⦊{}⦉@15
- }
- if @19⦊is_true⦉@19 @20⦊{
- a = 2;
- b = 2;
- }⦉@20@21⦊‸⦉@21
- match @22⦊(a, b)⦉@22 {
- (0 | 1, 2 | 3) => @25,26⦊{}⦉@25,26
- _ => @23⦊{}⦉@23
- }
- if @27⦊is_true⦉@27 @28⦊{
- a = 0;
- b = 2;
- }⦉@28@29⦊‸⦉@29
- match @30⦊(a, b)⦉@30 {
- (0 | 1, 2 | 3) => @33,34⦊{}⦉@33,34
- _ => @31⦊{}⦉@31
- }
-}@35⦊‸⦉@35
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.nested_loops/nested_loops.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.nested_loops/nested_loops.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 1abc24156d9c3..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.nested_loops/nested_loops.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,166 +0,0 @@
-
-
-
-
-nested_loops.main - Coverage Spans
-
-
-
-@0,1,2,3⦊fn main() {
- let is_true = std::env::args().len() == 1;
- let mut countdown = 10⦉@0,1,2,3;
-
- 'outer: while @4,5⦊countdown > 0⦉@4,5 {
- let @6,8,9⦊mut a = 100;
- let mut b = 100⦉@6,8,9;
- for @14,16⦊_⦉@14,16 in @10,11,12⦊0..50⦉@10,11,12 {
- if @14,16⦊a < 30⦉@14,16 {
- @17⦊break⦉@17;
- }@18,19,20⦊
- a -= 5;
- b -= 5;
- if b < 90⦉@18,19,20 {
- @21,23⦊a -= 10;
- if is_true⦉@21,23 {
- @24⦊break 'outer⦉@24;
- } else @25,26⦊{
- a -= 2;
- }⦉@25,26
- }@22⦊‸⦉@22
- }
- @28,29⦊countdown -= 1⦉@28,29;
- }
-}@30⦊‸⦉@30
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.overflow/overflow.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.overflow/overflow.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 2a9b1b10efcd2..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.overflow/overflow.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,258 +0,0 @@
-
-
-
-
-overflow.main - Coverage Spans
-
-
-
-@0⦊fn main() -> Result<(),u8> {
- let mut countdown = 10⦉@0;
- while @1,2⦊countdown > 0⦉@1,2 {
- if @3,5⦊countdown == 1⦉@3,5 @6,8,9,10,11⦊{
- let result = might_overflow(10);
- println!("Result: {}", result);
- }⦉@6,8,9,10,11 else if @7⦊countdown < 5⦉@7 @12,14,15,16,17⦊{
- let result = might_overflow(1);
- println!("Result: {}", result);
- }⦉@12,14,15,16,17@13⦊‸⦉@13
- @19,20⦊countdown -= 1⦉@19,20;
- }
- @4⦊Ok(())
-}⦉@4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.overflow/overflow.might_overflow.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.overflow/overflow.might_overflow.-------.InstrumentCoverage.0.html
deleted file mode 100644
index c6043f0bd07fe..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.overflow/overflow.might_overflow.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,394 +0,0 @@
-
-
-
-
-overflow.might_overflow - Coverage Spans
-
-
-
-@0⦊fn might_overflow(to_add: u32) -> u32 {
- if to_add > 5⦉@0 @1,3,4⦊{
- println!("this will probably overflow");
- }⦉@1,3,4@2⦊‸⦉@2
- let @5,6,7,8,9,10,11,12,13⦊add_to = u32::MAX - 5;
- println!("does {} + {} overflow?", add_to, to_add);
- let result = to_add + add_to;
- println!("continuing after overflow check");
- result
-}⦉@5,6,7,8,9,10,11,12,13
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.panic_unwind/panic_unwind.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.panic_unwind/panic_unwind.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 5b097f118e3a8..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.panic_unwind/panic_unwind.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-panic_unwind.main - Coverage Spans
-
-
-
-@0⦊fn main() -> Result<(), u8> {
- let mut countdown = 10⦉@0;
- while @1,2⦊countdown > 0⦉@1,2 {
- if @3,5⦊countdown == 1⦉@3,5 @6,8⦊{
- might_panic(true);
- }⦉@6,8 else if @7⦊countdown < 5⦉@7 @9,11⦊{
- might_panic(false);
- }⦉@9,11@10⦊‸⦉@10
- @13,14⦊countdown -= 1⦉@13,14;
- }
- @4⦊Ok(())
-}⦉@4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.panic_unwind/panic_unwind.might_panic.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.panic_unwind/panic_unwind.might_panic.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 32988629ba0eb..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.panic_unwind/panic_unwind.might_panic.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
-panic_unwind.might_panic - Coverage Spans
-
-
-
-@0⦊fn might_panic(should_panic: bool) ⦉@0{
- if @0⦊should_panic⦉@0 {
- @1,3,4⦊println!("panicking...");
- panic!("panics");⦉@1,3,4
- } else @2,5,6⦊{
- println!("Don't Panic");
- }
-}⦉@2,5,6
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 3e307c4f460d5..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,295 +0,0 @@
-
-
-
-
-partial_eq.main - Coverage Spans
-
-
-
-@0,1,2,3,4,5,6,7,8⦊fn main() {
- let version_3_2_1 = Version::new(3, 2, 1);
- let version_3_3_0 = Version::new(3, 3, 0);
-
- println!("{:?} < {:?} = {}", version_3_2_1, version_3_3_0, version_3_2_1 < version_3_3_0);
-}⦉@0,1,2,3,4,5,6,7,8
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#0}-new.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#0}-new.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 820ccf74d1b9e..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#0}-new.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-partial_eq.{impl#0}-new - Coverage Spans
-
-
-
- @0⦊pub fn new(major: usize, minor: usize, patch: usize) -> Self {
- Self {
- major,
- minor,
- patch,
- }
- }⦉@0
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#1}-cmp.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#1}-cmp.-------.InstrumentCoverage.0.html
deleted file mode 100644
index ee4c10afd8b89..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#1}-cmp.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-partial_eq.{impl#1}-cmp - Coverage Spans
-
-
-
- @0,1⦊‸⦉@0,1Ord@15⦊‸⦉@15
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-partial_cmp.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-partial_cmp.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 2f5092bd51f0a..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-partial_cmp.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-partial_eq.{impl#2}-partial_cmp - Coverage Spans
-
-
-
- @0,1⦊‸⦉@0,1PartialOrd@18⦊‸⦉@18
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#4}-assert_receiver_is_total_eq.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#4}-assert_receiver_is_total_eq.-------.InstrumentCoverage.0.html
deleted file mode 100644
index ebb8b1c15ce08..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#4}-assert_receiver_is_total_eq.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-partial_eq.{impl#4}-assert_receiver_is_total_eq - Coverage Spans
-
-
-
- @0⦊‸⦉@0Eq
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#6}-eq.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#6}-eq.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 9858b270d7ef9..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#6}-eq.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-partial_eq.{impl#6}-eq - Coverage Spans
-
-
-
- @0⦊‸⦉@0PartialEq@3⦊‸⦉@3
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#6}-ne.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#6}-ne.-------.InstrumentCoverage.0.html
deleted file mode 100644
index bf94e5cbf739b..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#6}-ne.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-partial_eq.{impl#6}-ne - Coverage Spans
-
-
-
- @0⦊‸⦉@0PartialEq@3⦊‸⦉@3
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#7}-fmt.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#7}-fmt.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 930492f24841f..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#7}-fmt.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-partial_eq.{impl#7}-fmt - Coverage Spans
-
-
-
- @0,1,2,3,4,5⦊Debug⦉@0,1,2,3,4,5
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#8}-clone.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#8}-clone.-------.InstrumentCoverage.0.html
deleted file mode 100644
index f1c983933432c..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#8}-clone.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
-partial_eq.{impl#8}-clone - Coverage Spans
-
-
-
- @0,1,2,3⦊Clone⦉@0,1,2,3
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.simple_loop/simple_loop.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.simple_loop/simple_loop.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 6b911eea34121..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.simple_loop/simple_loop.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,193 +0,0 @@
-
-
-
-
-simple_loop.main - Coverage Spans
-
-
-
-@0,1,2,3⦊fn main() {
- // Initialize test constants in a way that cannot be determined at compile time, to ensure
- // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
- // dependent conditions.
- let is_true = std::env::args().len() == 1;
-
- let mut countdown = 0;
-
- if
- is_true⦉@0,1,2,3
- @4⦊{
- countdown
- =
- 10
- ;
- }⦉@4@5⦊‸⦉@5
-
- loop
- {
- if
- @7,8⦊countdown
- ==
- 0⦉@7,8
- {
- @9⦊break⦉@9
- ;
- }@10,11⦊
- countdown
- -=
- 1⦉@10,11
- ;
- }
-}@9⦊‸⦉@9
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.simple_match/simple_match.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.simple_match/simple_match.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index a56692d9c2a48..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.simple_match/simple_match.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,222 +0,0 @@
-
-
-
-
-simple_match.main - Coverage Spans
-
-
-
-@0,1,2,3⦊fn main() {
- // Initialize test constants in a way that cannot be determined at compile time, to ensure
- // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
- // dependent conditions.
- let is_true = std::env::args().len() == 1;
-
- let mut countdown = 1;
- if is_true⦉@0,1,2,3 @4⦊{
- countdown = 0;
- }⦉@4@5⦊‸⦉@5
-
- for
- @12,14,16⦊_⦉@12,14,16
- in
- @8,9,10⦊0..2⦉@8,9,10
- {
- let z
- ;
- match
- @12,14,16⦊countdown⦉@12,14,16
- {
- @17⦊x⦉@17
- if
- @12,14,16⦊x
- <
- 1⦉@12,14,16
- =>
- @17⦊{
- z = countdown
- ;
- let y = countdown
- ;
- countdown = 10
- ;
- }⦉@17
- _
- =>
- @15⦊{}⦉@15
- }
- }
-}@11⦊‸⦉@11
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.tight_inf_loop/tight_inf_loop.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.tight_inf_loop/tight_inf_loop.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 8cbd265c6a01c..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.tight_inf_loop/tight_inf_loop.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
-tight_inf_loop.main - Coverage Spans
-
-
-
-@0⦊fn main() {
- if false⦉@0 {
- @3,4⦊loop {}⦉@3,4
- }@2⦊
-}⦉@2
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.try_error_result/try_error_result.call.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.try_error_result/try_error_result.call.-------.InstrumentCoverage.0.html
deleted file mode 100644
index a8a3139334c96..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.try_error_result/try_error_result.call.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-try_error_result.call - Coverage Spans
-
-
-
-@0⦊fn call(return_error: bool) -> Result<(),()> {
- if return_error⦉@0 {
- @1⦊Err(())⦉@1
- } else {
- @2⦊Ok(())⦉@2
- }
-}@3⦊‸⦉@3
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.try_error_result/try_error_result.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.try_error_result/try_error_result.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 5b0c5cb072f04..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.try_error_result/try_error_result.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
-
-
-try_error_result.main - Coverage Spans
-
-
-
-@0,1⦊fn main() -> Result<(),()> {
- let mut
- countdown = 10⦉@0,1
- ;
- for
- @6,8,9⦊_⦉@6,8,9
- in
- @2,3,4⦊0..10⦉@2,3,4
- {
- @6,8,9⦊countdown
- -= 1
- ;
- if
- countdown < 5⦉@6,8,9
- {
- @10,12,13⦊call(/*return_error=*/ true)⦉@10,12,13@15,17,18,19⦊?⦉@15,17,18,19;
- @14,20,21⦊call(/*return_error=*/ false)⦉@14,20,21@23,25,26,27⦊?⦉@23,25,26,27;
- }
- else
- {
- @11,28,29⦊call(/*return_error=*/ false)⦉@11,28,29@31,33,34,35⦊?⦉@31,33,34,35;
- }
- }
- @5⦊Ok(())⦉@5
-}@38⦊‸⦉@38
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.foo.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.foo.-------.InstrumentCoverage.0.html
deleted file mode 100644
index ef431a356c250..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.foo.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-unused.foo - Coverage Spans
-
-
-
-@0⦊fn foo<T>(x: T) {
- let mut i = 0⦉@0;
- while @1,2⦊i < 10⦉@1,2 {
- @3,5⦊i != 0⦉@3,5 || @7⦊i != 0⦉@7;
- @8,9⦊i += 1⦉@8,9;
- }
-}@4,10⦊‸⦉@4,10
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 864f6c4feb152..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-unused.main - Coverage Spans
-
-
-
-@0,1,2⦊fn main() -> Result<(), u8> {
- foo::<u32>(0);
- foo::<f32>(0.0);
- Ok(())
-}⦉@0,1,2
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.unused_func.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.unused_func.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 52beea080232e..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.unused_func.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-
-unused.unused_func - Coverage Spans
-
-
-
-@0⦊fn unused_func(mut a: u32) {
- if a != 0⦉@0 @1,3⦊{
- a += 1;
- }⦉@1,3@2⦊‸⦉@2
-}@4⦊‸⦉@4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.unused_func2.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.unused_func2.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 816ef73ea6b06..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.unused_func2.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-
-unused.unused_func2 - Coverage Spans
-
-
-
-@0⦊fn unused_func2(mut a: u32) {
- if a != 0⦉@0 @1,3⦊{
- a += 1;
- }⦉@1,3@2⦊‸⦉@2
-}@4⦊‸⦉@4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.unused_func3.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.unused_func3.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 739f9f42db359..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.unused_func3.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-
-unused.unused_func3 - Coverage Spans
-
-
-
-@0⦊fn unused_func3(mut a: u32) {
- if a != 0⦉@0 @1,3⦊{
- a += 1;
- }⦉@1,3@2⦊‸⦉@2
-}@4⦊‸⦉@4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.unused_template_func.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.unused_template_func.-------.InstrumentCoverage.0.html
deleted file mode 100644
index be4f5efc5dbf1..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.unused/unused.unused_template_func.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-unused.unused_template_func - Coverage Spans
-
-
-
-@0⦊fn unused_template_func<T>(x: T) {
- let mut i = 0⦉@0;
- while @1,2⦊i < 10⦉@1,2 {
- @3,5⦊i != 0⦉@3,5 || @7⦊i != 0⦉@7;
- @8,9⦊i += 1⦉@8,9;
- }
-}@4,10⦊‸⦉@4,10
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.unused_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.unused_function.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 65e21ecef13bd..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.unused_function.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-used_crate.unused_function - Coverage Spans
-
-
-
-@0,1,2,3⦊pub fn unused_function() {
- let is_true = std::env::args().len() == 1;
- let mut countdown = 2;
- if !is_true⦉@0,1,2,3 @4⦊{
- countdown = 20;
- }⦉@4@5⦊‸⦉@5
-}@6⦊‸⦉@6
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.unused_generic_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.unused_generic_function.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 02154a2268b75..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.unused_generic_function.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-used_crate.unused_generic_function - Coverage Spans
-
-
-
-@0,1,2,3,4⦊pub fn unused_generic_function<T: Debug>(arg: T) {
- println!("unused_generic_function with {:?}", arg);
-}⦉@0,1,2,3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.unused_private_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.unused_private_function.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 78228594e3753..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.unused_private_function.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-used_crate.unused_private_function - Coverage Spans
-
-
-
-@0,1,2,3⦊fn unused_private_function() {
- let is_true = std::env::args().len() == 1;
- let mut countdown = 2;
- if !is_true⦉@0,1,2,3 @4⦊{
- countdown = 20;
- }⦉@4@5⦊‸⦉@5
-}@6⦊‸⦉@6
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.use_this_lib_crate.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.use_this_lib_crate.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 8f618d2e24954..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.use_this_lib_crate.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,190 +0,0 @@
-
-
-
-
-used_crate.use_this_lib_crate - Coverage Spans
-
-
-
-@0,1,2,3,4,5,6,7,8⦊fn use_this_lib_crate() {
- used_from_bin_crate_and_lib_crate_generic_function("used from library used_crate.rs");
- used_with_same_type_from_bin_crate_and_lib_crate_generic_function(
- "used from library used_crate.rs",
- );
- let some_vec = vec![5, 6, 7, 8];
- used_only_from_this_lib_crate_generic_function(some_vec);
- used_only_from_this_lib_crate_generic_function("used ONLY from library used_crate.rs");
-}⦉@0,1,2,3,4,5,6,7,8
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 61a709c4729f2..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-used_crate.used_from_bin_crate_and_lib_crate_generic_function - Coverage Spans
-
-
-
-@0,1,2,3,4⦊pub fn used_from_bin_crate_and_lib_crate_generic_function<T: Debug>(arg: T) {
- println!("used_from_bin_crate_and_lib_crate_generic_function with {:?}", arg);
-}⦉@0,1,2,3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_function.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 974a24b2c6d44..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_function.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-used_crate.used_function - Coverage Spans
-
-
-
-@0,1,2,3⦊pub fn used_function() ⦉@0,1,2,3{
- // Initialize test constants in a way that cannot be determined at compile time, to ensure
- // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
- // dependent conditions.
- let @0,1,2,3⦊is_true = std::env::args().len() == 1;
- let mut countdown = 0;
- if is_true⦉@0,1,2,3 @4⦊{
- countdown = 10;
- }⦉@4@5⦊‸⦉@5
- @6,7⦊use_this_lib_crate();
-}⦉@6,7
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_only_from_bin_crate_generic_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_only_from_bin_crate_generic_function.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 68035339fe4a8..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_only_from_bin_crate_generic_function.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-used_crate.used_only_from_bin_crate_generic_function - Coverage Spans
-
-
-
-@0,1,2,3,4⦊pub fn used_only_from_bin_crate_generic_function<T: Debug>(arg: T) {
- println!("used_only_from_bin_crate_generic_function with {:?}", arg);
-}⦉@0,1,2,3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_only_from_this_lib_crate_generic_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_only_from_this_lib_crate_generic_function.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 63944eb9ab38e..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_only_from_this_lib_crate_generic_function.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-used_crate.used_only_from_this_lib_crate_generic_function - Coverage Spans
-
-
-
-@0,1,2,3,4⦊pub fn used_only_from_this_lib_crate_generic_function<T: Debug>(arg: T) {
- println!("used_only_from_this_lib_crate_generic_function with {:?}", arg);
-}⦉@0,1,2,3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_with_same_type_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_with_same_type_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html
deleted file mode 100644
index b146180fbd155..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_with_same_type_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-used_crate.used_with_same_type_from_bin_crate_and_lib_crate_generic_function - Coverage Spans
-
-
-
-@0,1,2,3,4⦊pub fn used_with_same_type_from_bin_crate_and_lib_crate_generic_function<T: Debug>(arg: T) {
- println!("used_with_same_type_from_bin_crate_and_lib_crate_generic_function with {:?}", arg);
-}⦉@0,1,2,3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.unused_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.unused_function.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 322eaf07677f4..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.unused_function.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-used_inline_crate.unused_function - Coverage Spans
-
-
-
-@0,1,2,3⦊pub fn unused_function() {
- let is_true = std::env::args().len() == 1;
- let mut countdown = 2;
- if !is_true⦉@0,1,2,3 @4⦊{
- countdown = 20;
- }⦉@4@5⦊‸⦉@5
-}@6⦊‸⦉@6
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.unused_generic_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.unused_generic_function.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 9e3052ccac155..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.unused_generic_function.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-used_inline_crate.unused_generic_function - Coverage Spans
-
-
-
-@0,1,2,3,4⦊pub fn unused_generic_function<T: Debug>(arg: T) {
- println!("unused_generic_function with {:?}", arg);
-}⦉@0,1,2,3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.unused_private_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.unused_private_function.-------.InstrumentCoverage.0.html
deleted file mode 100644
index e9c381db94025..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.unused_private_function.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-used_inline_crate.unused_private_function - Coverage Spans
-
-
-
-@0,1,2,3⦊fn unused_private_function() {
- let is_true = std::env::args().len() == 1;
- let mut countdown = 2;
- if !is_true⦉@0,1,2,3 @4⦊{
- countdown = 20;
- }⦉@4@5⦊‸⦉@5
-}@6⦊‸⦉@6
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.use_this_lib_crate.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.use_this_lib_crate.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 056f618a403c9..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.use_this_lib_crate.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,190 +0,0 @@
-
-
-
-
-used_inline_crate.use_this_lib_crate - Coverage Spans
-
-
-
-@0,1,2,3,4,5,6,7,8⦊fn use_this_lib_crate() {
- used_from_bin_crate_and_lib_crate_generic_function("used from library used_crate.rs");
- used_with_same_type_from_bin_crate_and_lib_crate_generic_function(
- "used from library used_crate.rs",
- );
- let some_vec = vec![5, 6, 7, 8];
- used_only_from_this_lib_crate_generic_function(some_vec);
- used_only_from_this_lib_crate_generic_function("used ONLY from library used_crate.rs");
-}⦉@0,1,2,3,4,5,6,7,8
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 0d88b0bc60e34..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-used_inline_crate.used_from_bin_crate_and_lib_crate_generic_function - Coverage Spans
-
-
-
-@0,1,2,3,4⦊pub fn used_from_bin_crate_and_lib_crate_generic_function<T: Debug>(arg: T) {
- println!("used_from_bin_crate_and_lib_crate_generic_function with {:?}", arg);
-}⦉@0,1,2,3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_function.-------.InstrumentCoverage.0.html
deleted file mode 100644
index d722d9f46ecff..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_function.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-used_inline_crate.used_function - Coverage Spans
-
-
-
-@0,1,2,3⦊pub fn used_function() ⦉@0,1,2,3{
- // Initialize test constants in a way that cannot be determined at compile time, to ensure
- // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
- // dependent conditions.
- let @0,1,2,3⦊is_true = std::env::args().len() == 1;
- let mut countdown = 0;
- if is_true⦉@0,1,2,3 @4⦊{
- countdown = 10;
- }⦉@4@5⦊‸⦉@5
- @6,7⦊use_this_lib_crate();
-}⦉@6,7
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_inline_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_inline_function.-------.InstrumentCoverage.0.html
deleted file mode 100644
index a15c31bb13fd0..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_inline_function.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-used_inline_crate.used_inline_function - Coverage Spans
-
-
-
-@0,1,2,3⦊pub fn used_inline_function() ⦉@0,1,2,3{
- // Initialize test constants in a way that cannot be determined at compile time, to ensure
- // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
- // dependent conditions.
- let @0,1,2,3⦊is_true = std::env::args().len() == 1;
- let mut countdown = 0;
- if is_true⦉@0,1,2,3 @4⦊{
- countdown = 10;
- }⦉@4@5⦊‸⦉@5
- @6,7⦊use_this_lib_crate();
-}⦉@6,7
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_only_from_bin_crate_generic_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_only_from_bin_crate_generic_function.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 252ff76d41696..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_only_from_bin_crate_generic_function.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-used_inline_crate.used_only_from_bin_crate_generic_function - Coverage Spans
-
-
-
-@0,1,2,3,4⦊pub fn used_only_from_bin_crate_generic_function<T: Debug>(arg: T) {
- println!("used_only_from_bin_crate_generic_function with {:?}", arg);
-}⦉@0,1,2,3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_only_from_this_lib_crate_generic_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_only_from_this_lib_crate_generic_function.-------.InstrumentCoverage.0.html
deleted file mode 100644
index f8fb4990ad9a6..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_only_from_this_lib_crate_generic_function.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-used_inline_crate.used_only_from_this_lib_crate_generic_function - Coverage Spans
-
-
-
-@0,1,2,3,4⦊pub fn used_only_from_this_lib_crate_generic_function<T: Debug>(arg: T) {
- println!("used_only_from_this_lib_crate_generic_function with {:?}", arg);
-}⦉@0,1,2,3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_with_same_type_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_with_same_type_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html
deleted file mode 100644
index db5e24d9b1dd6..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_inline_crate/used_inline_crate.used_with_same_type_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-used_inline_crate.used_with_same_type_from_bin_crate_and_lib_crate_generic_function - Coverage Spans
-
-
-
-@0,1,2,3,4⦊pub fn used_with_same_type_from_bin_crate_and_lib_crate_generic_function<T: Debug>(arg: T) {
- println!("used_with_same_type_from_bin_crate_and_lib_crate_generic_function with {:?}", arg);
-}⦉@0,1,2,3,4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.uses_crate/uses_crate.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.uses_crate/uses_crate.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 28cf051ecf873..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.uses_crate/uses_crate.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,193 +0,0 @@
-
-
-
-
-uses_crate.main - Coverage Spans
-
-
-
-@0,1,2,3,4,5,6,7,8,9⦊fn main() {
- used_crate::used_function();
- let some_vec = vec![1, 2, 3, 4];
- used_crate::used_only_from_bin_crate_generic_function(&some_vec);
- used_crate::used_only_from_bin_crate_generic_function("used from bin uses_crate.rs");
- used_crate::used_from_bin_crate_and_lib_crate_generic_function(some_vec);
- used_crate::used_with_same_type_from_bin_crate_and_lib_crate_generic_function("interesting?");
-}⦉@0,1,2,3,4,5,6,7,8,9
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.uses_inline_crate/uses_inline_crate.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.uses_inline_crate/uses_inline_crate.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 179940f6bd5b7..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.uses_inline_crate/uses_inline_crate.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,249 +0,0 @@
-
-
-
-
-uses_inline_crate.main - Coverage Spans
-
-
-
-@0,1,2,3,4,5,6,7,8,9,10⦊fn main() {
- used_inline_crate::used_function();
- used_inline_crate::used_inline_function();
- let some_vec = vec![1, 2, 3, 4];
- used_inline_crate::used_only_from_bin_crate_generic_function(&some_vec);
- used_inline_crate::used_only_from_bin_crate_generic_function("used from bin uses_crate.rs");
- used_inline_crate::used_from_bin_crate_and_lib_crate_generic_function(some_vec);
- used_inline_crate::used_with_same_type_from_bin_crate_and_lib_crate_generic_function(
- "interesting?",
- );
-}⦉@0,1,2,3,4,5,6,7,8,9,10
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.while/while.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.while/while.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index f037a8ee5c52f..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.while/while.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-while.main - Coverage Spans
-
-
-
-@0⦊fn main() {
- let num = 9⦉@0;
- while @1,2⦊num >= 10⦉@1,2 @3,5⦊{
- }⦉@3,5
-}@4⦊‸⦉@4
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.while_early_ret/while_early_ret.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.while_early_ret/while_early_ret.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index fcb5418e1d0cf..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.while_early_ret/while_early_ret.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-
-
-while_early_ret.main - Coverage Spans
-
-
-
-@0⦊fn main() -> Result<(),u8> {
- let mut countdown = 10⦉@0;
- while
- @1,2⦊countdown
- >
- 0⦉@1,2
- {
- if
- @3,5⦊countdown
- <
- 5⦉@3,5
- {
- return
- if
- @6⦊countdown
- >
- 8⦉@6
- {
- @8⦊Ok(())⦉@8
- }
- else
- {
- @9⦊Err(1)⦉@9
- }
- ;
- }@7,11⦊
- countdown
- -=
- 1⦉@7,11
- ;
- }
- @4⦊Ok(())⦉@4
-}@12⦊‸⦉@12
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.yield/yield.main-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.yield/yield.main-{closure#0}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 1e68c345f849b..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.yield/yield.main-{closure#0}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-yield.main-{closure#0} - Coverage Spans
-
-
-
- || @0⦊{
- yield 1⦉@0;
- return @1⦊"foo"
- }⦉@1
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.yield/yield.main-{closure#1}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.yield/yield.main-{closure#1}.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 842d7823bfd12..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.yield/yield.main-{closure#1}.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
-yield.main-{closure#1} - Coverage Spans
-
-
-
- || @0⦊{
- yield 1⦉@0;
- @1⦊yield 2⦉@1;
- @2⦊yield 3⦉@2;
- return @3⦊"foo"
- }⦉@3
-
-
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.yield/yield.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.yield/yield.main.-------.InstrumentCoverage.0.html
deleted file mode 100644
index 4c0c0d562b840..0000000000000
--- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.yield/yield.main.-------.InstrumentCoverage.0.html
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-yield.main - Coverage Spans
-
-
-
-@0,1,2⦊fn main() ⦉@0,1,2{
- let @0,1,2⦊mut generator⦉@0,1,2 = || {
- yield 1;
- return "foo"
- };
-
- match @0,1,2⦊Pin::new(&mut generator).resume(()) {
- GeneratorState::Yielded(1)⦉@0,1,2 => @4,6,7,8⦊{}⦉@4,6,7,8
- _ => @5⦊panic!("unexpected value from resume")⦉@5,
- }
- match @4,6,7,8⦊Pin::new(&mut generator).resume(())⦉@4,6,7,8 {
- GeneratorState::Complete(@10,11⦊"foo"⦉@10,11) => @12,13,14,15⦊{}⦉@12,13,14,15
- _ => @9⦊panic!("unexpected value from resume")⦉@9,
- }
-
- let @12,13,14,15⦊mut generator⦉@12,13,14,15 = || {
- yield 1;
- yield 2;
- yield 3;
- return "foo"
- };
-
- match @12,13,14,15⦊Pin::new(&mut generator).resume(()) {
- GeneratorState::Yielded(1)⦉@12,13,14,15 => @17,19,20,21⦊{}⦉@17,19,20,21
- _ => @18⦊panic!("unexpected value from resume")⦉@18,
- }
- match @17,19,20,21⦊Pin::new(&mut generator).resume(()) {
- GeneratorState::Yielded(2)⦉@17,19,20,21 => @23,25⦊{}⦉@23,25
- _ => @24⦊panic!("unexpected value from resume")⦉@24,
- }
-}@23,25⦊‸⦉@23,25
-
-
diff --git a/src/test/run-make-fulldeps/coverage/coverage_tools.mk b/src/test/run-make-fulldeps/coverage/coverage_tools.mk
index 38643aaf9021e..aa1dc7b91ce94 100644
--- a/src/test/run-make-fulldeps/coverage/coverage_tools.mk
+++ b/src/test/run-make-fulldeps/coverage/coverage_tools.mk
@@ -4,11 +4,3 @@
# -include ../coverage/coverage_tools.mk
-include ../tools.mk
-
-# 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`
-# file, required for coverage reports.
-#
-# Enabling `-C link-dead-code` is not necessary when compiling with `-Z instrument-coverage`,
-# due to improvements in the coverage map generation, to add unreachable functions known to Rust.
-# Therefore, `-C link-dead-code` is no longer automatically enabled.