From 6f627663a755fb1795a725c1b89d2d83be5096f9 Mon Sep 17 00:00:00 2001
From: Rich Kadel <richkadel@google.com>
Date: Mon, 5 Oct 2020 09:26:30 -0700
Subject: [PATCH] Renamed tests to avoid exceeding Windows max path limit

---
 compiler/rustc_mir/src/util/pretty.rs         |   8 +-
 .../Makefile                                  |   6 +-
 .../filecheck.testprog.txt                    |   0
 .../testprog.rs                               |   0
 .../Makefile                                  |   4 +-
 .../Makefile                                  |   8 +-
 .../expected_export_coverage.closure.json     |   2 +-
 .../expected_export_coverage.drop_trait.json  |   2 +-
 .../expected_export_coverage.generics.json    |   2 +-
 .../expected_export_coverage.if.json          |   2 +-
 .../expected_export_coverage.if_else.json     |   2 +-
 .../expected_export_coverage.inner_items.json |   2 +-
 ...expected_export_coverage.lazy_boolean.json |   2 +-
 ...cted_export_coverage.loop_break_value.json |   2 +-
 .../expected_export_coverage.simple_loop.json |   2 +-
 ...expected_export_coverage.simple_match.json |   2 +-
 ...ted_export_coverage.try_error_result.json} |   2 +-
 ...ed_export_coverage.various_conditions.json |   2 +-
 ...ed_export_coverage.while_early_return.json |   2 +-
 .../expected_show_coverage.closure.txt        |   0
 .../expected_show_coverage.drop_trait.txt     |   0
 .../expected_show_coverage.generics.txt       |   0
 .../expected_show_coverage.if.txt             |   0
 .../expected_show_coverage.if_else.txt        |   0
 .../expected_show_coverage.inner_items.txt    |  36 +-
 .../expected_show_coverage.lazy_boolean.txt   |   0
 ...xpected_show_coverage.loop_break_value.txt |   0
 .../expected_show_coverage.simple_loop.txt    |   0
 .../expected_show_coverage.simple_match.txt   |   0
 ...pected_show_coverage.try_error_result.txt} |   0
 ...ected_show_coverage.various_conditions.txt |   0
 ...ected_show_coverage.while_early_return.txt |   0
 .../prettify_json.py                          |   0
 .../Makefile                                  |   4 +-
 .../expected_export_coverage.closure.json     |   2 +-
 .../expected_export_coverage.drop_trait.json  |   2 +-
 .../expected_export_coverage.generics.json    |   2 +-
 .../expected_export_coverage.if.json          |   2 +-
 .../expected_export_coverage.if_else.json     |   2 +-
 .../expected_export_coverage.inner_items.json |   2 +-
 ...expected_export_coverage.lazy_boolean.json |   2 +-
 ...cted_export_coverage.loop_break_value.json |   2 +-
 .../expected_export_coverage.simple_loop.json |   2 +-
 ...expected_export_coverage.simple_match.json |   2 +-
 ...ted_export_coverage.try_error_result.json} |   2 +-
 ...ed_export_coverage.various_conditions.json |   2 +-
 ...ed_export_coverage.while_early_return.json |   2 +-
 .../expected_show_coverage.closure.txt        |   0
 .../expected_show_coverage.drop_trait.txt     |   0
 .../expected_show_coverage.generics.txt       |   0
 .../expected_show_coverage.if.txt             |   0
 .../expected_show_coverage.if_else.txt        |   0
 .../expected_show_coverage.inner_items.txt    |  36 +-
 .../expected_show_coverage.lazy_boolean.txt   |   0
 ...xpected_show_coverage.loop_break_value.txt |   0
 .../expected_show_coverage.simple_loop.txt    |   0
 .../expected_show_coverage.simple_match.txt   |   0
 ...pected_show_coverage.try_error_result.txt} |   0
 ...ected_show_coverage.various_conditions.txt |   0
 ...ected_show_coverage.while_early_return.txt |   0
 .../Makefile                                  |   6 +-
 ...osure#0}.-------.InstrumentCoverage.0.html |   0
 ...osure#1}.-------.InstrumentCoverage.0.html |   0
 ...osure#2}.-------.InstrumentCoverage.0.html |   0
 ...osure#3}.-------.InstrumentCoverage.0.html |   0
 ...ure.main.-------.InstrumentCoverage.0.html | 326 +++++++++---------
 ...ait.main.-------.InstrumentCoverage.0.html |   0
 ...#0}-drop.-------.InstrumentCoverage.0.html |   0
 ...ics.main.-------.InstrumentCoverage.0.html |   0
 ...strength.-------.InstrumentCoverage.0.html |   0
 ...#1}-drop.-------.InstrumentCoverage.0.html |   0
 .../if.main.-------.InstrumentCoverage.0.html |   0
 ...lse.main.-------.InstrumentCoverage.0.html |   0
 ...it_func.-------.InstrumentCoverage.0.html} |  22 +-
 ...in_func.-------.InstrumentCoverage.0.html} |   8 +-
 ...it_func.-------.InstrumentCoverage.0.html} |  18 +-
 ...ems.main.-------.InstrumentCoverage.0.html |  72 ++--
 ...ean.main.-------.InstrumentCoverage.0.html |   0
 ...lue.main.-------.InstrumentCoverage.0.html |   0
 ...oop.main.-------.InstrumentCoverage.0.html |   0
 ...tch.main.-------.InstrumentCoverage.0.html |   0
 ...lt.call.-------.InstrumentCoverage.0.html} |   2 +-
 ...lt.main.-------.InstrumentCoverage.0.html} |   2 +-
 ...ons.main.-------.InstrumentCoverage.0.html |   0
 ...urn.main.-------.InstrumentCoverage.0.html |   0
 .../Makefile                                  |   4 +-
 ...osure#0}.-------.InstrumentCoverage.0.html |   0
 ...osure#1}.-------.InstrumentCoverage.0.html |   0
 ...osure#2}.-------.InstrumentCoverage.0.html |   0
 ...osure#3}.-------.InstrumentCoverage.0.html |   0
 ...ure.main.-------.InstrumentCoverage.0.html | 326 +++++++++---------
 ...ait.main.-------.InstrumentCoverage.0.html |   0
 ...#0}-drop.-------.InstrumentCoverage.0.html |   0
 ...ics.main.-------.InstrumentCoverage.0.html |   0
 ...strength.-------.InstrumentCoverage.0.html |   0
 ...#1}-drop.-------.InstrumentCoverage.0.html |   0
 .../if.main.-------.InstrumentCoverage.0.html |   0
 ...lse.main.-------.InstrumentCoverage.0.html |   0
 ...it_func.-------.InstrumentCoverage.0.html} |  22 +-
 ...in_func.-------.InstrumentCoverage.0.html} |   8 +-
 ...it_func.-------.InstrumentCoverage.0.html} |  18 +-
 ...ems.main.-------.InstrumentCoverage.0.html |  72 ++--
 ...ean.main.-------.InstrumentCoverage.0.html |   0
 ...lue.main.-------.InstrumentCoverage.0.html |   0
 ...oop.main.-------.InstrumentCoverage.0.html |   0
 ...tch.main.-------.InstrumentCoverage.0.html |   0
 ...lt.call.-------.InstrumentCoverage.0.html} |   2 +-
 ...lt.main.-------.InstrumentCoverage.0.html} |   2 +-
 ...ons.main.-------.InstrumentCoverage.0.html |   0
 ...urn.main.-------.InstrumentCoverage.0.html |   0
 .../closure.rs                                |   0
 .../compiletest-ignore-dir                    |   0
 .../coverage_tools.mk                         |   0
 .../drop_trait.rs                             |   0
 .../generics.rs                               |   0
 .../{instrument-coverage => coverage}/if.rs   |   0
 .../if_else.rs                                |   0
 .../run-make-fulldeps/coverage/inner_items.rs |  57 +++
 .../lazy_boolean.rs                           |   0
 .../loop_break_value.rs                       |   0
 .../simple_loop.rs                            |   0
 .../simple_match.rs                           |   0
 .../try_error_result.rs}                      |   0
 .../various_conditions.rs                     |   0
 .../while_early_return.rs                     |   0
 .../instrument-coverage/inner_items.rs        |  57 ---
 126 files changed, 586 insertions(+), 592 deletions(-)
 rename src/test/run-make-fulldeps/{instrument-coverage-llvm-ir-base => coverage-llvmir-base}/Makefile (93%)
 rename src/test/run-make-fulldeps/{instrument-coverage-llvm-ir-base => coverage-llvmir-base}/filecheck.testprog.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-llvm-ir-base => coverage-llvmir-base}/testprog.rs (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-llvm-ir-link-dead-code => coverage-llvmir-deadcode}/Makefile (71%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/Makefile (94%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-base}/expected_export_coverage.closure.json (95%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-base}/expected_export_coverage.drop_trait.json (95%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-base}/expected_export_coverage.generics.json (95%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/expected_export_coverage.if.json (95%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-base}/expected_export_coverage.if_else.json (95%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/expected_export_coverage.inner_items.json (94%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/expected_export_coverage.lazy_boolean.json (94%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/expected_export_coverage.loop_break_value.json (94%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-base}/expected_export_coverage.simple_loop.json (94%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-base}/expected_export_coverage.simple_match.json (94%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base/expected_export_coverage.question_mark_error_result.json => coverage-reports-base/expected_export_coverage.try_error_result.json} (93%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-base}/expected_export_coverage.various_conditions.json (94%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-base}/expected_export_coverage.while_early_return.json (94%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/expected_show_coverage.closure.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/expected_show_coverage.drop_trait.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/expected_show_coverage.generics.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/expected_show_coverage.if.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/expected_show_coverage.if_else.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/expected_show_coverage.inner_items.txt (56%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/expected_show_coverage.lazy_boolean.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/expected_show_coverage.loop_break_value.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/expected_show_coverage.simple_loop.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/expected_show_coverage.simple_match.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base/expected_show_coverage.question_mark_error_result.txt => coverage-reports-base/expected_show_coverage.try_error_result.txt} (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/expected_show_coverage.various_conditions.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/expected_show_coverage.while_early_return.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-base}/prettify_json.py (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-deadcode}/Makefile (79%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-deadcode}/expected_export_coverage.closure.json (95%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-deadcode}/expected_export_coverage.drop_trait.json (95%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-deadcode}/expected_export_coverage.generics.json (95%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-deadcode}/expected_export_coverage.if.json (95%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-deadcode}/expected_export_coverage.if_else.json (95%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-deadcode}/expected_export_coverage.inner_items.json (94%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-deadcode}/expected_export_coverage.lazy_boolean.json (94%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-deadcode}/expected_export_coverage.loop_break_value.json (94%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-deadcode}/expected_export_coverage.simple_loop.json (94%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-deadcode}/expected_export_coverage.simple_match.json (94%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.question_mark_error_result.json => coverage-reports-deadcode/expected_export_coverage.try_error_result.json} (93%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-deadcode}/expected_export_coverage.various_conditions.json (94%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-base => coverage-reports-deadcode}/expected_export_coverage.while_early_return.json (94%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-deadcode}/expected_show_coverage.closure.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-deadcode}/expected_show_coverage.drop_trait.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-deadcode}/expected_show_coverage.generics.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-deadcode}/expected_show_coverage.if.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-deadcode}/expected_show_coverage.if_else.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-deadcode}/expected_show_coverage.inner_items.txt (56%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-deadcode}/expected_show_coverage.lazy_boolean.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-deadcode}/expected_show_coverage.loop_break_value.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-deadcode}/expected_show_coverage.simple_loop.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-deadcode}/expected_show_coverage.simple_match.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.question_mark_error_result.txt => coverage-reports-deadcode/expected_show_coverage.try_error_result.txt} (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-deadcode}/expected_show_coverage.various_conditions.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-cov-reports-link-dead-code => coverage-reports-deadcode}/expected_show_coverage.while_early_return.txt (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/Makefile (89%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html (93%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.generics/generics.{impl#0}-set_strength.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.if/if.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.if_else/if_else.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base/expected_mir_dump.inner_items/inner_items.main-InnerTrait-default_trait_func.-------.InstrumentCoverage.0.html => coverage-spanview-base/expected_mir_dump.inner_items/inner_items.main-InTrait-default_trait_func.-------.InstrumentCoverage.0.html} (66%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.inner_items/inner_items.main-inner_function.-------.InstrumentCoverage.0.html => coverage-spanview-base/expected_mir_dump.inner_items/inner_items.main-in_func.-------.InstrumentCoverage.0.html} (94%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.inner_items/inner_items.main-{impl#0}-inner_trait_func.-------.InstrumentCoverage.0.html => coverage-spanview-base/expected_mir_dump.inner_items/inner_items.main-{impl#0}-trait_func.-------.InstrumentCoverage.0.html} (73%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html (78%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.lazy_boolean/lazy_boolean.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.loop_break_value/loop_break_value.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.simple_loop/simple_loop.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.simple_match/simple_match.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.question_mark_error_result/question_mark_error_result.call.-------.InstrumentCoverage.0.html => coverage-spanview-base/expected_mir_dump.try_error_result/try_error_result.call.-------.InstrumentCoverage.0.html} (98%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.question_mark_error_result/question_mark_error_result.main.-------.InstrumentCoverage.0.html => coverage-spanview-base/expected_mir_dump.try_error_result/try_error_result.main.-------.InstrumentCoverage.0.html} (99%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.various_conditions/various_conditions.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base => coverage-spanview-base}/expected_mir_dump.while_early_return/while_early_return.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/Makefile (71%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html (93%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.generics/generics.{impl#0}-set_strength.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.if/if.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.if_else/if_else.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.inner_items/inner_items.main-InnerTrait-default_trait_func.-------.InstrumentCoverage.0.html => coverage-spanview-deadcode/expected_mir_dump.inner_items/inner_items.main-InTrait-default_trait_func.-------.InstrumentCoverage.0.html} (66%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base/expected_mir_dump.inner_items/inner_items.main-inner_function.-------.InstrumentCoverage.0.html => coverage-spanview-deadcode/expected_mir_dump.inner_items/inner_items.main-in_func.-------.InstrumentCoverage.0.html} (94%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base/expected_mir_dump.inner_items/inner_items.main-{impl#0}-inner_trait_func.-------.InstrumentCoverage.0.html => coverage-spanview-deadcode/expected_mir_dump.inner_items/inner_items.main-{impl#0}-trait_func.-------.InstrumentCoverage.0.html} (73%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html (78%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.lazy_boolean/lazy_boolean.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.loop_break_value/loop_break_value.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.simple_loop/simple_loop.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.simple_match/simple_match.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base/expected_mir_dump.question_mark_error_result/question_mark_error_result.call.-------.InstrumentCoverage.0.html => coverage-spanview-deadcode/expected_mir_dump.try_error_result/try_error_result.call.-------.InstrumentCoverage.0.html} (98%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-base/expected_mir_dump.question_mark_error_result/question_mark_error_result.main.-------.InstrumentCoverage.0.html => coverage-spanview-deadcode/expected_mir_dump.try_error_result/try_error_result.main.-------.InstrumentCoverage.0.html} (99%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.various_conditions/various_conditions.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage-mir-cov-html-link-dead-code => coverage-spanview-deadcode}/expected_mir_dump.while_early_return/while_early_return.main.-------.InstrumentCoverage.0.html (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage => coverage}/closure.rs (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage => coverage}/compiletest-ignore-dir (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage => coverage}/coverage_tools.mk (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage => coverage}/drop_trait.rs (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage => coverage}/generics.rs (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage => coverage}/if.rs (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage => coverage}/if_else.rs (100%)
 create mode 100644 src/test/run-make-fulldeps/coverage/inner_items.rs
 rename src/test/run-make-fulldeps/{instrument-coverage => coverage}/lazy_boolean.rs (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage => coverage}/loop_break_value.rs (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage => coverage}/simple_loop.rs (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage => coverage}/simple_match.rs (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage/question_mark_error_result.rs => coverage/try_error_result.rs} (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage => coverage}/various_conditions.rs (100%)
 rename src/test/run-make-fulldeps/{instrument-coverage => coverage}/while_early_return.rs (100%)
 delete mode 100644 src/test/run-make-fulldeps/instrument-coverage/inner_items.rs

diff --git a/compiler/rustc_mir/src/util/pretty.rs b/compiler/rustc_mir/src/util/pretty.rs
index 3a83fe11d0a..81bb1342104 100644
--- a/compiler/rustc_mir/src/util/pretty.rs
+++ b/compiler/rustc_mir/src/util/pretty.rs
@@ -154,13 +154,7 @@ fn dump_matched_mir_node<'tcx, F>(
                 dump_file_basename(tcx, pass_num, pass_name, disambiguator, body.source);
             let mut file = create_dump_file_with_basename(tcx, &file_basename, "html")?;
             if body.source.def_id().is_local() {
-                write_mir_fn_spanview(
-                    tcx,
-                    body,
-                    spanview,
-                    &file_basename,
-                    &mut file,
-                )?;
+                write_mir_fn_spanview(tcx, body, spanview, &file_basename, &mut file)?;
             }
         };
     }
diff --git a/src/test/run-make-fulldeps/instrument-coverage-llvm-ir-base/Makefile b/src/test/run-make-fulldeps/coverage-llvmir-base/Makefile
similarity index 93%
rename from src/test/run-make-fulldeps/instrument-coverage-llvm-ir-base/Makefile
rename to src/test/run-make-fulldeps/coverage-llvmir-base/Makefile
index f623248ab57..e84642922d9 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-llvm-ir-base/Makefile
+++ b/src/test/run-make-fulldeps/coverage-llvmir-base/Makefile
@@ -2,11 +2,11 @@
 
 # ISSUE(76038): When targeting MSVC, Rust binaries built with both `-Z instrument-coverage` and
 # `-C link-dead-code` typically crash (with a seg-fault) or at best generate an empty `*.profraw`.
-# See ../instrument-coverage/coverage_tools.mk for more information.
+# See ../coverage/coverage_tools.mk for more information.
 
--include ../instrument-coverage/coverage_tools.mk
+-include ../coverage/coverage_tools.mk
 
-BASEDIR=../instrument-coverage-llvm-ir-base
+BASEDIR=../coverage-llvmir-base
 
 ifeq ($(UNAME),Darwin)
 	INSTR_PROF_DATA_SUFFIX=,regular,live_support
diff --git a/src/test/run-make-fulldeps/instrument-coverage-llvm-ir-base/filecheck.testprog.txt b/src/test/run-make-fulldeps/coverage-llvmir-base/filecheck.testprog.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-llvm-ir-base/filecheck.testprog.txt
rename to src/test/run-make-fulldeps/coverage-llvmir-base/filecheck.testprog.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-llvm-ir-base/testprog.rs b/src/test/run-make-fulldeps/coverage-llvmir-base/testprog.rs
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-llvm-ir-base/testprog.rs
rename to src/test/run-make-fulldeps/coverage-llvmir-base/testprog.rs
diff --git a/src/test/run-make-fulldeps/instrument-coverage-llvm-ir-link-dead-code/Makefile b/src/test/run-make-fulldeps/coverage-llvmir-deadcode/Makefile
similarity index 71%
rename from src/test/run-make-fulldeps/instrument-coverage-llvm-ir-link-dead-code/Makefile
rename to src/test/run-make-fulldeps/coverage-llvmir-deadcode/Makefile
index c42530e233e..30c7c0fbb51 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-llvm-ir-link-dead-code/Makefile
+++ b/src/test/run-make-fulldeps/coverage-llvmir-deadcode/Makefile
@@ -4,8 +4,8 @@
 # LINK_DEAD_CODE requires ignore-msvc due to Issue #76038
 LINK_DEAD_CODE=yes
 
--include ../instrument-coverage-llvm-ir-base/Makefile
+-include ../coverage-llvmir-base/Makefile
 
 # ISSUE(76038): When targeting MSVC, Rust binaries built with both `-Z instrument-coverage` and
 # `-C link-dead-code` typically crash (with a seg-fault) or at best generate an empty `*.profraw`.
-# See ../instrument-coverage/coverage_tools.mk for more information.
+# See ../coverage/coverage_tools.mk for more information.
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/Makefile b/src/test/run-make-fulldeps/coverage-reports-base/Makefile
similarity index 94%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/Makefile
rename to src/test/run-make-fulldeps/coverage-reports-base/Makefile
index 0e05df72c4c..880d7fdb1b0 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/Makefile
+++ b/src/test/run-make-fulldeps/coverage-reports-base/Makefile
@@ -6,12 +6,12 @@
 
 # ISSUE(76038): When targeting MSVC, Rust binaries built with both `-Z instrument-coverage` and
 # `-C link-dead-code` typically crash (with a seg-fault) or at best generate an empty `*.profraw`.
-# See ../instrument-coverage/coverage_tools.mk for more information.
+# See ../coverage/coverage_tools.mk for more information.
 
--include ../instrument-coverage/coverage_tools.mk
+-include ../coverage/coverage_tools.mk
 
-BASEDIR=../instrument-coverage-cov-reports-base
-SOURCEDIR=../instrument-coverage
+BASEDIR=../coverage-reports-base
+SOURCEDIR=../coverage
 
 all: $(patsubst $(SOURCEDIR)/%.rs,%,$(wildcard $(SOURCEDIR)/*.rs))
 
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.closure.json b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.closure.json
similarity index 95%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.closure.json
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.closure.json
index 9dbd0c4e5d6..8c6edae2803 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.closure.json
+++ b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.closure.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/closure.rs",
+          "filename": "../coverage/closure.rs",
           "summary": {
             "functions": {
               "count": 5,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.drop_trait.json b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.drop_trait.json
similarity index 95%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.drop_trait.json
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.drop_trait.json
index cdfdca990fa..bd2e2d56d4a 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.drop_trait.json
+++ b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.drop_trait.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/drop_trait.rs",
+          "filename": "../coverage/drop_trait.rs",
           "summary": {
             "functions": {
               "count": 2,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.generics.json b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.generics.json
similarity index 95%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.generics.json
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.generics.json
index ae405afedc1..a50f4657e20 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.generics.json
+++ b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.generics.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/generics.rs",
+          "filename": "../coverage/generics.rs",
           "summary": {
             "functions": {
               "count": 3,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.if.json b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.if.json
similarity index 95%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.if.json
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.if.json
index 5231593d8a0..2ff53ad33fa 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.if.json
+++ b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.if.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/if.rs",
+          "filename": "../coverage/if.rs",
           "summary": {
             "functions": {
               "count": 1,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.if_else.json b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.if_else.json
similarity index 95%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.if_else.json
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.if_else.json
index abc1afc9ab5..36f81ceae19 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.if_else.json
+++ b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.if_else.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/if_else.rs",
+          "filename": "../coverage/if_else.rs",
           "summary": {
             "functions": {
               "count": 1,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.inner_items.json b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.inner_items.json
similarity index 94%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.inner_items.json
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.inner_items.json
index 366f2afc6d7..a24e6a33a33 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.inner_items.json
+++ b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.inner_items.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/inner_items.rs",
+          "filename": "../coverage/inner_items.rs",
           "summary": {
             "functions": {
               "count": 4,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.lazy_boolean.json b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.lazy_boolean.json
similarity index 94%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.lazy_boolean.json
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.lazy_boolean.json
index 3b052ad9106..585346dc32a 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.lazy_boolean.json
+++ b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.lazy_boolean.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/lazy_boolean.rs",
+          "filename": "../coverage/lazy_boolean.rs",
           "summary": {
             "functions": {
               "count": 1,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.loop_break_value.json b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.loop_break_value.json
similarity index 94%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.loop_break_value.json
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.loop_break_value.json
index 0b9344f86f4..6cb1465c818 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.loop_break_value.json
+++ b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.loop_break_value.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/loop_break_value.rs",
+          "filename": "../coverage/loop_break_value.rs",
           "summary": {
             "functions": {
               "count": 1,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.simple_loop.json b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.simple_loop.json
similarity index 94%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.simple_loop.json
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.simple_loop.json
index 5701575189a..38bc96898ea 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.simple_loop.json
+++ b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.simple_loop.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/simple_loop.rs",
+          "filename": "../coverage/simple_loop.rs",
           "summary": {
             "functions": {
               "count": 1,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.simple_match.json b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.simple_match.json
similarity index 94%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.simple_match.json
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.simple_match.json
index df43cb9640d..f9d91d66f1d 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.simple_match.json
+++ b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.simple_match.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/simple_match.rs",
+          "filename": "../coverage/simple_match.rs",
           "summary": {
             "functions": {
               "count": 1,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.question_mark_error_result.json b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.try_error_result.json
similarity index 93%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.question_mark_error_result.json
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.try_error_result.json
index f2e95e4a836..e6ef2c1ab89 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.question_mark_error_result.json
+++ b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.try_error_result.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/question_mark_error_result.rs",
+          "filename": "../coverage/try_error_result.rs",
           "summary": {
             "functions": {
               "count": 2,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.various_conditions.json b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.various_conditions.json
similarity index 94%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.various_conditions.json
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.various_conditions.json
index 82c80024df6..410821ea335 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.various_conditions.json
+++ b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.various_conditions.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/various_conditions.rs",
+          "filename": "../coverage/various_conditions.rs",
           "summary": {
             "functions": {
               "count": 1,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.while_early_return.json b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.while_early_return.json
similarity index 94%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.while_early_return.json
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.while_early_return.json
index aa4e9a3c5dd..865b705fa20 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.while_early_return.json
+++ b/src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.while_early_return.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/while_early_return.rs",
+          "filename": "../coverage/while_early_return.rs",
           "summary": {
             "functions": {
               "count": 1,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.closure.txt b/src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.closure.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.closure.txt
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.closure.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.drop_trait.txt b/src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.drop_trait.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.drop_trait.txt
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.drop_trait.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.generics.txt b/src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.generics.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.generics.txt
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.generics.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.if.txt b/src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.if.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.if.txt
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.if.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.if_else.txt b/src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.if_else.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.if_else.txt
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.if_else.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.inner_items.txt b/src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.inner_items.txt
similarity index 56%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.inner_items.txt
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.inner_items.txt
index 364d25b1646..b13ca83d018 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.inner_items.txt
+++ b/src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.inner_items.txt
@@ -11,46 +11,46 @@
    11|      1|        countdown = 10;
    12|      1|    }
    13|       |
-   14|       |    mod inner_mod {
-   15|       |        const INNER_MOD_CONST: u32 = 1000;
+   14|       |    mod in_mod {
+   15|       |        const IN_MOD_CONST: u32 = 1000;
    16|       |    }
    17|       |
-   18|       |    fn inner_function(a: u32) {
+   18|       |    fn in_func(a: u32) {
    19|      3|        let b = 1;
    20|      3|        let c = a + b;
    21|      3|        println!("c = {}", c)
    22|      3|    }
    23|       |
-   24|       |    struct InnerStruct {
-   25|       |        inner_struct_field: u32,
+   24|       |    struct InStruct {
+   25|       |        in_struct_field: u32,
    26|       |    }
    27|       |
-   28|       |    const INNER_CONST: u32 = 1234;
+   28|       |    const IN_CONST: u32 = 1234;
    29|       |
-   30|       |    trait InnerTrait {
-   31|       |        fn inner_trait_func(&mut self, incr: u32);
+   30|       |    trait InTrait {
+   31|       |        fn trait_func(&mut self, incr: u32);
    32|       |
    33|      1|        fn default_trait_func(&mut self) {
-   34|      1|            inner_function(INNER_CONST);
-   35|      1|            self.inner_trait_func(INNER_CONST);
+   34|      1|            in_func(IN_CONST);
+   35|      1|            self.trait_func(IN_CONST);
    36|      1|        }
    37|       |    }
    38|       |
-   39|       |    impl InnerTrait for InnerStruct {
-   40|       |        fn inner_trait_func(&mut self, incr: u32) {
-   41|      1|            self.inner_struct_field += incr;
-   42|      1|            inner_function(self.inner_struct_field);
+   39|       |    impl InTrait for InStruct {
+   40|       |        fn trait_func(&mut self, incr: u32) {
+   41|      1|            self.in_struct_field += incr;
+   42|      1|            in_func(self.in_struct_field);
    43|      1|        }
    44|       |    }
    45|       |
-   46|       |    type InnerType = String;
+   46|       |    type InType = String;
    47|       |
    48|      1|    if is_true {
-   49|      1|        inner_function(countdown);
+   49|      1|        in_func(countdown);
    50|      1|    }
    51|       |
-   52|      1|    let mut val = InnerStruct {
-   53|      1|        inner_struct_field: 101,
+   52|      1|    let mut val = InStruct {
+   53|      1|        in_struct_field: 101,
    54|      1|    };
    55|      1|
    56|      1|    val.default_trait_func();
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.lazy_boolean.txt b/src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.lazy_boolean.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.lazy_boolean.txt
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.lazy_boolean.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.loop_break_value.txt b/src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.loop_break_value.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.loop_break_value.txt
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.loop_break_value.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.simple_loop.txt b/src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.simple_loop.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.simple_loop.txt
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.simple_loop.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.simple_match.txt b/src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.simple_match.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.simple_match.txt
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.simple_match.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.question_mark_error_result.txt b/src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.try_error_result.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.question_mark_error_result.txt
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.try_error_result.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.various_conditions.txt b/src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.various_conditions.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.various_conditions.txt
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.various_conditions.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.while_early_return.txt b/src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.while_early_return.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.while_early_return.txt
rename to src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.while_early_return.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/prettify_json.py b/src/test/run-make-fulldeps/coverage-reports-base/prettify_json.py
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/prettify_json.py
rename to src/test/run-make-fulldeps/coverage-reports-base/prettify_json.py
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/Makefile b/src/test/run-make-fulldeps/coverage-reports-deadcode/Makefile
similarity index 79%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/Makefile
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/Makefile
index ab826d07e05..b6a9acbf18b 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/Makefile
+++ b/src/test/run-make-fulldeps/coverage-reports-deadcode/Makefile
@@ -8,8 +8,8 @@
 # LINK_DEAD_CODE requires ignore-msvc due to Issue #76038
 LINK_DEAD_CODE=yes
 
--include ../instrument-coverage-cov-reports-base/Makefile
+-include ../coverage-reports-base/Makefile
 
 # ISSUE(76038): When targeting MSVC, Rust binaries built with both `-Z instrument-coverage` and
 # `-C link-dead-code` typically crash (with a seg-fault) or at best generate an empty `*.profraw`.
-# See ../instrument-coverage/coverage_tools.mk for more information.
+# See ../coverage/coverage_tools.mk for more information.
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.closure.json b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.closure.json
similarity index 95%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.closure.json
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.closure.json
index 9dbd0c4e5d6..8c6edae2803 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.closure.json
+++ b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.closure.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/closure.rs",
+          "filename": "../coverage/closure.rs",
           "summary": {
             "functions": {
               "count": 5,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.drop_trait.json b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.drop_trait.json
similarity index 95%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.drop_trait.json
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.drop_trait.json
index cdfdca990fa..bd2e2d56d4a 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.drop_trait.json
+++ b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.drop_trait.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/drop_trait.rs",
+          "filename": "../coverage/drop_trait.rs",
           "summary": {
             "functions": {
               "count": 2,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.generics.json b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.generics.json
similarity index 95%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.generics.json
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.generics.json
index ae405afedc1..a50f4657e20 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.generics.json
+++ b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.generics.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/generics.rs",
+          "filename": "../coverage/generics.rs",
           "summary": {
             "functions": {
               "count": 3,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.if.json b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.if.json
similarity index 95%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.if.json
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.if.json
index 5231593d8a0..2ff53ad33fa 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.if.json
+++ b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.if.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/if.rs",
+          "filename": "../coverage/if.rs",
           "summary": {
             "functions": {
               "count": 1,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.if_else.json b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.if_else.json
similarity index 95%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.if_else.json
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.if_else.json
index abc1afc9ab5..36f81ceae19 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.if_else.json
+++ b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.if_else.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/if_else.rs",
+          "filename": "../coverage/if_else.rs",
           "summary": {
             "functions": {
               "count": 1,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.inner_items.json b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.inner_items.json
similarity index 94%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.inner_items.json
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.inner_items.json
index 366f2afc6d7..a24e6a33a33 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.inner_items.json
+++ b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.inner_items.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/inner_items.rs",
+          "filename": "../coverage/inner_items.rs",
           "summary": {
             "functions": {
               "count": 4,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.lazy_boolean.json b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.lazy_boolean.json
similarity index 94%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.lazy_boolean.json
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.lazy_boolean.json
index 3b052ad9106..585346dc32a 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.lazy_boolean.json
+++ b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.lazy_boolean.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/lazy_boolean.rs",
+          "filename": "../coverage/lazy_boolean.rs",
           "summary": {
             "functions": {
               "count": 1,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.loop_break_value.json b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.loop_break_value.json
similarity index 94%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.loop_break_value.json
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.loop_break_value.json
index 0b9344f86f4..6cb1465c818 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.loop_break_value.json
+++ b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.loop_break_value.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/loop_break_value.rs",
+          "filename": "../coverage/loop_break_value.rs",
           "summary": {
             "functions": {
               "count": 1,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.simple_loop.json b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.simple_loop.json
similarity index 94%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.simple_loop.json
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.simple_loop.json
index 5701575189a..38bc96898ea 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.simple_loop.json
+++ b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.simple_loop.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/simple_loop.rs",
+          "filename": "../coverage/simple_loop.rs",
           "summary": {
             "functions": {
               "count": 1,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.simple_match.json b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.simple_match.json
similarity index 94%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.simple_match.json
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.simple_match.json
index df43cb9640d..f9d91d66f1d 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.simple_match.json
+++ b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.simple_match.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/simple_match.rs",
+          "filename": "../coverage/simple_match.rs",
           "summary": {
             "functions": {
               "count": 1,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.question_mark_error_result.json b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.try_error_result.json
similarity index 93%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.question_mark_error_result.json
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.try_error_result.json
index f2e95e4a836..e6ef2c1ab89 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_export_coverage.question_mark_error_result.json
+++ b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.try_error_result.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/question_mark_error_result.rs",
+          "filename": "../coverage/try_error_result.rs",
           "summary": {
             "functions": {
               "count": 2,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.various_conditions.json b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.various_conditions.json
similarity index 94%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.various_conditions.json
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.various_conditions.json
index 82c80024df6..410821ea335 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.various_conditions.json
+++ b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.various_conditions.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/various_conditions.rs",
+          "filename": "../coverage/various_conditions.rs",
           "summary": {
             "functions": {
               "count": 1,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.while_early_return.json b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.while_early_return.json
similarity index 94%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.while_early_return.json
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.while_early_return.json
index aa4e9a3c5dd..865b705fa20 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.while_early_return.json
+++ b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.while_early_return.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/while_early_return.rs",
+          "filename": "../coverage/while_early_return.rs",
           "summary": {
             "functions": {
               "count": 1,
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.closure.txt b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.closure.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.closure.txt
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.closure.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.drop_trait.txt b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.drop_trait.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.drop_trait.txt
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.drop_trait.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.generics.txt b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.generics.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.generics.txt
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.generics.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.if.txt b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.if.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.if.txt
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.if.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.if_else.txt b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.if_else.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.if_else.txt
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.if_else.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.inner_items.txt b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.inner_items.txt
similarity index 56%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.inner_items.txt
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.inner_items.txt
index 364d25b1646..b13ca83d018 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.inner_items.txt
+++ b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.inner_items.txt
@@ -11,46 +11,46 @@
    11|      1|        countdown = 10;
    12|      1|    }
    13|       |
-   14|       |    mod inner_mod {
-   15|       |        const INNER_MOD_CONST: u32 = 1000;
+   14|       |    mod in_mod {
+   15|       |        const IN_MOD_CONST: u32 = 1000;
    16|       |    }
    17|       |
-   18|       |    fn inner_function(a: u32) {
+   18|       |    fn in_func(a: u32) {
    19|      3|        let b = 1;
    20|      3|        let c = a + b;
    21|      3|        println!("c = {}", c)
    22|      3|    }
    23|       |
-   24|       |    struct InnerStruct {
-   25|       |        inner_struct_field: u32,
+   24|       |    struct InStruct {
+   25|       |        in_struct_field: u32,
    26|       |    }
    27|       |
-   28|       |    const INNER_CONST: u32 = 1234;
+   28|       |    const IN_CONST: u32 = 1234;
    29|       |
-   30|       |    trait InnerTrait {
-   31|       |        fn inner_trait_func(&mut self, incr: u32);
+   30|       |    trait InTrait {
+   31|       |        fn trait_func(&mut self, incr: u32);
    32|       |
    33|      1|        fn default_trait_func(&mut self) {
-   34|      1|            inner_function(INNER_CONST);
-   35|      1|            self.inner_trait_func(INNER_CONST);
+   34|      1|            in_func(IN_CONST);
+   35|      1|            self.trait_func(IN_CONST);
    36|      1|        }
    37|       |    }
    38|       |
-   39|       |    impl InnerTrait for InnerStruct {
-   40|       |        fn inner_trait_func(&mut self, incr: u32) {
-   41|      1|            self.inner_struct_field += incr;
-   42|      1|            inner_function(self.inner_struct_field);
+   39|       |    impl InTrait for InStruct {
+   40|       |        fn trait_func(&mut self, incr: u32) {
+   41|      1|            self.in_struct_field += incr;
+   42|      1|            in_func(self.in_struct_field);
    43|      1|        }
    44|       |    }
    45|       |
-   46|       |    type InnerType = String;
+   46|       |    type InType = String;
    47|       |
    48|      1|    if is_true {
-   49|      1|        inner_function(countdown);
+   49|      1|        in_func(countdown);
    50|      1|    }
    51|       |
-   52|      1|    let mut val = InnerStruct {
-   53|      1|        inner_struct_field: 101,
+   52|      1|    let mut val = InStruct {
+   53|      1|        in_struct_field: 101,
    54|      1|    };
    55|      1|
    56|      1|    val.default_trait_func();
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.lazy_boolean.txt b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.lazy_boolean.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.lazy_boolean.txt
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.lazy_boolean.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.loop_break_value.txt b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.loop_break_value.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.loop_break_value.txt
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.loop_break_value.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.simple_loop.txt b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.simple_loop.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.simple_loop.txt
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.simple_loop.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.simple_match.txt b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.simple_match.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.simple_match.txt
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.simple_match.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.question_mark_error_result.txt b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.try_error_result.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.question_mark_error_result.txt
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.try_error_result.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.various_conditions.txt b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.various_conditions.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.various_conditions.txt
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.various_conditions.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.while_early_return.txt b/src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.while_early_return.txt
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/expected_show_coverage.while_early_return.txt
rename to src/test/run-make-fulldeps/coverage-reports-deadcode/expected_show_coverage.while_early_return.txt
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/Makefile b/src/test/run-make-fulldeps/coverage-spanview-base/Makefile
similarity index 89%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/Makefile
rename to src/test/run-make-fulldeps/coverage-spanview-base/Makefile
index f59c72dd399..fa2f4ec394e 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/Makefile
+++ b/src/test/run-make-fulldeps/coverage-spanview-base/Makefile
@@ -2,11 +2,11 @@
 
 # ISSUE(76038): When targeting MSVC, Rust binaries built with both `-Z instrument-coverage` and
 # `-C link-dead-code` typically crash (with a seg-fault) or at best generate an empty `*.profraw`.
-# See ../instrument-coverage/coverage_tools.mk for more information.
+# See ../coverage/coverage_tools.mk for more information.
 
--include ../instrument-coverage/coverage_tools.mk
+-include ../coverage/coverage_tools.mk
 
-SOURCEDIR=../instrument-coverage
+SOURCEDIR=../coverage
 
 all: $(patsubst $(SOURCEDIR)/%.rs,%,$(wildcard $(SOURCEDIR)/*.rs))
 
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html
similarity index 93%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html
index 740db365864..f70576ca24e 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html
+++ b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html
@@ -75,7 +75,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -107,7 +107,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -139,7 +139,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -171,7 +171,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -203,7 +203,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -235,7 +235,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -267,7 +267,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -299,7 +299,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -331,7 +331,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -363,7 +363,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -395,7 +395,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -427,7 +427,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -459,7 +459,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -491,7 +491,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -523,7 +523,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -555,7 +555,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -593,7 +593,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -629,7 +629,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -665,7 +665,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -701,7 +701,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -737,7 +737,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -773,7 +773,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -809,7 +809,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -845,7 +845,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -881,7 +881,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -923,7 +923,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -948,7 +948,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -969,7 +969,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1001,7 +1001,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1026,7 +1026,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1047,7 +1047,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1079,7 +1079,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1104,7 +1104,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1125,7 +1125,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1157,7 +1157,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1182,7 +1182,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1203,7 +1203,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1235,7 +1235,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1260,7 +1260,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1281,7 +1281,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1313,7 +1313,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1338,7 +1338,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1359,7 +1359,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1391,7 +1391,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1416,7 +1416,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1437,7 +1437,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1469,7 +1469,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1494,7 +1494,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1515,7 +1515,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1547,7 +1547,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1572,7 +1572,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1593,7 +1593,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1625,7 +1625,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1650,7 +1650,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1671,7 +1671,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1703,7 +1703,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1728,7 +1728,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1749,7 +1749,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1781,7 +1781,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1806,7 +1806,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1827,7 +1827,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1859,7 +1859,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1884,7 +1884,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1905,7 +1905,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1937,7 +1937,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1962,7 +1962,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1983,7 +1983,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2015,7 +2015,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2040,7 +2040,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2061,7 +2061,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2093,7 +2093,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2118,7 +2118,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2139,7 +2139,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2171,7 +2171,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2196,7 +2196,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2217,7 +2217,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2249,7 +2249,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2274,7 +2274,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2295,7 +2295,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2327,7 +2327,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2352,7 +2352,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2373,7 +2373,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2405,7 +2405,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2430,7 +2430,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2451,7 +2451,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2483,7 +2483,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2508,7 +2508,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2529,7 +2529,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2567,7 +2567,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2592,7 +2592,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2613,7 +2613,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2647,7 +2647,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2672,7 +2672,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2693,7 +2693,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2727,7 +2727,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2752,7 +2752,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2773,7 +2773,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2807,7 +2807,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2832,7 +2832,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2853,7 +2853,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2887,7 +2887,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2912,7 +2912,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2933,7 +2933,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2967,7 +2967,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2992,7 +2992,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3013,7 +3013,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3047,7 +3047,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3072,7 +3072,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3093,7 +3093,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3127,7 +3127,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3152,7 +3152,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3173,7 +3173,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3207,7 +3207,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3232,7 +3232,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3253,7 +3253,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3293,7 +3293,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3318,7 +3318,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3339,7 +3339,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3362,7 +3362,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -3395,7 +3395,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3420,7 +3420,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3441,7 +3441,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3464,7 +3464,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -3497,7 +3497,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3522,7 +3522,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3543,7 +3543,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3566,7 +3566,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -3599,7 +3599,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3624,7 +3624,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3645,7 +3645,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3668,7 +3668,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -3701,7 +3701,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3726,7 +3726,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3747,7 +3747,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3770,7 +3770,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -3803,7 +3803,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3828,7 +3828,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3849,7 +3849,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3872,7 +3872,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -3905,7 +3905,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3930,7 +3930,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3951,7 +3951,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3974,7 +3974,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -4007,7 +4007,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -4032,7 +4032,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -4053,7 +4053,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -4076,7 +4076,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -4109,7 +4109,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -4134,7 +4134,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -4155,7 +4155,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -4178,7 +4178,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -4211,7 +4211,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -4236,7 +4236,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -4257,7 +4257,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -4280,7 +4280,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -4313,7 +4313,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -4338,7 +4338,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -4359,7 +4359,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -4382,7 +4382,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -4415,7 +4415,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -4440,7 +4440,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -4461,7 +4461,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -4484,7 +4484,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.generics/generics.{impl#0}-set_strength.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.generics/generics.{impl#0}-set_strength.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.generics/generics.{impl#0}-set_strength.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.generics/generics.{impl#0}-set_strength.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.if/if.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.if/if.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.if/if.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.if/if.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.if_else/if_else.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.if_else/if_else.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.if_else/if_else.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.if_else/if_else.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.inner_items/inner_items.main-InnerTrait-default_trait_func.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.inner_items/inner_items.main-InTrait-default_trait_func.-------.InstrumentCoverage.0.html
similarity index 66%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.inner_items/inner_items.main-InnerTrait-default_trait_func.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.inner_items/inner_items.main-InTrait-default_trait_func.-------.InstrumentCoverage.0.html
index 6998bb32a3f..20c54d0e6b4 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.inner_items/inner_items.main-InnerTrait-default_trait_func.-------.InstrumentCoverage.0.html
+++ b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.inner_items/inner_items.main-InTrait-default_trait_func.-------.InstrumentCoverage.0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>inner_items.main-InnerTrait-default_trait_func - Coverage Spans</title>
+<title>inner_items.main-InTrait-default_trait_func - Coverage Spans</title>
 <style>
     .line {
         counter-increment: line;
@@ -59,24 +59,24 @@
 </style>
 </head>
 <body>
-<div class="code" style="counter-reset: line 32"><span class="line">        <span class="code" style="--layer: 0">fn default_trait_func(&amp;mut self) </span><span><span class="code even" style="--layer: 1" title="34:13-34:40: @0.Call: _2 = inner_function(const INNER_CONST) -&gt; [return: bb1, unwind: bb3]
+<div class="code" style="counter-reset: line 32"><span class="line">        <span class="code" style="--layer: 0">fn default_trait_func(&amp;mut self) </span><span><span class="code even" style="--layer: 1" title="34:13-34:30: @0.Call: _2 = in_func(const IN_CONST) -&gt; [return: bb1, unwind: bb3]
 35:13-35:17: @1[3]: _4 = &amp;mut (*_1)
-35:13-35:47: @1.Call: _3 = &lt;Self as InnerTrait&gt;::inner_trait_func(move _4, const INNER_CONST) -&gt; [return: bb2, unwind: bb3]
+35:13-35:38: @1.Call: _3 = &lt;Self as InTrait&gt;::trait_func(move _4, const IN_CONST) -&gt; [return: bb2, unwind: bb3]
 33:42-36:10: @2[2]: _0 = const ()
 36:10-36:10: @2.Return: return"><span class="annotation">@0,1,2⦊</span>{</span></span>
-<span class="line"><span class="code even" style="--layer: 1" title="34:13-34:40: @0.Call: _2 = inner_function(const INNER_CONST) -&gt; [return: bb1, unwind: bb3]
+<span class="line"><span class="code even" style="--layer: 1" title="34:13-34:30: @0.Call: _2 = in_func(const IN_CONST) -&gt; [return: bb1, unwind: bb3]
 35:13-35:17: @1[3]: _4 = &amp;mut (*_1)
-35:13-35:47: @1.Call: _3 = &lt;Self as InnerTrait&gt;::inner_trait_func(move _4, const INNER_CONST) -&gt; [return: bb2, unwind: bb3]
+35:13-35:38: @1.Call: _3 = &lt;Self as InTrait&gt;::trait_func(move _4, const IN_CONST) -&gt; [return: bb2, unwind: bb3]
 33:42-36:10: @2[2]: _0 = const ()
-36:10-36:10: @2.Return: return">            inner_function(INNER_CONST);</span></span>
-<span class="line"><span class="code even" style="--layer: 1" title="34:13-34:40: @0.Call: _2 = inner_function(const INNER_CONST) -&gt; [return: bb1, unwind: bb3]
+36:10-36:10: @2.Return: return">            in_func(IN_CONST);</span></span>
+<span class="line"><span class="code even" style="--layer: 1" title="34:13-34:30: @0.Call: _2 = in_func(const IN_CONST) -&gt; [return: bb1, unwind: bb3]
 35:13-35:17: @1[3]: _4 = &amp;mut (*_1)
-35:13-35:47: @1.Call: _3 = &lt;Self as InnerTrait&gt;::inner_trait_func(move _4, const INNER_CONST) -&gt; [return: bb2, unwind: bb3]
+35:13-35:38: @1.Call: _3 = &lt;Self as InTrait&gt;::trait_func(move _4, const IN_CONST) -&gt; [return: bb2, unwind: bb3]
 33:42-36:10: @2[2]: _0 = const ()
-36:10-36:10: @2.Return: return">            self.inner_trait_func(INNER_CONST);</span></span>
-<span class="line"><span class="code even" style="--layer: 1" title="34:13-34:40: @0.Call: _2 = inner_function(const INNER_CONST) -&gt; [return: bb1, unwind: bb3]
+36:10-36:10: @2.Return: return">            self.trait_func(IN_CONST);</span></span>
+<span class="line"><span class="code even" style="--layer: 1" title="34:13-34:30: @0.Call: _2 = in_func(const IN_CONST) -&gt; [return: bb1, unwind: bb3]
 35:13-35:17: @1[3]: _4 = &amp;mut (*_1)
-35:13-35:47: @1.Call: _3 = &lt;Self as InnerTrait&gt;::inner_trait_func(move _4, const INNER_CONST) -&gt; [return: bb2, unwind: bb3]
+35:13-35:38: @1.Call: _3 = &lt;Self as InTrait&gt;::trait_func(move _4, const IN_CONST) -&gt; [return: bb2, unwind: bb3]
 33:42-36:10: @2[2]: _0 = const ()
 36:10-36:10: @2.Return: return">        }<span class="annotation">⦉@0,1,2</span></span></span></span></div>
 </body>
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.inner_items/inner_items.main-inner_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.inner_items/inner_items.main-in_func.-------.InstrumentCoverage.0.html
similarity index 94%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.inner_items/inner_items.main-inner_function.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.inner_items/inner_items.main-in_func.-------.InstrumentCoverage.0.html
index c87ff329f3f..49639cc6884 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.inner_items/inner_items.main-inner_function.-------.InstrumentCoverage.0.html
+++ b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.inner_items/inner_items.main-in_func.-------.InstrumentCoverage.0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>inner_items.main-inner_function - Coverage Spans</title>
+<title>inner_items.main-in_func - Coverage Spans</title>
 <style>
     .line {
         counter-increment: line;
@@ -59,13 +59,13 @@
 </style>
 </head>
 <body>
-<div class="code" style="counter-reset: line 17"><span class="line">    <span class="code" style="--layer: 0">fn inner_function(a: u32) {</span></span>
+<div class="code" style="counter-reset: line 17"><span class="line">    <span class="code" style="--layer: 0">fn in_func(a: u32) {</span></span>
 <span class="line"><span class="code" style="--layer: 0">        let </span><span><span class="code even" style="--layer: 1" title="19:17-19:18: @0[1]: _2 = const 1_u32
 19:13-19:14: @0[2]: FakeRead(ForLet, _2)"><span class="annotation">@0⦊</span>b = 1<span class="annotation">⦉@0</span></span></span><span class="code" style="--layer: 0">;</span></span>
 <span class="line"><span class="code" style="--layer: 0">        let </span><span><span class="code odd" style="--layer: 1" title="20:13-20:14: @1[3]: FakeRead(ForLet, _3)"><span class="annotation">@1,2,3,4⦊</span>c<span class="annotation">⦉@1,2,3,4</span></span></span><span class="code" style="--layer: 0"> = </span><span><span class="code even" style="--layer: 1" title="20:17-20:18: @0[5]: _4 = _1
 20:21-20:22: @0[7]: _5 = _2
 20:17-20:22: @0[8]: _6 = CheckedAdd(_4, _5)"><span class="annotation">@0⦊</span>a + b<span class="annotation">⦉@0</span></span></span><span class="code" style="--layer: 0">;</span></span>
-<span class="line"><span class="code" style="--layer: 0">        </span><span><span class="code odd" style="--layer: 1" title="21:18-21:26: @1[9]: _23 = const inner_function::promoted[0]
+<span class="line"><span class="code" style="--layer: 0">        </span><span><span class="code odd" style="--layer: 1" title="21:18-21:26: @1[9]: _23 = const in_func::promoted[0]
 21:18-21:26: @1[10]: _11 = &amp;(*_23)
 21:18-21:26: @1[11]: _10 = &amp;(*_11)
 21:18-21:26: @1[12]: _9 = move _10 as &amp;[&amp;str] (Pointer(Unsize))
@@ -84,7 +84,7 @@
 21:9-21:30: @3.Call: _7 = _print(move _8) -&gt; [return: bb4, unwind: bb5]
 21:9-21:30: @4[6]: _0 = const ()
 22:6-22:6: @4.Return: return"><span class="annotation">@1,2,3,4⦊</span>println!("c = {}", c)</span></span>
-<span class="line"><span class="code odd" style="--layer: 1" title="21:18-21:26: @1[9]: _23 = const inner_function::promoted[0]
+<span class="line"><span class="code odd" style="--layer: 1" title="21:18-21:26: @1[9]: _23 = const in_func::promoted[0]
 21:18-21:26: @1[10]: _11 = &amp;(*_23)
 21:18-21:26: @1[11]: _10 = &amp;(*_11)
 21:18-21:26: @1[12]: _9 = move _10 as &amp;[&amp;str] (Pointer(Unsize))
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.inner_items/inner_items.main-{impl#0}-inner_trait_func.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.inner_items/inner_items.main-{impl#0}-trait_func.-------.InstrumentCoverage.0.html
similarity index 73%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.inner_items/inner_items.main-{impl#0}-inner_trait_func.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.inner_items/inner_items.main-{impl#0}-trait_func.-------.InstrumentCoverage.0.html
index 1dc29d400d8..a2cf86de278 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.inner_items/inner_items.main-{impl#0}-inner_trait_func.-------.InstrumentCoverage.0.html
+++ b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.inner_items/inner_items.main-{impl#0}-trait_func.-------.InstrumentCoverage.0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>inner_items.main-{impl#0}-inner_trait_func - Coverage Spans</title>
+<title>inner_items.main-{impl#0}-trait_func - Coverage Spans</title>
 <style>
     .line {
         counter-increment: line;
@@ -59,14 +59,14 @@
 </style>
 </head>
 <body>
-<div class="code" style="counter-reset: line 39"><span class="line">        <span class="code" style="--layer: 0">fn inner_trait_func(&amp;mut self, incr: u32) {</span></span>
-<span class="line"><span class="code" style="--layer: 0">            </span><span><span class="code even" style="--layer: 1" title="41:40-41:44: @0[1]: _3 = _2
-41:13-41:44: @0[2]: _4 = CheckedAdd(((*_1).0: u32), _3)"><span class="annotation">@0⦊</span>self.inner_struct_field += incr<span class="annotation">⦉@0</span></span></span><span class="code" style="--layer: 0">;</span></span>
-<span class="line"><span class="code" style="--layer: 0">            </span><span><span class="code odd" style="--layer: 1" title="42:28-42:51: @1[4]: _6 = ((*_1).0: u32)
-42:13-42:52: @1.Call: _5 = inner_function(move _6) -&gt; [return: bb2, unwind: bb3]
-43:10-43:10: @2.Return: return"><span class="annotation">@1,2⦊</span>inner_function(self.inner_struct_field);</span></span>
-<span class="line"><span class="code odd" style="--layer: 1" title="42:28-42:51: @1[4]: _6 = ((*_1).0: u32)
-42:13-42:52: @1.Call: _5 = inner_function(move _6) -&gt; [return: bb2, unwind: bb3]
+<div class="code" style="counter-reset: line 39"><span class="line">        <span class="code" style="--layer: 0">fn trait_func(&amp;mut self, incr: u32) {</span></span>
+<span class="line"><span class="code" style="--layer: 0">            </span><span><span class="code even" style="--layer: 1" title="41:37-41:41: @0[1]: _3 = _2
+41:13-41:41: @0[2]: _4 = CheckedAdd(((*_1).0: u32), _3)"><span class="annotation">@0⦊</span>self.in_struct_field += incr<span class="annotation">⦉@0</span></span></span><span class="code" style="--layer: 0">;</span></span>
+<span class="line"><span class="code" style="--layer: 0">            </span><span><span class="code odd" style="--layer: 1" title="42:21-42:41: @1[4]: _6 = ((*_1).0: u32)
+42:13-42:42: @1.Call: _5 = in_func(move _6) -&gt; [return: bb2, unwind: bb3]
+43:10-43:10: @2.Return: return"><span class="annotation">@1,2⦊</span>in_func(self.in_struct_field);</span></span>
+<span class="line"><span class="code odd" style="--layer: 1" title="42:21-42:41: @1[4]: _6 = ((*_1).0: u32)
+42:13-42:42: @1.Call: _5 = in_func(move _6) -&gt; [return: bb2, unwind: bb3]
 43:10-43:10: @2.Return: return">        }<span class="annotation">⦉@1,2</span></span></span></span></div>
 </body>
 </html>
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html
similarity index 78%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html
index 9a1256025d9..56557b8ef95 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html
+++ b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html
@@ -92,80 +92,80 @@
 <span class="line"><span class="code odd" style="--layer: 1" title="11:9-11:23: @6[0]: _5 = const 10_u32
 10:16-12:6: @6[1]: _6 = const ()">    }<span class="annotation">⦉@4,6</span></span></span><span class="code" style="--layer: 0"></span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
-<span class="line"><span class="code" style="--layer: 0">    mod inner_mod {</span></span>
-<span class="line"><span class="code" style="--layer: 0">        const INNER_MOD_CONST: u32 = 1000;</span></span>
+<span class="line"><span class="code" style="--layer: 0">    mod in_mod {</span></span>
+<span class="line"><span class="code" style="--layer: 0">        const IN_MOD_CONST: u32 = 1000;</span></span>
 <span class="line"><span class="code" style="--layer: 0">    }</span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
-<span class="line"><span class="code" style="--layer: 0">    fn inner_function(a: u32) {</span></span>
+<span class="line"><span class="code" style="--layer: 0">    fn in_func(a: u32) {</span></span>
 <span class="line"><span class="code" style="--layer: 0">        let b = 1;</span></span>
 <span class="line"><span class="code" style="--layer: 0">        let c = a + b;</span></span>
 <span class="line"><span class="code" style="--layer: 0">        println!("c = {}", c)</span></span>
 <span class="line"><span class="code" style="--layer: 0">    }</span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
-<span class="line"><span class="code" style="--layer: 0">    struct InnerStruct {</span></span>
-<span class="line"><span class="code" style="--layer: 0">        inner_struct_field: u32,</span></span>
+<span class="line"><span class="code" style="--layer: 0">    struct InStruct {</span></span>
+<span class="line"><span class="code" style="--layer: 0">        in_struct_field: u32,</span></span>
 <span class="line"><span class="code" style="--layer: 0">    }</span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
-<span class="line"><span class="code" style="--layer: 0">    const INNER_CONST: u32 = 1234;</span></span>
+<span class="line"><span class="code" style="--layer: 0">    const IN_CONST: u32 = 1234;</span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
-<span class="line"><span class="code" style="--layer: 0">    trait InnerTrait {</span></span>
-<span class="line"><span class="code" style="--layer: 0">        fn inner_trait_func(&amp;mut self, incr: u32);</span></span>
+<span class="line"><span class="code" style="--layer: 0">    trait InTrait {</span></span>
+<span class="line"><span class="code" style="--layer: 0">        fn trait_func(&amp;mut self, incr: u32);</span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
 <span class="line"><span class="code" style="--layer: 0">        fn default_trait_func(&amp;mut self) {</span></span>
-<span class="line"><span class="code" style="--layer: 0">            inner_function(INNER_CONST);</span></span>
-<span class="line"><span class="code" style="--layer: 0">            self.inner_trait_func(INNER_CONST);</span></span>
+<span class="line"><span class="code" style="--layer: 0">            in_func(IN_CONST);</span></span>
+<span class="line"><span class="code" style="--layer: 0">            self.trait_func(IN_CONST);</span></span>
 <span class="line"><span class="code" style="--layer: 0">        }</span></span>
 <span class="line"><span class="code" style="--layer: 0">    }</span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
-<span class="line"><span class="code" style="--layer: 0">    impl InnerTrait for InnerStruct {</span></span>
-<span class="line"><span class="code" style="--layer: 0">        fn inner_trait_func(&amp;mut self, incr: u32) {</span></span>
-<span class="line"><span class="code" style="--layer: 0">            self.inner_struct_field += incr;</span></span>
-<span class="line"><span class="code" style="--layer: 0">            inner_function(self.inner_struct_field);</span></span>
+<span class="line"><span class="code" style="--layer: 0">    impl InTrait for InStruct {</span></span>
+<span class="line"><span class="code" style="--layer: 0">        fn trait_func(&amp;mut self, incr: u32) {</span></span>
+<span class="line"><span class="code" style="--layer: 0">            self.in_struct_field += incr;</span></span>
+<span class="line"><span class="code" style="--layer: 0">            in_func(self.in_struct_field);</span></span>
 <span class="line"><span class="code" style="--layer: 0">        }</span></span>
 <span class="line"><span class="code" style="--layer: 0">    }</span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
-<span class="line"><span class="code" style="--layer: 0">    type InnerType = String;</span></span>
+<span class="line"><span class="code" style="--layer: 0">    type InType = String;</span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
 <span class="line"><span class="code" style="--layer: 0">    if </span><span><span class="code even" style="--layer: 1" title="48:8-48:15: @7[4]: _9 = _1
-48:8-48:15: @7[5]: FakeRead(ForMatchedPlace, _9)"><span class="annotation">@7⦊</span>is_true<span class="annotation">⦉@7</span></span></span><span class="code" style="--layer: 0"> </span><span><span class="code odd" style="--layer: 1" title="49:24-49:33: @10[2]: _11 = _5
-49:9-49:34: @10.Call: _10 = inner_function(move _11) -&gt; [return: bb11, unwind: bb15]
+48:8-48:15: @7[5]: FakeRead(ForMatchedPlace, _9)"><span class="annotation">@7⦊</span>is_true<span class="annotation">⦉@7</span></span></span><span class="code" style="--layer: 0"> </span><span><span class="code odd" style="--layer: 1" title="49:17-49:26: @10[2]: _11 = _5
+49:9-49:27: @10.Call: _10 = in_func(move _11) -&gt; [return: bb11, unwind: bb15]
 48:16-50:6: @11[2]: _8 = const ()"><span class="annotation">@8,10,11⦊</span>{</span></span>
-<span class="line"><span class="code odd" style="--layer: 1" title="49:24-49:33: @10[2]: _11 = _5
-49:9-49:34: @10.Call: _10 = inner_function(move _11) -&gt; [return: bb11, unwind: bb15]
-48:16-50:6: @11[2]: _8 = const ()">        inner_function(countdown);</span></span>
-<span class="line"><span class="code odd" style="--layer: 1" title="49:24-49:33: @10[2]: _11 = _5
-49:9-49:34: @10.Call: _10 = inner_function(move _11) -&gt; [return: bb11, unwind: bb15]
+<span class="line"><span class="code odd" style="--layer: 1" title="49:17-49:26: @10[2]: _11 = _5
+49:9-49:27: @10.Call: _10 = in_func(move _11) -&gt; [return: bb11, unwind: bb15]
+48:16-50:6: @11[2]: _8 = const ()">        in_func(countdown);</span></span>
+<span class="line"><span class="code odd" style="--layer: 1" title="49:17-49:26: @10[2]: _11 = _5
+49:9-49:27: @10.Call: _10 = in_func(move _11) -&gt; [return: bb11, unwind: bb15]
 48:16-50:6: @11[2]: _8 = const ()">    }<span class="annotation">⦉@8,10,11</span></span></span><span class="code" style="--layer: 0"></span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
-<span class="line"><span class="code" style="--layer: 0">    let </span><span><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InnerStruct { inner_struct_field: const 101_u32 }
+<span class="line"><span class="code" style="--layer: 0">    let </span><span><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InStruct { in_struct_field: const 101_u32 }
 52:9-52:16: @12[4]: FakeRead(ForLet, _12)
 56:5-56:8: @12[7]: _14 = &amp;mut _12
-56:5-56:29: @12.Call: _13 = &lt;InnerStruct as InnerTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
-57:2-57:2: @13.Return: return"><span class="annotation">@12,13⦊</span>mut val = InnerStruct {</span></span>
-<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InnerStruct { inner_struct_field: const 101_u32 }
+56:5-56:29: @12.Call: _13 = &lt;InStruct as InTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
+57:2-57:2: @13.Return: return"><span class="annotation">@12,13⦊</span>mut val = InStruct {</span></span>
+<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InStruct { in_struct_field: const 101_u32 }
 52:9-52:16: @12[4]: FakeRead(ForLet, _12)
 56:5-56:8: @12[7]: _14 = &amp;mut _12
-56:5-56:29: @12.Call: _13 = &lt;InnerStruct as InnerTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
-57:2-57:2: @13.Return: return">        inner_struct_field: 101,</span></span>
-<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InnerStruct { inner_struct_field: const 101_u32 }
+56:5-56:29: @12.Call: _13 = &lt;InStruct as InTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
+57:2-57:2: @13.Return: return">        in_struct_field: 101,</span></span>
+<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InStruct { in_struct_field: const 101_u32 }
 52:9-52:16: @12[4]: FakeRead(ForLet, _12)
 56:5-56:8: @12[7]: _14 = &amp;mut _12
-56:5-56:29: @12.Call: _13 = &lt;InnerStruct as InnerTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
+56:5-56:29: @12.Call: _13 = &lt;InStruct as InTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
 57:2-57:2: @13.Return: return">    };</span></span>
-<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InnerStruct { inner_struct_field: const 101_u32 }
+<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InStruct { in_struct_field: const 101_u32 }
 52:9-52:16: @12[4]: FakeRead(ForLet, _12)
 56:5-56:8: @12[7]: _14 = &amp;mut _12
-56:5-56:29: @12.Call: _13 = &lt;InnerStruct as InnerTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
+56:5-56:29: @12.Call: _13 = &lt;InStruct as InTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
 57:2-57:2: @13.Return: return"></span></span>
-<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InnerStruct { inner_struct_field: const 101_u32 }
+<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InStruct { in_struct_field: const 101_u32 }
 52:9-52:16: @12[4]: FakeRead(ForLet, _12)
 56:5-56:8: @12[7]: _14 = &amp;mut _12
-56:5-56:29: @12.Call: _13 = &lt;InnerStruct as InnerTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
+56:5-56:29: @12.Call: _13 = &lt;InStruct as InTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
 57:2-57:2: @13.Return: return">    val.default_trait_func();</span></span>
-<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InnerStruct { inner_struct_field: const 101_u32 }
+<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InStruct { in_struct_field: const 101_u32 }
 52:9-52:16: @12[4]: FakeRead(ForLet, _12)
 56:5-56:8: @12[7]: _14 = &amp;mut _12
-56:5-56:29: @12.Call: _13 = &lt;InnerStruct as InnerTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
+56:5-56:29: @12.Call: _13 = &lt;InStruct as InTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
 57:2-57:2: @13.Return: return">}<span class="annotation">⦉@12,13</span></span></span></span></div>
 </body>
 </html>
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.lazy_boolean/lazy_boolean.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.lazy_boolean/lazy_boolean.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.lazy_boolean/lazy_boolean.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.lazy_boolean/lazy_boolean.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.loop_break_value/loop_break_value.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.loop_break_value/loop_break_value.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.loop_break_value/loop_break_value.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.loop_break_value/loop_break_value.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.simple_loop/simple_loop.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.simple_loop/simple_loop.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.simple_loop/simple_loop.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.simple_loop/simple_loop.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.simple_match/simple_match.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.simple_match/simple_match.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.simple_match/simple_match.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.simple_match/simple_match.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.question_mark_error_result/question_mark_error_result.call.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.try_error_result/try_error_result.call.-------.InstrumentCoverage.0.html
similarity index 98%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.question_mark_error_result/question_mark_error_result.call.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.try_error_result/try_error_result.call.-------.InstrumentCoverage.0.html
index 0c253d5e5c2..9f993342340 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.question_mark_error_result/question_mark_error_result.call.-------.InstrumentCoverage.0.html
+++ b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.try_error_result/try_error_result.call.-------.InstrumentCoverage.0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>question_mark_error_result.call - Coverage Spans</title>
+<title>try_error_result.call - Coverage Spans</title>
 <style>
     .line {
         counter-increment: line;
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.question_mark_error_result/question_mark_error_result.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.try_error_result/try_error_result.main.-------.InstrumentCoverage.0.html
similarity index 99%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.question_mark_error_result/question_mark_error_result.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.try_error_result/try_error_result.main.-------.InstrumentCoverage.0.html
index 2589b0454da..660c3031f35 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.question_mark_error_result/question_mark_error_result.main.-------.InstrumentCoverage.0.html
+++ b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.try_error_result/try_error_result.main.-------.InstrumentCoverage.0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>question_mark_error_result.main - Coverage Spans</title>
+<title>try_error_result.main - Coverage Spans</title>
 <style>
     .line {
         counter-increment: line;
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.various_conditions/various_conditions.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.various_conditions/various_conditions.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.various_conditions/various_conditions.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.various_conditions/various_conditions.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.while_early_return/while_early_return.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.while_early_return/while_early_return.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.while_early_return/while_early_return.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-base/expected_mir_dump.while_early_return/while_early_return.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/Makefile b/src/test/run-make-fulldeps/coverage-spanview-deadcode/Makefile
similarity index 71%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/Makefile
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/Makefile
index 2d82c3b3453..826e85b35e5 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/Makefile
+++ b/src/test/run-make-fulldeps/coverage-spanview-deadcode/Makefile
@@ -4,8 +4,8 @@
 # LINK_DEAD_CODE requires ignore-msvc due to Issue #76038
 LINK_DEAD_CODE=yes
 
--include ../instrument-coverage-mir-cov-html-base/Makefile
+-include ../coverage-spanview-base/Makefile
 
 # ISSUE(76038): When targeting MSVC, Rust binaries built with both `-Z instrument-coverage` and
 # `-C link-dead-code` typically crash (with a seg-fault) or at best generate an empty `*.profraw`.
-# See ../instrument-coverage/coverage_tools.mk for more information.
+# See ../coverage/coverage_tools.mk for more information.
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html
similarity index 93%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html
index 740db365864..f70576ca24e 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html
+++ b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html
@@ -75,7 +75,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -107,7 +107,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -139,7 +139,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -171,7 +171,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -203,7 +203,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -235,7 +235,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -267,7 +267,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -299,7 +299,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -331,7 +331,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -363,7 +363,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -395,7 +395,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -427,7 +427,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -459,7 +459,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -491,7 +491,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -523,7 +523,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -555,7 +555,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -593,7 +593,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -629,7 +629,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -665,7 +665,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -701,7 +701,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -737,7 +737,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -773,7 +773,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -809,7 +809,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -845,7 +845,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -881,7 +881,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -923,7 +923,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -948,7 +948,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -969,7 +969,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1001,7 +1001,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1026,7 +1026,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1047,7 +1047,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1079,7 +1079,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1104,7 +1104,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1125,7 +1125,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1157,7 +1157,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1182,7 +1182,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1203,7 +1203,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1235,7 +1235,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1260,7 +1260,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1281,7 +1281,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1313,7 +1313,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1338,7 +1338,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1359,7 +1359,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1391,7 +1391,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1416,7 +1416,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1437,7 +1437,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1469,7 +1469,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1494,7 +1494,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1515,7 +1515,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1547,7 +1547,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1572,7 +1572,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1593,7 +1593,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1625,7 +1625,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1650,7 +1650,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1671,7 +1671,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1703,7 +1703,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1728,7 +1728,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1749,7 +1749,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1781,7 +1781,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1806,7 +1806,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1827,7 +1827,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1859,7 +1859,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1884,7 +1884,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1905,7 +1905,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -1937,7 +1937,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -1962,7 +1962,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -1983,7 +1983,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2015,7 +2015,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2040,7 +2040,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2061,7 +2061,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2093,7 +2093,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2118,7 +2118,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2139,7 +2139,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2171,7 +2171,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2196,7 +2196,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2217,7 +2217,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2249,7 +2249,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2274,7 +2274,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2295,7 +2295,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2327,7 +2327,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2352,7 +2352,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2373,7 +2373,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2405,7 +2405,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2430,7 +2430,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2451,7 +2451,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2483,7 +2483,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2508,7 +2508,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2529,7 +2529,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2567,7 +2567,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2592,7 +2592,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2613,7 +2613,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2647,7 +2647,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2672,7 +2672,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2693,7 +2693,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2727,7 +2727,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2752,7 +2752,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2773,7 +2773,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2807,7 +2807,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2832,7 +2832,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2853,7 +2853,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2887,7 +2887,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2912,7 +2912,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -2933,7 +2933,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -2967,7 +2967,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -2992,7 +2992,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3013,7 +3013,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3047,7 +3047,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3072,7 +3072,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3093,7 +3093,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3127,7 +3127,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3152,7 +3152,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3173,7 +3173,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3207,7 +3207,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3232,7 +3232,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3253,7 +3253,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3293,7 +3293,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3318,7 +3318,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3339,7 +3339,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3362,7 +3362,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -3395,7 +3395,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3420,7 +3420,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3441,7 +3441,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3464,7 +3464,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -3497,7 +3497,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3522,7 +3522,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3543,7 +3543,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3566,7 +3566,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -3599,7 +3599,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3624,7 +3624,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3645,7 +3645,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3668,7 +3668,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -3701,7 +3701,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3726,7 +3726,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3747,7 +3747,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3770,7 +3770,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -3803,7 +3803,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3828,7 +3828,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3849,7 +3849,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3872,7 +3872,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -3905,7 +3905,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -3930,7 +3930,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -3951,7 +3951,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -3974,7 +3974,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -4007,7 +4007,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -4032,7 +4032,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -4053,7 +4053,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -4076,7 +4076,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -4109,7 +4109,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -4134,7 +4134,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -4155,7 +4155,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -4178,7 +4178,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -4211,7 +4211,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -4236,7 +4236,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -4257,7 +4257,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -4280,7 +4280,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -4313,7 +4313,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -4338,7 +4338,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -4359,7 +4359,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -4382,7 +4382,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
@@ -4415,7 +4415,7 @@
 12:9-12:32: @5[10]: _13 = &amp;(*_14)
 12:9-12:32: @5[11]: _12 = move _13 as &amp;[&amp;str] (Pointer(Unsize))
 14:9-14:20: @5[21]: _23 = move _7
-14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
+14:9-26:10: @5.Call: _22 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:18:13: 25:14]&gt;(move _23, move _24) -&gt; [return: bb6, unwind: bb45]
 14:9-26:10: @6[2]: _21 = &amp;_22
 11:5-27:7: @6[3]: _20 = (move _21,)
 11:5-27:7: @6[5]: FakeRead(ForMatchedPlace, _20)
@@ -4440,7 +4440,7 @@
 42:9-42:32: @14[16]: _37 = move _38 as &amp;[&amp;str] (Pointer(Unsize))
 44:9-44:20: @14[26]: _48 = move _7
 48:13-48:14: @14[28]: _49 = _32
-44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
+44:9-49:10: @14.Call: _47 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:33:9: 40:6]&gt;(move _48, move _49) -&gt; [return: bb15, unwind: bb42]
 44:9-49:10: @15[2]: _46 = &amp;_47
 41:5-50:7: @15[3]: _45 = (move _46,)
 41:5-50:7: @15[5]: FakeRead(ForMatchedPlace, _45)
@@ -4461,7 +4461,7 @@
 54:9-54:32: @21[9]: _59 = &amp;(*_60)
 54:9-54:32: @21[10]: _58 = move _59 as &amp;[&amp;str] (Pointer(Unsize))
 56:9-56:20: @21[20]: _69 = move _7
-56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
+56:9-68:10: @21.Call: _68 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:60:13: 67:14]&gt;(move _69, move _70) -&gt; [return: bb22, unwind: bb39]
 56:9-68:10: @22[2]: _67 = &amp;_68
 53:5-69:7: @22[3]: _66 = (move _67,)
 53:5-69:7: @22[5]: FakeRead(ForMatchedPlace, _66)
@@ -4484,7 +4484,7 @@
 84:9-84:32: @28[16]: _82 = move _83 as &amp;[&amp;str] (Pointer(Unsize))
 86:9-86:20: @28[26]: _93 = move _7
 90:13-90:14: @28[28]: _94 = _77
-86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../instrument-coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
+86:9-91:10: @28.Call: _92 = Option::&lt;String&gt;::unwrap_or_else::&lt;[closure@../coverage/closure.rs:75:9: 82:6]&gt;(move _93, move _94) -&gt; [return: bb29, unwind: bb36]
 86:9-91:10: @29[2]: _91 = &amp;_92
 83:5-92:7: @29[3]: _90 = (move _91,)
 83:5-92:7: @29[5]: FakeRead(ForMatchedPlace, _90)
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.generics/generics.{impl#0}-set_strength.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.generics/generics.{impl#0}-set_strength.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.generics/generics.{impl#0}-set_strength.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.generics/generics.{impl#0}-set_strength.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.if/if.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.if/if.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.if/if.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.if/if.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.if_else/if_else.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.if_else/if_else.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.if_else/if_else.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.if_else/if_else.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.inner_items/inner_items.main-InnerTrait-default_trait_func.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.inner_items/inner_items.main-InTrait-default_trait_func.-------.InstrumentCoverage.0.html
similarity index 66%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.inner_items/inner_items.main-InnerTrait-default_trait_func.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.inner_items/inner_items.main-InTrait-default_trait_func.-------.InstrumentCoverage.0.html
index 6998bb32a3f..20c54d0e6b4 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.inner_items/inner_items.main-InnerTrait-default_trait_func.-------.InstrumentCoverage.0.html
+++ b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.inner_items/inner_items.main-InTrait-default_trait_func.-------.InstrumentCoverage.0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>inner_items.main-InnerTrait-default_trait_func - Coverage Spans</title>
+<title>inner_items.main-InTrait-default_trait_func - Coverage Spans</title>
 <style>
     .line {
         counter-increment: line;
@@ -59,24 +59,24 @@
 </style>
 </head>
 <body>
-<div class="code" style="counter-reset: line 32"><span class="line">        <span class="code" style="--layer: 0">fn default_trait_func(&amp;mut self) </span><span><span class="code even" style="--layer: 1" title="34:13-34:40: @0.Call: _2 = inner_function(const INNER_CONST) -&gt; [return: bb1, unwind: bb3]
+<div class="code" style="counter-reset: line 32"><span class="line">        <span class="code" style="--layer: 0">fn default_trait_func(&amp;mut self) </span><span><span class="code even" style="--layer: 1" title="34:13-34:30: @0.Call: _2 = in_func(const IN_CONST) -&gt; [return: bb1, unwind: bb3]
 35:13-35:17: @1[3]: _4 = &amp;mut (*_1)
-35:13-35:47: @1.Call: _3 = &lt;Self as InnerTrait&gt;::inner_trait_func(move _4, const INNER_CONST) -&gt; [return: bb2, unwind: bb3]
+35:13-35:38: @1.Call: _3 = &lt;Self as InTrait&gt;::trait_func(move _4, const IN_CONST) -&gt; [return: bb2, unwind: bb3]
 33:42-36:10: @2[2]: _0 = const ()
 36:10-36:10: @2.Return: return"><span class="annotation">@0,1,2⦊</span>{</span></span>
-<span class="line"><span class="code even" style="--layer: 1" title="34:13-34:40: @0.Call: _2 = inner_function(const INNER_CONST) -&gt; [return: bb1, unwind: bb3]
+<span class="line"><span class="code even" style="--layer: 1" title="34:13-34:30: @0.Call: _2 = in_func(const IN_CONST) -&gt; [return: bb1, unwind: bb3]
 35:13-35:17: @1[3]: _4 = &amp;mut (*_1)
-35:13-35:47: @1.Call: _3 = &lt;Self as InnerTrait&gt;::inner_trait_func(move _4, const INNER_CONST) -&gt; [return: bb2, unwind: bb3]
+35:13-35:38: @1.Call: _3 = &lt;Self as InTrait&gt;::trait_func(move _4, const IN_CONST) -&gt; [return: bb2, unwind: bb3]
 33:42-36:10: @2[2]: _0 = const ()
-36:10-36:10: @2.Return: return">            inner_function(INNER_CONST);</span></span>
-<span class="line"><span class="code even" style="--layer: 1" title="34:13-34:40: @0.Call: _2 = inner_function(const INNER_CONST) -&gt; [return: bb1, unwind: bb3]
+36:10-36:10: @2.Return: return">            in_func(IN_CONST);</span></span>
+<span class="line"><span class="code even" style="--layer: 1" title="34:13-34:30: @0.Call: _2 = in_func(const IN_CONST) -&gt; [return: bb1, unwind: bb3]
 35:13-35:17: @1[3]: _4 = &amp;mut (*_1)
-35:13-35:47: @1.Call: _3 = &lt;Self as InnerTrait&gt;::inner_trait_func(move _4, const INNER_CONST) -&gt; [return: bb2, unwind: bb3]
+35:13-35:38: @1.Call: _3 = &lt;Self as InTrait&gt;::trait_func(move _4, const IN_CONST) -&gt; [return: bb2, unwind: bb3]
 33:42-36:10: @2[2]: _0 = const ()
-36:10-36:10: @2.Return: return">            self.inner_trait_func(INNER_CONST);</span></span>
-<span class="line"><span class="code even" style="--layer: 1" title="34:13-34:40: @0.Call: _2 = inner_function(const INNER_CONST) -&gt; [return: bb1, unwind: bb3]
+36:10-36:10: @2.Return: return">            self.trait_func(IN_CONST);</span></span>
+<span class="line"><span class="code even" style="--layer: 1" title="34:13-34:30: @0.Call: _2 = in_func(const IN_CONST) -&gt; [return: bb1, unwind: bb3]
 35:13-35:17: @1[3]: _4 = &amp;mut (*_1)
-35:13-35:47: @1.Call: _3 = &lt;Self as InnerTrait&gt;::inner_trait_func(move _4, const INNER_CONST) -&gt; [return: bb2, unwind: bb3]
+35:13-35:38: @1.Call: _3 = &lt;Self as InTrait&gt;::trait_func(move _4, const IN_CONST) -&gt; [return: bb2, unwind: bb3]
 33:42-36:10: @2[2]: _0 = const ()
 36:10-36:10: @2.Return: return">        }<span class="annotation">⦉@0,1,2</span></span></span></span></div>
 </body>
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.inner_items/inner_items.main-inner_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.inner_items/inner_items.main-in_func.-------.InstrumentCoverage.0.html
similarity index 94%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.inner_items/inner_items.main-inner_function.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.inner_items/inner_items.main-in_func.-------.InstrumentCoverage.0.html
index c87ff329f3f..49639cc6884 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.inner_items/inner_items.main-inner_function.-------.InstrumentCoverage.0.html
+++ b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.inner_items/inner_items.main-in_func.-------.InstrumentCoverage.0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>inner_items.main-inner_function - Coverage Spans</title>
+<title>inner_items.main-in_func - Coverage Spans</title>
 <style>
     .line {
         counter-increment: line;
@@ -59,13 +59,13 @@
 </style>
 </head>
 <body>
-<div class="code" style="counter-reset: line 17"><span class="line">    <span class="code" style="--layer: 0">fn inner_function(a: u32) {</span></span>
+<div class="code" style="counter-reset: line 17"><span class="line">    <span class="code" style="--layer: 0">fn in_func(a: u32) {</span></span>
 <span class="line"><span class="code" style="--layer: 0">        let </span><span><span class="code even" style="--layer: 1" title="19:17-19:18: @0[1]: _2 = const 1_u32
 19:13-19:14: @0[2]: FakeRead(ForLet, _2)"><span class="annotation">@0⦊</span>b = 1<span class="annotation">⦉@0</span></span></span><span class="code" style="--layer: 0">;</span></span>
 <span class="line"><span class="code" style="--layer: 0">        let </span><span><span class="code odd" style="--layer: 1" title="20:13-20:14: @1[3]: FakeRead(ForLet, _3)"><span class="annotation">@1,2,3,4⦊</span>c<span class="annotation">⦉@1,2,3,4</span></span></span><span class="code" style="--layer: 0"> = </span><span><span class="code even" style="--layer: 1" title="20:17-20:18: @0[5]: _4 = _1
 20:21-20:22: @0[7]: _5 = _2
 20:17-20:22: @0[8]: _6 = CheckedAdd(_4, _5)"><span class="annotation">@0⦊</span>a + b<span class="annotation">⦉@0</span></span></span><span class="code" style="--layer: 0">;</span></span>
-<span class="line"><span class="code" style="--layer: 0">        </span><span><span class="code odd" style="--layer: 1" title="21:18-21:26: @1[9]: _23 = const inner_function::promoted[0]
+<span class="line"><span class="code" style="--layer: 0">        </span><span><span class="code odd" style="--layer: 1" title="21:18-21:26: @1[9]: _23 = const in_func::promoted[0]
 21:18-21:26: @1[10]: _11 = &amp;(*_23)
 21:18-21:26: @1[11]: _10 = &amp;(*_11)
 21:18-21:26: @1[12]: _9 = move _10 as &amp;[&amp;str] (Pointer(Unsize))
@@ -84,7 +84,7 @@
 21:9-21:30: @3.Call: _7 = _print(move _8) -&gt; [return: bb4, unwind: bb5]
 21:9-21:30: @4[6]: _0 = const ()
 22:6-22:6: @4.Return: return"><span class="annotation">@1,2,3,4⦊</span>println!("c = {}", c)</span></span>
-<span class="line"><span class="code odd" style="--layer: 1" title="21:18-21:26: @1[9]: _23 = const inner_function::promoted[0]
+<span class="line"><span class="code odd" style="--layer: 1" title="21:18-21:26: @1[9]: _23 = const in_func::promoted[0]
 21:18-21:26: @1[10]: _11 = &amp;(*_23)
 21:18-21:26: @1[11]: _10 = &amp;(*_11)
 21:18-21:26: @1[12]: _9 = move _10 as &amp;[&amp;str] (Pointer(Unsize))
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.inner_items/inner_items.main-{impl#0}-inner_trait_func.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.inner_items/inner_items.main-{impl#0}-trait_func.-------.InstrumentCoverage.0.html
similarity index 73%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.inner_items/inner_items.main-{impl#0}-inner_trait_func.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.inner_items/inner_items.main-{impl#0}-trait_func.-------.InstrumentCoverage.0.html
index 1dc29d400d8..a2cf86de278 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.inner_items/inner_items.main-{impl#0}-inner_trait_func.-------.InstrumentCoverage.0.html
+++ b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.inner_items/inner_items.main-{impl#0}-trait_func.-------.InstrumentCoverage.0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>inner_items.main-{impl#0}-inner_trait_func - Coverage Spans</title>
+<title>inner_items.main-{impl#0}-trait_func - Coverage Spans</title>
 <style>
     .line {
         counter-increment: line;
@@ -59,14 +59,14 @@
 </style>
 </head>
 <body>
-<div class="code" style="counter-reset: line 39"><span class="line">        <span class="code" style="--layer: 0">fn inner_trait_func(&amp;mut self, incr: u32) {</span></span>
-<span class="line"><span class="code" style="--layer: 0">            </span><span><span class="code even" style="--layer: 1" title="41:40-41:44: @0[1]: _3 = _2
-41:13-41:44: @0[2]: _4 = CheckedAdd(((*_1).0: u32), _3)"><span class="annotation">@0⦊</span>self.inner_struct_field += incr<span class="annotation">⦉@0</span></span></span><span class="code" style="--layer: 0">;</span></span>
-<span class="line"><span class="code" style="--layer: 0">            </span><span><span class="code odd" style="--layer: 1" title="42:28-42:51: @1[4]: _6 = ((*_1).0: u32)
-42:13-42:52: @1.Call: _5 = inner_function(move _6) -&gt; [return: bb2, unwind: bb3]
-43:10-43:10: @2.Return: return"><span class="annotation">@1,2⦊</span>inner_function(self.inner_struct_field);</span></span>
-<span class="line"><span class="code odd" style="--layer: 1" title="42:28-42:51: @1[4]: _6 = ((*_1).0: u32)
-42:13-42:52: @1.Call: _5 = inner_function(move _6) -&gt; [return: bb2, unwind: bb3]
+<div class="code" style="counter-reset: line 39"><span class="line">        <span class="code" style="--layer: 0">fn trait_func(&amp;mut self, incr: u32) {</span></span>
+<span class="line"><span class="code" style="--layer: 0">            </span><span><span class="code even" style="--layer: 1" title="41:37-41:41: @0[1]: _3 = _2
+41:13-41:41: @0[2]: _4 = CheckedAdd(((*_1).0: u32), _3)"><span class="annotation">@0⦊</span>self.in_struct_field += incr<span class="annotation">⦉@0</span></span></span><span class="code" style="--layer: 0">;</span></span>
+<span class="line"><span class="code" style="--layer: 0">            </span><span><span class="code odd" style="--layer: 1" title="42:21-42:41: @1[4]: _6 = ((*_1).0: u32)
+42:13-42:42: @1.Call: _5 = in_func(move _6) -&gt; [return: bb2, unwind: bb3]
+43:10-43:10: @2.Return: return"><span class="annotation">@1,2⦊</span>in_func(self.in_struct_field);</span></span>
+<span class="line"><span class="code odd" style="--layer: 1" title="42:21-42:41: @1[4]: _6 = ((*_1).0: u32)
+42:13-42:42: @1.Call: _5 = in_func(move _6) -&gt; [return: bb2, unwind: bb3]
 43:10-43:10: @2.Return: return">        }<span class="annotation">⦉@1,2</span></span></span></span></div>
 </body>
 </html>
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html
similarity index 78%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html
index 9a1256025d9..56557b8ef95 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html
+++ b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html
@@ -92,80 +92,80 @@
 <span class="line"><span class="code odd" style="--layer: 1" title="11:9-11:23: @6[0]: _5 = const 10_u32
 10:16-12:6: @6[1]: _6 = const ()">    }<span class="annotation">⦉@4,6</span></span></span><span class="code" style="--layer: 0"></span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
-<span class="line"><span class="code" style="--layer: 0">    mod inner_mod {</span></span>
-<span class="line"><span class="code" style="--layer: 0">        const INNER_MOD_CONST: u32 = 1000;</span></span>
+<span class="line"><span class="code" style="--layer: 0">    mod in_mod {</span></span>
+<span class="line"><span class="code" style="--layer: 0">        const IN_MOD_CONST: u32 = 1000;</span></span>
 <span class="line"><span class="code" style="--layer: 0">    }</span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
-<span class="line"><span class="code" style="--layer: 0">    fn inner_function(a: u32) {</span></span>
+<span class="line"><span class="code" style="--layer: 0">    fn in_func(a: u32) {</span></span>
 <span class="line"><span class="code" style="--layer: 0">        let b = 1;</span></span>
 <span class="line"><span class="code" style="--layer: 0">        let c = a + b;</span></span>
 <span class="line"><span class="code" style="--layer: 0">        println!("c = {}", c)</span></span>
 <span class="line"><span class="code" style="--layer: 0">    }</span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
-<span class="line"><span class="code" style="--layer: 0">    struct InnerStruct {</span></span>
-<span class="line"><span class="code" style="--layer: 0">        inner_struct_field: u32,</span></span>
+<span class="line"><span class="code" style="--layer: 0">    struct InStruct {</span></span>
+<span class="line"><span class="code" style="--layer: 0">        in_struct_field: u32,</span></span>
 <span class="line"><span class="code" style="--layer: 0">    }</span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
-<span class="line"><span class="code" style="--layer: 0">    const INNER_CONST: u32 = 1234;</span></span>
+<span class="line"><span class="code" style="--layer: 0">    const IN_CONST: u32 = 1234;</span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
-<span class="line"><span class="code" style="--layer: 0">    trait InnerTrait {</span></span>
-<span class="line"><span class="code" style="--layer: 0">        fn inner_trait_func(&amp;mut self, incr: u32);</span></span>
+<span class="line"><span class="code" style="--layer: 0">    trait InTrait {</span></span>
+<span class="line"><span class="code" style="--layer: 0">        fn trait_func(&amp;mut self, incr: u32);</span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
 <span class="line"><span class="code" style="--layer: 0">        fn default_trait_func(&amp;mut self) {</span></span>
-<span class="line"><span class="code" style="--layer: 0">            inner_function(INNER_CONST);</span></span>
-<span class="line"><span class="code" style="--layer: 0">            self.inner_trait_func(INNER_CONST);</span></span>
+<span class="line"><span class="code" style="--layer: 0">            in_func(IN_CONST);</span></span>
+<span class="line"><span class="code" style="--layer: 0">            self.trait_func(IN_CONST);</span></span>
 <span class="line"><span class="code" style="--layer: 0">        }</span></span>
 <span class="line"><span class="code" style="--layer: 0">    }</span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
-<span class="line"><span class="code" style="--layer: 0">    impl InnerTrait for InnerStruct {</span></span>
-<span class="line"><span class="code" style="--layer: 0">        fn inner_trait_func(&amp;mut self, incr: u32) {</span></span>
-<span class="line"><span class="code" style="--layer: 0">            self.inner_struct_field += incr;</span></span>
-<span class="line"><span class="code" style="--layer: 0">            inner_function(self.inner_struct_field);</span></span>
+<span class="line"><span class="code" style="--layer: 0">    impl InTrait for InStruct {</span></span>
+<span class="line"><span class="code" style="--layer: 0">        fn trait_func(&amp;mut self, incr: u32) {</span></span>
+<span class="line"><span class="code" style="--layer: 0">            self.in_struct_field += incr;</span></span>
+<span class="line"><span class="code" style="--layer: 0">            in_func(self.in_struct_field);</span></span>
 <span class="line"><span class="code" style="--layer: 0">        }</span></span>
 <span class="line"><span class="code" style="--layer: 0">    }</span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
-<span class="line"><span class="code" style="--layer: 0">    type InnerType = String;</span></span>
+<span class="line"><span class="code" style="--layer: 0">    type InType = String;</span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
 <span class="line"><span class="code" style="--layer: 0">    if </span><span><span class="code even" style="--layer: 1" title="48:8-48:15: @7[4]: _9 = _1
-48:8-48:15: @7[5]: FakeRead(ForMatchedPlace, _9)"><span class="annotation">@7⦊</span>is_true<span class="annotation">⦉@7</span></span></span><span class="code" style="--layer: 0"> </span><span><span class="code odd" style="--layer: 1" title="49:24-49:33: @10[2]: _11 = _5
-49:9-49:34: @10.Call: _10 = inner_function(move _11) -&gt; [return: bb11, unwind: bb15]
+48:8-48:15: @7[5]: FakeRead(ForMatchedPlace, _9)"><span class="annotation">@7⦊</span>is_true<span class="annotation">⦉@7</span></span></span><span class="code" style="--layer: 0"> </span><span><span class="code odd" style="--layer: 1" title="49:17-49:26: @10[2]: _11 = _5
+49:9-49:27: @10.Call: _10 = in_func(move _11) -&gt; [return: bb11, unwind: bb15]
 48:16-50:6: @11[2]: _8 = const ()"><span class="annotation">@8,10,11⦊</span>{</span></span>
-<span class="line"><span class="code odd" style="--layer: 1" title="49:24-49:33: @10[2]: _11 = _5
-49:9-49:34: @10.Call: _10 = inner_function(move _11) -&gt; [return: bb11, unwind: bb15]
-48:16-50:6: @11[2]: _8 = const ()">        inner_function(countdown);</span></span>
-<span class="line"><span class="code odd" style="--layer: 1" title="49:24-49:33: @10[2]: _11 = _5
-49:9-49:34: @10.Call: _10 = inner_function(move _11) -&gt; [return: bb11, unwind: bb15]
+<span class="line"><span class="code odd" style="--layer: 1" title="49:17-49:26: @10[2]: _11 = _5
+49:9-49:27: @10.Call: _10 = in_func(move _11) -&gt; [return: bb11, unwind: bb15]
+48:16-50:6: @11[2]: _8 = const ()">        in_func(countdown);</span></span>
+<span class="line"><span class="code odd" style="--layer: 1" title="49:17-49:26: @10[2]: _11 = _5
+49:9-49:27: @10.Call: _10 = in_func(move _11) -&gt; [return: bb11, unwind: bb15]
 48:16-50:6: @11[2]: _8 = const ()">    }<span class="annotation">⦉@8,10,11</span></span></span><span class="code" style="--layer: 0"></span></span>
 <span class="line"><span class="code" style="--layer: 0"></span></span>
-<span class="line"><span class="code" style="--layer: 0">    let </span><span><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InnerStruct { inner_struct_field: const 101_u32 }
+<span class="line"><span class="code" style="--layer: 0">    let </span><span><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InStruct { in_struct_field: const 101_u32 }
 52:9-52:16: @12[4]: FakeRead(ForLet, _12)
 56:5-56:8: @12[7]: _14 = &amp;mut _12
-56:5-56:29: @12.Call: _13 = &lt;InnerStruct as InnerTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
-57:2-57:2: @13.Return: return"><span class="annotation">@12,13⦊</span>mut val = InnerStruct {</span></span>
-<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InnerStruct { inner_struct_field: const 101_u32 }
+56:5-56:29: @12.Call: _13 = &lt;InStruct as InTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
+57:2-57:2: @13.Return: return"><span class="annotation">@12,13⦊</span>mut val = InStruct {</span></span>
+<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InStruct { in_struct_field: const 101_u32 }
 52:9-52:16: @12[4]: FakeRead(ForLet, _12)
 56:5-56:8: @12[7]: _14 = &amp;mut _12
-56:5-56:29: @12.Call: _13 = &lt;InnerStruct as InnerTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
-57:2-57:2: @13.Return: return">        inner_struct_field: 101,</span></span>
-<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InnerStruct { inner_struct_field: const 101_u32 }
+56:5-56:29: @12.Call: _13 = &lt;InStruct as InTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
+57:2-57:2: @13.Return: return">        in_struct_field: 101,</span></span>
+<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InStruct { in_struct_field: const 101_u32 }
 52:9-52:16: @12[4]: FakeRead(ForLet, _12)
 56:5-56:8: @12[7]: _14 = &amp;mut _12
-56:5-56:29: @12.Call: _13 = &lt;InnerStruct as InnerTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
+56:5-56:29: @12.Call: _13 = &lt;InStruct as InTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
 57:2-57:2: @13.Return: return">    };</span></span>
-<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InnerStruct { inner_struct_field: const 101_u32 }
+<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InStruct { in_struct_field: const 101_u32 }
 52:9-52:16: @12[4]: FakeRead(ForLet, _12)
 56:5-56:8: @12[7]: _14 = &amp;mut _12
-56:5-56:29: @12.Call: _13 = &lt;InnerStruct as InnerTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
+56:5-56:29: @12.Call: _13 = &lt;InStruct as InTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
 57:2-57:2: @13.Return: return"></span></span>
-<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InnerStruct { inner_struct_field: const 101_u32 }
+<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InStruct { in_struct_field: const 101_u32 }
 52:9-52:16: @12[4]: FakeRead(ForLet, _12)
 56:5-56:8: @12[7]: _14 = &amp;mut _12
-56:5-56:29: @12.Call: _13 = &lt;InnerStruct as InnerTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
+56:5-56:29: @12.Call: _13 = &lt;InStruct as InTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
 57:2-57:2: @13.Return: return">    val.default_trait_func();</span></span>
-<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InnerStruct { inner_struct_field: const 101_u32 }
+<span class="line"><span class="code even" style="--layer: 1" title="52:19-54:6: @12[3]: _12 = InStruct { in_struct_field: const 101_u32 }
 52:9-52:16: @12[4]: FakeRead(ForLet, _12)
 56:5-56:8: @12[7]: _14 = &amp;mut _12
-56:5-56:29: @12.Call: _13 = &lt;InnerStruct as InnerTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
+56:5-56:29: @12.Call: _13 = &lt;InStruct as InTrait&gt;::default_trait_func(move _14) -&gt; [return: bb13, unwind: bb15]
 57:2-57:2: @13.Return: return">}<span class="annotation">⦉@12,13</span></span></span></span></div>
 </body>
 </html>
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.lazy_boolean/lazy_boolean.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.lazy_boolean/lazy_boolean.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.lazy_boolean/lazy_boolean.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.lazy_boolean/lazy_boolean.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.loop_break_value/loop_break_value.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.loop_break_value/loop_break_value.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.loop_break_value/loop_break_value.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.loop_break_value/loop_break_value.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.simple_loop/simple_loop.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.simple_loop/simple_loop.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.simple_loop/simple_loop.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.simple_loop/simple_loop.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.simple_match/simple_match.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.simple_match/simple_match.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.simple_match/simple_match.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.simple_match/simple_match.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.question_mark_error_result/question_mark_error_result.call.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.try_error_result/try_error_result.call.-------.InstrumentCoverage.0.html
similarity index 98%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.question_mark_error_result/question_mark_error_result.call.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.try_error_result/try_error_result.call.-------.InstrumentCoverage.0.html
index 0c253d5e5c2..9f993342340 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.question_mark_error_result/question_mark_error_result.call.-------.InstrumentCoverage.0.html
+++ b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.try_error_result/try_error_result.call.-------.InstrumentCoverage.0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>question_mark_error_result.call - Coverage Spans</title>
+<title>try_error_result.call - Coverage Spans</title>
 <style>
     .line {
         counter-increment: line;
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.question_mark_error_result/question_mark_error_result.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.try_error_result/try_error_result.main.-------.InstrumentCoverage.0.html
similarity index 99%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.question_mark_error_result/question_mark_error_result.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.try_error_result/try_error_result.main.-------.InstrumentCoverage.0.html
index 2589b0454da..660c3031f35 100644
--- a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-base/expected_mir_dump.question_mark_error_result/question_mark_error_result.main.-------.InstrumentCoverage.0.html
+++ b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.try_error_result/try_error_result.main.-------.InstrumentCoverage.0.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>question_mark_error_result.main - Coverage Spans</title>
+<title>try_error_result.main - Coverage Spans</title>
 <style>
     .line {
         counter-increment: line;
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.various_conditions/various_conditions.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.various_conditions/various_conditions.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.various_conditions/various_conditions.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.various_conditions/various_conditions.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.while_early_return/while_early_return.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.while_early_return/while_early_return.main.-------.InstrumentCoverage.0.html
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code/expected_mir_dump.while_early_return/while_early_return.main.-------.InstrumentCoverage.0.html
rename to src/test/run-make-fulldeps/coverage-spanview-deadcode/expected_mir_dump.while_early_return/while_early_return.main.-------.InstrumentCoverage.0.html
diff --git a/src/test/run-make-fulldeps/instrument-coverage/closure.rs b/src/test/run-make-fulldeps/coverage/closure.rs
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage/closure.rs
rename to src/test/run-make-fulldeps/coverage/closure.rs
diff --git a/src/test/run-make-fulldeps/instrument-coverage/compiletest-ignore-dir b/src/test/run-make-fulldeps/coverage/compiletest-ignore-dir
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage/compiletest-ignore-dir
rename to src/test/run-make-fulldeps/coverage/compiletest-ignore-dir
diff --git a/src/test/run-make-fulldeps/instrument-coverage/coverage_tools.mk b/src/test/run-make-fulldeps/coverage/coverage_tools.mk
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage/coverage_tools.mk
rename to src/test/run-make-fulldeps/coverage/coverage_tools.mk
diff --git a/src/test/run-make-fulldeps/instrument-coverage/drop_trait.rs b/src/test/run-make-fulldeps/coverage/drop_trait.rs
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage/drop_trait.rs
rename to src/test/run-make-fulldeps/coverage/drop_trait.rs
diff --git a/src/test/run-make-fulldeps/instrument-coverage/generics.rs b/src/test/run-make-fulldeps/coverage/generics.rs
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage/generics.rs
rename to src/test/run-make-fulldeps/coverage/generics.rs
diff --git a/src/test/run-make-fulldeps/instrument-coverage/if.rs b/src/test/run-make-fulldeps/coverage/if.rs
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage/if.rs
rename to src/test/run-make-fulldeps/coverage/if.rs
diff --git a/src/test/run-make-fulldeps/instrument-coverage/if_else.rs b/src/test/run-make-fulldeps/coverage/if_else.rs
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage/if_else.rs
rename to src/test/run-make-fulldeps/coverage/if_else.rs
diff --git a/src/test/run-make-fulldeps/coverage/inner_items.rs b/src/test/run-make-fulldeps/coverage/inner_items.rs
new file mode 100644
index 00000000000..66e76513e26
--- /dev/null
+++ b/src/test/run-make-fulldeps/coverage/inner_items.rs
@@ -0,0 +1,57 @@
+#![allow(unused_assignments, unused_variables)]
+
+fn main() {
+    // Initialize test constants in a way that cannot be determined at compile time, to ensure
+    // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
+    // dependent conditions.
+    let is_true = std::env::args().len() == 1;
+
+    let mut countdown = 0;
+    if is_true {
+        countdown = 10;
+    }
+
+    mod in_mod {
+        const IN_MOD_CONST: u32 = 1000;
+    }
+
+    fn in_func(a: u32) {
+        let b = 1;
+        let c = a + b;
+        println!("c = {}", c)
+    }
+
+    struct InStruct {
+        in_struct_field: u32,
+    }
+
+    const IN_CONST: u32 = 1234;
+
+    trait InTrait {
+        fn trait_func(&mut self, incr: u32);
+
+        fn default_trait_func(&mut self) {
+            in_func(IN_CONST);
+            self.trait_func(IN_CONST);
+        }
+    }
+
+    impl InTrait for InStruct {
+        fn trait_func(&mut self, incr: u32) {
+            self.in_struct_field += incr;
+            in_func(self.in_struct_field);
+        }
+    }
+
+    type InType = String;
+
+    if is_true {
+        in_func(countdown);
+    }
+
+    let mut val = InStruct {
+        in_struct_field: 101,
+    };
+
+    val.default_trait_func();
+}
diff --git a/src/test/run-make-fulldeps/instrument-coverage/lazy_boolean.rs b/src/test/run-make-fulldeps/coverage/lazy_boolean.rs
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage/lazy_boolean.rs
rename to src/test/run-make-fulldeps/coverage/lazy_boolean.rs
diff --git a/src/test/run-make-fulldeps/instrument-coverage/loop_break_value.rs b/src/test/run-make-fulldeps/coverage/loop_break_value.rs
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage/loop_break_value.rs
rename to src/test/run-make-fulldeps/coverage/loop_break_value.rs
diff --git a/src/test/run-make-fulldeps/instrument-coverage/simple_loop.rs b/src/test/run-make-fulldeps/coverage/simple_loop.rs
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage/simple_loop.rs
rename to src/test/run-make-fulldeps/coverage/simple_loop.rs
diff --git a/src/test/run-make-fulldeps/instrument-coverage/simple_match.rs b/src/test/run-make-fulldeps/coverage/simple_match.rs
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage/simple_match.rs
rename to src/test/run-make-fulldeps/coverage/simple_match.rs
diff --git a/src/test/run-make-fulldeps/instrument-coverage/question_mark_error_result.rs b/src/test/run-make-fulldeps/coverage/try_error_result.rs
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage/question_mark_error_result.rs
rename to src/test/run-make-fulldeps/coverage/try_error_result.rs
diff --git a/src/test/run-make-fulldeps/instrument-coverage/various_conditions.rs b/src/test/run-make-fulldeps/coverage/various_conditions.rs
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage/various_conditions.rs
rename to src/test/run-make-fulldeps/coverage/various_conditions.rs
diff --git a/src/test/run-make-fulldeps/instrument-coverage/while_early_return.rs b/src/test/run-make-fulldeps/coverage/while_early_return.rs
similarity index 100%
rename from src/test/run-make-fulldeps/instrument-coverage/while_early_return.rs
rename to src/test/run-make-fulldeps/coverage/while_early_return.rs
diff --git a/src/test/run-make-fulldeps/instrument-coverage/inner_items.rs b/src/test/run-make-fulldeps/instrument-coverage/inner_items.rs
deleted file mode 100644
index 1e2fe5a9353..00000000000
--- a/src/test/run-make-fulldeps/instrument-coverage/inner_items.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-#![allow(unused_assignments, unused_variables)]
-
-fn main() {
-    // Initialize test constants in a way that cannot be determined at compile time, to ensure
-    // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
-    // dependent conditions.
-    let is_true = std::env::args().len() == 1;
-
-    let mut countdown = 0;
-    if is_true {
-        countdown = 10;
-    }
-
-    mod inner_mod {
-        const INNER_MOD_CONST: u32 = 1000;
-    }
-
-    fn inner_function(a: u32) {
-        let b = 1;
-        let c = a + b;
-        println!("c = {}", c)
-    }
-
-    struct InnerStruct {
-        inner_struct_field: u32,
-    }
-
-    const INNER_CONST: u32 = 1234;
-
-    trait InnerTrait {
-        fn inner_trait_func(&mut self, incr: u32);
-
-        fn default_trait_func(&mut self) {
-            inner_function(INNER_CONST);
-            self.inner_trait_func(INNER_CONST);
-        }
-    }
-
-    impl InnerTrait for InnerStruct {
-        fn inner_trait_func(&mut self, incr: u32) {
-            self.inner_struct_field += incr;
-            inner_function(self.inner_struct_field);
-        }
-    }
-
-    type InnerType = String;
-
-    if is_true {
-        inner_function(countdown);
-    }
-
-    let mut val = InnerStruct {
-        inner_struct_field: 101,
-    };
-
-    val.default_trait_func();
-}