Skip to content

Commit 6495029

Browse files
committed
path trimming: disable on src/test/run-make-fulldeps/coverage-spanview
1 parent eaefe4a commit 6495029

File tree

78 files changed

+3796
-3794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+3796
-3794
lines changed

src/test/run-make-fulldeps/coverage-spanview/Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ endif
4242
echo "--edition=2018" \
4343
) \
4444
--crate-type rlib \
45+
-Ztrim-diagnostic-paths=no \
4546
-Zinstrument-coverage \
4647
-Zdump-mir=InstrumentCoverage \
4748
-Zdump-mir-spanview \
@@ -73,6 +74,7 @@ endif
7374
echo "--edition=2018" \
7475
) \
7576
-L "$(TMPDIR)" \
77+
-Ztrim-diagnostic-paths=no \
7678
-Zinstrument-coverage \
7779
-Zdump-mir=InstrumentCoverage \
7880
-Zdump-mir-spanview \

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@
9797
26:9-26:23: @18[0]: _1 = move (_18.0: i32)"><span class="annotation">@17,18⦊</span>countdown -= 1<span class="annotation">⦉@17,18</span></span></span><span class="code" style="--layer: 0">;</span></span>
9898
<span class="line"><span class="code" style="--layer: 0"> }</span></span>
9999
<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 = ()
100-
28:5-28:11: @4[5]: _0 = Result::&lt;(), u8&gt;::Ok(move _20)
100+
28:5-28:11: @4[5]: _0 = std::result::Result::&lt;(), u8&gt;::Ok(move _20)
101101
29:2-29:2: @4.Return: return"><span class="annotation">@4⦊</span>Ok(())</span></span>
102102
<span class="line"><span class="code even" style="--layer: 1" title="28:8-28:10: @4[4]: _20 = ()
103-
28:5-28:11: @4[5]: _0 = Result::&lt;(), u8&gt;::Ok(move _20)
103+
28:5-28:11: @4[5]: _0 = std::result::Result::&lt;(), u8&gt;::Ok(move _20)
104104
29:2-29:2: @4.Return: return">}<span class="annotation">⦉@4</span></span></span></span></div>
105105
</body>
106106
</html>

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

