diff --git a/compiler/rustc_errors/src/diagnostic.rs b/compiler/rustc_errors/src/diagnostic.rs
index decbf03b9de85..538e1a59ab8d9 100644
--- a/compiler/rustc_errors/src/diagnostic.rs
+++ b/compiler/rustc_errors/src/diagnostic.rs
@@ -30,7 +30,8 @@ pub enum DiagnosticId {
Lint { name: String, has_future_breakage: bool },
}
-/// For example a note attached to an error.
+/// A "sub"-diagnostic attached to a parent diagnostic.
+/// For example, a note attached to an error.
#[derive(Clone, Debug, PartialEq, Hash, Encodable, Decodable)]
pub struct SubDiagnostic {
pub level: Level,
@@ -124,6 +125,7 @@ impl Diagnostic {
self.level = Level::Cancelled;
}
+ /// Check if this diagnostic [was cancelled][Self::cancel()].
pub fn cancelled(&self) -> bool {
self.level == Level::Cancelled
}
@@ -164,7 +166,7 @@ impl Diagnostic {
self.note_expected_found_extra(expected_label, expected, found_label, found, &"", &"")
}
- pub fn note_unsuccessfull_coercion(
+ pub fn note_unsuccessful_coercion(
&mut self,
expected: DiagnosticStyledString,
found: DiagnosticStyledString,
@@ -241,6 +243,7 @@ impl Diagnostic {
self
}
+ /// Add a note attached to this diagnostic.
pub fn note(&mut self, msg: &str) -> &mut Self {
self.sub(Level::Note, msg, MultiSpan::new(), None);
self
@@ -252,33 +255,40 @@ impl Diagnostic {
}
/// Prints the span with a note above it.
+ /// This is like [`Diagnostic::note()`], but it gets its own span.
pub fn span_note<S: Into<MultiSpan>>(&mut self, sp: S, msg: &str) -> &mut Self {
self.sub(Level::Note, msg, sp.into(), None);
self
}
+ /// Add a warning attached to this diagnostic.
pub fn warn(&mut self, msg: &str) -> &mut Self {
self.sub(Level::Warning, msg, MultiSpan::new(), None);
self
}
- /// Prints the span with a warn above it.
+ /// Prints the span with a warning above it.
+ /// This is like [`Diagnostic::warn()`], but it gets its own span.
pub fn span_warn<S: Into<MultiSpan>>(&mut self, sp: S, msg: &str) -> &mut Self {
self.sub(Level::Warning, msg, sp.into(), None);
self
}
+ /// Add a help message attached to this diagnostic.
pub fn help(&mut self, msg: &str) -> &mut Self {
self.sub(Level::Help, msg, MultiSpan::new(), None);
self
}
/// Prints the span with some help above it.
+ /// This is like [`Diagnostic::help()`], but it gets its own span.
pub fn span_help<S: Into<MultiSpan>>(&mut self, sp: S, msg: &str) -> &mut Self {
self.sub(Level::Help, msg, sp.into(), None);
self
}
+ /// Show a suggestion that has multiple parts to it.
+ /// In other words, multiple changes need to be applied as part of this suggestion.
pub fn multipart_suggestion(
&mut self,
msg: &str,
@@ -299,6 +309,8 @@ impl Diagnostic {
self
}
+ /// Show multiple suggestions that have multiple parts.
+ /// See also [`Diagnostic::multipart_suggestion()`].
pub fn multipart_suggestions(
&mut self,
msg: &str,
@@ -382,6 +394,7 @@ impl Diagnostic {
self
}
+ /// [`Diagnostic::span_suggestion()`] but you can set the [`SuggestionStyle`].
pub fn span_suggestion_with_style(
&mut self,
sp: Span,
@@ -401,6 +414,7 @@ impl Diagnostic {
self
}
+ /// Always show the suggested change.
pub fn span_suggestion_verbose(
&mut self,
sp: Span,
@@ -419,6 +433,7 @@ impl Diagnostic {
}
/// Prints out a message with multiple suggested edits of the code.
+ /// See also [`Diagnostic::span_suggestion()`].
pub fn span_suggestions(
&mut self,
sp: Span,
@@ -458,7 +473,7 @@ impl Diagnostic {
self
}
- /// Prints out a message with for a suggestion without showing the suggested code.
+ /// Prints out a message for a suggestion without showing the suggested code.
///
/// This is intended to be used for suggestions that are obvious in what the changes need to
/// be from the message, showing the span label inline would be visually unpleasant
@@ -481,7 +496,7 @@ impl Diagnostic {
self
}
- /// Adds a suggestion to the json output, but otherwise remains silent/undisplayed in the cli.
+ /// Adds a suggestion to the JSON output that will not be shown in the CLI.
///
/// This is intended to be used for suggestions that are *very* obvious in what the changes
/// need to be from the message, but we still want other tools to be able to apply them.
diff --git a/compiler/rustc_errors/src/diagnostic_builder.rs b/compiler/rustc_errors/src/diagnostic_builder.rs
index c9259a1502c8d..f165a60336a6a 100644
--- a/compiler/rustc_errors/src/diagnostic_builder.rs
+++ b/compiler/rustc_errors/src/diagnostic_builder.rs
@@ -30,6 +30,15 @@ struct DiagnosticBuilderInner<'a> {
allow_suggestions: bool,
}
+/// This is a helper macro for [`forward!`] that allows automatically adding documentation
+/// that uses tokens from [`forward!`]'s input.
+macro_rules! forward_inner_docs {
+ ($e:expr => $i:item) => {
+ #[doc = $e]
+ $i
+ }
+}
+
/// In general, the `DiagnosticBuilder` uses deref to allow access to
/// the fields and methods of the embedded `diagnostic` in a
/// transparent way. *However,* many of the methods are intended to
@@ -45,10 +54,11 @@ macro_rules! forward {
pub fn $n:ident(&self, $($name:ident: $ty:ty),* $(,)?) -> &Self
) => {
$(#[$attrs])*
+ forward_inner_docs!(concat!("See [`Diagnostic::", stringify!($n), "()`].") =>
pub fn $n(&self, $($name: $ty),*) -> &Self {
self.diagnostic.$n($($name),*);
self
- }
+ });
};
// Forward pattern for &mut self -> &mut Self
@@ -57,10 +67,11 @@ macro_rules! forward {
pub fn $n:ident(&mut self, $($name:ident: $ty:ty),* $(,)?) -> &mut Self
) => {
$(#[$attrs])*
+ forward_inner_docs!(concat!("See [`Diagnostic::", stringify!($n), "()`].") =>
pub fn $n(&mut self, $($name: $ty),*) -> &mut Self {
self.0.diagnostic.$n($($name),*);
self
- }
+ });
};
// Forward pattern for &mut self -> &mut Self, with S: Into<MultiSpan>
@@ -74,10 +85,11 @@ macro_rules! forward {
) -> &mut Self
) => {
$(#[$attrs])*
+ forward_inner_docs!(concat!("See [`Diagnostic::", stringify!($n), "()`].") =>
pub fn $n<S: Into<MultiSpan>>(&mut self, $($name: $ty),*) -> &mut Self {
self.0.diagnostic.$n($($name),*);
self
- }
+ });
};
}
@@ -116,7 +128,7 @@ impl<'a> DiagnosticBuilder<'a> {
/// Stashes diagnostic for possible later improvement in a different,
/// later stage of the compiler. The diagnostic can be accessed with
- /// the provided `span` and `key` through `.steal_diagnostic` on `Handler`.
+ /// the provided `span` and `key` through [`Handler::steal_diagnostic()`].
///
/// As with `buffer`, this is unless the handler has disabled such buffering.
pub fn stash(self, span: Span, key: StashKey) {
@@ -202,7 +214,7 @@ impl<'a> DiagnosticBuilder<'a> {
}
/// Labels all the given spans with the provided label.
- /// See `span_label` for more information.
+ /// See [`Diagnostic::span_label()`] for more information.
pub fn span_labels(
&mut self,
spans: impl IntoIterator<Item = Span>,
@@ -233,7 +245,7 @@ impl<'a> DiagnosticBuilder<'a> {
found_extra: &dyn fmt::Display,
) -> &mut Self);
- forward!(pub fn note_unsuccessfull_coercion(
+ forward!(pub fn note_unsuccessful_coercion(
&mut self,
expected: DiagnosticStyledString,
found: DiagnosticStyledString,
@@ -254,6 +266,7 @@ impl<'a> DiagnosticBuilder<'a> {
msg: &str,
) -> &mut Self);
+ /// See [`Diagnostic::multipart_suggestion()`].
pub fn multipart_suggestion(
&mut self,
msg: &str,
@@ -267,6 +280,7 @@ impl<'a> DiagnosticBuilder<'a> {
self
}
+ /// See [`Diagnostic::multipart_suggestions()`].
pub fn multipart_suggestions(
&mut self,
msg: &str,
@@ -280,6 +294,7 @@ impl<'a> DiagnosticBuilder<'a> {
self
}
+ /// See [`Diagnostic::tool_only_multipart_suggestion()`].
pub fn tool_only_multipart_suggestion(
&mut self,
msg: &str,
@@ -293,6 +308,7 @@ impl<'a> DiagnosticBuilder<'a> {
self
}
+ /// See [`Diagnostic::span_suggestion()`].
pub fn span_suggestion(
&mut self,
sp: Span,
@@ -307,6 +323,7 @@ impl<'a> DiagnosticBuilder<'a> {
self
}
+ /// See [`Diagnostic::span_suggestions()`].
pub fn span_suggestions(
&mut self,
sp: Span,
@@ -321,6 +338,7 @@ impl<'a> DiagnosticBuilder<'a> {
self
}
+ /// See [`Diagnostic::span_suggestion_short()`].
pub fn span_suggestion_short(
&mut self,
sp: Span,
@@ -335,6 +353,7 @@ impl<'a> DiagnosticBuilder<'a> {
self
}
+ /// See [`Diagnostic::span_suggestion_verbose()`].
pub fn span_suggestion_verbose(
&mut self,
sp: Span,
@@ -349,6 +368,7 @@ impl<'a> DiagnosticBuilder<'a> {
self
}
+ /// See [`Diagnostic::span_suggestion_hidden()`].
pub fn span_suggestion_hidden(
&mut self,
sp: Span,
@@ -363,6 +383,7 @@ impl<'a> DiagnosticBuilder<'a> {
self
}
+ /// See [`Diagnostic::tool_only_span_suggestion()`] for more information.
pub fn tool_only_span_suggestion(
&mut self,
sp: Span,
@@ -380,19 +401,22 @@ impl<'a> DiagnosticBuilder<'a> {
forward!(pub fn set_span<S: Into<MultiSpan>>(&mut self, sp: S) -> &mut Self);
forward!(pub fn code(&mut self, s: DiagnosticId) -> &mut Self);
+ /// Allow attaching suggestions this diagnostic.
+ /// If this is set to `false`, then any suggestions attached with the `span_suggestion_*`
+ /// methods after this is set to `false` will be ignored.
pub fn allow_suggestions(&mut self, allow: bool) -> &mut Self {
self.0.allow_suggestions = allow;
self
}
/// Convenience function for internal use, clients should use one of the
- /// struct_* methods on Handler.
+ /// `struct_*` methods on [`Handler`].
crate fn new(handler: &'a Handler, level: Level, message: &str) -> DiagnosticBuilder<'a> {
DiagnosticBuilder::new_with_code(handler, level, None, message)
}
/// Convenience function for internal use, clients should use one of the
- /// struct_* methods on Handler.
+ /// `struct_*` methods on [`Handler`].
crate fn new_with_code(
handler: &'a Handler,
level: Level,
diff --git a/compiler/rustc_infer/src/infer/error_reporting/mod.rs b/compiler/rustc_infer/src/infer/error_reporting/mod.rs
index fdec3c9fb7362..18e1465c0e6ed 100644
--- a/compiler/rustc_infer/src/infer/error_reporting/mod.rs
+++ b/compiler/rustc_infer/src/infer/error_reporting/mod.rs
@@ -1622,7 +1622,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
}
}
(TypeError::ObjectUnsafeCoercion(_), _) => {
- diag.note_unsuccessfull_coercion(found, expected);
+ diag.note_unsuccessful_coercion(found, expected);
}
(_, _) => {
debug!(
diff --git a/compiler/rustc_mir/src/borrow_check/region_infer/mod.rs b/compiler/rustc_mir/src/borrow_check/region_infer/mod.rs
index 3586be2804d6a..9d45f6fd0d348 100644
--- a/compiler/rustc_mir/src/borrow_check/region_infer/mod.rs
+++ b/compiler/rustc_mir/src/borrow_check/region_infer/mod.rs
@@ -1145,8 +1145,24 @@ impl<'tcx> RegionInferenceContext<'tcx> {
for ur in self.scc_values.universal_regions_outlived_by(r_scc) {
let new_lub = self.universal_region_relations.postdom_upper_bound(lub, ur);
debug!("approx_universal_upper_bound: ur={:?} lub={:?} new_lub={:?}", ur, lub, new_lub);
+ // The upper bound of two non-static regions is static: this
+ // means we know nothing about the relationship between these
+ // two regions. Pick a 'better' one to use when constructing
+ // a diagnostic
if ur != static_r && lub != static_r && new_lub == static_r {
- lub = std::cmp::min(ur, lub);
+ // Prefer the region with an `external_name` - this
+ // indicates that the region is early-bound, so working with
+ // it can produce a nicer error.
+ if self.region_definition(ur).external_name.is_some() {
+ lub = ur;
+ } else if self.region_definition(lub).external_name.is_some() {
+ // Leave lub unchanged
+ } else {
+ // If we get here, we don't have any reason to prefer
+ // one region over the other. Just pick the
+ // one with the lower index for now.
+ lub = std::cmp::min(ur, lub);
+ }
} else {
lub = new_lub;
}
diff --git a/compiler/rustc_resolve/src/late/diagnostics.rs b/compiler/rustc_resolve/src/late/diagnostics.rs
index 6ce299a941708..68f59baffce17 100644
--- a/compiler/rustc_resolve/src/late/diagnostics.rs
+++ b/compiler/rustc_resolve/src/late/diagnostics.rs
@@ -542,6 +542,26 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
err.span_label(base_span, fallback_label);
}
}
+ if let Some(err_code) = &err.code {
+ if err_code == &rustc_errors::error_code!(E0425) {
+ for label_rib in &self.label_ribs {
+ for (label_ident, _) in &label_rib.bindings {
+ if format!("'{}", ident) == label_ident.to_string() {
+ let msg = "a label with a similar name exists";
+ // FIXME: consider only emitting this suggestion if a label would be valid here
+ // which is pretty much only the case for `break` expressions.
+ err.span_suggestion(
+ span,
+ &msg,
+ label_ident.name.to_string(),
+ Applicability::MaybeIncorrect,
+ );
+ }
+ }
+ }
+ }
+ }
+
(err, candidates)
}
diff --git a/library/alloc/src/collections/vec_deque/mod.rs b/library/alloc/src/collections/vec_deque/mod.rs
index 57807bc545390..9e54c15ea6a0b 100644
--- a/library/alloc/src/collections/vec_deque/mod.rs
+++ b/library/alloc/src/collections/vec_deque/mod.rs
@@ -2793,8 +2793,12 @@ impl<T> From<Vec<T>> for VecDeque<T> {
let len = other.len();
// We need to extend the buf if it's not a power of two, too small
- // or doesn't have at least one free space
- if !buf.capacity().is_power_of_two()
+ // or doesn't have at least one free space.
+ // We check if `T` is a ZST in the first condition,
+ // because `usize::MAX` (the capacity returned by `capacity()` for ZST)
+ // is not a power of two and thus it'll always try
+ // to reserve more memory which will panic for ZST (rust-lang/rust#78532)
+ if (!buf.capacity().is_power_of_two() && mem::size_of::<T>() != 0)
|| (buf.capacity() < (MINIMUM_CAPACITY + 1))
|| (buf.capacity() == len)
{
diff --git a/library/alloc/tests/vec_deque.rs b/library/alloc/tests/vec_deque.rs
index 705f0d62fbb7a..0919b1325bceb 100644
--- a/library/alloc/tests/vec_deque.rs
+++ b/library/alloc/tests/vec_deque.rs
@@ -1728,3 +1728,10 @@ fn test_zero_sized_push() {
}
}
}
+
+#[test]
+fn test_from_zero_sized_vec() {
+ let v = vec![(); 100];
+ let queue = VecDeque::from(v);
+ assert_eq!(queue.len(), 100);
+}
diff --git a/src/test/run-make-fulldeps/coverage-reports/Makefile b/src/test/run-make-fulldeps/coverage-reports/Makefile
index a5d6970009a3b..5c24f909130c0 100644
--- a/src/test/run-make-fulldeps/coverage-reports/Makefile
+++ b/src/test/run-make-fulldeps/coverage-reports/Makefile
@@ -9,11 +9,13 @@
BASEDIR=../coverage-reports
SOURCEDIR=../coverage
-# The `llvm-cov show` flag `--debug`, used to generate the `counters` output files, is only enabled
-# if LLVM assertions are enabled. Requires Rust config `llvm/optimize` and not
+# The `llvm-cov show` flag `--debug`, used to generate the `counters` output files, is only
+# enabled if LLVM assertions are enabled. This requires Rust config `llvm/optimize` and not
# `llvm/release_debuginfo`. Note that some CI builds disable debug assertions (by setting
-# `NO_LLVM_ASSERTIONS=1`), so it is not OK to fail the test, but `bless`ed test results cannot be
-# generated without debug assertions.
+# `NO_LLVM_ASSERTIONS=1`), so the tests must still pass even if the `--debug` flag is
+# not supported. (Note that `counters` files are only produced in the `$(TMPDIR)`
+# directory, for inspection and debugging support. They are *not* copied to `expected_*`
+# files when `--bless`ed.)
LLVM_COV_DEBUG := $(shell \
"$(LLVM_BIN_DIR)"/llvm-cov show --debug 2>&1 | \
grep -q "Unknown command line argument '--debug'"; \
@@ -51,11 +53,10 @@ endif
# Yes these `--ignore-filename-regex=` options are included in all invocations of `llvm-cov show`
# for now, but it is effectively ignored for all tests that don't include this file anyway.
#
-# Note that it's also possible the `_counters.<test>.txt` and `<test>.json` files may order
-# results from multiple files inconsistently, which might also have to be accomodated if and when
-# we allow `llvm-cov` to produce results for multiple files. (The path separators appear to be
-# normalized to `/` in those files, thankfully.) But since we are ignoring results for all but one
-# file, this workaround addresses those potential issues as well.
+# (Note that it's also possible the `_counters.<test>.txt` and `<test>.json` files (if generated)
+# may order results from multiple files inconsistently, which might also have to be accomodated
+# if and when we allow `llvm-cov` to produce results for multiple files. Note, the path separators
+# appear to be normalized to `/` in those files, thankfully.)
LLVM_COV_IGNORE_FILES=\
--ignore-filename-regex=uses_crate.rs
@@ -77,9 +78,7 @@ endif
.PHONY: clear_expected_if_blessed
clear_expected_if_blessed:
ifdef RUSTC_BLESS_TEST
- rm -f expected_export_coverage.*.json
- rm -f expected_show_coverage.*.txt
- rm -f expected_show_coverage_counters.*.txt
+ rm -f expected_*
endif
-include clear_expected_if_blessed
@@ -140,12 +139,8 @@ endif
ifdef RUSTC_BLESS_TEST
cp "$(TMPDIR)"/actual_show_coverage.$@.txt \
expected_show_coverage.$@.txt
- cp "$(TMPDIR)"/actual_show_coverage_counters.$@.txt \
- expected_show_coverage_counters.$@.txt
else
- # Compare the show coverage output (`--bless` refreshes `typical` files)
- # Note `llvm-cov show` output for some programs can vary, but can be ignored
- # by inserting `// ignore-llvm-cov-show-diffs` at the top of the source file.
+ # Compare the show coverage output (`--bless` refreshes `typical` files).
#
# FIXME(richkadel): None of the Rust test source samples have the
# `// ignore-llvm-cov-show-diffs` anymore. This directive exists to work around a limitation
@@ -158,8 +153,10 @@ else
#
# This workaround only works if the coverage counts are identical across all reported
# instantiations. If there is no way to ensure this, you may need to apply the
- # `// ignore-llvm-cov-show-diffs` directive, and rely on the `.json` and counter
- # files for validating results have not changed.
+ # `// ignore-llvm-cov-show-diffs` directive, and check for differences using the
+ # `.json` files to validate that results have not changed. (Until then, the JSON
+ # files are redundant, so there is no need to generate `expected_*.json` files or
+ # compare actual JSON results.)
$(DIFF) --ignore-matching-lines='::<.*>.*:$$' \
expected_show_coverage.$@.txt "$(TMPDIR)"/actual_show_coverage.$@.txt || \
@@ -169,37 +166,77 @@ else
( >&2 echo 'diff failed, and not suppressed without `// ignore-llvm-cov-show-diffs` in $(SOURCEDIR)/$@.rs'; \
false \
)
-
-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.)' \
- )
-
- # FIXME(richkadel): Apply the demangler to the `*_show_coverage_counters.*.txt` files,
- # so the crate disambiguator differences will be stripped away. At that point, these files
- # will be less likely to vary, and the last `echo` above (starting with "Ignore anyway")
- # can be replaced with `false` to fail the test.
endif
-endif
+####################################################################################################
- # 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
+# 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
-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
+####################################################################################################
+
+# 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-reports/expected_export_coverage.abort.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.abort.json
deleted file mode 100644
index db7dd0b15e960..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.abort.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/abort.rs",
- "summary": {
- "functions": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "instantiations": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "lines": {
- "count": 19,
- "covered": 17,
- "percent": 89.47368421052632
- },
- "regions": {
- "count": 17,
- "covered": 16,
- "notcovered": 1,
- "percent": 94.11764705882352
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "instantiations": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "lines": {
- "count": 19,
- "covered": 17,
- "percent": 89.47368421052632
- },
- "regions": {
- "count": 17,
- "covered": 16,
- "notcovered": 1,
- "percent": 94.11764705882352
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.assert.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.assert.json
deleted file mode 100644
index bb857ba3f3b3f..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.assert.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/assert.rs",
- "summary": {
- "functions": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "instantiations": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "lines": {
- "count": 15,
- "covered": 13,
- "percent": 86.66666666666667
- },
- "regions": {
- "count": 14,
- "covered": 13,
- "notcovered": 1,
- "percent": 92.85714285714286
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "instantiations": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "lines": {
- "count": 15,
- "covered": 13,
- "percent": 86.66666666666667
- },
- "regions": {
- "count": 14,
- "covered": 13,
- "notcovered": 1,
- "percent": 92.85714285714286
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.async.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.async.json
deleted file mode 100644
index 794a2e382535a..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.async.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/async.rs",
- "summary": {
- "functions": {
- "count": 17,
- "covered": 16,
- "percent": 94.11764705882352
- },
- "instantiations": {
- "count": 17,
- "covered": 16,
- "percent": 94.11764705882352
- },
- "lines": {
- "count": 105,
- "covered": 77,
- "percent": 73.33333333333333
- },
- "regions": {
- "count": 78,
- "covered": 36,
- "notcovered": 42,
- "percent": 46.15384615384615
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 17,
- "covered": 16,
- "percent": 94.11764705882352
- },
- "instantiations": {
- "count": 17,
- "covered": 16,
- "percent": 94.11764705882352
- },
- "lines": {
- "count": 105,
- "covered": 77,
- "percent": 73.33333333333333
- },
- "regions": {
- "count": 78,
- "covered": 36,
- "notcovered": 42,
- "percent": 46.15384615384615
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.closure.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.closure.json
deleted file mode 100644
index 39e1dea66f963..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.closure.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/closure.rs",
- "summary": {
- "functions": {
- "count": 6,
- "covered": 4,
- "percent": 66.66666666666666
- },
- "instantiations": {
- "count": 6,
- "covered": 4,
- "percent": 66.66666666666666
- },
- "lines": {
- "count": 161,
- "covered": 131,
- "percent": 81.36645962732919
- },
- "regions": {
- "count": 42,
- "covered": 22,
- "notcovered": 20,
- "percent": 52.38095238095239
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 6,
- "covered": 4,
- "percent": 66.66666666666666
- },
- "instantiations": {
- "count": 6,
- "covered": 4,
- "percent": 66.66666666666666
- },
- "lines": {
- "count": 161,
- "covered": 131,
- "percent": 81.36645962732919
- },
- "regions": {
- "count": 42,
- "covered": 22,
- "notcovered": 20,
- "percent": 52.38095238095239
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.conditions.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.conditions.json
deleted file mode 100644
index 69356604856b6..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.conditions.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/conditions.rs",
- "summary": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 64,
- "covered": 33,
- "percent": 51.5625
- },
- "regions": {
- "count": 64,
- "covered": 21,
- "notcovered": 43,
- "percent": 32.8125
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 64,
- "covered": 33,
- "percent": 51.5625
- },
- "regions": {
- "count": 64,
- "covered": 21,
- "notcovered": 43,
- "percent": 32.8125
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.dead_code.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.dead_code.json
deleted file mode 100644
index 6588ba90274ad..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.dead_code.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/dead_code.rs",
- "summary": {
- "functions": {
- "count": 1,
- "covered": 0,
- "percent": 0
- },
- "instantiations": {
- "count": 1,
- "covered": 0,
- "percent": 0
- },
- "lines": {
- "count": 33,
- "covered": 11,
- "percent": 33.33333333333333
- },
- "regions": {
- "count": 12,
- "covered": 3,
- "notcovered": 9,
- "percent": 25
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 1,
- "covered": 0,
- "percent": 0
- },
- "instantiations": {
- "count": 1,
- "covered": 0,
- "percent": 0
- },
- "lines": {
- "count": 33,
- "covered": 11,
- "percent": 33.33333333333333
- },
- "regions": {
- "count": 12,
- "covered": 3,
- "notcovered": 9,
- "percent": 25
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.drop_trait.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.drop_trait.json
deleted file mode 100644
index e303d3802f519..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.drop_trait.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/drop_trait.rs",
- "summary": {
- "functions": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "instantiations": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "lines": {
- "count": 12,
- "covered": 12,
- "percent": 100
- },
- "regions": {
- "count": 4,
- "covered": 4,
- "notcovered": 0,
- "percent": 100
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "instantiations": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "lines": {
- "count": 12,
- "covered": 12,
- "percent": 100
- },
- "regions": {
- "count": 4,
- "covered": 4,
- "notcovered": 0,
- "percent": 100
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.generics.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.generics.json
deleted file mode 100644
index bfae69d7ac4dc..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.generics.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/generics.rs",
- "summary": {
- "functions": {
- "count": 3,
- "covered": 3,
- "percent": 100
- },
- "instantiations": {
- "count": 5,
- "covered": 5,
- "percent": 100
- },
- "lines": {
- "count": 18,
- "covered": 18,
- "percent": 100
- },
- "regions": {
- "count": 5,
- "covered": 5,
- "notcovered": 0,
- "percent": 100
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 3,
- "covered": 3,
- "percent": 100
- },
- "instantiations": {
- "count": 5,
- "covered": 5,
- "percent": 100
- },
- "lines": {
- "count": 18,
- "covered": 18,
- "percent": 100
- },
- "regions": {
- "count": 5,
- "covered": 5,
- "notcovered": 0,
- "percent": 100
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.if.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.if.json
deleted file mode 100644
index 8f233f8bfc548..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.if.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/if.rs",
- "summary": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 26,
- "covered": 26,
- "percent": 100
- },
- "regions": {
- "count": 4,
- "covered": 3,
- "notcovered": 1,
- "percent": 75
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 26,
- "covered": 26,
- "percent": 100
- },
- "regions": {
- "count": 4,
- "covered": 3,
- "notcovered": 1,
- "percent": 75
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.if_else.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.if_else.json
deleted file mode 100644
index 5c0454e1ecbc2..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.if_else.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/if_else.rs",
- "summary": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 32,
- "covered": 23,
- "percent": 71.875
- },
- "regions": {
- "count": 7,
- "covered": 5,
- "notcovered": 2,
- "percent": 71.42857142857143
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 32,
- "covered": 23,
- "percent": 71.875
- },
- "regions": {
- "count": 7,
- "covered": 5,
- "notcovered": 2,
- "percent": 71.42857142857143
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.inner_items.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.inner_items.json
deleted file mode 100644
index 07ef9a9ab3348..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.inner_items.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/inner_items.rs",
- "summary": {
- "functions": {
- "count": 4,
- "covered": 4,
- "percent": 100
- },
- "instantiations": {
- "count": 4,
- "covered": 4,
- "percent": 100
- },
- "lines": {
- "count": 29,
- "covered": 29,
- "percent": 100
- },
- "regions": {
- "count": 11,
- "covered": 9,
- "notcovered": 2,
- "percent": 81.81818181818183
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 4,
- "covered": 4,
- "percent": 100
- },
- "instantiations": {
- "count": 4,
- "covered": 4,
- "percent": 100
- },
- "lines": {
- "count": 29,
- "covered": 29,
- "percent": 100
- },
- "regions": {
- "count": 11,
- "covered": 9,
- "notcovered": 2,
- "percent": 81.81818181818183
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.lazy_boolean.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.lazy_boolean.json
deleted file mode 100644
index c3a96b08e6a2a..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.lazy_boolean.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/lazy_boolean.rs",
- "summary": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 44,
- "covered": 33,
- "percent": 75
- },
- "regions": {
- "count": 28,
- "covered": 21,
- "notcovered": 7,
- "percent": 75
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 44,
- "covered": 33,
- "percent": 75
- },
- "regions": {
- "count": 28,
- "covered": 21,
- "notcovered": 7,
- "percent": 75
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.loop_break_value.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.loop_break_value.json
deleted file mode 100644
index 6cb1465c81873..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.loop_break_value.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/loop_break_value.rs",
- "summary": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 11,
- "covered": 11,
- "percent": 100
- },
- "regions": {
- "count": 1,
- "covered": 1,
- "notcovered": 0,
- "percent": 100
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 11,
- "covered": 11,
- "percent": 100
- },
- "regions": {
- "count": 1,
- "covered": 1,
- "notcovered": 0,
- "percent": 100
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.loops_branches.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.loops_branches.json
deleted file mode 100644
index 6d566f2b818c8..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.loops_branches.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/loops_branches.rs",
- "summary": {
- "functions": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "instantiations": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "lines": {
- "count": 11,
- "covered": 11,
- "percent": 100
- },
- "regions": {
- "count": 8,
- "covered": 7,
- "notcovered": 1,
- "percent": 87.5
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "instantiations": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "lines": {
- "count": 11,
- "covered": 11,
- "percent": 100
- },
- "regions": {
- "count": 8,
- "covered": 7,
- "notcovered": 1,
- "percent": 87.5
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.match_or_pattern.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.match_or_pattern.json
deleted file mode 100644
index 8559fc84aa937..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.match_or_pattern.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/match_or_pattern.rs",
- "summary": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 37,
- "covered": 33,
- "percent": 89.1891891891892
- },
- "regions": {
- "count": 25,
- "covered": 17,
- "notcovered": 8,
- "percent": 68
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 37,
- "covered": 33,
- "percent": 89.1891891891892
- },
- "regions": {
- "count": 25,
- "covered": 17,
- "notcovered": 8,
- "percent": 68
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.nested_loops.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.nested_loops.json
deleted file mode 100644
index bf3b5cb031b92..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.nested_loops.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/nested_loops.rs",
- "summary": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 22,
- "covered": 17,
- "percent": 77.27272727272727
- },
- "regions": {
- "count": 14,
- "covered": 11,
- "notcovered": 3,
- "percent": 78.57142857142857
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 22,
- "covered": 17,
- "percent": 77.27272727272727
- },
- "regions": {
- "count": 14,
- "covered": 11,
- "notcovered": 3,
- "percent": 78.57142857142857
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.overflow.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.overflow.json
deleted file mode 100644
index 128f5888ed113..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.overflow.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/overflow.rs",
- "summary": {
- "functions": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "instantiations": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "lines": {
- "count": 23,
- "covered": 21,
- "percent": 91.30434782608695
- },
- "regions": {
- "count": 13,
- "covered": 12,
- "notcovered": 1,
- "percent": 92.3076923076923
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "instantiations": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "lines": {
- "count": 23,
- "covered": 21,
- "percent": 91.30434782608695
- },
- "regions": {
- "count": 13,
- "covered": 12,
- "notcovered": 1,
- "percent": 92.3076923076923
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.panic_unwind.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.panic_unwind.json
deleted file mode 100644
index 9c08dfd41a12b..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.panic_unwind.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/panic_unwind.rs",
- "summary": {
- "functions": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "instantiations": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "lines": {
- "count": 19,
- "covered": 17,
- "percent": 89.47368421052632
- },
- "regions": {
- "count": 13,
- "covered": 12,
- "notcovered": 1,
- "percent": 92.3076923076923
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "instantiations": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "lines": {
- "count": 19,
- "covered": 17,
- "percent": 89.47368421052632
- },
- "regions": {
- "count": 13,
- "covered": 12,
- "notcovered": 1,
- "percent": 92.3076923076923
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.partial_eq.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.partial_eq.json
deleted file mode 100644
index 6a0d83a6d0e44..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.partial_eq.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/partial_eq.rs",
- "summary": {
- "functions": {
- "count": 5,
- "covered": 4,
- "percent": 80
- },
- "instantiations": {
- "count": 5,
- "covered": 4,
- "percent": 80
- },
- "lines": {
- "count": 18,
- "covered": 16,
- "percent": 88.88888888888889
- },
- "regions": {
- "count": 24,
- "covered": 5,
- "notcovered": 19,
- "percent": 20.833333333333336
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 5,
- "covered": 4,
- "percent": 80
- },
- "instantiations": {
- "count": 5,
- "covered": 4,
- "percent": 80
- },
- "lines": {
- "count": 18,
- "covered": 16,
- "percent": 88.88888888888889
- },
- "regions": {
- "count": 24,
- "covered": 5,
- "notcovered": 19,
- "percent": 20.833333333333336
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.simple_loop.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.simple_loop.json
deleted file mode 100644
index 4c849692a034c..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.simple_loop.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/simple_loop.rs",
- "summary": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 25,
- "covered": 25,
- "percent": 100
- },
- "regions": {
- "count": 7,
- "covered": 6,
- "notcovered": 1,
- "percent": 85.71428571428571
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 25,
- "covered": 25,
- "percent": 100
- },
- "regions": {
- "count": 7,
- "covered": 6,
- "notcovered": 1,
- "percent": 85.71428571428571
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.simple_match.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.simple_match.json
deleted file mode 100644
index 41bc4d57d59f4..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.simple_match.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/simple_match.rs",
- "summary": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 27,
- "covered": 27,
- "percent": 100
- },
- "regions": {
- "count": 11,
- "covered": 10,
- "notcovered": 1,
- "percent": 90.9090909090909
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 27,
- "covered": 27,
- "percent": 100
- },
- "regions": {
- "count": 11,
- "covered": 10,
- "notcovered": 1,
- "percent": 90.9090909090909
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.tight_inf_loop.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.tight_inf_loop.json
deleted file mode 100644
index 7f6c90b92d296..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.tight_inf_loop.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/tight_inf_loop.rs",
- "summary": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 4,
- "covered": 4,
- "percent": 100
- },
- "regions": {
- "count": 2,
- "covered": 2,
- "notcovered": 0,
- "percent": 100
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 4,
- "covered": 4,
- "percent": 100
- },
- "regions": {
- "count": 2,
- "covered": 2,
- "notcovered": 0,
- "percent": 100
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.try_error_result.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.try_error_result.json
deleted file mode 100644
index df4de9dc54bdc..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.try_error_result.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/try_error_result.rs",
- "summary": {
- "functions": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "instantiations": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "lines": {
- "count": 20,
- "covered": 18,
- "percent": 90
- },
- "regions": {
- "count": 16,
- "covered": 12,
- "notcovered": 4,
- "percent": 75
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "instantiations": {
- "count": 2,
- "covered": 2,
- "percent": 100
- },
- "lines": {
- "count": 20,
- "covered": 18,
- "percent": 90
- },
- "regions": {
- "count": 16,
- "covered": 12,
- "notcovered": 4,
- "percent": 75
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.uses_crate.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.uses_crate.json
deleted file mode 100644
index 35ddd58fc437a..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.uses_crate.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/lib/used_crate.rs",
- "summary": {
- "functions": {
- "count": 6,
- "covered": 5,
- "percent": 83.33333333333334
- },
- "instantiations": {
- "count": 10,
- "covered": 8,
- "percent": 80
- },
- "lines": {
- "count": 46,
- "covered": 26,
- "percent": 56.52173913043478
- },
- "regions": {
- "count": 19,
- "covered": 8,
- "notcovered": 11,
- "percent": 42.10526315789473
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 6,
- "covered": 5,
- "percent": 83.33333333333334
- },
- "instantiations": {
- "count": 10,
- "covered": 8,
- "percent": 80
- },
- "lines": {
- "count": 46,
- "covered": 26,
- "percent": 56.52173913043478
- },
- "regions": {
- "count": 19,
- "covered": 8,
- "notcovered": 11,
- "percent": 42.10526315789473
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.while.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.while.json
deleted file mode 100644
index 339c533ada6dc..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.while.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/while.rs",
- "summary": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 5,
- "covered": 4,
- "percent": 80
- },
- "regions": {
- "count": 4,
- "covered": 3,
- "notcovered": 1,
- "percent": 75
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 5,
- "covered": 4,
- "percent": 80
- },
- "regions": {
- "count": 4,
- "covered": 3,
- "notcovered": 1,
- "percent": 75
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.while_early_ret.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.while_early_ret.json
deleted file mode 100644
index b7fe2a0fb47df..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.while_early_ret.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/while_early_ret.rs",
- "summary": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 19,
- "covered": 17,
- "percent": 89.47368421052632
- },
- "regions": {
- "count": 9,
- "covered": 7,
- "notcovered": 2,
- "percent": 77.77777777777779
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "instantiations": {
- "count": 1,
- "covered": 1,
- "percent": 100
- },
- "lines": {
- "count": 19,
- "covered": 17,
- "percent": 89.47368421052632
- },
- "regions": {
- "count": 9,
- "covered": 7,
- "notcovered": 2,
- "percent": 77.77777777777779
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.yield.json b/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.yield.json
deleted file mode 100644
index 6fc41212bc091..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.yield.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "data": [
- {
- "files": [
- {
- "filename": "../coverage/yield.rs",
- "summary": {
- "functions": {
- "count": 3,
- "covered": 3,
- "percent": 100
- },
- "instantiations": {
- "count": 3,
- "covered": 3,
- "percent": 100
- },
- "lines": {
- "count": 26,
- "covered": 19,
- "percent": 73.07692307692307
- },
- "regions": {
- "count": 23,
- "covered": 17,
- "notcovered": 6,
- "percent": 73.91304347826086
- }
- }
- }
- ],
- "totals": {
- "functions": {
- "count": 3,
- "covered": 3,
- "percent": 100
- },
- "instantiations": {
- "count": 3,
- "covered": 3,
- "percent": 100
- },
- "lines": {
- "count": 26,
- "covered": 19,
- "percent": 73.07692307692307
- },
- "regions": {
- "count": 23,
- "covered": 17,
- "notcovered": 6,
- "percent": 73.91304347826086
- }
- }
- }
- ],
- "type": "llvm.coverage.json.export",
- "version": "2.0.1"
-}
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.abort.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.abort.txt
deleted file mode 100644
index cbf7462eba5e6..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.abort.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-Counter in file 0 14:1 -> 15:27, #1
-Counter in file 0 16:11 -> 16:24, (#1 + (#2 + #3))
-Counter in file 0 17:12 -> 17:25, ((#1 + (#2 + #3)) - #4)
-Counter in file 0 17:26 -> 19:10, #5
-Counter in file 0 19:10 -> 19:11, (((#1 + (#2 + #3)) - #4) - #5)
-Counter in file 0 21:12 -> 21:25, (#5 + (((#1 + (#2 + #3)) - #4) - #5))
-Counter in file 0 21:26 -> 21:49, #6
-Counter in file 0 21:49 -> 21:50, ((#5 + (((#1 + (#2 + #3)) - #4) - #5)) - #6)
-Counter in file 0 25:12 -> 25:25, (#6 + ((#5 + (((#1 + (#2 + #3)) - #4) - #5)) - #6))
-Counter in file 0 25:26 -> 25:49, #2
-Counter in file 0 25:49 -> 25:50, #3
-Counter in file 0 26:9 -> 26:23, (#2 + #3)
-Counter in file 0 28:5 -> 29:2, #4
-Counter in file 0 5:1 -> 5:36, #1
-Counter in file 0 6:8 -> 6:20, (#1 + 0)
-Counter in file 0 7:9 -> 8:37, #2
-Counter in file 0 9:12 -> 12:2, (#1 - #2)
-Emitting segments for file: ../coverage/abort.rs
-Combined regions:
- 5:1 -> 5:36 (count=12)
- 6:8 -> 6:20 (count=12)
- 7:9 -> 8:37 (count=0)
- 9:12 -> 12:2 (count=12)
- 14:1 -> 15:27 (count=1)
- 16:11 -> 16:24 (count=11)
- 17:12 -> 17:25 (count=10)
- 17:26 -> 19:10 (count=4)
- 19:10 -> 19:11 (count=6)
- 21:12 -> 21:25 (count=10)
- 21:26 -> 21:49 (count=4)
- 21:49 -> 21:50 (count=6)
- 25:12 -> 25:25 (count=10)
- 25:26 -> 25:49 (count=4)
- 25:49 -> 25:50 (count=6)
- 26:9 -> 26:23 (count=10)
- 28:5 -> 29:2 (count=1)
-Segment at 5:1 (count = 12), RegionEntry
-Segment at 5:36 (count = 0), Skipped
-Segment at 6:8 (count = 12), RegionEntry
-Segment at 6:20 (count = 0), Skipped
-Segment at 7:9 (count = 0), RegionEntry
-Segment at 8:37 (count = 0), Skipped
-Segment at 9:12 (count = 12), RegionEntry
-Segment at 12:2 (count = 0), Skipped
-Segment at 14:1 (count = 1), RegionEntry
-Segment at 15:27 (count = 0), Skipped
-Segment at 16:11 (count = 11), RegionEntry
-Segment at 16:24 (count = 0), Skipped
-Segment at 17:12 (count = 10), RegionEntry
-Segment at 17:25 (count = 0), Skipped
-Segment at 17:26 (count = 4), RegionEntry
-Segment at 19:10 (count = 6), RegionEntry
-Segment at 19:11 (count = 0), Skipped
-Segment at 21:12 (count = 10), RegionEntry
-Segment at 21:25 (count = 0), Skipped
-Segment at 21:26 (count = 4), RegionEntry
-Segment at 21:49 (count = 6), RegionEntry
-Segment at 21:50 (count = 0), Skipped
-Segment at 25:12 (count = 10), RegionEntry
-Segment at 25:25 (count = 0), Skipped
-Segment at 25:26 (count = 4), RegionEntry
-Segment at 25:49 (count = 6), RegionEntry
-Segment at 25:50 (count = 0), Skipped
-Segment at 26:9 (count = 10), RegionEntry
-Segment at 26:23 (count = 0), Skipped
-Segment at 28:5 (count = 1), RegionEntry
-Segment at 29:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.assert.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.assert.txt
deleted file mode 100644
index 0866a9a59a11d..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.assert.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-Counter in file 0 9:1 -> 10:27, #1
-Counter in file 0 11:11 -> 11:24, (#1 + (#2 + (#3 + #4)))
-Counter in file 0 12:12 -> 12:26, ((#1 + (#2 + (#3 + #4))) - #5)
-Counter in file 0 12:27 -> 14:10, #2
-Counter in file 0 14:19 -> 14:32, (((#1 + (#2 + (#3 + #4))) - #5) - #2)
-Counter in file 0 14:33 -> 16:10, #3
-Counter in file 0 16:10 -> 16:11, #4
-Counter in file 0 17:9 -> 17:23, (#2 + (#3 + #4))
-Counter in file 0 19:5 -> 20:2, #5
-Counter in file 0 4:1 -> 4:41, #1
-Counter in file 0 5:5 -> 5:48, (#1 + 0)
-Counter in file 0 6:16 -> 6:21, (#1 + 0)
-Counter in file 0 6:37 -> 6:61, #2
-Counter in file 0 7:1 -> 7:2, (#1 - #2)
-Emitting segments for file: ../coverage/assert.rs
-Combined regions:
- 4:1 -> 4:41 (count=4)
- 5:5 -> 5:48 (count=4)
- 6:16 -> 6:21 (count=4)
- 6:37 -> 6:61 (count=1)
- 7:1 -> 7:2 (count=3)
- 9:1 -> 10:27 (count=1)
- 11:11 -> 11:24 (count=11)
- 12:12 -> 12:26 (count=11)
- 12:27 -> 14:10 (count=1)
- 14:19 -> 14:32 (count=10)
- 14:33 -> 16:10 (count=3)
- 16:10 -> 16:11 (count=6)
- 17:9 -> 17:23 (count=10)
- 19:5 -> 20:2 (count=0)
-Segment at 4:1 (count = 4), RegionEntry
-Segment at 4:41 (count = 0), Skipped
-Segment at 5:5 (count = 4), RegionEntry
-Segment at 5:48 (count = 0), Skipped
-Segment at 6:16 (count = 4), RegionEntry
-Segment at 6:21 (count = 0), Skipped
-Segment at 6:37 (count = 1), RegionEntry
-Segment at 6:61 (count = 0), Skipped
-Segment at 7:1 (count = 3), RegionEntry
-Segment at 7:2 (count = 0), Skipped
-Segment at 9:1 (count = 1), RegionEntry
-Segment at 10:27 (count = 0), Skipped
-Segment at 11:11 (count = 11), RegionEntry
-Segment at 11:24 (count = 0), Skipped
-Segment at 12:12 (count = 11), RegionEntry
-Segment at 12:26 (count = 0), Skipped
-Segment at 12:27 (count = 1), RegionEntry
-Segment at 14:10 (count = 0), Skipped
-Segment at 14:19 (count = 10), RegionEntry
-Segment at 14:32 (count = 0), Skipped
-Segment at 14:33 (count = 3), RegionEntry
-Segment at 16:10 (count = 6), RegionEntry
-Segment at 16:11 (count = 0), Skipped
-Segment at 17:9 (count = 10), RegionEntry
-Segment at 17:23 (count = 0), Skipped
-Segment at 19:5 (count = 0), RegionEntry
-Segment at 20:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.async.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.async.txt
deleted file mode 100644
index 4df0bac8c866c..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.async.txt
+++ /dev/null
@@ -1,311 +0,0 @@
-Counter in file 0 13:1 -> 13:20, #1
-Counter in file 0 15:1 -> 15:20, 0
-Counter in file 0 15:20 -> 15:21, 0
-Counter in file 0 19:1 -> 19:30, 0
-Counter in file 0 19:30 -> 19:31, 0
-Counter in file 0 21:23 -> 22:12, 0
-Counter in file 0 23:9 -> 23:10, 0
-Counter in file 0 23:14 -> 23:17, 0
-Counter in file 0 23:27 -> 23:28, 0
-Counter in file 0 23:32 -> 23:34, 0
-Counter in file 0 24:9 -> 24:10, 0
-Counter in file 0 24:14 -> 24:17, 0
-Counter in file 0 24:27 -> 24:28, 0
-Counter in file 0 24:32 -> 24:34, 0
-Counter in file 0 25:14 -> 25:16, 0
-Counter in file 0 27:1 -> 27:2, 0
-Counter in file 0 29:22 -> 32:12, 0
-Counter in file 0 33:9 -> 33:10, 0
-Counter in file 0 33:14 -> 33:19, 0
-Counter in file 0 33:26 -> 33:27, 0
-Counter in file 0 33:32 -> 33:34, 0
-Counter in file 0 34:14 -> 34:16, 0
-Counter in file 0 36:1 -> 36:2, 0
-Counter in file 0 75:1 -> 76:12, 0
-Counter in file 0 77:14 -> 77:16, 0
-Counter in file 0 78:14 -> 78:16, 0
-Counter in file 0 79:14 -> 79:16, 0
-Counter in file 0 81:1 -> 81:2, 0
-Counter in file 0 91:25 -> 91:34, 0
-Counter in file 0 5:1 -> 5:25, #1
-Counter in file 0 21:1 -> 21:23, #1
-Counter in file 0 17:20 -> 17:21, #1
-Counter in file 0 67:5 -> 67:23, #1
-Counter in file 0 38:1 -> 38:19, #1
-Counter in file 0 38:19 -> 42:12, #1
-Counter in file 0 43:9 -> 43:10, #3
-Counter in file 0 43:14 -> 43:18, (#1 + 0)
-Counter in file 0 43:28 -> 43:33, #2
-Counter in file 0 43:39 -> 43:42, (#3 + 0)
-Counter in file 0 44:9 -> 44:10, #6
-Counter in file 0 44:14 -> 44:17, #4
-Counter in file 0 44:27 -> 44:32, #8
-Counter in file 0 44:36 -> 44:38, (#6 + 0)
-Counter in file 0 45:14 -> 45:16, #7
-Counter in file 0 47:1 -> 47:2, (#5 + (#6 + #7))
-Counter in file 0 13:20 -> 13:21, #1
-Counter in file 0 29:1 -> 29:22, #1
-Counter in file 0 93:1 -> 101:2, #1
-Counter in file 0 91:1 -> 91:25, #1
-Counter in file 0 5:25 -> 6:14, #1
-Counter in file 0 7:9 -> 7:10, #2
-Counter in file 0 9:9 -> 9:10, (#1 - #2)
-Counter in file 0 11:1 -> 11:2, (#2 + (#1 - #2))
-Counter in file 0 51:5 -> 52:18, #1
-Counter in file 0 53:13 -> 53:14, #2
-Counter in file 0 63:13 -> 63:14, (#1 - #2)
-Counter in file 0 65:5 -> 65:6, (#2 + (#1 - #2))
-Counter in file 0 49:1 -> 68:12, #1
-Counter in file 0 69:9 -> 69:10, #2
-Counter in file 0 69:14 -> 69:27, (#1 + 0)
-Counter in file 0 69:31 -> 69:39, (#2 + 0)
-Counter in file 0 70:9 -> 70:10, #3
-Counter in file 0 70:14 -> 70:26, #5
-Counter in file 0 70:30 -> 70:32, (#3 + 0)
-Counter in file 0 71:14 -> 71:16, #4
-Counter in file 0 73:1 -> 73:2, (#2 + (#3 + #4))
-Counter in file 0 83:1 -> 84:12, #1
-Counter in file 0 85:14 -> 85:16, (#1 - (#3 + #2))
-Counter in file 0 86:14 -> 86:16, #2
-Counter in file 0 87:14 -> 87:16, #3
-Counter in file 0 89:1 -> 89:2, (#3 + (#2 + (#1 - (#3 + #2))))
-Counter in file 0 17:1 -> 17:20, #1
-Counter in file 0 66:5 -> 66:23, #1
-Counter in file 0 17:9 -> 17:10, #1
-Counter in file 0 17:9 -> 17:10, #1
-Counter in file 0 117:17 -> 117:19, #1
-Counter in file 0 17:9 -> 17:10, #1
-Counter in file 0 110:5 -> 120:54, #1
-Counter in file 0 123:32 -> 123:35, ((#1 + #2) - #2)
-Counter in file 0 123:39 -> 123:73, (#1 + #2)
-Counter in file 0 124:23 -> 124:26, (((#1 + #2) - #2) + 0)
-Counter in file 0 125:14 -> 125:15, #2
-Counter in file 0 127:5 -> 127:6, (((#1 + #2) - #2) + 0)
-Emitting segments for file: ../coverage/async.rs
-Combined regions:
- 5:1 -> 5:25 (count=1)
- 5:25 -> 6:14 (count=1)
- 7:9 -> 7:10 (count=1)
- 9:9 -> 9:10 (count=0)
- 11:1 -> 11:2 (count=1)
- 13:1 -> 13:20 (count=0)
- 15:1 -> 15:20 (count=0)
- 15:20 -> 15:21 (count=0)
- 17:1 -> 17:20 (count=1)
- 17:20 -> 17:21 (count=1)
- 19:1 -> 19:30 (count=0)
- 19:30 -> 19:31 (count=0)
- 21:1 -> 21:23 (count=1)
- 21:23 -> 22:12 (count=0)
- 23:9 -> 23:10 (count=0)
- 23:14 -> 23:17 (count=0)
- 23:27 -> 23:28 (count=0)
- 23:32 -> 23:34 (count=0)
- 24:9 -> 24:10 (count=0)
- 24:14 -> 24:17 (count=0)
- 24:27 -> 24:28 (count=0)
- 24:32 -> 24:34 (count=0)
- 25:14 -> 25:16 (count=0)
- 27:1 -> 27:2 (count=0)
- 29:1 -> 29:22 (count=1)
- 29:22 -> 32:12 (count=0)
- 33:9 -> 33:10 (count=0)
- 33:14 -> 33:19 (count=0)
- 33:26 -> 33:27 (count=0)
- 33:32 -> 33:34 (count=0)
- 34:14 -> 34:16 (count=0)
- 36:1 -> 36:2 (count=0)
- 38:1 -> 38:19 (count=1)
- 38:19 -> 42:12 (count=1)
- 43:9 -> 43:10 (count=0)
- 43:14 -> 43:18 (count=1)
- 43:28 -> 43:33 (count=1)
- 43:39 -> 43:42 (count=0)
- 44:9 -> 44:10 (count=0)
- 44:14 -> 44:17 (count=1)
- 44:27 -> 44:32 (count=1)
- 44:36 -> 44:38 (count=0)
- 45:14 -> 45:16 (count=1)
- 47:1 -> 47:2 (count=1)
- 49:1 -> 68:12 (count=1)
- 51:5 -> 52:18 (count=1)
- 53:13 -> 53:14 (count=0)
- 63:13 -> 63:14 (count=1)
- 65:5 -> 65:6 (count=1)
- 67:5 -> 67:23 (count=1)
- 69:9 -> 69:10 (count=0)
- 69:14 -> 69:27 (count=1)
- 69:31 -> 69:39 (count=0)
- 70:9 -> 70:10 (count=0)
- 70:14 -> 70:26 (count=1)
- 70:30 -> 70:32 (count=0)
- 71:14 -> 71:16 (count=1)
- 73:1 -> 73:2 (count=1)
- 75:1 -> 76:12 (count=0)
- 77:14 -> 77:16 (count=0)
- 78:14 -> 78:16 (count=0)
- 79:14 -> 79:16 (count=0)
- 81:1 -> 81:2 (count=0)
- 83:1 -> 84:12 (count=1)
- 85:14 -> 85:16 (count=0)
- 86:14 -> 86:16 (count=0)
- 87:14 -> 87:16 (count=1)
- 89:1 -> 89:2 (count=1)
- 91:1 -> 91:25 (count=1)
- 91:25 -> 91:34 (count=0)
- 93:1 -> 101:2 (count=1)
- 110:5 -> 120:54 (count=1)
- 117:17 -> 117:19 (count=1)
- 123:32 -> 123:35 (count=1)
- 123:39 -> 123:73 (count=1)
- 124:23 -> 124:26 (count=1)
- 125:14 -> 125:15 (count=0)
- 127:5 -> 127:6 (count=1)
-Segment at 5:1 (count = 1), RegionEntry
-Segment at 5:25 (count = 1), RegionEntry
-Segment at 6:14 (count = 0), Skipped
-Segment at 7:9 (count = 1), RegionEntry
-Segment at 7:10 (count = 0), Skipped
-Segment at 9:9 (count = 0), RegionEntry
-Segment at 9:10 (count = 0), Skipped
-Segment at 11:1 (count = 1), RegionEntry
-Segment at 11:2 (count = 0), Skipped
-Segment at 13:1 (count = 0), RegionEntry
-Segment at 13:20 (count = 0), Skipped
-Segment at 15:1 (count = 0), RegionEntry
-Segment at 15:20 (count = 0), RegionEntry
-Segment at 15:21 (count = 0), Skipped
-Segment at 17:1 (count = 1), RegionEntry
-Segment at 17:20 (count = 1), RegionEntry
-Segment at 17:21 (count = 0), Skipped
-Segment at 19:1 (count = 0), RegionEntry
-Segment at 19:30 (count = 0), RegionEntry
-Segment at 19:31 (count = 0), Skipped
-Segment at 21:1 (count = 1), RegionEntry
-Segment at 21:23 (count = 0), RegionEntry
-Segment at 22:12 (count = 0), Skipped
-Segment at 23:9 (count = 0), RegionEntry
-Segment at 23:10 (count = 0), Skipped
-Segment at 23:14 (count = 0), RegionEntry
-Segment at 23:17 (count = 0), Skipped
-Segment at 23:27 (count = 0), RegionEntry
-Segment at 23:28 (count = 0), Skipped
-Segment at 23:32 (count = 0), RegionEntry
-Segment at 23:34 (count = 0), Skipped
-Segment at 24:9 (count = 0), RegionEntry
-Segment at 24:10 (count = 0), Skipped
-Segment at 24:14 (count = 0), RegionEntry
-Segment at 24:17 (count = 0), Skipped
-Segment at 24:27 (count = 0), RegionEntry
-Segment at 24:28 (count = 0), Skipped
-Segment at 24:32 (count = 0), RegionEntry
-Segment at 24:34 (count = 0), Skipped
-Segment at 25:14 (count = 0), RegionEntry
-Segment at 25:16 (count = 0), Skipped
-Segment at 27:1 (count = 0), RegionEntry
-Segment at 27:2 (count = 0), Skipped
-Segment at 29:1 (count = 1), RegionEntry
-Segment at 29:22 (count = 0), RegionEntry
-Segment at 32:12 (count = 0), Skipped
-Segment at 33:9 (count = 0), RegionEntry
-Segment at 33:10 (count = 0), Skipped
-Segment at 33:14 (count = 0), RegionEntry
-Segment at 33:19 (count = 0), Skipped
-Segment at 33:26 (count = 0), RegionEntry
-Segment at 33:27 (count = 0), Skipped
-Segment at 33:32 (count = 0), RegionEntry
-Segment at 33:34 (count = 0), Skipped
-Segment at 34:14 (count = 0), RegionEntry
-Segment at 34:16 (count = 0), Skipped
-Segment at 36:1 (count = 0), RegionEntry
-Segment at 36:2 (count = 0), Skipped
-Segment at 38:1 (count = 1), RegionEntry
-Segment at 38:19 (count = 1), RegionEntry
-Segment at 42:12 (count = 0), Skipped
-Segment at 43:9 (count = 0), RegionEntry
-Segment at 43:10 (count = 0), Skipped
-Segment at 43:14 (count = 1), RegionEntry
-Segment at 43:18 (count = 0), Skipped
-Segment at 43:28 (count = 1), RegionEntry
-Segment at 43:33 (count = 0), Skipped
-Segment at 43:39 (count = 0), RegionEntry
-Segment at 43:42 (count = 0), Skipped
-Segment at 44:9 (count = 0), RegionEntry
-Segment at 44:10 (count = 0), Skipped
-Segment at 44:14 (count = 1), RegionEntry
-Segment at 44:17 (count = 0), Skipped
-Segment at 44:27 (count = 1), RegionEntry
-Segment at 44:32 (count = 0), Skipped
-Segment at 44:36 (count = 0), RegionEntry
-Segment at 44:38 (count = 0), Skipped
-Segment at 45:14 (count = 1), RegionEntry
-Segment at 45:16 (count = 0), Skipped
-Segment at 47:1 (count = 1), RegionEntry
-Segment at 47:2 (count = 0), Skipped
-Segment at 49:1 (count = 1), RegionEntry
-Segment at 51:5 (count = 1), RegionEntry
-Segment at 52:18 (count = 1)
-Segment at 53:13 (count = 0), RegionEntry
-Segment at 53:14 (count = 1)
-Segment at 63:13 (count = 1), RegionEntry
-Segment at 63:14 (count = 1)
-Segment at 65:5 (count = 1), RegionEntry
-Segment at 65:6 (count = 1)
-Segment at 67:5 (count = 1), RegionEntry
-Segment at 67:23 (count = 1)
-Segment at 68:12 (count = 0), Skipped
-Segment at 69:9 (count = 0), RegionEntry
-Segment at 69:10 (count = 0), Skipped
-Segment at 69:14 (count = 1), RegionEntry
-Segment at 69:27 (count = 0), Skipped
-Segment at 69:31 (count = 0), RegionEntry
-Segment at 69:39 (count = 0), Skipped
-Segment at 70:9 (count = 0), RegionEntry
-Segment at 70:10 (count = 0), Skipped
-Segment at 70:14 (count = 1), RegionEntry
-Segment at 70:26 (count = 0), Skipped
-Segment at 70:30 (count = 0), RegionEntry
-Segment at 70:32 (count = 0), Skipped
-Segment at 71:14 (count = 1), RegionEntry
-Segment at 71:16 (count = 0), Skipped
-Segment at 73:1 (count = 1), RegionEntry
-Segment at 73:2 (count = 0), Skipped
-Segment at 75:1 (count = 0), RegionEntry
-Segment at 76:12 (count = 0), Skipped
-Segment at 77:14 (count = 0), RegionEntry
-Segment at 77:16 (count = 0), Skipped
-Segment at 78:14 (count = 0), RegionEntry
-Segment at 78:16 (count = 0), Skipped
-Segment at 79:14 (count = 0), RegionEntry
-Segment at 79:16 (count = 0), Skipped
-Segment at 81:1 (count = 0), RegionEntry
-Segment at 81:2 (count = 0), Skipped
-Segment at 83:1 (count = 1), RegionEntry
-Segment at 84:12 (count = 0), Skipped
-Segment at 85:14 (count = 0), RegionEntry
-Segment at 85:16 (count = 0), Skipped
-Segment at 86:14 (count = 0), RegionEntry
-Segment at 86:16 (count = 0), Skipped
-Segment at 87:14 (count = 1), RegionEntry
-Segment at 87:16 (count = 0), Skipped
-Segment at 89:1 (count = 1), RegionEntry
-Segment at 89:2 (count = 0), Skipped
-Segment at 91:1 (count = 1), RegionEntry
-Segment at 91:25 (count = 0), RegionEntry
-Segment at 91:34 (count = 0), Skipped
-Segment at 93:1 (count = 1), RegionEntry
-Segment at 101:2 (count = 0), Skipped
-Segment at 110:5 (count = 1), RegionEntry
-Segment at 117:17 (count = 1), RegionEntry
-Segment at 117:19 (count = 1)
-Segment at 120:54 (count = 0), Skipped
-Segment at 123:32 (count = 1), RegionEntry
-Segment at 123:35 (count = 0), Skipped
-Segment at 123:39 (count = 1), RegionEntry
-Segment at 123:73 (count = 0), Skipped
-Segment at 124:23 (count = 1), RegionEntry
-Segment at 124:26 (count = 0), Skipped
-Segment at 125:14 (count = 0), RegionEntry
-Segment at 125:15 (count = 0), Skipped
-Segment at 127:5 (count = 1), RegionEntry
-Segment at 127:6 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.closure.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.closure.txt
deleted file mode 100644
index 1aacac0ed2515..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.closure.txt
+++ /dev/null
@@ -1,153 +0,0 @@
-Counter in file 0 98:5 -> 100:20, #1
-Counter in file 0 100:21 -> 102:10, #2
-Counter in file 0 102:10 -> 102:11, (#1 - #2)
-Counter in file 0 103:9 -> 104:6, (#2 + (#1 - #2))
-Counter in file 0 123:5 -> 124:20, 0
-Counter in file 0 124:21 -> 126:10, 0
-Counter in file 0 126:10 -> 126:11, 0
-Counter in file 0 127:9 -> 128:6, 0
-Counter in file 0 131:53 -> 131:67, 0
-Counter in file 0 141:59 -> 141:85, 0
-Counter in file 0 143:56 -> 145:6, 0
-Counter in file 0 149:7 -> 149:33, 0
-Counter in file 0 153:7 -> 153:33, 0
-Counter in file 0 3:1 -> 18:13, #1
-Counter in file 0 25:14 -> 33:9, (#1 + 0)
-Counter in file 0 40:6 -> 60:13, (#1 + 0)
-Counter in file 0 67:14 -> 75:9, (#1 + 0)
-Counter in file 0 82:6 -> 97:9, (#1 + 0)
-Counter in file 0 104:6 -> 120:9, (#1 + 0)
-Counter in file 0 128:6 -> 131:33, (#1 + 0)
-Counter in file 0 131:67 -> 136:33, (#1 + 0)
-Counter in file 0 136:75 -> 141:39, (#1 + 0)
-Counter in file 0 141:85 -> 143:36, (#1 + 0)
-Counter in file 0 145:6 -> 147:36, (#1 + 0)
-Counter in file 0 149:33 -> 151:43, (#1 + 0)
-Counter in file 0 153:33 -> 155:2, (#1 + 0)
-Counter in file 0 61:13 -> 63:28, #1
-Counter in file 0 63:29 -> 65:18, #2
-Counter in file 0 65:18 -> 65:19, (#1 - #2)
-Counter in file 0 66:17 -> 67:14, (#2 + (#1 - #2))
-Counter in file 0 76:5 -> 78:20, #1
-Counter in file 0 78:21 -> 80:10, #2
-Counter in file 0 80:10 -> 80:11, (#1 - #2)
-Counter in file 0 81:9 -> 82:6, (#2 + (#1 - #2))
-Counter in file 0 34:5 -> 36:20, #1
-Counter in file 0 36:21 -> 38:10, #2
-Counter in file 0 38:10 -> 38:11, (#1 - #2)
-Counter in file 0 39:9 -> 40:6, (#2 + (#1 - #2))
-Counter in file 0 19:13 -> 21:28, #1
-Counter in file 0 21:29 -> 23:18, #2
-Counter in file 0 23:18 -> 23:19, (#1 - #2)
-Counter in file 0 24:17 -> 25:14, (#2 + (#1 - #2))
-Emitting segments for file: ../coverage/closure.rs
-Combined regions:
- 3:1 -> 18:13 (count=1)
- 19:13 -> 21:28 (count=0)
- 21:29 -> 23:18 (count=0)
- 23:18 -> 23:19 (count=0)
- 24:17 -> 25:14 (count=0)
- 25:14 -> 33:9 (count=1)
- 34:5 -> 36:20 (count=0)
- 36:21 -> 38:10 (count=0)
- 38:10 -> 38:11 (count=0)
- 39:9 -> 40:6 (count=0)
- 40:6 -> 60:13 (count=1)
- 61:13 -> 63:28 (count=1)
- 63:29 -> 65:18 (count=0)
- 65:18 -> 65:19 (count=1)
- 66:17 -> 67:14 (count=1)
- 67:14 -> 75:9 (count=1)
- 76:5 -> 78:20 (count=1)
- 78:21 -> 80:10 (count=0)
- 80:10 -> 80:11 (count=1)
- 81:9 -> 82:6 (count=1)
- 82:6 -> 97:9 (count=1)
- 98:5 -> 100:20 (count=5)
- 100:21 -> 102:10 (count=0)
- 102:10 -> 102:11 (count=5)
- 103:9 -> 104:6 (count=5)
- 104:6 -> 120:9 (count=1)
- 123:5 -> 124:20 (count=0)
- 124:21 -> 126:10 (count=0)
- 126:10 -> 126:11 (count=0)
- 127:9 -> 128:6 (count=0)
- 128:6 -> 131:33 (count=1)
- 131:53 -> 131:67 (count=0)
- 131:67 -> 136:33 (count=1)
- 136:75 -> 141:39 (count=1)
- 141:59 -> 141:85 (count=0)
- 141:85 -> 143:36 (count=1)
- 143:56 -> 145:6 (count=0)
- 145:6 -> 147:36 (count=1)
- 149:7 -> 149:33 (count=0)
- 149:33 -> 151:43 (count=1)
- 153:7 -> 153:33 (count=0)
- 153:33 -> 155:2 (count=1)
-Segment at 3:1 (count = 1), RegionEntry
-Segment at 18:13 (count = 0), Skipped
-Segment at 19:13 (count = 0), RegionEntry
-Segment at 21:28 (count = 0), Skipped
-Segment at 21:29 (count = 0), RegionEntry
-Segment at 23:18 (count = 0), RegionEntry
-Segment at 23:19 (count = 0), Skipped
-Segment at 24:17 (count = 0), RegionEntry
-Segment at 25:14 (count = 1), RegionEntry
-Segment at 33:9 (count = 0), Skipped
-Segment at 34:5 (count = 0), RegionEntry
-Segment at 36:20 (count = 0), Skipped
-Segment at 36:21 (count = 0), RegionEntry
-Segment at 38:10 (count = 0), RegionEntry
-Segment at 38:11 (count = 0), Skipped
-Segment at 39:9 (count = 0), RegionEntry
-Segment at 40:6 (count = 1), RegionEntry
-Segment at 60:13 (count = 0), Skipped
-Segment at 61:13 (count = 1), RegionEntry
-Segment at 63:28 (count = 0), Skipped
-Segment at 63:29 (count = 0), RegionEntry
-Segment at 65:18 (count = 1), RegionEntry
-Segment at 65:19 (count = 0), Skipped
-Segment at 66:17 (count = 1), RegionEntry
-Segment at 67:14 (count = 1), RegionEntry
-Segment at 75:9 (count = 0), Skipped
-Segment at 76:5 (count = 1), RegionEntry
-Segment at 78:20 (count = 0), Skipped
-Segment at 78:21 (count = 0), RegionEntry
-Segment at 80:10 (count = 1), RegionEntry
-Segment at 80:11 (count = 0), Skipped
-Segment at 81:9 (count = 1), RegionEntry
-Segment at 82:6 (count = 1), RegionEntry
-Segment at 97:9 (count = 0), Skipped
-Segment at 98:5 (count = 5), RegionEntry
-Segment at 100:20 (count = 0), Skipped
-Segment at 100:21 (count = 0), RegionEntry
-Segment at 102:10 (count = 5), RegionEntry
-Segment at 102:11 (count = 0), Skipped
-Segment at 103:9 (count = 5), RegionEntry
-Segment at 104:6 (count = 1), RegionEntry
-Segment at 120:9 (count = 0), Skipped
-Segment at 123:5 (count = 0), RegionEntry
-Segment at 124:20 (count = 0), Skipped
-Segment at 124:21 (count = 0), RegionEntry
-Segment at 126:10 (count = 0), RegionEntry
-Segment at 126:11 (count = 0), Skipped
-Segment at 127:9 (count = 0), RegionEntry
-Segment at 128:6 (count = 1), RegionEntry
-Segment at 131:33 (count = 0), Skipped
-Segment at 131:53 (count = 0), RegionEntry
-Segment at 131:67 (count = 1), RegionEntry
-Segment at 136:33 (count = 0), Skipped
-Segment at 136:75 (count = 1), RegionEntry
-Segment at 141:39 (count = 0), Skipped
-Segment at 141:59 (count = 0), RegionEntry
-Segment at 141:85 (count = 1), RegionEntry
-Segment at 143:36 (count = 0), Skipped
-Segment at 143:56 (count = 0), RegionEntry
-Segment at 145:6 (count = 1), RegionEntry
-Segment at 147:36 (count = 0), Skipped
-Segment at 149:7 (count = 0), RegionEntry
-Segment at 149:33 (count = 1), RegionEntry
-Segment at 151:43 (count = 0), Skipped
-Segment at 153:7 (count = 0), RegionEntry
-Segment at 153:33 (count = 1), RegionEntry
-Segment at 155:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.conditions.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.conditions.txt
deleted file mode 100644
index 3a9c6a9b92e98..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.conditions.txt
+++ /dev/null
@@ -1,253 +0,0 @@
-Counter in file 0 3:1 -> 3:11, #1
-Counter in file 0 4:9 -> 5:12, (#1 + 0)
-Counter in file 0 5:13 -> 7:6, #2
-Counter in file 0 10:9 -> 10:10, (#3 + (#12 + #13))
-Counter in file 0 10:16 -> 10:29, (#2 + 0)
-Counter in file 0 11:9 -> 12:10, #3
-Counter in file 0 13:15 -> 13:28, ((#2 + 0) - #3)
-Counter in file 0 14:12 -> 14:25, #4
-Counter in file 0 14:29 -> 14:42, (#4 - #15)
-Counter in file 0 14:46 -> 14:60, #21
-Counter in file 0 14:61 -> 16:10, #12
-Counter in file 0 16:10 -> 16:11, #13
-Counter in file 0 17:9 -> 18:18, (#12 + #13)
-Counter in file 0 20:9 -> 20:15, (((#2 + 0) - #3) - #4)
-Counter in file 0 23:9 -> 24:12, ((#3 + (#12 + #13)) + 0)
-Counter in file 0 24:13 -> 26:6, #14
-Counter in file 0 28:8 -> 28:21, (#14 + 0)
-Counter in file 0 28:22 -> 30:6, #16
-Counter in file 0 30:15 -> 30:28, ((#14 + 0) - #16)
-Counter in file 0 31:12 -> 31:25, (((#14 + 0) - #16) - #11)
-Counter in file 0 31:29 -> 31:42, ((((#14 + 0) - #16) - #11) - #23)
-Counter in file 0 31:46 -> 31:60, #31
-Counter in file 0 31:61 -> 33:10, #18
-Counter in file 0 33:10 -> 33:11, #19
-Counter in file 0 34:9 -> 34:23, (#18 + #19)
-Counter in file 0 36:9 -> 36:15, #11
-Counter in file 0 39:8 -> 39:12, (#16 + (#18 + #19))
-Counter in file 0 40:13 -> 41:16, #20
-Counter in file 0 41:17 -> 43:10, #24
-Counter in file 0 45:12 -> 45:25, (#24 + 0)
-Counter in file 0 45:26 -> 47:10, #25
-Counter in file 0 48:17 -> 48:30, ((#24 + 0) - #25)
-Counter in file 0 49:16 -> 49:29, (((#24 + 0) - #25) - #10)
-Counter in file 0 49:33 -> 49:46, ((((#24 + 0) - #25) - #10) - #35)
-Counter in file 0 49:50 -> 49:64, #40
-Counter in file 0 49:65 -> 51:14, #26
-Counter in file 0 51:14 -> 51:15, #27
-Counter in file 0 52:13 -> 52:27, (#26 + #27)
-Counter in file 0 54:13 -> 54:19, #10
-Counter in file 0 59:9 -> 60:12, ((#25 + (#26 + #27)) + 0)
-Counter in file 0 60:13 -> 62:6, #28
-Counter in file 0 64:9 -> 64:10, (#30 + (#33 + #34))
-Counter in file 0 64:16 -> 64:29, (#28 + 0)
-Counter in file 0 64:30 -> 66:6, #30
-Counter in file 0 66:15 -> 66:28, ((#28 + 0) - #30)
-Counter in file 0 67:12 -> 67:25, (((#28 + 0) - #30) - #9)
-Counter in file 0 67:29 -> 67:42, ((((#28 + 0) - #30) - #9) - #36)
-Counter in file 0 67:46 -> 67:60, #42
-Counter in file 0 67:61 -> 69:10, #33
-Counter in file 0 69:10 -> 69:11, #34
-Counter in file 0 70:9 -> 70:23, (#33 + #34)
-Counter in file 0 72:13 -> 74:15, #9
-Counter in file 0 77:9 -> 77:10, (#5 + (#6 + #7))
-Counter in file 0 77:16 -> 77:29, ((#30 + (#33 + #34)) + 0)
-Counter in file 0 77:30 -> 79:6, #5
-Counter in file 0 79:15 -> 79:28, ((#30 + (#33 + #34)) - #5)
-Counter in file 0 80:12 -> 80:25, (((#30 + (#33 + #34)) - #5) - #8)
-Counter in file 0 80:29 -> 80:42, ((((#30 + (#33 + #34)) - #5) - #8) - #39)
-Counter in file 0 80:46 -> 80:60, #45
-Counter in file 0 80:61 -> 82:10, #6
-Counter in file 0 82:10 -> 82:11, #7
-Counter in file 0 83:9 -> 83:23, (#6 + #7)
-Counter in file 0 85:9 -> 85:15, #8
-Counter in file 0 87:1 -> 87:2, ((#5 + (#6 + #7)) + (((#8 + #9) + (#10 + #11)) + (((#2 + 0) - #3) - #4)))
-Emitting segments for file: ../coverage/conditions.rs
-Combined regions:
- 3:1 -> 3:11 (count=1)
- 4:9 -> 5:12 (count=1)
- 5:13 -> 7:6 (count=1)
- 10:9 -> 10:10 (count=1)
- 10:16 -> 10:29 (count=1)
- 11:9 -> 12:10 (count=1)
- 13:15 -> 13:28 (count=0)
- 14:12 -> 14:25 (count=0)
- 14:29 -> 14:42 (count=0)
- 14:46 -> 14:60 (count=0)
- 14:61 -> 16:10 (count=0)
- 16:10 -> 16:11 (count=0)
- 17:9 -> 18:18 (count=0)
- 20:9 -> 20:15 (count=0)
- 23:9 -> 24:12 (count=1)
- 24:13 -> 26:6 (count=1)
- 28:8 -> 28:21 (count=1)
- 28:22 -> 30:6 (count=1)
- 30:15 -> 30:28 (count=0)
- 31:12 -> 31:25 (count=0)
- 31:29 -> 31:42 (count=0)
- 31:46 -> 31:60 (count=0)
- 31:61 -> 33:10 (count=0)
- 33:10 -> 33:11 (count=0)
- 34:9 -> 34:23 (count=0)
- 36:9 -> 36:15 (count=0)
- 39:8 -> 39:12 (count=1)
- 40:13 -> 41:16 (count=1)
- 41:17 -> 43:10 (count=1)
- 45:12 -> 45:25 (count=1)
- 45:26 -> 47:10 (count=1)
- 48:17 -> 48:30 (count=0)
- 49:16 -> 49:29 (count=0)
- 49:33 -> 49:46 (count=0)
- 49:50 -> 49:64 (count=0)
- 49:65 -> 51:14 (count=0)
- 51:14 -> 51:15 (count=0)
- 52:13 -> 52:27 (count=0)
- 54:13 -> 54:19 (count=0)
- 59:9 -> 60:12 (count=1)
- 60:13 -> 62:6 (count=1)
- 64:9 -> 64:10 (count=0)
- 64:16 -> 64:29 (count=1)
- 64:30 -> 66:6 (count=0)
- 66:15 -> 66:28 (count=1)
- 67:12 -> 67:25 (count=0)
- 67:29 -> 67:42 (count=0)
- 67:46 -> 67:60 (count=0)
- 67:61 -> 69:10 (count=0)
- 69:10 -> 69:11 (count=0)
- 70:9 -> 70:23 (count=0)
- 72:13 -> 74:15 (count=1)
- 77:9 -> 77:10 (count=0)
- 77:16 -> 77:29 (count=0)
- 77:30 -> 79:6 (count=0)
- 79:15 -> 79:28 (count=0)
- 80:12 -> 80:25 (count=0)
- 80:29 -> 80:42 (count=0)
- 80:46 -> 80:60 (count=0)
- 80:61 -> 82:10 (count=0)
- 82:10 -> 82:11 (count=0)
- 83:9 -> 83:23 (count=0)
- 85:9 -> 85:15 (count=0)
- 87:1 -> 87:2 (count=1)
-Segment at 3:1 (count = 1), RegionEntry
-Segment at 3:11 (count = 0), Skipped
-Segment at 4:9 (count = 1), RegionEntry
-Segment at 5:12 (count = 0), Skipped
-Segment at 5:13 (count = 1), RegionEntry
-Segment at 7:6 (count = 0), Skipped
-Segment at 10:9 (count = 1), RegionEntry
-Segment at 10:10 (count = 0), Skipped
-Segment at 10:16 (count = 1), RegionEntry
-Segment at 10:29 (count = 0), Skipped
-Segment at 11:9 (count = 1), RegionEntry
-Segment at 12:10 (count = 0), Skipped
-Segment at 13:15 (count = 0), RegionEntry
-Segment at 13:28 (count = 0), Skipped
-Segment at 14:12 (count = 0), RegionEntry
-Segment at 14:25 (count = 0), Skipped
-Segment at 14:29 (count = 0), RegionEntry
-Segment at 14:42 (count = 0), Skipped
-Segment at 14:46 (count = 0), RegionEntry
-Segment at 14:60 (count = 0), Skipped
-Segment at 14:61 (count = 0), RegionEntry
-Segment at 16:10 (count = 0), RegionEntry
-Segment at 16:11 (count = 0), Skipped
-Segment at 17:9 (count = 0), RegionEntry
-Segment at 18:18 (count = 0), Skipped
-Segment at 20:9 (count = 0), RegionEntry
-Segment at 20:15 (count = 0), Skipped
-Segment at 23:9 (count = 1), RegionEntry
-Segment at 24:12 (count = 0), Skipped
-Segment at 24:13 (count = 1), RegionEntry
-Segment at 26:6 (count = 0), Skipped
-Segment at 28:8 (count = 1), RegionEntry
-Segment at 28:21 (count = 0), Skipped
-Segment at 28:22 (count = 1), RegionEntry
-Segment at 30:6 (count = 0), Skipped
-Segment at 30:15 (count = 0), RegionEntry
-Segment at 30:28 (count = 0), Skipped
-Segment at 31:12 (count = 0), RegionEntry
-Segment at 31:25 (count = 0), Skipped
-Segment at 31:29 (count = 0), RegionEntry
-Segment at 31:42 (count = 0), Skipped
-Segment at 31:46 (count = 0), RegionEntry
-Segment at 31:60 (count = 0), Skipped
-Segment at 31:61 (count = 0), RegionEntry
-Segment at 33:10 (count = 0), RegionEntry
-Segment at 33:11 (count = 0), Skipped
-Segment at 34:9 (count = 0), RegionEntry
-Segment at 34:23 (count = 0), Skipped
-Segment at 36:9 (count = 0), RegionEntry
-Segment at 36:15 (count = 0), Skipped
-Segment at 39:8 (count = 1), RegionEntry
-Segment at 39:12 (count = 0), Skipped
-Segment at 40:13 (count = 1), RegionEntry
-Segment at 41:16 (count = 0), Skipped
-Segment at 41:17 (count = 1), RegionEntry
-Segment at 43:10 (count = 0), Skipped
-Segment at 45:12 (count = 1), RegionEntry
-Segment at 45:25 (count = 0), Skipped
-Segment at 45:26 (count = 1), RegionEntry
-Segment at 47:10 (count = 0), Skipped
-Segment at 48:17 (count = 0), RegionEntry
-Segment at 48:30 (count = 0), Skipped
-Segment at 49:16 (count = 0), RegionEntry
-Segment at 49:29 (count = 0), Skipped
-Segment at 49:33 (count = 0), RegionEntry
-Segment at 49:46 (count = 0), Skipped
-Segment at 49:50 (count = 0), RegionEntry
-Segment at 49:64 (count = 0), Skipped
-Segment at 49:65 (count = 0), RegionEntry
-Segment at 51:14 (count = 0), RegionEntry
-Segment at 51:15 (count = 0), Skipped
-Segment at 52:13 (count = 0), RegionEntry
-Segment at 52:27 (count = 0), Skipped
-Segment at 54:13 (count = 0), RegionEntry
-Segment at 54:19 (count = 0), Skipped
-Segment at 59:9 (count = 1), RegionEntry
-Segment at 60:12 (count = 0), Skipped
-Segment at 60:13 (count = 1), RegionEntry
-Segment at 62:6 (count = 0), Skipped
-Segment at 64:9 (count = 0), RegionEntry
-Segment at 64:10 (count = 0), Skipped
-Segment at 64:16 (count = 1), RegionEntry
-Segment at 64:29 (count = 0), Skipped
-Segment at 64:30 (count = 0), RegionEntry
-Segment at 66:6 (count = 0), Skipped
-Segment at 66:15 (count = 1), RegionEntry
-Segment at 66:28 (count = 0), Skipped
-Segment at 67:12 (count = 0), RegionEntry
-Segment at 67:25 (count = 0), Skipped
-Segment at 67:29 (count = 0), RegionEntry
-Segment at 67:42 (count = 0), Skipped
-Segment at 67:46 (count = 0), RegionEntry
-Segment at 67:60 (count = 0), Skipped
-Segment at 67:61 (count = 0), RegionEntry
-Segment at 69:10 (count = 0), RegionEntry
-Segment at 69:11 (count = 0), Skipped
-Segment at 70:9 (count = 0), RegionEntry
-Segment at 70:23 (count = 0), Skipped
-Segment at 72:13 (count = 1), RegionEntry
-Segment at 74:15 (count = 0), Skipped
-Segment at 77:9 (count = 0), RegionEntry
-Segment at 77:10 (count = 0), Skipped
-Segment at 77:16 (count = 0), RegionEntry
-Segment at 77:29 (count = 0), Skipped
-Segment at 77:30 (count = 0), RegionEntry
-Segment at 79:6 (count = 0), Skipped
-Segment at 79:15 (count = 0), RegionEntry
-Segment at 79:28 (count = 0), Skipped
-Segment at 80:12 (count = 0), RegionEntry
-Segment at 80:25 (count = 0), Skipped
-Segment at 80:29 (count = 0), RegionEntry
-Segment at 80:42 (count = 0), Skipped
-Segment at 80:46 (count = 0), RegionEntry
-Segment at 80:60 (count = 0), Skipped
-Segment at 80:61 (count = 0), RegionEntry
-Segment at 82:10 (count = 0), RegionEntry
-Segment at 82:11 (count = 0), Skipped
-Segment at 83:9 (count = 0), RegionEntry
-Segment at 83:23 (count = 0), Skipped
-Segment at 85:9 (count = 0), RegionEntry
-Segment at 85:15 (count = 0), Skipped
-Segment at 87:1 (count = 1), RegionEntry
-Segment at 87:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.dead_code.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.dead_code.txt
deleted file mode 100644
index a2187d477c820..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.dead_code.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Counter in file 0 3:1 -> 10:15, 0
-Counter in file 0 10:16 -> 12:6, 0
-Counter in file 0 12:6 -> 12:7, 0
-Counter in file 0 13:1 -> 13:2, 0
-Counter in file 0 15:1 -> 22:15, 0
-Counter in file 0 22:16 -> 24:6, 0
-Counter in file 0 24:6 -> 24:7, 0
-Counter in file 0 25:1 -> 25:2, 0
-Counter in file 0 27:1 -> 34:15, #1
-Counter in file 0 34:16 -> 36:6, #2
-Counter in file 0 36:6 -> 36:7, (#1 - #2)
-Counter in file 0 37:1 -> 37:2, (#2 + (#1 - #2))
-Emitting segments for file: ../coverage/dead_code.rs
-Combined regions:
- 3:1 -> 10:15 (count=0)
- 10:16 -> 12:6 (count=0)
- 12:6 -> 12:7 (count=0)
- 13:1 -> 13:2 (count=0)
- 15:1 -> 22:15 (count=0)
- 22:16 -> 24:6 (count=0)
- 24:6 -> 24:7 (count=0)
- 25:1 -> 25:2 (count=0)
- 27:1 -> 34:15 (count=1)
- 34:16 -> 36:6 (count=1)
- 36:6 -> 36:7 (count=0)
- 37:1 -> 37:2 (count=1)
-Segment at 3:1 (count = 0), RegionEntry
-Segment at 10:15 (count = 0), Skipped
-Segment at 10:16 (count = 0), RegionEntry
-Segment at 12:6 (count = 0), RegionEntry
-Segment at 12:7 (count = 0), Skipped
-Segment at 13:1 (count = 0), RegionEntry
-Segment at 13:2 (count = 0), Skipped
-Segment at 15:1 (count = 0), RegionEntry
-Segment at 22:15 (count = 0), Skipped
-Segment at 22:16 (count = 0), RegionEntry
-Segment at 24:6 (count = 0), RegionEntry
-Segment at 24:7 (count = 0), Skipped
-Segment at 25:1 (count = 0), RegionEntry
-Segment at 25:2 (count = 0), Skipped
-Segment at 27:1 (count = 1), RegionEntry
-Segment at 34:15 (count = 0), Skipped
-Segment at 34:16 (count = 1), RegionEntry
-Segment at 36:6 (count = 0), RegionEntry
-Segment at 36:7 (count = 0), Skipped
-Segment at 37:1 (count = 1), RegionEntry
-Segment at 37:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.drop_trait.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.drop_trait.txt
deleted file mode 100644
index 66c51e3a2982d..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.drop_trait.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Counter in file 0 9:5 -> 11:6, #1
-Counter in file 0 14:1 -> 19:12, #1
-Counter in file 0 20:9 -> 21:22, #2
-Counter in file 0 27:1 -> 27:2, (#2 + 0)
-Emitting segments for file: ../coverage/drop_trait.rs
-Combined regions:
- 9:5 -> 11:6 (count=2)
- 14:1 -> 19:12 (count=1)
- 20:9 -> 21:22 (count=1)
- 27:1 -> 27:2 (count=1)
-Segment at 9:5 (count = 2), RegionEntry
-Segment at 11:6 (count = 0), Skipped
-Segment at 14:1 (count = 1), RegionEntry
-Segment at 19:12 (count = 0), Skipped
-Segment at 20:9 (count = 1), RegionEntry
-Segment at 21:22 (count = 0), Skipped
-Segment at 27:1 (count = 1), RegionEntry
-Segment at 27:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.generics.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.generics.txt
deleted file mode 100644
index e2cbf6f709e6e..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.generics.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-Counter in file 0 17:5 -> 19:6, #1
-Counter in file 0 17:5 -> 19:6, #1
-Counter in file 0 22:1 -> 30:12, #1
-Counter in file 0 31:9 -> 32:22, #2
-Counter in file 0 42:1 -> 42:2, (#2 + 0)
-Counter in file 0 10:5 -> 12:6, #1
-Counter in file 0 10:5 -> 12:6, #1
-Emitting segments for file: ../coverage/generics.rs
-Combined regions:
- 10:5 -> 12:6 (count=3)
- 17:5 -> 19:6 (count=2)
- 22:1 -> 30:12 (count=1)
- 31:9 -> 32:22 (count=1)
- 42:1 -> 42:2 (count=1)
-Segment at 10:5 (count = 3), RegionEntry
-Segment at 12:6 (count = 0), Skipped
-Segment at 17:5 (count = 2), RegionEntry
-Segment at 19:6 (count = 0), Skipped
-Segment at 22:1 (count = 1), RegionEntry
-Segment at 30:12 (count = 0), Skipped
-Segment at 31:9 (count = 1), RegionEntry
-Segment at 32:22 (count = 0), Skipped
-Segment at 42:1 (count = 1), RegionEntry
-Segment at 42:2 (count = 0), Skipped
-Emitting segments for function: _RNvMCs4fqI2P2rA04_8genericsINtB2_8FireworkdE12set_strengthB2_
-Combined regions:
- 10:5 -> 12:6 (count=2)
-Segment at 10:5 (count = 2), RegionEntry
-Segment at 12:6 (count = 0), Skipped
-Emitting segments for function: _RNvMCs4fqI2P2rA04_8genericsINtB2_8FireworklE12set_strengthB2_
-Combined regions:
- 10:5 -> 12:6 (count=1)
-Segment at 10:5 (count = 1), RegionEntry
-Segment at 12:6 (count = 0), Skipped
-Emitting segments for function: _RNvXs_Cs4fqI2P2rA04_8genericsINtB4_8FireworklENtNtNtCs3rFBWs28XFJ_4core3ops4drop4Drop4dropB4_
-Combined regions:
- 17:5 -> 19:6 (count=1)
-Segment at 17:5 (count = 1), RegionEntry
-Segment at 19:6 (count = 0), Skipped
-Emitting segments for function: _RNvXs_Cs4fqI2P2rA04_8genericsINtB4_8FireworkdENtNtNtCs3rFBWs28XFJ_4core3ops4drop4Drop4dropB4_
-Combined regions:
- 17:5 -> 19:6 (count=1)
-Segment at 17:5 (count = 1), RegionEntry
-Segment at 19:6 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.if.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.if.txt
deleted file mode 100644
index 2e802a462ea2c..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.if.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Counter in file 0 3:1 -> 21:16, #1
-Counter in file 0 22:5 -> 27:6, #2
-Counter in file 0 27:6 -> 27:7, (#1 - #2)
-Counter in file 0 28:1 -> 28:2, (#2 + (#1 - #2))
-Emitting segments for file: ../coverage/if.rs
-Combined regions:
- 3:1 -> 21:16 (count=1)
- 22:5 -> 27:6 (count=1)
- 27:6 -> 27:7 (count=0)
- 28:1 -> 28:2 (count=1)
-Segment at 3:1 (count = 1), RegionEntry
-Segment at 21:16 (count = 0), Skipped
-Segment at 22:5 (count = 1), RegionEntry
-Segment at 27:6 (count = 0), RegionEntry
-Segment at 27:7 (count = 0), Skipped
-Segment at 28:1 (count = 1), RegionEntry
-Segment at 28:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.if_else.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.if_else.txt
deleted file mode 100644
index 03b35b0f00999..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.if_else.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Counter in file 0 3:1 -> 11:16, #1
-Counter in file 0 12:5 -> 17:6, #2
-Counter in file 0 20:9 -> 22:16, (#1 - #2)
-Counter in file 0 26:9 -> 26:16, (#2 + (#1 - #2))
-Counter in file 0 27:5 -> 32:6, #3
-Counter in file 0 34:5 -> 39:6, ((#2 + (#1 - #2)) - #3)
-Counter in file 0 40:1 -> 40:2, (#3 + ((#2 + (#1 - #2)) - #3))
-Emitting segments for file: ../coverage/if_else.rs
-Combined regions:
- 3:1 -> 11:16 (count=1)
- 12:5 -> 17:6 (count=1)
- 20:9 -> 22:16 (count=0)
- 26:9 -> 26:16 (count=1)
- 27:5 -> 32:6 (count=1)
- 34:5 -> 39:6 (count=0)
- 40:1 -> 40:2 (count=1)
-Segment at 3:1 (count = 1), RegionEntry
-Segment at 11:16 (count = 0), Skipped
-Segment at 12:5 (count = 1), RegionEntry
-Segment at 17:6 (count = 0), Skipped
-Segment at 20:9 (count = 0), RegionEntry
-Segment at 22:16 (count = 0), Skipped
-Segment at 26:9 (count = 1), RegionEntry
-Segment at 26:16 (count = 0), Skipped
-Segment at 27:5 (count = 1), RegionEntry
-Segment at 32:6 (count = 0), Skipped
-Segment at 34:5 (count = 0), RegionEntry
-Segment at 39:6 (count = 0), Skipped
-Segment at 40:1 (count = 1), RegionEntry
-Segment at 40:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.inner_items.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.inner_items.txt
deleted file mode 100644
index 5dc704d6149f1..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.inner_items.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-Counter in file 0 18:5 -> 22:6, #1
-Counter in file 0 3:1 -> 3:11, #1
-Counter in file 0 7:9 -> 10:15, (#1 + 0)
-Counter in file 0 10:16 -> 12:6, #2
-Counter in file 0 12:6 -> 12:7, (#1 - #2)
-Counter in file 0 48:8 -> 48:15, (#2 + (#1 - #2))
-Counter in file 0 48:16 -> 50:6, #3
-Counter in file 0 50:6 -> 50:7, ((#2 + (#1 - #2)) - #3)
-Counter in file 0 52:9 -> 57:2, (#3 + ((#2 + (#1 - #2)) - #3))
-Counter in file 0 33:9 -> 36:10, #1
-Counter in file 0 40:9 -> 43:10, #1
-Emitting segments for file: ../coverage/inner_items.rs
-Combined regions:
- 3:1 -> 3:11 (count=1)
- 7:9 -> 10:15 (count=1)
- 10:16 -> 12:6 (count=1)
- 12:6 -> 12:7 (count=0)
- 18:5 -> 22:6 (count=3)
- 33:9 -> 36:10 (count=1)
- 40:9 -> 43:10 (count=1)
- 48:8 -> 48:15 (count=1)
- 48:16 -> 50:6 (count=1)
- 50:6 -> 50:7 (count=0)
- 52:9 -> 57:2 (count=1)
-Segment at 3:1 (count = 1), RegionEntry
-Segment at 3:11 (count = 0), Skipped
-Segment at 7:9 (count = 1), RegionEntry
-Segment at 10:15 (count = 0), Skipped
-Segment at 10:16 (count = 1), RegionEntry
-Segment at 12:6 (count = 0), RegionEntry
-Segment at 12:7 (count = 0), Skipped
-Segment at 18:5 (count = 3), RegionEntry
-Segment at 22:6 (count = 0), Skipped
-Segment at 33:9 (count = 1), RegionEntry
-Segment at 36:10 (count = 0), Skipped
-Segment at 40:9 (count = 1), RegionEntry
-Segment at 43:10 (count = 0), Skipped
-Segment at 48:8 (count = 1), RegionEntry
-Segment at 48:15 (count = 0), Skipped
-Segment at 48:16 (count = 1), RegionEntry
-Segment at 50:6 (count = 0), RegionEntry
-Segment at 50:7 (count = 0), Skipped
-Segment at 52:9 (count = 1), RegionEntry
-Segment at 57:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.lazy_boolean.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.lazy_boolean.txt
deleted file mode 100644
index d5667fb861e2c..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.lazy_boolean.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-Counter in file 0 3:1 -> 10:15, #1
-Counter in file 0 10:16 -> 14:6, #2
-Counter in file 0 14:6 -> 14:7, (#1 - #2)
-Counter in file 0 16:9 -> 16:17, ((#3 + #4) + (((#2 + (#1 - #2)) - #3) - #4))
-Counter in file 0 18:13 -> 18:18, (#2 + (#1 - #2))
-Counter in file 0 20:13 -> 20:18, ((#2 + (#1 - #2)) - #3)
-Counter in file 0 23:9 -> 23:17, ((#5 + #6) + ((((#3 + #4) + (((#2 + (#1 - #2)) - #3) - #4)) - #5) - #6))
-Counter in file 0 25:13 -> 25:18, (((#3 + #4) + (((#2 + (#1 - #2)) - #3) - #4)) + 0)
-Counter in file 0 27:13 -> 27:18, (((#3 + #4) + (((#2 + (#1 - #2)) - #3) - #4)) - #5)
-Counter in file 0 29:9 -> 29:17, (#8 + ((((#5 + #6) + ((((#3 + #4) + (((#2 + (#1 - #2)) - #3) - #4)) - #5) - #6)) - #7) + (#7 - #8)))
-Counter in file 0 29:20 -> 29:25, (((#5 + #6) + ((((#3 + #4) + (((#2 + (#1 - #2)) - #3) - #4)) - #5) - #6)) + 0)
-Counter in file 0 29:29 -> 29:34, #7
-Counter in file 0 30:9 -> 30:17, (#10 + (((#8 + ((((#5 + #6) + ((((#3 + #4) + (((#2 + (#1 - #2)) - #3) - #4)) - #5) - #6)) - #7) + (#7 - #8))) - #9) + (#9 - #10)))
-Counter in file 0 30:20 -> 30:25, ((#8 + ((((#5 + #6) + ((((#3 + #4) + (((#2 + (#1 - #2)) - #3) - #4)) - #5) - #6)) - #7) + (#7 - #8))) + 0)
-Counter in file 0 30:29 -> 30:34, #9
-Counter in file 0 33:9 -> 34:16, ((#10 + (((#8 + ((((#5 + #6) + ((((#3 + #4) + (((#2 + (#1 - #2)) - #3) - #4)) - #5) - #6)) - #7) + (#7 - #8))) - #9) + (#9 - #10))) + 0)
-Counter in file 0 35:5 -> 38:6, #11
-Counter in file 0 38:6 -> 38:7, ((#10 + (((#8 + ((((#5 + #6) + ((((#3 + #4) + (((#2 + (#1 - #2)) - #3) - #4)) - #5) - #6)) - #7) + (#7 - #8))) - #9) + (#9 - #10))) - #11)
-Counter in file 0 41:9 -> 41:16, (#11 + ((#10 + (((#8 + ((((#5 + #6) + ((((#3 + #4) + (((#2 + (#1 - #2)) - #3) - #4)) - #5) - #6)) - #7) + (#7 - #8))) - #9) + (#9 - #10))) - #11))
-Counter in file 0 42:5 -> 45:6, #12
-Counter in file 0 47:5 -> 50:6, ((#11 + ((#10 + (((#8 + ((((#5 + #6) + ((((#3 + #4) + (((#2 + (#1 - #2)) - #3) - #4)) - #5) - #6)) - #7) + (#7 - #8))) - #9) + (#9 - #10))) - #11)) - #12)
-Counter in file 0 52:8 -> 52:16, (#12 + ((#11 + ((#10 + (((#8 + ((((#5 + #6) + ((((#3 + #4) + (((#2 + (#1 - #2)) - #3) - #4)) - #5) - #6)) - #7) + (#7 - #8))) - #9) + (#9 - #10))) - #11)) - #12))
-Counter in file 0 52:17 -> 54:6, #13
-Counter in file 0 54:6 -> 54:7, ((#12 + ((#11 + ((#10 + (((#8 + ((((#5 + #6) + ((((#3 + #4) + (((#2 + (#1 - #2)) - #3) - #4)) - #5) - #6)) - #7) + (#7 - #8))) - #9) + (#9 - #10))) - #11)) - #12)) - #13)
-Counter in file 0 56:8 -> 56:15, (#13 + ((#12 + ((#11 + ((#10 + (((#8 + ((((#5 + #6) + ((((#3 + #4) + (((#2 + (#1 - #2)) - #3) - #4)) - #5) - #6)) - #7) + (#7 - #8))) - #9) + (#9 - #10))) - #11)) - #12)) - #13))
-Counter in file 0 56:16 -> 58:6, #14
-Counter in file 0 58:12 -> 60:6, ((#13 + ((#12 + ((#11 + ((#10 + (((#8 + ((((#5 + #6) + ((((#3 + #4) + (((#2 + (#1 - #2)) - #3) - #4)) - #5) - #6)) - #7) + (#7 - #8))) - #9) + (#9 - #10))) - #11)) - #12)) - #13)) - #14)
-Counter in file 0 61:1 -> 61:2, (#14 + ((#13 + ((#12 + ((#11 + ((#10 + (((#8 + ((((#5 + #6) + ((((#3 + #4) + (((#2 + (#1 - #2)) - #3) - #4)) - #5) - #6)) - #7) + (#7 - #8))) - #9) + (#9 - #10))) - #11)) - #12)) - #13)) - #14))
-Emitting segments for file: ../coverage/lazy_boolean.rs
-Combined regions:
- 3:1 -> 10:15 (count=1)
- 10:16 -> 14:6 (count=1)
- 14:6 -> 14:7 (count=0)
- 16:9 -> 16:17 (count=1)
- 18:13 -> 18:18 (count=1)
- 20:13 -> 20:18 (count=0)
- 23:9 -> 23:17 (count=1)
- 25:13 -> 25:18 (count=1)
- 27:13 -> 27:18 (count=1)
- 29:9 -> 29:17 (count=1)
- 29:20 -> 29:25 (count=1)
- 29:29 -> 29:34 (count=1)
- 30:9 -> 30:17 (count=1)
- 30:20 -> 30:25 (count=1)
- 30:29 -> 30:34 (count=0)
- 33:9 -> 34:16 (count=1)
- 35:5 -> 38:6 (count=0)
- 38:6 -> 38:7 (count=1)
- 41:9 -> 41:16 (count=1)
- 42:5 -> 45:6 (count=1)
- 47:5 -> 50:6 (count=0)
- 52:8 -> 52:16 (count=1)
- 52:17 -> 54:6 (count=0)
- 54:6 -> 54:7 (count=1)
- 56:8 -> 56:15 (count=1)
- 56:16 -> 58:6 (count=1)
- 58:12 -> 60:6 (count=0)
- 61:1 -> 61:2 (count=1)
-Segment at 3:1 (count = 1), RegionEntry
-Segment at 10:15 (count = 0), Skipped
-Segment at 10:16 (count = 1), RegionEntry
-Segment at 14:6 (count = 0), RegionEntry
-Segment at 14:7 (count = 0), Skipped
-Segment at 16:9 (count = 1), RegionEntry
-Segment at 16:17 (count = 0), Skipped
-Segment at 18:13 (count = 1), RegionEntry
-Segment at 18:18 (count = 0), Skipped
-Segment at 20:13 (count = 0), RegionEntry
-Segment at 20:18 (count = 0), Skipped
-Segment at 23:9 (count = 1), RegionEntry
-Segment at 23:17 (count = 0), Skipped
-Segment at 25:13 (count = 1), RegionEntry
-Segment at 25:18 (count = 0), Skipped
-Segment at 27:13 (count = 1), RegionEntry
-Segment at 27:18 (count = 0), Skipped
-Segment at 29:9 (count = 1), RegionEntry
-Segment at 29:17 (count = 0), Skipped
-Segment at 29:20 (count = 1), RegionEntry
-Segment at 29:25 (count = 0), Skipped
-Segment at 29:29 (count = 1), RegionEntry
-Segment at 29:34 (count = 0), Skipped
-Segment at 30:9 (count = 1), RegionEntry
-Segment at 30:17 (count = 0), Skipped
-Segment at 30:20 (count = 1), RegionEntry
-Segment at 30:25 (count = 0), Skipped
-Segment at 30:29 (count = 0), RegionEntry
-Segment at 30:34 (count = 0), Skipped
-Segment at 33:9 (count = 1), RegionEntry
-Segment at 34:16 (count = 0), Skipped
-Segment at 35:5 (count = 0), RegionEntry
-Segment at 38:6 (count = 1), RegionEntry
-Segment at 38:7 (count = 0), Skipped
-Segment at 41:9 (count = 1), RegionEntry
-Segment at 41:16 (count = 0), Skipped
-Segment at 42:5 (count = 1), RegionEntry
-Segment at 45:6 (count = 0), Skipped
-Segment at 47:5 (count = 0), RegionEntry
-Segment at 50:6 (count = 0), Skipped
-Segment at 52:8 (count = 1), RegionEntry
-Segment at 52:16 (count = 0), Skipped
-Segment at 52:17 (count = 0), RegionEntry
-Segment at 54:6 (count = 1), RegionEntry
-Segment at 54:7 (count = 0), Skipped
-Segment at 56:8 (count = 1), RegionEntry
-Segment at 56:15 (count = 0), Skipped
-Segment at 56:16 (count = 1), RegionEntry
-Segment at 58:6 (count = 0), Skipped
-Segment at 58:12 (count = 0), RegionEntry
-Segment at 60:6 (count = 0), Skipped
-Segment at 61:1 (count = 1), RegionEntry
-Segment at 61:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.loop_break_value.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.loop_break_value.txt
deleted file mode 100644
index 17bd5c2ff3186..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.loop_break_value.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Counter in file 0 3:1 -> 13:2, #1
-Emitting segments for file: ../coverage/loop_break_value.rs
-Combined regions:
- 3:1 -> 13:2 (count=1)
-Segment at 3:1 (count = 1), RegionEntry
-Segment at 13:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.loops_branches.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.loops_branches.txt
deleted file mode 100644
index d1da50b1529e4..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.loops_branches.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Counter in file 0 9:5 -> 10:16, #1
-Counter in file 0 11:16 -> 11:21, #2
-Counter in file 0 14:14 -> 14:15, (#2 - #5)
-Counter in file 0 15:13 -> 15:31, ((0 - #6) + (#2 - #5))
-Counter in file 0 15:31 -> 15:32, #4
-Counter in file 0 18:9 -> 18:15, (#3 + 0)
-Counter in file 0 19:5 -> 19:6, (#4 + (#3 + 0))
-Counter in file 0 22:1 -> 25:2, #1
-Emitting segments for file: ../coverage/loops_branches.rs
-Combined regions:
- 9:5 -> 10:16 (count=1)
- 11:16 -> 11:21 (count=1)
- 14:14 -> 14:15 (count=1)
- 15:13 -> 15:31 (count=1)
- 15:31 -> 15:32 (count=0)
- 18:9 -> 18:15 (count=1)
- 19:5 -> 19:6 (count=1)
- 22:1 -> 25:2 (count=1)
-Segment at 9:5 (count = 1), RegionEntry
-Segment at 10:16 (count = 0), Skipped
-Segment at 11:16 (count = 1), RegionEntry
-Segment at 11:21 (count = 0), Skipped
-Segment at 14:14 (count = 1), RegionEntry
-Segment at 14:15 (count = 0), Skipped
-Segment at 15:13 (count = 1), RegionEntry
-Segment at 15:31 (count = 0), RegionEntry
-Segment at 15:32 (count = 0), Skipped
-Segment at 18:9 (count = 1), RegionEntry
-Segment at 18:15 (count = 0), Skipped
-Segment at 19:5 (count = 1), RegionEntry
-Segment at 19:6 (count = 0), Skipped
-Segment at 22:1 (count = 1), RegionEntry
-Segment at 25:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.match_or_pattern.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.match_or_pattern.txt
deleted file mode 100644
index fc12612ce7d7e..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.match_or_pattern.txt
+++ /dev/null
@@ -1,98 +0,0 @@
-Counter in file 0 3:1 -> 11:15, #1
-Counter in file 0 11:16 -> 14:6, #2
-Counter in file 0 14:6 -> 14:7, (#1 - #2)
-Counter in file 0 15:11 -> 15:17, (#2 + (#1 - #2))
-Counter in file 0 18:27 -> 18:29, #5
-Counter in file 0 19:14 -> 19:16, (#3 + #4)
-Counter in file 0 21:8 -> 21:15, ((#3 + #4) + #5)
-Counter in file 0 21:16 -> 24:6, #6
-Counter in file 0 24:6 -> 24:7, (((#3 + #4) + #5) - #6)
-Counter in file 0 25:11 -> 25:17, (#6 + (((#3 + #4) + #5) - #6))
-Counter in file 0 26:27 -> 26:29, #9
-Counter in file 0 27:14 -> 27:16, (#7 + #8)
-Counter in file 0 29:8 -> 29:15, ((#7 + #8) + #9)
-Counter in file 0 29:16 -> 32:6, #10
-Counter in file 0 32:6 -> 32:7, (((#7 + #8) + #9) - #10)
-Counter in file 0 33:11 -> 33:17, (#10 + (((#7 + #8) + #9) - #10))
-Counter in file 0 34:27 -> 34:29, #13
-Counter in file 0 35:14 -> 35:16, (#11 + #12)
-Counter in file 0 37:8 -> 37:15, ((#11 + #12) + #13)
-Counter in file 0 37:16 -> 40:6, #14
-Counter in file 0 40:6 -> 40:7, (((#11 + #12) + #13) - #14)
-Counter in file 0 41:11 -> 41:17, (#14 + (((#11 + #12) + #13) - #14))
-Counter in file 0 42:27 -> 42:29, #17
-Counter in file 0 43:14 -> 43:16, (#15 + #16)
-Counter in file 0 45:1 -> 45:2, ((#15 + #16) + #17)
-Emitting segments for file: ../coverage/match_or_pattern.rs
-Combined regions:
- 3:1 -> 11:15 (count=1)
- 11:16 -> 14:6 (count=1)
- 14:6 -> 14:7 (count=0)
- 15:11 -> 15:17 (count=1)
- 18:27 -> 18:29 (count=0)
- 19:14 -> 19:16 (count=1)
- 21:8 -> 21:15 (count=1)
- 21:16 -> 24:6 (count=1)
- 24:6 -> 24:7 (count=0)
- 25:11 -> 25:17 (count=1)
- 26:27 -> 26:29 (count=0)
- 27:14 -> 27:16 (count=1)
- 29:8 -> 29:15 (count=1)
- 29:16 -> 32:6 (count=1)
- 32:6 -> 32:7 (count=0)
- 33:11 -> 33:17 (count=1)
- 34:27 -> 34:29 (count=0)
- 35:14 -> 35:16 (count=1)
- 37:8 -> 37:15 (count=1)
- 37:16 -> 40:6 (count=1)
- 40:6 -> 40:7 (count=0)
- 41:11 -> 41:17 (count=1)
- 42:27 -> 42:29 (count=1)
- 43:14 -> 43:16 (count=0)
- 45:1 -> 45:2 (count=1)
-Segment at 3:1 (count = 1), RegionEntry
-Segment at 11:15 (count = 0), Skipped
-Segment at 11:16 (count = 1), RegionEntry
-Segment at 14:6 (count = 0), RegionEntry
-Segment at 14:7 (count = 0), Skipped
-Segment at 15:11 (count = 1), RegionEntry
-Segment at 15:17 (count = 0), Skipped
-Segment at 18:27 (count = 0), RegionEntry
-Segment at 18:29 (count = 0), Skipped
-Segment at 19:14 (count = 1), RegionEntry
-Segment at 19:16 (count = 0), Skipped
-Segment at 21:8 (count = 1), RegionEntry
-Segment at 21:15 (count = 0), Skipped
-Segment at 21:16 (count = 1), RegionEntry
-Segment at 24:6 (count = 0), RegionEntry
-Segment at 24:7 (count = 0), Skipped
-Segment at 25:11 (count = 1), RegionEntry
-Segment at 25:17 (count = 0), Skipped
-Segment at 26:27 (count = 0), RegionEntry
-Segment at 26:29 (count = 0), Skipped
-Segment at 27:14 (count = 1), RegionEntry
-Segment at 27:16 (count = 0), Skipped
-Segment at 29:8 (count = 1), RegionEntry
-Segment at 29:15 (count = 0), Skipped
-Segment at 29:16 (count = 1), RegionEntry
-Segment at 32:6 (count = 0), RegionEntry
-Segment at 32:7 (count = 0), Skipped
-Segment at 33:11 (count = 1), RegionEntry
-Segment at 33:17 (count = 0), Skipped
-Segment at 34:27 (count = 0), RegionEntry
-Segment at 34:29 (count = 0), Skipped
-Segment at 35:14 (count = 1), RegionEntry
-Segment at 35:16 (count = 0), Skipped
-Segment at 37:8 (count = 1), RegionEntry
-Segment at 37:15 (count = 0), Skipped
-Segment at 37:16 (count = 1), RegionEntry
-Segment at 40:6 (count = 0), RegionEntry
-Segment at 40:7 (count = 0), Skipped
-Segment at 41:11 (count = 1), RegionEntry
-Segment at 41:17 (count = 0), Skipped
-Segment at 42:27 (count = 1), RegionEntry
-Segment at 42:29 (count = 0), Skipped
-Segment at 43:14 (count = 0), RegionEntry
-Segment at 43:16 (count = 0), Skipped
-Segment at 45:1 (count = 1), RegionEntry
-Segment at 45:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.nested_loops.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.nested_loops.txt
deleted file mode 100644
index f30dd9e37164e..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.nested_loops.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-Counter in file 0 1:1 -> 3:27, #1
-Counter in file 0 5:19 -> 5:32, (#1 + (#2 + #3))
-Counter in file 0 6:13 -> 7:24, ((#1 + (#2 + #3)) - #4)
-Counter in file 0 8:13 -> 8:14, ((((#1 + (#2 + #3)) - #4) + (#6 + #7)) - #3)
-Counter in file 0 8:18 -> 8:23, (((#1 + (#2 + #3)) - #4) + (#6 + #7))
-Counter in file 0 9:16 -> 9:22, (((((#1 + (#2 + #3)) - #4) + (#6 + #7)) - #3) + 0)
-Counter in file 0 10:17 -> 10:22, #2
-Counter in file 0 11:14 -> 14:22, (((((#1 + (#2 + #3)) - #4) + (#6 + #7)) - #3) - #2)
-Counter in file 0 15:17 -> 16:27, ((((((#1 + (#2 + #3)) - #4) + (#6 + #7)) - #3) - #2) - #7)
-Counter in file 0 17:21 -> 17:33, #5
-Counter in file 0 18:24 -> 20:18, #6
-Counter in file 0 21:14 -> 21:15, #7
-Counter in file 0 23:9 -> 23:23, (#2 + #3)
-Counter in file 0 25:1 -> 25:2, (#5 + #4)
-Emitting segments for file: ../coverage/nested_loops.rs
-Combined regions:
- 1:1 -> 3:27 (count=1)
- 5:19 -> 5:32 (count=1)
- 6:13 -> 7:24 (count=1)
- 8:13 -> 8:14 (count=3)
- 8:18 -> 8:23 (count=3)
- 9:16 -> 9:22 (count=3)
- 10:17 -> 10:22 (count=0)
- 11:14 -> 14:22 (count=3)
- 15:17 -> 16:27 (count=1)
- 17:21 -> 17:33 (count=1)
- 18:24 -> 20:18 (count=0)
- 21:14 -> 21:15 (count=2)
- 23:9 -> 23:23 (count=0)
- 25:1 -> 25:2 (count=1)
-Segment at 1:1 (count = 1), RegionEntry
-Segment at 3:27 (count = 0), Skipped
-Segment at 5:19 (count = 1), RegionEntry
-Segment at 5:32 (count = 0), Skipped
-Segment at 6:13 (count = 1), RegionEntry
-Segment at 7:24 (count = 0), Skipped
-Segment at 8:13 (count = 3), RegionEntry
-Segment at 8:14 (count = 0), Skipped
-Segment at 8:18 (count = 3), RegionEntry
-Segment at 8:23 (count = 0), Skipped
-Segment at 9:16 (count = 3), RegionEntry
-Segment at 9:22 (count = 0), Skipped
-Segment at 10:17 (count = 0), RegionEntry
-Segment at 10:22 (count = 0), Skipped
-Segment at 11:14 (count = 3), RegionEntry
-Segment at 14:22 (count = 0), Skipped
-Segment at 15:17 (count = 1), RegionEntry
-Segment at 16:27 (count = 0), Skipped
-Segment at 17:21 (count = 1), RegionEntry
-Segment at 17:33 (count = 0), Skipped
-Segment at 18:24 (count = 0), RegionEntry
-Segment at 20:18 (count = 0), Skipped
-Segment at 21:14 (count = 2), RegionEntry
-Segment at 21:15 (count = 0), Skipped
-Segment at 23:9 (count = 0), RegionEntry
-Segment at 23:23 (count = 0), Skipped
-Segment at 25:1 (count = 1), RegionEntry
-Segment at 25:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.overflow.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.overflow.txt
deleted file mode 100644
index 380bb7cf17016..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.overflow.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-Counter in file 0 15:1 -> 16:27, #1
-Counter in file 0 17:11 -> 17:24, (#1 + (#2 + (#3 + #4)))
-Counter in file 0 18:12 -> 18:26, ((#1 + (#2 + (#3 + #4))) - #5)
-Counter in file 0 18:27 -> 21:10, #2
-Counter in file 0 21:19 -> 21:32, (((#1 + (#2 + (#3 + #4))) - #5) - #2)
-Counter in file 0 21:33 -> 24:10, #3
-Counter in file 0 24:10 -> 24:11, #4
-Counter in file 0 25:9 -> 25:23, (#2 + (#3 + #4))
-Counter in file 0 27:5 -> 28:2, #5
-Counter in file 0 4:1 -> 5:18, #1
-Counter in file 0 5:19 -> 7:6, #2
-Counter in file 0 7:6 -> 7:7, (#1 - #2)
-Counter in file 0 8:9 -> 13:2, (#2 + (#1 - #2))
-Emitting segments for file: ../coverage/overflow.rs
-Combined regions:
- 4:1 -> 5:18 (count=4)
- 5:19 -> 7:6 (count=1)
- 7:6 -> 7:7 (count=3)
- 8:9 -> 13:2 (count=4)
- 15:1 -> 16:27 (count=1)
- 17:11 -> 17:24 (count=11)
- 18:12 -> 18:26 (count=11)
- 18:27 -> 21:10 (count=1)
- 21:19 -> 21:32 (count=10)
- 21:33 -> 24:10 (count=3)
- 24:10 -> 24:11 (count=6)
- 25:9 -> 25:23 (count=10)
- 27:5 -> 28:2 (count=0)
-Segment at 4:1 (count = 4), RegionEntry
-Segment at 5:18 (count = 0), Skipped
-Segment at 5:19 (count = 1), RegionEntry
-Segment at 7:6 (count = 3), RegionEntry
-Segment at 7:7 (count = 0), Skipped
-Segment at 8:9 (count = 4), RegionEntry
-Segment at 13:2 (count = 0), Skipped
-Segment at 15:1 (count = 1), RegionEntry
-Segment at 16:27 (count = 0), Skipped
-Segment at 17:11 (count = 11), RegionEntry
-Segment at 17:24 (count = 0), Skipped
-Segment at 18:12 (count = 11), RegionEntry
-Segment at 18:26 (count = 0), Skipped
-Segment at 18:27 (count = 1), RegionEntry
-Segment at 21:10 (count = 0), Skipped
-Segment at 21:19 (count = 10), RegionEntry
-Segment at 21:32 (count = 0), Skipped
-Segment at 21:33 (count = 3), RegionEntry
-Segment at 24:10 (count = 6), RegionEntry
-Segment at 24:11 (count = 0), Skipped
-Segment at 25:9 (count = 10), RegionEntry
-Segment at 25:23 (count = 0), Skipped
-Segment at 27:5 (count = 0), RegionEntry
-Segment at 28:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.panic_unwind.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.panic_unwind.txt
deleted file mode 100644
index b3f61ad325d1c..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.panic_unwind.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-Counter in file 0 13:1 -> 14:27, #1
-Counter in file 0 15:11 -> 15:24, (#1 + (#2 + (#3 + #4)))
-Counter in file 0 16:12 -> 16:26, ((#1 + (#2 + (#3 + #4))) - #5)
-Counter in file 0 16:27 -> 18:10, #2
-Counter in file 0 18:19 -> 18:32, (((#1 + (#2 + (#3 + #4))) - #5) - #2)
-Counter in file 0 18:33 -> 20:10, #3
-Counter in file 0 20:10 -> 20:11, #4
-Counter in file 0 21:9 -> 21:23, (#2 + (#3 + #4))
-Counter in file 0 23:5 -> 24:2, #5
-Counter in file 0 4:1 -> 4:36, #1
-Counter in file 0 5:8 -> 5:20, (#1 + 0)
-Counter in file 0 6:9 -> 7:26, #2
-Counter in file 0 8:12 -> 11:2, (#1 - #2)
-Emitting segments for file: ../coverage/panic_unwind.rs
-Combined regions:
- 4:1 -> 4:36 (count=4)
- 5:8 -> 5:20 (count=4)
- 6:9 -> 7:26 (count=1)
- 8:12 -> 11:2 (count=3)
- 13:1 -> 14:27 (count=1)
- 15:11 -> 15:24 (count=11)
- 16:12 -> 16:26 (count=11)
- 16:27 -> 18:10 (count=1)
- 18:19 -> 18:32 (count=10)
- 18:33 -> 20:10 (count=3)
- 20:10 -> 20:11 (count=6)
- 21:9 -> 21:23 (count=10)
- 23:5 -> 24:2 (count=0)
-Segment at 4:1 (count = 4), RegionEntry
-Segment at 4:36 (count = 0), Skipped
-Segment at 5:8 (count = 4), RegionEntry
-Segment at 5:20 (count = 0), Skipped
-Segment at 6:9 (count = 1), RegionEntry
-Segment at 7:26 (count = 0), Skipped
-Segment at 8:12 (count = 3), RegionEntry
-Segment at 11:2 (count = 0), Skipped
-Segment at 13:1 (count = 1), RegionEntry
-Segment at 14:27 (count = 0), Skipped
-Segment at 15:11 (count = 11), RegionEntry
-Segment at 15:24 (count = 0), Skipped
-Segment at 16:12 (count = 11), RegionEntry
-Segment at 16:26 (count = 0), Skipped
-Segment at 16:27 (count = 1), RegionEntry
-Segment at 18:10 (count = 0), Skipped
-Segment at 18:19 (count = 10), RegionEntry
-Segment at 18:32 (count = 0), Skipped
-Segment at 18:33 (count = 3), RegionEntry
-Segment at 20:10 (count = 6), RegionEntry
-Segment at 20:11 (count = 0), Skipped
-Segment at 21:9 (count = 10), RegionEntry
-Segment at 21:23 (count = 0), Skipped
-Segment at 23:5 (count = 0), RegionEntry
-Segment at 24:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.partial_eq.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.partial_eq.txt
deleted file mode 100644
index fa5c12bb6f8e0..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.partial_eq.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-Counter in file 0 4:10 -> 4:15, 0
-Counter in file 0 4:24 -> 4:25, 0
-Counter in file 0 4:24 -> 4:25, 0
-Counter in file 0 4:32 -> 4:33, 0
-Counter in file 0 4:32 -> 4:33, 0
-Counter in file 0 4:35 -> 4:36, 0
-Counter in file 0 4:39 -> 4:40, 0
-Counter in file 0 4:39 -> 4:40, 0
-Counter in file 0 4:39 -> 4:40, 0
-Counter in file 0 4:39 -> 4:40, 0
-Counter in file 0 4:48 -> 4:49, 0
-Counter in file 0 4:51 -> 4:52, 0
-Counter in file 0 4:53 -> 4:54, 0
-Counter in file 0 7:5 -> 7:6, #1
-Counter in file 0 7:5 -> 7:6, 0
-Counter in file 0 7:5 -> 7:6, 0
-Counter in file 0 7:5 -> 7:6, 0
-Counter in file 0 8:5 -> 8:17, 0
-Counter in file 0 8:5 -> 8:17, 0
-Counter in file 0 8:5 -> 8:17, 0
-Counter in file 0 21:1 -> 26:2, #1
-Counter in file 0 4:17 -> 4:22, #1
-Counter in file 0 12:5 -> 18:6, #1
-Counter in file 0 4:39 -> 4:40, #1
-Counter in file 0 8:5 -> 8:17, #1
-Emitting segments for file: ../coverage/partial_eq.rs
-Combined regions:
- 4:10 -> 4:15 (count=0)
- 4:17 -> 4:22 (count=2)
- 4:24 -> 4:25 (count=0)
- 4:32 -> 4:33 (count=0)
- 4:35 -> 4:36 (count=0)
- 4:39 -> 4:40 (count=1)
- 4:48 -> 4:49 (count=0)
- 4:51 -> 4:52 (count=0)
- 4:53 -> 4:54 (count=0)
- 7:5 -> 7:6 (count=1)
- 8:5 -> 8:17 (count=0)
- 12:5 -> 18:6 (count=2)
- 21:1 -> 26:2 (count=1)
-Segment at 4:10 (count = 0), RegionEntry
-Segment at 4:15 (count = 0), Skipped
-Segment at 4:17 (count = 2), RegionEntry
-Segment at 4:22 (count = 0), Skipped
-Segment at 4:24 (count = 0), RegionEntry
-Segment at 4:25 (count = 0), Skipped
-Segment at 4:32 (count = 0), RegionEntry
-Segment at 4:33 (count = 0), Skipped
-Segment at 4:35 (count = 0), RegionEntry
-Segment at 4:36 (count = 0), Skipped
-Segment at 4:39 (count = 1), RegionEntry
-Segment at 4:40 (count = 0), Skipped
-Segment at 4:48 (count = 0), RegionEntry
-Segment at 4:49 (count = 0), Skipped
-Segment at 4:51 (count = 0), RegionEntry
-Segment at 4:52 (count = 0), Skipped
-Segment at 4:53 (count = 0), RegionEntry
-Segment at 4:54 (count = 0), Skipped
-Segment at 7:5 (count = 1), RegionEntry
-Segment at 7:6 (count = 0), Skipped
-Segment at 8:5 (count = 0), RegionEntry
-Segment at 8:17 (count = 0), Skipped
-Segment at 12:5 (count = 2), RegionEntry
-Segment at 18:6 (count = 0), Skipped
-Segment at 21:1 (count = 1), RegionEntry
-Segment at 26:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.simple_loop.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.simple_loop.txt
deleted file mode 100644
index c0b09486dfba4..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.simple_loop.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Counter in file 0 3:1 -> 12:16, #1
-Counter in file 0 13:5 -> 18:6, #2
-Counter in file 0 18:6 -> 18:7, (#1 - #2)
-Counter in file 0 23:13 -> 25:14, ((#2 + (#1 - #2)) + #3)
-Counter in file 0 27:13 -> 27:18, (((#2 + (#1 - #2)) + #3) - #3)
-Counter in file 0 29:10 -> 32:10, #3
-Counter in file 0 35:1 -> 35:2, ((((#2 + (#1 - #2)) + #3) - #3) + 0)
-Emitting segments for file: ../coverage/simple_loop.rs
-Combined regions:
- 3:1 -> 12:16 (count=1)
- 13:5 -> 18:6 (count=1)
- 18:6 -> 18:7 (count=0)
- 23:13 -> 25:14 (count=11)
- 27:13 -> 27:18 (count=1)
- 29:10 -> 32:10 (count=10)
- 35:1 -> 35:2 (count=1)
-Segment at 3:1 (count = 1), RegionEntry
-Segment at 12:16 (count = 0), Skipped
-Segment at 13:5 (count = 1), RegionEntry
-Segment at 18:6 (count = 0), RegionEntry
-Segment at 18:7 (count = 0), Skipped
-Segment at 23:13 (count = 11), RegionEntry
-Segment at 25:14 (count = 0), Skipped
-Segment at 27:13 (count = 1), RegionEntry
-Segment at 27:18 (count = 0), Skipped
-Segment at 29:10 (count = 10), RegionEntry
-Segment at 32:10 (count = 0), Skipped
-Segment at 35:1 (count = 1), RegionEntry
-Segment at 35:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.simple_match.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.simple_match.txt
deleted file mode 100644
index c01630bd87bc9..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.simple_match.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-Counter in file 0 3:1 -> 10:15, #1
-Counter in file 0 10:16 -> 12:6, #2
-Counter in file 0 12:6 -> 12:7, (#1 - #2)
-Counter in file 0 15:9 -> 15:10, (((#2 + (#1 - #2)) + (#3 + #4)) - #5)
-Counter in file 0 17:9 -> 17:13, ((#2 + (#1 - #2)) + (#3 + #4))
-Counter in file 0 22:13 -> 22:22, ((((#2 + (#1 - #2)) + (#3 + #4)) - #5) + 0)
-Counter in file 0 24:13 -> 24:14, #3
-Counter in file 0 26:17 -> 28:18, ((((#2 + (#1 - #2)) + (#3 + #4)) - #5) + 0)
-Counter in file 0 30:13 -> 37:14, (#3 + 0)
-Counter in file 0 40:13 -> 40:15, #4
-Counter in file 0 43:1 -> 43:2, #5
-Emitting segments for file: ../coverage/simple_match.rs
-Combined regions:
- 3:1 -> 10:15 (count=1)
- 10:16 -> 12:6 (count=1)
- 12:6 -> 12:7 (count=0)
- 15:9 -> 15:10 (count=2)
- 17:9 -> 17:13 (count=3)
- 22:13 -> 22:22 (count=2)
- 24:13 -> 24:14 (count=1)
- 26:17 -> 28:18 (count=2)
- 30:13 -> 37:14 (count=1)
- 40:13 -> 40:15 (count=1)
- 43:1 -> 43:2 (count=1)
-Segment at 3:1 (count = 1), RegionEntry
-Segment at 10:15 (count = 0), Skipped
-Segment at 10:16 (count = 1), RegionEntry
-Segment at 12:6 (count = 0), RegionEntry
-Segment at 12:7 (count = 0), Skipped
-Segment at 15:9 (count = 2), RegionEntry
-Segment at 15:10 (count = 0), Skipped
-Segment at 17:9 (count = 3), RegionEntry
-Segment at 17:13 (count = 0), Skipped
-Segment at 22:13 (count = 2), RegionEntry
-Segment at 22:22 (count = 0), Skipped
-Segment at 24:13 (count = 1), RegionEntry
-Segment at 24:14 (count = 0), Skipped
-Segment at 26:17 (count = 2), RegionEntry
-Segment at 28:18 (count = 0), Skipped
-Segment at 30:13 (count = 1), RegionEntry
-Segment at 37:14 (count = 0), Skipped
-Segment at 40:13 (count = 1), RegionEntry
-Segment at 40:15 (count = 0), Skipped
-Segment at 43:1 (count = 1), RegionEntry
-Segment at 43:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.tight_inf_loop.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.tight_inf_loop.txt
deleted file mode 100644
index a6cd429880856..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.tight_inf_loop.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Counter in file 0 1:1 -> 2:13, #1
-Counter in file 0 4:6 -> 5:2, (#1 - #2)
-Emitting segments for file: ../coverage/tight_inf_loop.rs
-Combined regions:
- 1:1 -> 2:13 (count=1)
- 4:6 -> 5:2 (count=1)
-Segment at 1:1 (count = 1), RegionEntry
-Segment at 2:13 (count = 0), Skipped
-Segment at 4:6 (count = 1), RegionEntry
-Segment at 5:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.try_error_result.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.try_error_result.txt
deleted file mode 100644
index 2b7962df2f9f9..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.try_error_result.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-Counter in file 0 12:1 -> 14:23, #1
-Counter in file 0 17:9 -> 17:10, ((#1 + (#2 + #3)) - #4)
-Counter in file 0 19:9 -> 19:14, (#1 + (#2 + #3))
-Counter in file 0 21:9 -> 25:26, (((#1 + (#2 + #3)) - #4) + 0)
-Counter in file 0 27:13 -> 27:41, #8
-Counter in file 0 27:41 -> 27:42, #5
-Counter in file 0 28:13 -> 28:42, (#8 - #5)
-Counter in file 0 28:42 -> 28:43, #6
-Counter in file 0 32:13 -> 32:42, (((#1 + (#2 + #3)) - #4) - #8)
-Counter in file 0 32:42 -> 32:43, #7
-Counter in file 0 35:5 -> 35:11, #4
-Counter in file 0 36:1 -> 36:2, ((#5 + (#6 + #7)) + #4)
-Counter in file 0 4:1 -> 5:20, #1
-Counter in file 0 6:9 -> 6:16, #2
-Counter in file 0 8:9 -> 8:15, (#1 - #2)
-Counter in file 0 10:1 -> 10:2, (#2 + (#1 - #2))
-Emitting segments for file: ../coverage/try_error_result.rs
-Combined regions:
- 4:1 -> 5:20 (count=6)
- 6:9 -> 6:16 (count=1)
- 8:9 -> 8:15 (count=5)
- 10:1 -> 10:2 (count=6)
- 12:1 -> 14:23 (count=1)
- 17:9 -> 17:10 (count=6)
- 19:9 -> 19:14 (count=6)
- 21:9 -> 25:26 (count=6)
- 27:13 -> 27:41 (count=1)
- 27:41 -> 27:42 (count=1)
- 28:13 -> 28:42 (count=0)
- 28:42 -> 28:43 (count=0)
- 32:13 -> 32:42 (count=5)
- 32:42 -> 32:43 (count=0)
- 35:5 -> 35:11 (count=0)
- 36:1 -> 36:2 (count=1)
-Segment at 4:1 (count = 6), RegionEntry
-Segment at 5:20 (count = 0), Skipped
-Segment at 6:9 (count = 1), RegionEntry
-Segment at 6:16 (count = 0), Skipped
-Segment at 8:9 (count = 5), RegionEntry
-Segment at 8:15 (count = 0), Skipped
-Segment at 10:1 (count = 6), RegionEntry
-Segment at 10:2 (count = 0), Skipped
-Segment at 12:1 (count = 1), RegionEntry
-Segment at 14:23 (count = 0), Skipped
-Segment at 17:9 (count = 6), RegionEntry
-Segment at 17:10 (count = 0), Skipped
-Segment at 19:9 (count = 6), RegionEntry
-Segment at 19:14 (count = 0), Skipped
-Segment at 21:9 (count = 6), RegionEntry
-Segment at 25:26 (count = 0), Skipped
-Segment at 27:13 (count = 1), RegionEntry
-Segment at 27:41 (count = 1), RegionEntry
-Segment at 27:42 (count = 0), Skipped
-Segment at 28:13 (count = 0), RegionEntry
-Segment at 28:42 (count = 0), RegionEntry
-Segment at 28:43 (count = 0), Skipped
-Segment at 32:13 (count = 5), RegionEntry
-Segment at 32:42 (count = 0), RegionEntry
-Segment at 32:43 (count = 0), Skipped
-Segment at 35:5 (count = 0), RegionEntry
-Segment at 35:11 (count = 0), Skipped
-Segment at 36:1 (count = 1), RegionEntry
-Segment at 36:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.uses_crate.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.uses_crate.txt
deleted file mode 100644
index b0319cd9e1896..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.uses_crate.txt
+++ /dev/null
@@ -1,110 +0,0 @@
-Counter in file 0 17:1 -> 19:2, #1
-Counter in file 0 25:1 -> 27:2, #1
-Counter in file 0 17:1 -> 19:2, #1
-Counter in file 0 5:1 -> 12:2, #1
-Counter in file 0 17:1 -> 19:2, 0
-Counter in file 0 33:1 -> 35:2, 0
-Counter in file 0 45:1 -> 48:16, 0
-Counter in file 0 48:17 -> 50:6, 0
-Counter in file 0 50:6 -> 50:7, 0
-Counter in file 0 51:1 -> 51:2, 0
-Counter in file 0 53:1 -> 61:2, #1
-Counter in file 0 25:1 -> 27:2, #1
-Counter in file 0 29:1 -> 31:2, #1
-Counter in file 0 21:1 -> 23:2, #1
-Counter in file 0 5:1 -> 5:24, #1
-Counter in file 0 9:9 -> 11:15, (#1 + 0)
-Counter in file 0 11:16 -> 13:6, #2
-Counter in file 0 13:6 -> 13:7, (#1 - #2)
-Counter in file 0 14:5 -> 15:2, (#2 + (#1 - #2))
-Counter in file 0 21:1 -> 23:2, #1
-Counter in file 0 37:1 -> 40:16, #1
-Counter in file 0 40:17 -> 42:6, #2
-Counter in file 0 42:6 -> 42:7, (#1 - #2)
-Counter in file 0 43:1 -> 43:2, (#2 + (#1 - #2))
-Emitting segments for file: ../coverage/lib/used_crate.rs
-Combined regions:
- 5:1 -> 5:24 (count=1)
- 9:9 -> 11:15 (count=1)
- 11:16 -> 13:6 (count=1)
- 13:6 -> 13:7 (count=0)
- 14:5 -> 15:2 (count=1)
- 17:1 -> 19:2 (count=2)
- 21:1 -> 23:2 (count=2)
- 25:1 -> 27:2 (count=2)
- 29:1 -> 31:2 (count=2)
- 33:1 -> 35:2 (count=0)
- 37:1 -> 40:16 (count=0)
- 40:17 -> 42:6 (count=0)
- 42:6 -> 42:7 (count=0)
- 43:1 -> 43:2 (count=0)
- 45:1 -> 48:16 (count=0)
- 48:17 -> 50:6 (count=0)
- 50:6 -> 50:7 (count=0)
- 51:1 -> 51:2 (count=0)
- 53:1 -> 61:2 (count=1)
-Segment at 5:1 (count = 1), RegionEntry
-Segment at 5:24 (count = 0), Skipped
-Segment at 9:9 (count = 1), RegionEntry
-Segment at 11:15 (count = 0), Skipped
-Segment at 11:16 (count = 1), RegionEntry
-Segment at 13:6 (count = 0), RegionEntry
-Segment at 13:7 (count = 0), Skipped
-Segment at 14:5 (count = 1), RegionEntry
-Segment at 15:2 (count = 0), Skipped
-Segment at 17:1 (count = 2), RegionEntry
-Segment at 19:2 (count = 0), Skipped
-Segment at 21:1 (count = 2), RegionEntry
-Segment at 23:2 (count = 0), Skipped
-Segment at 25:1 (count = 2), RegionEntry
-Segment at 27:2 (count = 0), Skipped
-Segment at 29:1 (count = 2), RegionEntry
-Segment at 31:2 (count = 0), Skipped
-Segment at 33:1 (count = 0), RegionEntry
-Segment at 35:2 (count = 0), Skipped
-Segment at 37:1 (count = 0), RegionEntry
-Segment at 40:16 (count = 0), Skipped
-Segment at 40:17 (count = 0), RegionEntry
-Segment at 42:6 (count = 0), RegionEntry
-Segment at 42:7 (count = 0), Skipped
-Segment at 43:1 (count = 0), RegionEntry
-Segment at 43:2 (count = 0), Skipped
-Segment at 45:1 (count = 0), RegionEntry
-Segment at 48:16 (count = 0), Skipped
-Segment at 48:17 (count = 0), RegionEntry
-Segment at 50:6 (count = 0), RegionEntry
-Segment at 50:7 (count = 0), Skipped
-Segment at 51:1 (count = 0), RegionEntry
-Segment at 51:2 (count = 0), Skipped
-Segment at 53:1 (count = 1), RegionEntry
-Segment at 61:2 (count = 0), Skipped
-Emitting segments for function: _RINvCsbDqzXfLQacH_10used_crate41used_only_from_bin_crate_generic_functionReECs4fqI2P2rA04_10uses_crate
-Combined regions:
- 17:1 -> 19:2 (count=1)
-Segment at 17:1 (count = 1), RegionEntry
-Segment at 19:2 (count = 0), Skipped
-Emitting segments for function: _RINvCsbDqzXfLQacH_10used_crate41used_only_from_bin_crate_generic_functionRINtNtCs3QflaznQylx_5alloc3vec3VeclEECs4fqI2P2rA04_10uses_crate
-Combined regions:
- 17:1 -> 19:2 (count=1)
-Segment at 17:1 (count = 1), RegionEntry
-Segment at 19:2 (count = 0), Skipped
-Emitting segments for function: _RINvCsbDqzXfLQacH_10used_crate46used_only_from_this_lib_crate_generic_functionINtNtCs3QflaznQylx_5alloc3vec3VeclEEB2_
-Combined regions:
- 21:1 -> 23:2 (count=1)
-Segment at 21:1 (count = 1), RegionEntry
-Segment at 23:2 (count = 0), Skipped
-Emitting segments for function: _RINvCsbDqzXfLQacH_10used_crate46used_only_from_this_lib_crate_generic_functionReEB2_
-Combined regions:
- 21:1 -> 23:2 (count=1)
-Segment at 21:1 (count = 1), RegionEntry
-Segment at 23:2 (count = 0), Skipped
-Emitting segments for function: _RINvCsbDqzXfLQacH_10used_crate50used_from_bin_crate_and_lib_crate_generic_functionINtNtCs3QflaznQylx_5alloc3vec3VeclEECs4fqI2P2rA04_10uses_crate
-Combined regions:
- 25:1 -> 27:2 (count=1)
-Segment at 25:1 (count = 1), RegionEntry
-Segment at 27:2 (count = 0), Skipped
-Emitting segments for function: _RINvCsbDqzXfLQacH_10used_crate50used_from_bin_crate_and_lib_crate_generic_functionReEB2_
-Combined regions:
- 25:1 -> 27:2 (count=1)
-Segment at 25:1 (count = 1), RegionEntry
-Segment at 27:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.while.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.while.txt
deleted file mode 100644
index 90629ac84cdf6..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.while.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Counter in file 0 1:1 -> 2:16, #1
-Counter in file 0 3:11 -> 3:20, (#1 + #2)
-Counter in file 0 3:21 -> 4:6, #2
-Counter in file 0 5:1 -> 5:2, ((#1 + #2) - #2)
-Emitting segments for file: ../coverage/while.rs
-Combined regions:
- 1:1 -> 2:16 (count=1)
- 3:11 -> 3:20 (count=1)
- 3:21 -> 4:6 (count=0)
- 5:1 -> 5:2 (count=1)
-Segment at 1:1 (count = 1), RegionEntry
-Segment at 2:16 (count = 0), Skipped
-Segment at 3:11 (count = 1), RegionEntry
-Segment at 3:20 (count = 0), Skipped
-Segment at 3:21 (count = 0), RegionEntry
-Segment at 4:6 (count = 0), Skipped
-Segment at 5:1 (count = 1), RegionEntry
-Segment at 5:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.while_early_ret.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.while_early_ret.txt
deleted file mode 100644
index 12f444945a18a..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.while_early_ret.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-Counter in file 0 4:1 -> 5:27, #1
-Counter in file 0 7:9 -> 9:10, (#1 + #2)
-Counter in file 0 12:13 -> 14:14, ((#1 + #2) - #3)
-Counter in file 0 18:21 -> 20:22, (((#1 + #2) - #3) - #2)
-Counter in file 0 22:21 -> 22:27, #4
-Counter in file 0 26:21 -> 26:27, #5
-Counter in file 0 29:10 -> 32:10, #2
-Counter in file 0 35:5 -> 35:11, #3
-Counter in file 0 36:1 -> 36:2, ((#4 + #5) + #3)
-Emitting segments for file: ../coverage/while_early_ret.rs
-Combined regions:
- 4:1 -> 5:27 (count=1)
- 7:9 -> 9:10 (count=7)
- 12:13 -> 14:14 (count=7)
- 18:21 -> 20:22 (count=1)
- 22:21 -> 22:27 (count=0)
- 26:21 -> 26:27 (count=1)
- 29:10 -> 32:10 (count=6)
- 35:5 -> 35:11 (count=0)
- 36:1 -> 36:2 (count=1)
-Segment at 4:1 (count = 1), RegionEntry
-Segment at 5:27 (count = 0), Skipped
-Segment at 7:9 (count = 7), RegionEntry
-Segment at 9:10 (count = 0), Skipped
-Segment at 12:13 (count = 7), RegionEntry
-Segment at 14:14 (count = 0), Skipped
-Segment at 18:21 (count = 1), RegionEntry
-Segment at 20:22 (count = 0), Skipped
-Segment at 22:21 (count = 0), RegionEntry
-Segment at 22:27 (count = 0), Skipped
-Segment at 26:21 (count = 1), RegionEntry
-Segment at 26:27 (count = 0), Skipped
-Segment at 29:10 (count = 6), RegionEntry
-Segment at 32:10 (count = 0), Skipped
-Segment at 35:5 (count = 0), RegionEntry
-Segment at 35:11 (count = 0), Skipped
-Segment at 36:1 (count = 1), RegionEntry
-Segment at 36:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.yield.txt b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.yield.txt
deleted file mode 100644
index 6ed3e465611e9..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.yield.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-Counter in file 0 7:1 -> 7:11, #1
-Counter in file 0 8:9 -> 8:22, (#1 + 0)
-Counter in file 0 13:11 -> 14:35, (#1 + 0)
-Counter in file 0 14:39 -> 14:41, #4
-Counter in file 0 15:14 -> 15:52, (#2 + #3)
-Counter in file 0 17:11 -> 17:46, (#4 + 0)
-Counter in file 0 18:34 -> 18:39, (#4 - #5)
-Counter in file 0 18:44 -> 18:46, ((#4 - #5) - #6)
-Counter in file 0 19:14 -> 19:52, (#5 + #6)
-Counter in file 0 22:9 -> 22:22, (((#4 - #5) - #6) + 0)
-Counter in file 0 29:11 -> 30:35, (((#4 - #5) - #6) + 0)
-Counter in file 0 30:39 -> 30:41, #9
-Counter in file 0 31:14 -> 31:52, (#7 + #8)
-Counter in file 0 33:11 -> 34:35, (#9 + 0)
-Counter in file 0 34:39 -> 34:41, #12
-Counter in file 0 35:14 -> 35:52, (#10 + #11)
-Counter in file 0 37:1 -> 37:2, (#12 + 0)
-Counter in file 0 8:28 -> 9:16, #1
-Counter in file 0 10:16 -> 11:6, #2
-Counter in file 0 22:28 -> 23:16, #1
-Counter in file 0 24:9 -> 24:16, #2
-Counter in file 0 25:9 -> 25:16, #3
-Counter in file 0 26:16 -> 27:6, #4
-Emitting segments for file: ../coverage/yield.rs
-Combined regions:
- 7:1 -> 7:11 (count=1)
- 8:9 -> 8:22 (count=1)
- 8:28 -> 9:16 (count=1)
- 10:16 -> 11:6 (count=1)
- 13:11 -> 14:35 (count=1)
- 14:39 -> 14:41 (count=1)
- 15:14 -> 15:52 (count=0)
- 17:11 -> 17:46 (count=1)
- 18:34 -> 18:39 (count=1)
- 18:44 -> 18:46 (count=1)
- 19:14 -> 19:52 (count=0)
- 22:9 -> 22:22 (count=1)
- 22:28 -> 23:16 (count=1)
- 24:9 -> 24:16 (count=1)
- 25:9 -> 25:16 (count=0)
- 26:16 -> 27:6 (count=0)
- 29:11 -> 30:35 (count=1)
- 30:39 -> 30:41 (count=1)
- 31:14 -> 31:52 (count=0)
- 33:11 -> 34:35 (count=1)
- 34:39 -> 34:41 (count=1)
- 35:14 -> 35:52 (count=0)
- 37:1 -> 37:2 (count=1)
-Segment at 7:1 (count = 1), RegionEntry
-Segment at 7:11 (count = 0), Skipped
-Segment at 8:9 (count = 1), RegionEntry
-Segment at 8:22 (count = 0), Skipped
-Segment at 8:28 (count = 1), RegionEntry
-Segment at 9:16 (count = 0), Skipped
-Segment at 10:16 (count = 1), RegionEntry
-Segment at 11:6 (count = 0), Skipped
-Segment at 13:11 (count = 1), RegionEntry
-Segment at 14:35 (count = 0), Skipped
-Segment at 14:39 (count = 1), RegionEntry
-Segment at 14:41 (count = 0), Skipped
-Segment at 15:14 (count = 0), RegionEntry
-Segment at 15:52 (count = 0), Skipped
-Segment at 17:11 (count = 1), RegionEntry
-Segment at 17:46 (count = 0), Skipped
-Segment at 18:34 (count = 1), RegionEntry
-Segment at 18:39 (count = 0), Skipped
-Segment at 18:44 (count = 1), RegionEntry
-Segment at 18:46 (count = 0), Skipped
-Segment at 19:14 (count = 0), RegionEntry
-Segment at 19:52 (count = 0), Skipped
-Segment at 22:9 (count = 1), RegionEntry
-Segment at 22:22 (count = 0), Skipped
-Segment at 22:28 (count = 1), RegionEntry
-Segment at 23:16 (count = 0), Skipped
-Segment at 24:9 (count = 1), RegionEntry
-Segment at 24:16 (count = 0), Skipped
-Segment at 25:9 (count = 0), RegionEntry
-Segment at 25:16 (count = 0), Skipped
-Segment at 26:16 (count = 0), RegionEntry
-Segment at 27:6 (count = 0), Skipped
-Segment at 29:11 (count = 1), RegionEntry
-Segment at 30:35 (count = 0), Skipped
-Segment at 30:39 (count = 1), RegionEntry
-Segment at 30:41 (count = 0), Skipped
-Segment at 31:14 (count = 0), RegionEntry
-Segment at 31:52 (count = 0), Skipped
-Segment at 33:11 (count = 1), RegionEntry
-Segment at 34:35 (count = 0), Skipped
-Segment at 34:39 (count = 1), RegionEntry
-Segment at 34:41 (count = 0), Skipped
-Segment at 35:14 (count = 0), RegionEntry
-Segment at 35:52 (count = 0), Skipped
-Segment at 37:1 (count = 1), RegionEntry
-Segment at 37:2 (count = 0), Skipped
diff --git a/src/test/run-make-fulldeps/coverage-reports/prettify_json.py b/src/test/run-make-fulldeps/coverage-reports/prettify_json.py
deleted file mode 100644
index ed9279841f70e..0000000000000
--- a/src/test/run-make-fulldeps/coverage-reports/prettify_json.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/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/ui/async-await/issue-74072-lifetime-name-annotations.stderr b/src/test/ui/async-await/issue-74072-lifetime-name-annotations.stderr
index 123c3192cffba..b96cab9f0f51a 100644
--- a/src/test/ui/async-await/issue-74072-lifetime-name-annotations.stderr
+++ b/src/test/ui/async-await/issue-74072-lifetime-name-annotations.stderr
@@ -2,7 +2,7 @@ error[E0506]: cannot assign to `*x` because it is borrowed
--> $DIR/issue-74072-lifetime-name-annotations.rs:9:5
|
LL | pub async fn async_fn(x: &mut i32) -> &i32 {
- | - let's call the lifetime of this reference `'1`
+ | - let's call the lifetime of this reference `'1`
LL | let y = &*x;
| --- borrow of `*x` occurs here
LL | *x += 1;
diff --git a/src/test/ui/async-await/issue-75785-confusing-named-region.rs b/src/test/ui/async-await/issue-75785-confusing-named-region.rs
new file mode 100644
index 0000000000000..452614087be94
--- /dev/null
+++ b/src/test/ui/async-await/issue-75785-confusing-named-region.rs
@@ -0,0 +1,13 @@
+// edition:2018
+//
+// Regression test for issue #75785
+// Tests that we don't point to a confusing named
+// region when emitting a diagnostic
+
+pub async fn async_fn(x: &mut i32) -> (&i32, &i32) {
+ let y = &*x;
+ *x += 1; //~ ERROR cannot assign to
+ (&32, y)
+}
+
+fn main() {}
diff --git a/src/test/ui/async-await/issue-75785-confusing-named-region.stderr b/src/test/ui/async-await/issue-75785-confusing-named-region.stderr
new file mode 100644
index 0000000000000..3b731d9c60a6a
--- /dev/null
+++ b/src/test/ui/async-await/issue-75785-confusing-named-region.stderr
@@ -0,0 +1,15 @@
+error[E0506]: cannot assign to `*x` because it is borrowed
+ --> $DIR/issue-75785-confusing-named-region.rs:9:5
+ |
+LL | pub async fn async_fn(x: &mut i32) -> (&i32, &i32) {
+ | - let's call the lifetime of this reference `'1`
+LL | let y = &*x;
+ | --- borrow of `*x` occurs here
+LL | *x += 1;
+ | ^^^^^^^ assignment to borrowed `*x` occurs here
+LL | (&32, y)
+ | -------- returning this value requires that `*x` is borrowed for `'1`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0506`.
diff --git a/src/test/ui/label/label_misspelled.rs b/src/test/ui/label/label_misspelled.rs
new file mode 100644
index 0000000000000..ebfd5642c9fa8
--- /dev/null
+++ b/src/test/ui/label/label_misspelled.rs
@@ -0,0 +1,18 @@
+fn main() {
+ 'LOOP: loop {
+ LOOP;
+ //~^ ERROR cannot find value `LOOP` in this scope
+ };
+ 'while_loop: while true { //~ WARN denote infinite loops with
+ while_loop;
+ //~^ ERROR cannot find value `while_loop` in this scope
+ };
+ 'while_let: while let Some(_) = Some(()) {
+ while_let;
+ //~^ ERROR cannot find value `while_let` in this scope
+ }
+ 'for_loop: for _ in 0..3 {
+ for_loop;
+ //~^ ERROR cannot find value `for_loop` in this scope
+ };
+}
diff --git a/src/test/ui/label/label_misspelled.stderr b/src/test/ui/label/label_misspelled.stderr
new file mode 100644
index 0000000000000..1368ca4126cdd
--- /dev/null
+++ b/src/test/ui/label/label_misspelled.stderr
@@ -0,0 +1,47 @@
+error[E0425]: cannot find value `LOOP` in this scope
+ --> $DIR/label_misspelled.rs:3:9
+ |
+LL | LOOP;
+ | ^^^^
+ | |
+ | not found in this scope
+ | help: a label with a similar name exists: `'LOOP`
+
+error[E0425]: cannot find value `while_loop` in this scope
+ --> $DIR/label_misspelled.rs:7:9
+ |
+LL | while_loop;
+ | ^^^^^^^^^^
+ | |
+ | not found in this scope
+ | help: a label with a similar name exists: `'while_loop`
+
+error[E0425]: cannot find value `while_let` in this scope
+ --> $DIR/label_misspelled.rs:11:9
+ |
+LL | while_let;
+ | ^^^^^^^^^
+ | |
+ | not found in this scope
+ | help: a label with a similar name exists: `'while_let`
+
+error[E0425]: cannot find value `for_loop` in this scope
+ --> $DIR/label_misspelled.rs:15:9
+ |
+LL | for_loop;
+ | ^^^^^^^^
+ | |
+ | not found in this scope
+ | help: a label with a similar name exists: `'for_loop`
+
+warning: denote infinite loops with `loop { ... }`
+ --> $DIR/label_misspelled.rs:6:5
+ |
+LL | 'while_loop: while true {
+ | ^^^^^^^^^^^^^^^^^^^^^^^ help: use `loop`
+ |
+ = note: `#[warn(while_true)]` on by default
+
+error: aborting due to 4 previous errors; 1 warning emitted
+
+For more information about this error, try `rustc --explain E0425`.
diff --git a/src/test/ui/loops/loop-break-value.rs b/src/test/ui/loops/loop-break-value.rs
index 6c4160c36aa39..8a080cfdf494a 100644
--- a/src/test/ui/loops/loop-break-value.rs
+++ b/src/test/ui/loops/loop-break-value.rs
@@ -90,4 +90,10 @@ fn main() {
break; //~ ERROR mismatched types
break 4;
};
+
+ 'LOOP: for _ in 0 .. 9 {
+ break LOOP;
+ //~^ ERROR cannot find value `LOOP` in this scope
+ //~| ERROR `break` with value from a `for` loop
+ }
}
diff --git a/src/test/ui/loops/loop-break-value.stderr b/src/test/ui/loops/loop-break-value.stderr
index 0503d3d4c7817..0237435c8b46a 100644
--- a/src/test/ui/loops/loop-break-value.stderr
+++ b/src/test/ui/loops/loop-break-value.stderr
@@ -1,3 +1,12 @@
+error[E0425]: cannot find value `LOOP` in this scope
+ --> $DIR/loop-break-value.rs:95:15
+ |
+LL | break LOOP;
+ | ^^^^
+ | |
+ | not found in this scope
+ | help: a label with a similar name exists: `'LOOP`
+
warning: denote infinite loops with `loop { ... }`
--> $DIR/loop-break-value.rs:26:5
|
@@ -94,6 +103,17 @@ help: instead, use `break` on its own without a value inside this `for` loop
LL | break;
| ^^^^^
+error[E0571]: `break` with value from a `for` loop
+ --> $DIR/loop-break-value.rs:95:9
+ |
+LL | break LOOP;
+ | ^^^^^^^^^^ can only break with a value inside `loop` or breakable block
+ |
+help: instead, use `break` on its own without a value inside this `for` loop
+ |
+LL | break;
+ | ^^^^^
+
error[E0308]: mismatched types
--> $DIR/loop-break-value.rs:4:31
|
@@ -151,7 +171,7 @@ LL | break;
| expected integer, found `()`
| help: give it a value of the expected type: `break value`
-error: aborting due to 16 previous errors; 1 warning emitted
+error: aborting due to 18 previous errors; 1 warning emitted
-Some errors have detailed explanations: E0308, E0571.
+Some errors have detailed explanations: E0308, E0425, E0571.
For more information about an error, try `rustc --explain E0308`.