Fix run-make-fulldeps/coverage-spanview

Author: da-x

src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.abort/abort.main.-------.InstrumentCoverage.0.html

@@ -100,10 +100,10 @@
 26:9-26:23: @21[0]: _1 = move (_18.0: i32)"><span class="annotation">@20,21⦊</span>countdown -= 1<span class="annotation">⦉@20,21</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">    </span><span><span class="code even" style="--layer: 1" title="28:8-28:10: @4[4]: _20 = ()
-28:5-28:11: @4[5]: _0 = std::result::Result::&lt;(), u8&gt;::Ok(move _20)
+28:5-28:11: @4[5]: _0 = Result::&lt;(), u8&gt;::Ok(move _20)
 29:2-29:2: @4.Return: return"><span class="annotation">@4⦊</span>Ok(())</span></span>
 <span class="line"><span class="code even" style="--layer: 1" title="28:8-28:10: @4[4]: _20 = ()
-28:5-28:11: @4[5]: _0 = std::result::Result::&lt;(), u8&gt;::Ok(move _20)
+28:5-28:11: @4[5]: _0 = Result::&lt;(), u8&gt;::Ok(move _20)
 29:2-29:2: @4.Return: return">}<span class="annotation">⦉@4</span></span></span></span></div>
 </body>
 </html>

src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.main.-------.InstrumentCoverage.0.html

@@ -95,10 +95,10 @@
 17:9-17:23: @16[0]: _1 = move (_13.0: i32)"><span class="annotation">@15,16⦊</span>countdown -= 1<span class="annotation">⦉@15,16</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">    </span><span><span class="code even" style="--layer: 1" title="19:8-19:10: @4[4]: _15 = ()
-19:5-19:11: @4[5]: _0 = std::result::Result::&lt;(), u8&gt;::Ok(move _15)
+19:5-19:11: @4[5]: _0 = Result::&lt;(), u8&gt;::Ok(move _15)
 20:2-20:2: @4.Return: return"><span class="annotation">@4⦊</span>Ok(())</span></span>
 <span class="line"><span class="code even" style="--layer: 1" title="19:8-19:10: @4[4]: _15 = ()
-19:5-19:11: @4[5]: _0 = std::result::Result::&lt;(), u8&gt;::Ok(move _15)
+19:5-19:11: @4[5]: _0 = Result::&lt;(), u8&gt;::Ok(move _15)
 20:2-20:2: @4.Return: return">}<span class="annotation">⦉@4</span></span></span></span></div>
 </body>
 </html>

src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.might_fail_assert.-------.InstrumentCoverage.0.html

@@ -79,7 +79,7 @@
 5:5-5:48: @0[20]: FakeRead(ForMatchedPlace, _13)
 5:5-5:48: @0[22]: _15 = (_13.0: &u32)
 5:5-5:48: @0[25]: _17 = &(*_15)
-5:5-5:48: @0[27]: _18 = <u32 as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r u32, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer))
+5:5-5:48: @0[27]: _18 = <u32 as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r u32, &'s mut std::fmt::Formatter<'t0>) -> Result<(), std::fmt::Error> (Pointer(ReifyFnPointer))
 5:5-5:48: @0.Call: _16 = ArgumentV1::new::<u32>(move _17, move _18) -> [return: bb1, unwind: bb13]
 5:5-5:48: @1[2]: _12 = [move _16]
 5:5-5:48: @1[5]: _11 = &_12

src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#0}.-------.InstrumentCoverage.0.html

@@ -73,7 +73,7 @@
 17:38-17:74: @1[5]: FakeRead(ForMatchedPlace, _13)
 17:38-17:74: @1[7]: _25 = (_13.0: &std::fmt::Arguments)
 17:38-17:74: @1[10]: _27 = &(*_25)