+14-14
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@
8181
7:9-7:33: @1[18]: _13 = &amp;(*_32)
8282
7:9-7:33: @1[19]: _12 = &amp;(*_13)
8383
7:9-7:33: @1[20]: _11 = move _12 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
84-
7:9-7:33: @1.Call: _6 = Arguments::new_v1(move _7, move _11) -&gt; [return: bb3, unwind: bb7]
85-
7:9-7:33: @3.Call: _5 = _print(move _6) -&gt; [return: bb4, unwind: bb7]
84+
7:9-7:33: @1.Call: _6 = std::fmt::Arguments::new_v1(move _7, move _11) -&gt; [return: bb3, unwind: bb7]
85+
7:9-7:33: @3.Call: _5 = std::io::_print(move _6) -&gt; [return: bb4, unwind: bb7]
8686
7:9-7:33: @4[5]: _4 = const ()
87-
8:9-8:37: @4.Call: begin_panic::&lt;&amp;str&gt;(const &quot;panics and aborts&quot;) -&gt; bb7"><span class="annotation">@1,3,4⦊</span>println!("aborting...");</span></span>
87+
8:9-8:37: @4.Call: std::rt::begin_panic::&lt;&amp;str&gt;(const &quot;panics and aborts&quot;) -&gt; bb7"><span class="annotation">@1,3,4⦊</span>println!("aborting...");</span></span>
8888
<span class="line"><span class="code odd" style="--layer: 1" title="7:18-7:31: @1[6]: _33 = const might_abort::promoted[3]
8989
7:18-7:31: @1[7]: _9 = &amp;(*_33)
9090
7:18-7:31: @1[8]: _8 = &amp;(*_9)
@@ -95,10 +95,10 @@
9595
7:9-7:33: @1[18]: _13 = &amp;(*_32)
9696
7:9-7:33: @1[19]: _12 = &amp;(*_13)
9797
7:9-7:33: @1[20]: _11 = move _12 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
98-
7:9-7:33: @1.Call: _6 = Arguments::new_v1(move _7, move _11) -&gt; [return: bb3, unwind: bb7]
99-
7:9-7:33: @3.Call: _5 = _print(move _6) -&gt; [return: bb4, unwind: bb7]
98+
7:9-7:33: @1.Call: _6 = std::fmt::Arguments::new_v1(move _7, move _11) -&gt; [return: bb3, unwind: bb7]
99+
7:9-7:33: @3.Call: _5 = std::io::_print(move _6) -&gt; [return: bb4, unwind: bb7]
100100
7:9-7:33: @4[5]: _4 = const ()
101-
8:9-8:37: @4.Call: begin_panic::&lt;&amp;str&gt;(const &quot;panics and aborts&quot;) -&gt; bb7"> panic!("panics and aborts");<span class="annotation">⦉@1,3,4</span></span></span><span class="code" style="--layer: 0"></span></span>
101+
8:9-8:37: @4.Call: std::rt::begin_panic::&lt;&amp;str&gt;(const &quot;panics and aborts&quot;) -&gt; bb7"> panic!("panics and aborts");<span class="annotation">⦉@1,3,4</span></span></span><span class="code" style="--layer: 0"></span></span>
102102
<span class="line"><span class="code" style="--layer: 0"> } else </span><span><span class="code even" style="--layer: 1" title="10:18-10:31: @2[6]: _31 = const might_abort::promoted[1]
103103
10:18-10:31: @2[7]: _23 = &amp;(*_31)
104104
10:18-10:31: @2[8]: _22 = &amp;(*_23)
@@ -109,8 +109,8 @@
109109
10:9-10:33: @2[18]: _27 = &amp;(*_30)
110110
10:9-10:33: @2[19]: _26 = &amp;(*_27)
111111
10:9-10:33: @2[20]: _25 = move _26 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
112-
10:9-10:33: @2.Call: _20 = Arguments::new_v1(move _21, move _25) -&gt; [return: bb5, unwind: bb7]
113-
10:9-10:33: @5.Call: _19 = _print(move _20) -&gt; [return: bb6, unwind: bb7]
112+
10:9-10:33: @2.Call: _20 = std::fmt::Arguments::new_v1(move _21, move _25) -&gt; [return: bb5, unwind: bb7]
113+
10:9-10:33: @5.Call: _19 = std::io::_print(move _20) -&gt; [return: bb6, unwind: bb7]
114114
10:9-10:33: @6[5]: _18 = const ()
115115
9:12-11:6: @6[7]: _0 = const ()
116116
12:2-12:2: @6.Return: return"><span class="annotation">@2,5,6⦊</span>{</span></span>
@@ -124,8 +124,8 @@
124124
10:9-10:33: @2[18]: _27 = &amp;(*_30)
125125
10:9-10:33: @2[19]: _26 = &amp;(*_27)
126126
10:9-10:33: @2[20]: _25 = move _26 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
127-
10:9-10:33: @2.Call: _20 = Arguments::new_v1(move _21, move _25) -&gt; [return: bb5, unwind: bb7]
128-
10:9-10:33: @5.Call: _19 = _print(move _20) -&gt; [return: bb6, unwind: bb7]
127+
10:9-10:33: @2.Call: _20 = std::fmt::Arguments::new_v1(move _21, move _25) -&gt; [return: bb5, unwind: bb7]
128+
10:9-10:33: @5.Call: _19 = std::io::_print(move _20) -&gt; [return: bb6, unwind: bb7]
129129
10:9-10:33: @6[5]: _18 = const ()
130130
9:12-11:6: @6[7]: _0 = const ()
131131
12:2-12:2: @6.Return: return"> println!("Don't Panic");</span></span>
@@ -139,8 +139,8 @@
139139
10:9-10:33: @2[18]: _27 = &amp;(*_30)
140140
10:9-10:33: @2[19]: _26 = &amp;(*_27)
141141
10:9-10:33: @2[20]: _25 = move _26 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
142-
10:9-10:33: @2.Call: _20 = Arguments::new_v1(move _21, move _25) -&gt; [return: bb5, unwind: bb7]
143-
10:9-10:33: @5.Call: _19 = _print(move _20) -&gt; [return: bb6, unwind: bb7]
142+
10:9-10:33: @2.Call: _20 = std::fmt::Arguments::new_v1(move _21, move _25) -&gt; [return: bb5, unwind: bb7]
143+
10:9-10:33: @5.Call: _19 = std::io::_print(move _20) -&gt; [return: bb6, unwind: bb7]
144144
10:9-10:33: @6[5]: _18 = const ()
145145
9:12-11:6: @6[7]: _0 = const ()
146146
12:2-12:2: @6.Return: return"> }</span></span>
@@ -154,8 +154,8 @@
154154
10:9-10:33: @2[18]: _27 = &amp;(*_30)
155155
10:9-10:33: @2[19]: _26 = &amp;(*_27)
156156
10:9-10:33: @2[20]: _25 = move _26 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
157-
10:9-10:33: @2.Call: _20 = Arguments::new_v1(move _21, move _25) -&gt; [return: bb5, unwind: bb7]
158-
10:9-10:33: @5.Call: _19 = _print(move _20) -&gt; [return: bb6, unwind: bb7]
157+
10:9-10:33: @2.Call: _20 = std::fmt::Arguments::new_v1(move _21, move _25) -&gt; [return: bb5, unwind: bb7]
158+
10:9-10:33: @5.Call: _19 = std::io::_print(move _20) -&gt; [return: bb6, unwind: bb7]
159159
10:9-10:33: @6[5]: _18 = const ()
160160
9:12-11:6: @6[7]: _0 = const ()
161161
12:2-12:2: @6.Return: return">}<span class="annotation">⦉@2,5,6</span></span></span></span></div>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@
9393
17:9-17:23: @14[0]: _1 = move (_13.0: i32)"><span class="annotation">@13,14⦊</span>countdown -= 1<span class="annotation">⦉@13,14</span></span></span><span class="code" style="--layer: 0">;</span></span>
9494
<span class="line"><span class="code" style="--layer: 0"> }</span></span>
9595
<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 = ()
96-
19:5-19:11: @4[5]: _0 = Result::&lt;(), u8&gt;::Ok(move _15)
96+
19:5-19:11: @4[5]: _0 = std::result::Result::&lt;(), u8&gt;::Ok(move _15)
9797
20:2-20:2: @4.Return: return"><span class="annotation">@4⦊</span>Ok(())</span></span>
9898
<span class="line"><span class="code even" style="--layer: 1" title="19:8-19:10: @4[4]: _15 = ()
99-
19:5-19:11: @4[5]: _0 = Result::&lt;(), u8&gt;::Ok(move _15)
99+
19:5-19:11: @4[5]: _0 = std::result::Result::&lt;(), u8&gt;::Ok(move _15)
100100
20:2-20:2: @4.Return: return">}<span class="annotation">⦉@4</span></span></span></span></div>
101101
</body>
102102
</html>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@
8080
5:5-5:48: @0[22]: _15 = (_13.0: &amp;u32)
8181
5:5-5:48: @0[25]: _17 = &amp;(*_15)
8282
5:5-5:48: @0[27]: _18 = &lt;u32 as std::fmt::Display&gt;::fmt as for&lt;&#39;r, &#39;s, &#39;t0&gt; fn(&amp;&#39;r u32, &amp;&#39;s mut std::fmt::Formatter&lt;&#39;t0&gt;) -&gt; std::result::Result&lt;(), std::fmt::Error&gt; (Pointer(ReifyFnPointer))
83-
5:5-5:48: @0.Call: _16 = ArgumentV1::new::&lt;u32&gt;(move _17, move _18) -&gt; [return: bb1, unwind: bb12]
83+
5:5-5:48: @0.Call: _16 = std::fmt::ArgumentV1::new::&lt;u32&gt;(move _17, move _18) -&gt; [return: bb1, unwind: bb12]
8484
5:5-5:48: @1[2]: _12 = [move _16]
8585
5:5-5:48: @1[5]: _11 = &amp;_12
8686
5:5-5:48: @1[6]: _10 = &amp;(*_11)
8787
5:5-5:48: @1[7]: _9 = move _10 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
88-
5:5-5:48: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -&gt; [return: bb2, unwind: bb12]
89-
5:5-5:48: @2.Call: _3 = _print(move _4) -&gt; [return: bb3, unwind: bb12]
88+
5:5-5:48: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -&gt; [return: bb2, unwind: bb12]
89+
5:5-5:48: @2.Call: _3 = std::io::_print(move _4) -&gt; [return: bb3, unwind: bb12]
9090
5:5-5:48: @3[6]: _2 = const ()"><span class="annotation">@0,1,2,3,4⦊</span>println!("does 1 + 1 = {}?", one_plus_one);<span class="annotation">⦉@0,1,2,3,4</span></span></span><span class="code" style="--layer: 0"></span></span>
9191
<span class="line"><span class="code" style="--layer: 0"> assert_eq!(</span><span><span class="code even" style="--layer: 1" title="6:16-6:21: @3[11]: _23 = CheckedAdd(const 1_u32, const 1_u32)"><span class="annotation">@0,1,2,3,4⦊</span>1 + 1<span class="annotation">⦉@0,1,2,3,4</span></span></span><span class="code" style="--layer: 0">, one_plus_one, </span><span><span class="code odd" style="--layer: 1" title="6:37-6:61: @5[28]: _70 = const might_fail_assert::promoted[1]
9292
6:37-6:61: @5[29]: _50 = &amp;(*_70)

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@
7373
24:38-24:74: @1[5]: FakeRead(ForMatchedPlace, _13)
7474
24:38-24:74: @1[7]: _25 = (_13.0: &amp;std::fmt::Arguments)
7575
24:38-24:74: @1[10]: _27 = &amp;(*_25)
76-
24:38-24:74: @1[12]: _28 = &lt;Arguments as std::fmt::Display&gt;::fmt as for&lt;&#39;r, &#39;s, &#39;t0&gt; fn(&amp;&#39;r std::fmt::Arguments, &amp;&#39;s mut std::fmt::Formatter&lt;&#39;t0&gt;) -&gt; std::result::Result&lt;(), std::fmt::Error&gt; (Pointer(ReifyFnPointer))
77-
24:38-24:74: @1.Call: _26 = ArgumentV1::new::&lt;Arguments&gt;(move _27, move _28) -&gt; [return: bb2, unwind: bb4]
76+
24:38-24:74: @1[12]: _28 = &lt;std::fmt::Arguments as std::fmt::Display&gt;::fmt as for&lt;&#39;r, &#39;s, &#39;t0&gt; fn(&amp;&#39;r std::fmt::Arguments, &amp;&#39;s mut std::fmt::Formatter&lt;&#39;t0&gt;) -&gt; std::result::Result&lt;(), std::fmt::Error&gt; (Pointer(ReifyFnPointer))
77+
24:38-24:74: @1.Call: _26 = std::fmt::ArgumentV1::new::&lt;std::fmt::Arguments&gt;(move _27, move _28) -&gt; [return: bb2, unwind: bb4]
7878
24:38-24:74: @2[2]: _12 = [move _26]
7979
24:38-24:74: @2[5]: _11 = &amp;_12
8080
24:38-24:74: @2[6]: _10 = &amp;(*_11)
8181
24:38-24:74: @2[7]: _9 = move _10 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
82-
24:38-24:74: @2.Call: _4 = Arguments::new_v1(move _5, move _9) -&gt; [return: bb3, unwind: bb4]"><span class="annotation">@0,1,2,3⦊</span><span class="annotation">⦉@0,1,2,3</span></span></span><span class="code" style="--layer: 0">$crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+))</span></span></div>
82+
24:38-24:74: @2.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -&gt; [return: bb3, unwind: bb4]"><span class="annotation">@0,1,2,3⦊</span><span class="annotation">⦉@0,1,2,3</span></span></span><span class="code" style="--layer: 0">$crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+))</span></span></div>
8383
</body>
8484
</html>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@
7373
24:38-24:74: @1[5]: FakeRead(ForMatchedPlace, _13)
7474
24:38-24:74: @1[7]: _25 = (_13.0: &amp;std::fmt::Arguments)
7575
24:38-24:74: @1[10]: _27 = &amp;(*_25)
76-
24:38-24:74: @1[12]: _28 = &lt;Arguments as std::fmt::Display&gt;::fmt as for&lt;&#39;r, &#39;s, &#39;t0&gt; fn(&amp;&#39;r std::fmt::Arguments, &amp;&#39;s mut std::fmt::Formatter&lt;&#39;t0&gt;) -&gt; std::result::Result&lt;(), std::fmt::Error&gt; (Pointer(ReifyFnPointer))
77-
24:38-24:74: @1.Call: _26 = ArgumentV1::new::&lt;Arguments&gt;(move _27, move _28) -&gt; [return: bb2, unwind: bb4]
76+
24:38-24:74: @1[12]: _28 = &lt;std::fmt::Arguments as std::fmt::Display&gt;::fmt as for&lt;&#39;r, &#39;s, &#39;t0&gt; fn(&amp;&#39;r std::fmt::Arguments, &amp;&#39;s mut std::fmt::Formatter&lt;&#39;t0&gt;) -&gt; std::result::Result&lt;(), std::fmt::Error&gt; (Pointer(ReifyFnPointer))
77+
24:38-24:74: @1.Call: _26 = std::fmt::ArgumentV1::new::&lt;std::fmt::Arguments&gt;(move _27, move _28) -&gt; [return: bb2, unwind: bb4]
7878
24:38-24:74: @2[2]: _12 = [move _26]
7979
24:38-24:74: @2[5]: _11 = &amp;_12
8080
24:38-24:74: @2[6]: _10 = &amp;(*_11)
8181
24:38-24:74: @2[7]: _9 = move _10 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
82-
24:38-24:74: @2.Call: _4 = Arguments::new_v1(move _5, move _9) -&gt; [return: bb3, unwind: bb4]"><span class="annotation">@0,1,2,3⦊</span><span class="annotation">⦉@0,1,2,3</span></span></span><span class="code" style="--layer: 0">$crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+))</span></span></div>
82+
24:38-24:74: @2.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -&gt; [return: bb3, unwind: bb4]"><span class="annotation">@0,1,2,3⦊</span><span class="annotation">⦉@0,1,2,3</span></span></span><span class="code" style="--layer: 0">$crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+))</span></span></div>
8383
</body>
8484
</html>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@
7373
24:38-24:74: @1[5]: FakeRead(ForMatchedPlace, _13)
7474
24:38-24:74: @1[7]: _25 = (_13.0: &amp;std::fmt::Arguments)
7575
24:38-24:74: @1[10]: _27 = &amp;(*_25)
76-
24:38-24:74: @1[12]: _28 = &lt;Arguments as std::fmt::Display&gt;::fmt as for&lt;&#39;r, &#39;s, &#39;t0&gt; fn(&amp;&#39;r std::fmt::Arguments, &amp;&#39;s mut std::fmt::Formatter&lt;&#39;t0&gt;) -&gt; std::result::Result&lt;(), std::fmt::Error&gt; (Pointer(ReifyFnPointer))
77-
24:38-24:74: @1.Call: _26 = ArgumentV1::new::&lt;Arguments&gt;(move _27, move _28) -&gt; [return: bb2, unwind: bb4]
76+
24:38-24:74: @1[12]: _28 = &lt;std::fmt::Arguments as std::fmt::Display&gt;::fmt as for&lt;&#39;r, &#39;s, &#39;t0&gt; fn(&amp;&#39;r std::fmt::Arguments, &amp;&#39;s mut std::fmt::Formatter&lt;&#39;t0&gt;) -&gt; std::result::Result&lt;(), std::fmt::Error&gt; (Pointer(ReifyFnPointer))
77+
24:38-24:74: @1.Call: _26 = std::fmt::ArgumentV1::new::&lt;std::fmt::Arguments&gt;(move _27, move _28) -&gt; [return: bb2, unwind: bb4]
7878
24:38-24:74: @2[2]: _12 = [move _26]
7979
24:38-24:74: @2[5]: _11 = &amp;_12
8080
24:38-24:74: @2[6]: _10 = &amp;(*_11)
8181
24:38-24:74: @2[7]: _9 = move _10 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
82-
24:38-24:74: @2.Call: _4 = Arguments::new_v1(move _5, move _9) -&gt; [return: bb3, unwind: bb4]"><span class="annotation">@0,1,2,3⦊</span><span class="annotation">⦉@0,1,2,3</span></span></span><span class="code" style="--layer: 0">$crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+))</span></span></div>
82+
24:38-24:74: @2.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -&gt; [return: bb3, unwind: bb4]"><span class="annotation">@0,1,2,3⦊</span><span class="annotation">⦉@0,1,2,3</span></span></span><span class="code" style="--layer: 0">$crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+))</span></span></div>
8383
</body>
8484
</html>

0 commit comments

Comments
 (0)