-17:38-17:74: @1[12]: _28 = <Arguments as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r std::fmt::Arguments, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer))
+17:38-17:74: @1[12]: _28 = <Arguments as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r std::fmt::Arguments, &'s mut std::fmt::Formatter<'t0>) -> Result<(), std::fmt::Error> (Pointer(ReifyFnPointer))
 17:38-17:74: @1.Call: _26 = ArgumentV1::new::<Arguments>(move _27, move _28) -> [return: bb2, unwind: bb4]
 17:38-17:74: @2[2]: _12 = [move _26]
 17:38-17:74: @2[5]: _11 = &_12

src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#1}.-------.InstrumentCoverage.0.html

@@ -73,7 +73,7 @@
 17:38-17:74: @1[5]: FakeRead(ForMatchedPlace, _13)
 17:38-17:74: @1[7]: _25 = (_13.0: &std::fmt::Arguments)
 17:38-17:74: @1[10]: _27 = &(*_25)
-17:38-17:74: @1[12]: _28 = <Arguments as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r std::fmt::Arguments, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer))
+17:38-17:74: @1[12]: _28 = <Arguments as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r std::fmt::Arguments, &'s mut std::fmt::Formatter<'t0>) -> Result<(), std::fmt::Error> (Pointer(ReifyFnPointer))
 17:38-17:74: @1.Call: _26 = ArgumentV1::new::<Arguments>(move _27, move _28) -> [return: bb2, unwind: bb4]
 17:38-17:74: @2[2]: _12 = [move _26]
 17:38-17:74: @2[5]: _11 = &_12

src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#2}.-------.InstrumentCoverage.0.html

@@ -73,7 +73,7 @@
 17:38-17:74: @1[5]: FakeRead(ForMatchedPlace, _13)
 17:38-17:74: @1[7]: _25 = (_13.0: &std::fmt::Arguments)
 17:38-17:74: @1[10]: _27 = &(*_25)
-17:38-17:74: @1[12]: _28 = <Arguments as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r std::fmt::Arguments, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer))
+17:38-17:74: @1[12]: _28 = <Arguments as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r std::fmt::Arguments, &'s mut std::fmt::Formatter<'t0>) -> Result<(), std::fmt::Error> (Pointer(ReifyFnPointer))
 17:38-17:74: @1.Call: _26 = ArgumentV1::new::<Arguments>(move _27, move _28) -> [return: bb2, unwind: bb4]
 17:38-17:74: @2[2]: _12 = [move _26]
 17:38-17:74: @2[5]: _11 = &_12

src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html

@@ -96,7 +96,7 @@
 103:9-103:29: @4[21]: FakeRead(ForMatchedPlace, _16)
 103:9-103:29: @4[23]: _18 = (_16.0: &&str)
 103:9-103:29: @4[26]: _20 = &(*_18)
-103:9-103:29: @4[28]: _21 = <&str as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r &str, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer))
+103:9-103:29: @4[28]: _21 = <&str as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r &str, &'s mut std::fmt::Formatter<'t0>) -> Result<(), std::fmt::Error> (Pointer(ReifyFnPointer))
 103:9-103:29: @4.Call: _19 = ArgumentV1::new::<&str>(move _20, move _21) -> [return: bb5, unwind: bb10]
 103:9-103:29: @5[2]: _15 = [move _19]
 103:9-103:29: @5[5]: _14 = &_15
@@ -116,7 +116,7 @@
 103:9-103:29: @4[21]: FakeRead(ForMatchedPlace, _16)
 103:9-103:29: @4[23]: _18 = (_16.0: &&str)
 103:9-103:29: @4[26]: _20 = &(*_18)
-103:9-103:29: @4[28]: _21 = <&str as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r &str, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer))
+103:9-103:29: @4[28]: _21 = <&str as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r &str, &'s mut std::fmt::Formatter<'t0>) -> Result<(), std::fmt::Error> (Pointer(ReifyFnPointer))
 103:9-103:29: @4.Call: _19 = ArgumentV1::new::<&str>(move _20, move _21) -> [return: bb5, unwind: bb10]
 103:9-103:29: @5[2]: _15 = [move _19]
 103:9-103:29: @5[5]: _14 = &_15