diff --git a/src/test/run-make-fulldeps/coverage-spanview/Makefile b/src/test/run-make-fulldeps/coverage-spanview/Makefile index 2713e7d52ffd..cd54ac0ed4c7 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/Makefile +++ b/src/test/run-make-fulldeps/coverage-spanview/Makefile @@ -42,6 +42,7 @@ endif echo "--edition=2018" \ ) \ --crate-type rlib \ + -Ztrim-diagnostic-paths=no \ -Zinstrument-coverage \ -Zdump-mir=InstrumentCoverage \ -Zdump-mir-spanview \ @@ -73,6 +74,7 @@ endif echo "--edition=2018" \ ) \ -L "$(TMPDIR)" \ + -Ztrim-diagnostic-paths=no \ -Zinstrument-coverage \ -Zdump-mir=InstrumentCoverage \ -Zdump-mir-spanview \ diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.abort/abort.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.abort/abort.main.-------.InstrumentCoverage.0.html index 6af254ae6fc7..176587af25be 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.abort/abort.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.abort/abort.main.-------.InstrumentCoverage.0.html @@ -97,10 +97,10 @@ For revisions in Pull Requests (PR): 26:9-26:23: @18[0]: _1 = move (_18.0: i32)">@17,18⦊countdown -= 1⦉@17,18; } @4⦊Ok(()) }⦉@4 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.abort/abort.might_abort.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.abort/abort.might_abort.-------.InstrumentCoverage.0.html index b058dce29834..a302b974ae1d 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.abort/abort.might_abort.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.abort/abort.might_abort.-------.InstrumentCoverage.0.html @@ -81,10 +81,10 @@ For revisions in Pull Requests (PR): 7:9-7:33: @1[18]: _13 = &(*_32) 7:9-7:33: @1[19]: _12 = &(*_13) 7:9-7:33: @1[20]: _11 = move _12 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -7:9-7:33: @1.Call: _6 = Arguments::new_v1(move _7, move _11) -> [return: bb3, unwind: bb7] -7:9-7:33: @3.Call: _5 = _print(move _6) -> [return: bb4, unwind: bb7] +7:9-7:33: @1.Call: _6 = std::fmt::Arguments::new_v1(move _7, move _11) -> [return: bb3, unwind: bb7] +7:9-7:33: @3.Call: _5 = std::io::_print(move _6) -> [return: bb4, unwind: bb7] 7:9-7:33: @4[5]: _4 = const () -8:9-8:37: @4.Call: begin_panic::<&str>(const "panics and aborts") -> bb7">@1,3,4⦊println!("aborting..."); +8:9-8:37: @4.Call: std::rt::begin_panic::<&str>(const "panics and aborts") -> bb7">@1,3,4⦊println!("aborting..."); panic!("panics and aborts");⦉@1,3,4 +8:9-8:37: @4.Call: std::rt::begin_panic::<&str>(const "panics and aborts") -> bb7"> panic!("panics and aborts");⦉@1,3,4 } else @2,5,6⦊{ @@ -124,8 +124,8 @@ For revisions in Pull Requests (PR): 10:9-10:33: @2[18]: _27 = &(*_30) 10:9-10:33: @2[19]: _26 = &(*_27) 10:9-10:33: @2[20]: _25 = move _26 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -10:9-10:33: @2.Call: _20 = Arguments::new_v1(move _21, move _25) -> [return: bb5, unwind: bb7] -10:9-10:33: @5.Call: _19 = _print(move _20) -> [return: bb6, unwind: bb7] +10:9-10:33: @2.Call: _20 = std::fmt::Arguments::new_v1(move _21, move _25) -> [return: bb5, unwind: bb7] +10:9-10:33: @5.Call: _19 = std::io::_print(move _20) -> [return: bb6, unwind: bb7] 10:9-10:33: @6[5]: _18 = const () 9:12-11:6: @6[7]: _0 = const () 12:2-12:2: @6.Return: return"> println!("Don't Panic"); @@ -139,8 +139,8 @@ For revisions in Pull Requests (PR): 10:9-10:33: @2[18]: _27 = &(*_30) 10:9-10:33: @2[19]: _26 = &(*_27) 10:9-10:33: @2[20]: _25 = move _26 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -10:9-10:33: @2.Call: _20 = Arguments::new_v1(move _21, move _25) -> [return: bb5, unwind: bb7] -10:9-10:33: @5.Call: _19 = _print(move _20) -> [return: bb6, unwind: bb7] +10:9-10:33: @2.Call: _20 = std::fmt::Arguments::new_v1(move _21, move _25) -> [return: bb5, unwind: bb7] +10:9-10:33: @5.Call: _19 = std::io::_print(move _20) -> [return: bb6, unwind: bb7] 10:9-10:33: @6[5]: _18 = const () 9:12-11:6: @6[7]: _0 = const () 12:2-12:2: @6.Return: return"> } @@ -154,8 +154,8 @@ For revisions in Pull Requests (PR): 10:9-10:33: @2[18]: _27 = &(*_30) 10:9-10:33: @2[19]: _26 = &(*_27) 10:9-10:33: @2[20]: _25 = move _26 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -10:9-10:33: @2.Call: _20 = Arguments::new_v1(move _21, move _25) -> [return: bb5, unwind: bb7] -10:9-10:33: @5.Call: _19 = _print(move _20) -> [return: bb6, unwind: bb7] +10:9-10:33: @2.Call: _20 = std::fmt::Arguments::new_v1(move _21, move _25) -> [return: bb5, unwind: bb7] +10:9-10:33: @5.Call: _19 = std::io::_print(move _20) -> [return: bb6, unwind: bb7] 10:9-10:33: @6[5]: _18 = const () 9:12-11:6: @6[7]: _0 = const () 12:2-12:2: @6.Return: return">}⦉@2,5,6 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.main.-------.InstrumentCoverage.0.html index f51f534aad37..365e94cd31e5 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.main.-------.InstrumentCoverage.0.html @@ -93,10 +93,10 @@ For revisions in Pull Requests (PR): 17:9-17:23: @14[0]: _1 = move (_13.0: i32)">@13,14⦊countdown -= 1⦉@13,14; } @4⦊Ok(()) }⦉@4 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.might_fail_assert.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.might_fail_assert.-------.InstrumentCoverage.0.html index 823bb0cfd840..b7f3cf0819fc 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.might_fail_assert.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.assert/assert.might_fail_assert.-------.InstrumentCoverage.0.html @@ -80,13 +80,13 @@ For revisions in Pull Requests (PR): 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.Call: _16 = ArgumentV1::new::<u32>(move _17, move _18) -> [return: bb1, unwind: bb12] +5:5-5:48: @0.Call: _16 = std::fmt::ArgumentV1::new::<u32>(move _17, move _18) -> [return: bb1, unwind: bb12] 5:5-5:48: @1[2]: _12 = [move _16] 5:5-5:48: @1[5]: _11 = &_12 5:5-5:48: @1[6]: _10 = &(*_11) 5:5-5:48: @1[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -5:5-5:48: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb12] -5:5-5:48: @2.Call: _3 = _print(move _4) -> [return: bb3, unwind: bb12] +5:5-5:48: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb12] +5:5-5:48: @2.Call: _3 = std::io::_print(move _4) -> [return: bb3, unwind: bb12] 5:5-5:48: @3[6]: _2 = const ()">@0,1,2,3,4⦊println!("does 1 + 1 = {}?", one_plus_one);⦉@0,1,2,3,4 assert_eq!(@0,1,2,3,4⦊1 + 1⦉@0,1,2,3,4, one_plus_one, @0,1,2,3⦊‸⦉@0,1,2,3$crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+)) +24:38-24:74: @2.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb3, unwind: bb4]">@0,1,2,3⦊‸⦉@0,1,2,3$crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+)) diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#1}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#1}.-------.InstrumentCoverage.0.html index 828b9cebd6ae..1bbcfa5744b6 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#1}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#1}.-------.InstrumentCoverage.0.html @@ -73,12 +73,12 @@ For revisions in Pull Requests (PR): 24:38-24:74: @1[5]: FakeRead(ForMatchedPlace, _13) 24:38-24:74: @1[7]: _25 = (_13.0: &std::fmt::Arguments) 24:38-24:74: @1[10]: _27 = &(*_25) -24:38-24: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)) -24:38-24:74: @1.Call: _26 = ArgumentV1::new::<Arguments>(move _27, move _28) -> [return: bb2, unwind: bb4] +24:38-24:74: @1[12]: _28 = <std::fmt::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)) +24:38-24:74: @1.Call: _26 = std::fmt::ArgumentV1::new::<std::fmt::Arguments>(move _27, move _28) -> [return: bb2, unwind: bb4] 24:38-24:74: @2[2]: _12 = [move _26] 24:38-24:74: @2[5]: _11 = &_12 24:38-24:74: @2[6]: _10 = &(*_11) 24:38-24:74: @2[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -24:38-24:74: @2.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb3, unwind: bb4]">@0,1,2,3⦊‸⦉@0,1,2,3$crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+)) +24:38-24:74: @2.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb3, unwind: bb4]">@0,1,2,3⦊‸⦉@0,1,2,3$crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+)) diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#2}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#2}.-------.InstrumentCoverage.0.html index 28b10e59b5a3..14cb98d20c98 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#2}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on-VTABLE-{closure#2}.-------.InstrumentCoverage.0.html @@ -73,12 +73,12 @@ For revisions in Pull Requests (PR): 24:38-24:74: @1[5]: FakeRead(ForMatchedPlace, _13) 24:38-24:74: @1[7]: _25 = (_13.0: &std::fmt::Arguments) 24:38-24:74: @1[10]: _27 = &(*_25) -24:38-24: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)) -24:38-24:74: @1.Call: _26 = ArgumentV1::new::<Arguments>(move _27, move _28) -> [return: bb2, unwind: bb4] +24:38-24:74: @1[12]: _28 = <std::fmt::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)) +24:38-24:74: @1.Call: _26 = std::fmt::ArgumentV1::new::<std::fmt::Arguments>(move _27, move _28) -> [return: bb2, unwind: bb4] 24:38-24:74: @2[2]: _12 = [move _26] 24:38-24:74: @2[5]: _11 = &_12 24:38-24:74: @2[6]: _10 = &(*_11) 24:38-24:74: @2[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -24:38-24:74: @2.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb3, unwind: bb4]">@0,1,2,3⦊‸⦉@0,1,2,3$crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+)) +24:38-24:74: @2.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb3, unwind: bb4]">@0,1,2,3⦊‸⦉@0,1,2,3$crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+)) diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on.-------.InstrumentCoverage.0.html index 81310c8cb25a..9a5bd6e42cd3 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.executor-block_on.-------.InstrumentCoverage.0.html @@ -70,166 +70,166 @@ For revisions in Pull Requests (PR):
@0,1,2,3,4,5⦊pub fn block_on<F: Future>(mut future: F) -> F::Output { let mut future = unsafe { Pin::new_unchecked(&mut future) }; static VTABLE: RawWakerVTable = RawWakerVTable::new( |_| unimplemented!("clone"), |_| unimplemented!("wake"), |_| unimplemented!("wake_by_ref"), |_| (), ); let waker = unsafe { Waker::from_raw(RawWaker::new(core::ptr::null(), &VTABLE)) }; let mut context = Context::from_waker(&waker)⦉@0,1,2,3,4,5; loop { if let Poll::Ready(@10,12,14,15,16,17⦊val⦉@10,12,14,15,16,17) = @6,7,8,9⦊future.as_mut().poll(&mut context)⦉@6,7,8,9 { break @10,12,14,15,16,17⦊val⦉@10,12,14,15,16,17; }@11,13⦊‸⦉@11,13 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.main.-------.InstrumentCoverage.0.html index 313a36ed6c2f..b892af0ed37d 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.async/async.main.-------.InstrumentCoverage.0.html @@ -72,118 +72,118 @@ For revisions in Pull Requests (PR):
@0,1,2,3,4,5,6,7,8,9,10,11,12,13⦊fn main() { let _ = g(10); let _ = h(9); let mut future = Box::pin(i(8)); j(7); l(6); let _ = m(5); executor::block_on(future.as_mut()); }⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html index b4b171dc955c..3998295a0525 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#0}.-------.InstrumentCoverage.0.html @@ -86,11 +86,11 @@ For revisions in Pull Requests (PR): 36:21-38:10: @1[1]: _3 = const ()"> }⦉@1@2⦊‸⦉@2 @3,4⦊"alt string 2".to_owned() }⦉@3,4
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#10}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#10}.-------.InstrumentCoverage.0.html index c1edc3eb929b..3bdfe71b48c2 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#10}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#10}.-------.InstrumentCoverage.0.html @@ -86,11 +86,11 @@ For revisions in Pull Requests (PR): 21:29-23:18: @1[1]: _3 = const ()"> }⦉@1@2⦊‸⦉@2 @3,4⦊"alt string 1".to_owned() }⦉@3,4 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#11}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#11}.-------.InstrumentCoverage.0.html index 24c1cadacac4..4b3f04b5a0c7 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#11}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#11}.-------.InstrumentCoverage.0.html @@ -86,11 +86,11 @@ For revisions in Pull Requests (PR): 63:29-65:18: @1[1]: _3 = const ()"> }⦉@1@2⦊‸⦉@2 @3,4⦊"alt string 3".to_owned() }⦉@3,4 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html index 7a3921c5aec7..8ae494178f70 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#1}.-------.InstrumentCoverage.0.html @@ -86,11 +86,11 @@ For revisions in Pull Requests (PR): 78:21-80:10: @1[1]: _3 = const ()"> }⦉@1@2⦊‸⦉@2 @3,4⦊"alt string 4".to_owned() }⦉@3,4 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html index 5071842aa1e9..ad40ba57d69b 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#2}.-------.InstrumentCoverage.0.html @@ -94,13 +94,13 @@ For revisions in Pull Requests (PR): 103:9-103:29: @3[23]: _18 = (_16.0: &&str) 103:9-103:29: @3[26]: _20 = &(*_18) 103:9-103:29: @3[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: @3.Call: _19 = ArgumentV1::new::<&str>(move _20, move _21) -> [return: bb4, unwind: bb8] +103:9-103:29: @3.Call: _19 = std::fmt::ArgumentV1::new::<&str>(move _20, move _21) -> [return: bb4, unwind: bb8] 103:9-103:29: @4[2]: _15 = [move _19] 103:9-103:29: @4[5]: _14 = &_15 103:9-103:29: @4[6]: _13 = &(*_14) 103:9-103:29: @4[7]: _12 = move _13 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -103:9-103:29: @4.Call: _7 = Arguments::new_v1(move _8, move _12) -> [return: bb5, unwind: bb8] -103:9-103:29: @5.Call: _6 = format(move _7) -> [return: bb6, unwind: bb8] +103:9-103:29: @4.Call: _7 = std::fmt::Arguments::new_v1(move _8, move _12) -> [return: bb5, unwind: bb8] +103:9-103:29: @5.Call: _6 = std::fmt::format(move _7) -> [return: bb6, unwind: bb8] 103:9-103:29: @6[1]: FakeRead(ForLet, _6) 103:9-103:29: @6[6]: _0 = move _6 104:6-104:6: @7.Return: return">@3,4,5,6,7⦊format!("'{}'", val) @@ -114,13 +114,13 @@ For revisions in Pull Requests (PR): 103:9-103:29: @3[23]: _18 = (_16.0: &&str) 103:9-103:29: @3[26]: _20 = &(*_18) 103:9-103:29: @3[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: @3.Call: _19 = ArgumentV1::new::<&str>(move _20, move _21) -> [return: bb4, unwind: bb8] +103:9-103:29: @3.Call: _19 = std::fmt::ArgumentV1::new::<&str>(move _20, move _21) -> [return: bb4, unwind: bb8] 103:9-103:29: @4[2]: _15 = [move _19] 103:9-103:29: @4[5]: _14 = &_15 103:9-103:29: @4[6]: _13 = &(*_14) 103:9-103:29: @4[7]: _12 = move _13 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -103:9-103:29: @4.Call: _7 = Arguments::new_v1(move _8, move _12) -> [return: bb5, unwind: bb8] -103:9-103:29: @5.Call: _6 = format(move _7) -> [return: bb6, unwind: bb8] +103:9-103:29: @4.Call: _7 = std::fmt::Arguments::new_v1(move _8, move _12) -> [return: bb5, unwind: bb8] +103:9-103:29: @5.Call: _6 = std::fmt::format(move _7) -> [return: bb6, unwind: bb8] 103:9-103:29: @6[1]: FakeRead(ForLet, _6) 103:9-103:29: @6[6]: _0 = move _6 104:6-104:6: @7.Return: return"> }⦉@3,4,5,6,7 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html index 094077584009..23101d76a8ef 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#3}.-------.InstrumentCoverage.0.html @@ -81,11 +81,11 @@ For revisions in Pull Requests (PR): 124:21-126:10: @1[1]: _3 = const ()"> }⦉@1@2⦊‸⦉@2 @3,4⦊"closure should be unused".to_owned() }⦉@3,4 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#5}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#5}.-------.InstrumentCoverage.0.html index 9ff7a13522af..8ba7a6187fdb 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#5}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#5}.-------.InstrumentCoverage.0.html @@ -79,8 +79,8 @@ For revisions in Pull Requests (PR): 112:28-112:61: @0[17]: _11 = &(*_14) 112:28-112:61: @0[18]: _10 = &(*_11) 112:28-112:61: @0[19]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -112:28-112:61: @0.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb1, unwind: bb3] -112:9-112:62: @1.Call: _3 = _print(move _4) -> [return: bb2, unwind: bb3] +112:28-112:61: @0.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb1, unwind: bb3] +112:9-112:62: @1.Call: _3 = std::io::_print(move _4) -> [return: bb2, unwind: bb3] 111:23-113:6: @2[5]: _0 = const () 111:23-113:6: @2.Return: return">@0,1,2⦊{ $crate::io::_print($crate::format_args_nl!($($arg)*)); }⦉@0,1,2 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#6}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#6}.-------.InstrumentCoverage.0.html index d479211aa37e..74c75c6c46ca 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#6}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#6}.-------.InstrumentCoverage.0.html @@ -79,8 +79,8 @@ For revisions in Pull Requests (PR): 141:61-141:83: @0[17]: _11 = &(*_14) 141:61-141:83: @0[18]: _10 = &(*_11) 141:61-141:83: @0[19]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -141:61-141:83: @0.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb1, unwind: bb3] -141:61-141:83: @1.Call: _3 = _print(move _4) -> [return: bb2, unwind: bb3] +141:61-141:83: @0.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb1, unwind: bb3] +141:61-141:83: @1.Call: _3 = std::io::_print(move _4) -> [return: bb2, unwind: bb3] 141:61-141:83: @2[5]: _0 = const () 141:85-141:85: @2.Return: return">@0,1,2⦊{ println!("not called") }⦉@0,1,2 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#7}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#7}.-------.InstrumentCoverage.0.html index 2734c0b24688..386fb1b9e6f9 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#7}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#7}.-------.InstrumentCoverage.0.html @@ -79,8 +79,8 @@ For revisions in Pull Requests (PR): 144:9-144:31: @0[17]: _11 = &(*_14) 144:9-144:31: @0[18]: _10 = &(*_11) 144:9-144:31: @0[19]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -144:9-144:31: @0.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb1, unwind: bb3] -144:9-144:31: @1.Call: _3 = _print(move _4) -> [return: bb2, unwind: bb3] +144:9-144:31: @0.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb1, unwind: bb3] +144:9-144:31: @1.Call: _3 = std::io::_print(move _4) -> [return: bb2, unwind: bb3] 144:9-144:31: @2[5]: _0 = const () 145:6-145:6: @2.Return: return">@0,1,2⦊{ println!("not called") }⦉@0,1,2 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#8}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#8}.-------.InstrumentCoverage.0.html index a032df54ea21..f9da6ac9dfc3 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#8}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#8}.-------.InstrumentCoverage.0.html @@ -81,8 +81,8 @@ For revisions in Pull Requests (PR): 149:9-149:31: @0[17]: _11 = &(*_14) 149:9-149:31: @0[18]: _10 = &(*_11) 149:9-149:31: @0[19]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -149:9-149:31: @0.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb1, unwind: bb3] -149:9-149:31: @1.Call: _3 = _print(move _4) -> [return: bb2, unwind: bb3] +149:9-149:31: @0.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb1, unwind: bb3] +149:9-149:31: @1.Call: _3 = std::io::_print(move _4) -> [return: bb2, unwind: bb3] 149:9-149:31: @2[5]: _0 = const () 149:33-149:33: @2.Return: return">@0,1,2⦊{ println!("not called") }⦉@0,1,2 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#9}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#9}.-------.InstrumentCoverage.0.html index 3c174e03ebe3..e259fc9bb67e 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#9}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#9}.-------.InstrumentCoverage.0.html @@ -81,8 +81,8 @@ For revisions in Pull Requests (PR): 153:9-153:31: @0[17]: _11 = &(*_14) 153:9-153:31: @0[18]: _10 = &(*_11) 153:9-153:31: @0[19]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -153:9-153:31: @0.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb1, unwind: bb3] -153:9-153:31: @1.Call: _3 = _print(move _4) -> [return: bb2, unwind: bb3] +153:9-153:31: @0.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb1, unwind: bb3] +153:9-153:31: @1.Call: _3 = std::io::_print(move _4) -> [return: bb2, unwind: bb3] 153:9-153:31: @2[5]: _0 = const () 153:33-153:33: @2.Return: return">@0,1,2⦊{ println!("not called") }⦉@0,1,2 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html index 702c7937064b..a7d1728114ec 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main.-------.InstrumentCoverage.0.html @@ -69,516 +69,516 @@ For revisions in Pull Requests (PR): -
@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊fn main() { - // Initialize test constants in a way that cannot be determined at compile time, to ensure - // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from - // dependent conditions. - let is_true = std::env::args().len() == 1; - let is_false = ! is_true; - - let mut some_string = Some(String::from("the string content")); - println!( - "The string or alt: {}" - , - some_string - . - unwrap_or_else - ( - ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42|| { @@ -587,327 +587,327 @@ For revisions in Pull Requests (PR): countdown = 10; } "alt string 1".to_owned() - } }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊ - ) - ); - - some_string = Some(String::from("the string content")); - let - a - = - ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42|| @@ -917,39 +917,39 @@ For revisions in Pull Requests (PR): countdown = 10; } "alt string 2".to_owned() - } }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊; - println!( - "The string or alt: {}" - , - some_string - . - unwrap_or_else - ( - a - ) - ); - - some_string = None; - println!( - "The string or alt: {}" - , - some_string - . - unwrap_or_else - ( - ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42|| { @@ -2561,39 +2561,39 @@ For revisions in Pull Requests (PR): countdown = 10; } "alt string 3".to_owned() - } }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊ - ) - ); - - some_string = None; - let - a - = - ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42|| @@ -3296,39 +3296,39 @@ For revisions in Pull Requests (PR): countdown = 10; } "alt string 4".to_owned() - } }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊; - println!( - "The string or alt: {}" - , - some_string - . - unwrap_or_else - ( - a - ) - ); - - let - quote_closure - = - countdown = 10; } format!("'{}'", val) - } }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊; - println!( - "Repeated, quoted string: {:?}" - , - std::iter::repeat("repeat me") - .take(5) - .map - ( - quote_closure - ) - .collect::<Vec<_>>() - ); - - let - _unused_closure - = - ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42| @@ -7149,39 +7149,39 @@ For revisions in Pull Requests (PR): countdown = 10; } "closure should be unused".to_owned() - } }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊; - - let mut countdown = 10; - let _short_unused_closure = ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42| _unused_arg: u8 | countdown += 1 let _short_unused_closure = ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42| _unused_arg: u8 | countdown += 1@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊; - - // Macros can sometimes confuse the coverage results. Compare this next assignment, with an - // unused closure that invokes the `println!()` macro, with the closure assignment above, that - // does not use a macro. The closure above correctly shows `0` executions. - let _short_unused_closure = ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42| _unused_arg: u8 | println!("not called") let _short_unused_closure = ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42| _unused_arg: u8 | println!("not called")@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊; - // The closure assignment above is executed, with a line count of `1`, but the `println!()` - // could not have been called, and yet, there is no indication that it wasn't... - - // ...but adding block braces gives the expected result, showing the block was not executed. - let _short_unused_closure_block = ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42| _unused_arg: u8 | { println!("not called") } let _short_unused_closure_block = ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42| _unused_arg: u8 | { println!("not called") }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊; - - let _shortish_unused_closure = ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42| _unused_arg: u8 | { println!("not called") - } }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊; - - let _as_short_unused_closure = ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42| _unused_arg: u8 - | { println!("not called") } | { println!("not called") }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊; - - let _almost_as_short_unused_closure = ⦉@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42| _unused_arg: u8 - | { println!("not called") } | { println!("not called") }@0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42⦊ - ; -@3⦊countdown > 7⦉@3 { @4,6⦊countdown -= 4; +12:9-12:10: @6[1]: _4 = const main::B">@4,6⦊countdown -= 4; B⦉@4,6 +12:9-12:10: @6[1]: _4 = const main::B"> B⦉@4,6 } else if @5⦊countdown > 2⦉@5 { if @74,87,88⦊should_be_reachable = countdown; println!("reached"); return⦉@74,87,88; }; diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.dead_code/dead_code.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.dead_code/dead_code.main.-------.InstrumentCoverage.0.html index 421fe27825c3..be06ddd126da 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.dead_code/dead_code.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.dead_code/dead_code.main.-------.InstrumentCoverage.0.html @@ -69,65 +69,65 @@ For revisions in Pull Requests (PR): -
@0,1,2,3⦊fn main() { - // Initialize test constants in a way that cannot be determined at compile time, to ensure - // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from - // dependent conditions. - let is_true = std::env::args().len() == 1; - - let mut countdown = 0; -@0,1,2,3⦊fn unused_fn() { - // Initialize test constants in a way that cannot be determined at compile time, to ensure - // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from - // dependent conditions. - let is_true = std::env::args().len() == 1; - - let mut countdown = 0; -@0,1,2,3⦊pub fn unused_pub_fn_not_in_library() { - // Initialize test constants in a way that cannot be determined at compile time, to ensure - // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from - // dependent conditions. - let is_true = std::env::args().len() == 1; - - let mut countdown = 0; -@3,5,6,7⦊assert_eq!(1, 1);⦉@3,5,6,7⦉@4 } else { @9⦊@8,10,11,12⦊assert_eq!(1, 2);⦉@8,10,11,12⦉@9 } }@13⦊‸⦉@13
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.doctest_crate/doctest_crate.fn_run_in_doctests.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.doctest_crate/doctest_crate.fn_run_in_doctests.-------.InstrumentCoverage.0.html index 02c25cc904c4..f55bb0f32d9c 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.doctest_crate/doctest_crate.fn_run_in_doctests.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.doctest_crate/doctest_crate.fn_run_in_doctests.-------.InstrumentCoverage.0.html @@ -84,16 +84,16 @@ For revisions in Pull Requests (PR): 4:14-4:30: @6[28]: _28 = (_23.0: &&i32) 4:14-4:30: @6[30]: _29 = (_23.1: &&i32) 4:14-4:30: @6[33]: _31 = &(*_28) -4:14-4:30: @6[35]: _32 = <&i32 as Debug>::fmt as for<'r, 's, 't0> fn(&'r &i32, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -4:14-4:30: @6.Call: _30 = ArgumentV1::new::<&i32>(move _31, move _32) -> [return: bb8, unwind: bb29] +4:14-4:30: @6[35]: _32 = <&i32 as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r &i32, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +4:14-4:30: @6.Call: _30 = std::fmt::ArgumentV1::new::<&i32>(move _31, move _32) -> [return: bb8, unwind: bb29] 4:14-4:30: @8[4]: _34 = &(*_29) -4:14-4:30: @8[6]: _35 = <&i32 as Debug>::fmt as for<'r, 's, 't0> fn(&'r &i32, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -4:14-4:30: @8.Call: _33 = ArgumentV1::new::<&i32>(move _34, move _35) -> [return: bb9, unwind: bb29] +4:14-4:30: @8[6]: _35 = <&i32 as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r &i32, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +4:14-4:30: @8.Call: _33 = std::fmt::ArgumentV1::new::<&i32>(move _34, move _35) -> [return: bb9, unwind: bb29] 4:14-4:30: @9[2]: _22 = [move _30, move _33] 4:14-4:30: @9[7]: _21 = &_22 4:14-4:30: @9[8]: _20 = &(*_21) 4:14-4:30: @9[9]: _19 = move _20 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -4:14-4:30: @9.Call: _14 = Arguments::new_v1(move _15, move _19) -> [return: bb10, unwind: bb29] +4:14-4:30: @9.Call: _14 = std::fmt::Arguments::new_v1(move _15, move _19) -> [return: bb10, unwind: bb29] 4:14-4:30: @10.Call: core::panicking::panic_fmt(move _14) -> bb29">@6,8,9,10⦊assert_eq!(1, 1)⦉@6,8,9,10⦉@7, // this is run, 2 => @13⦊@12,14,15,16⦊assert_eq!(1, 1)⦉@12,14,15,16⦉@13, // this, 3 => @19⦊@18,20,21,22⦊assert_eq!(1, 1)⦉@18,20,21,22⦉@19, // and this too _ => @24⦊@23,25,26,27⦊assert_eq!(1, 2)⦉@23,25,26,27⦉@24, // however this is not } }@28⦊‸⦉@28
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html index bf49fed2dd60..66a6e776a062 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.drop_trait/drop_trait.main.-------.InstrumentCoverage.0.html @@ -109,10 +109,10 @@ For revisions in Pull Requests (PR): 20:9-20:43: @1[18]: _15 = &(*_20) 20:9-20:43: @1[19]: _14 = &(*_15) 20:9-20:43: @1[20]: _13 = move _14 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -20:9-20:43: @1.Call: _8 = Arguments::new_v1(move _9, move _13) -> [return: bb3, unwind: bb11] -20:9-20:43: @3.Call: _7 = _print(move _8) -> [return: bb4, unwind: bb11] +20:9-20:43: @1.Call: _8 = std::fmt::Arguments::new_v1(move _9, move _13) -> [return: bb3, unwind: bb11] +20:9-20:43: @3.Call: _7 = std::io::_print(move _8) -> [return: bb4, unwind: bb11] 20:9-20:43: @4[5]: _6 = const () -21:16-21:22: @4[7]: _0 = Result::<(), u8>::Err(const 1_u8)">@1,3,4,8,9⦊println!("Exiting with error..."); +21:16-21:22: @4[7]: _0 = std::result::Result::<(), u8>::Err(const 1_u8)">@1,3,4,8,9⦊println!("Exiting with error..."); return Err(1)⦉@1,3,4,8,9; +21:16-21:22: @4[7]: _0 = std::result::Result::<(), u8>::Err(const 1_u8)"> return Err(1)⦉@1,3,4,8,9; }@2,5,6,7⦊ +26:5-26:11: @5[3]: _0 = std::result::Result::<(), u8>::Ok(move _19)">@2,5,6,7⦊ +26:5-26:11: @5[3]: _0 = std::result::Result::<(), u8>::Ok(move _19)"> let _ = Firework { strength: 1000 }; +26:5-26:11: @5[3]: _0 = std::result::Result::<(), u8>::Ok(move _19)"> let _ = Firework { strength: 1000 }; +26:5-26:11: @5[3]: _0 = std::result::Result::<(), u8>::Ok(move _19)"> Ok(())⦉@2,5,6,7 +26:5-26:11: @5[3]: _0 = std::result::Result::<(), u8>::Ok(move _19)"> Ok(())⦉@2,5,6,7 }@10⦊‸⦉@10 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html index b5dedeec8ac7..57d56c5cf736 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.drop_trait/drop_trait.{impl#0}-drop.-------.InstrumentCoverage.0.html @@ -69,7 +69,7 @@ For revisions in Pull Requests (PR): -
@0,1,2,3⦊fn drop(&mut self) { - println!("BOOM times {}!!!", self.strength); - }⦉@0,1,2,3
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html index fa23bd2e961f..098c14042516 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.main.-------.InstrumentCoverage.0.html @@ -178,10 +178,10 @@ For revisions in Pull Requests (PR): 31:9-31:43: @4[18]: _21 = &(*_26) 31:9-31:43: @4[19]: _20 = &(*_21) 31:9-31:43: @4[20]: _19 = move _20 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -31:9-31:43: @4.Call: _14 = Arguments::new_v1(move _15, move _19) -> [return: bb6, unwind: bb14] -31:9-31:43: @6.Call: _13 = _print(move _14) -> [return: bb7, unwind: bb14] +31:9-31:43: @4.Call: _14 = std::fmt::Arguments::new_v1(move _15, move _19) -> [return: bb6, unwind: bb14] +31:9-31:43: @6.Call: _13 = std::io::_print(move _14) -> [return: bb7, unwind: bb14] 31:9-31:43: @7[5]: _12 = const () -32:16-32:22: @7[7]: _0 = Result::<(), u8>::Err(const 1_u8)">@4,6,7,11,12⦊println!("Exiting with error..."); +32:16-32:22: @7[7]: _0 = std::result::Result::<(), u8>::Err(const 1_u8)">@4,6,7,11,12⦊println!("Exiting with error..."); return Err(1)⦉@4,6,7,11,12; +32:16-32:22: @7[7]: _0 = std::result::Result::<(), u8>::Err(const 1_u8)"> return Err(1)⦉@4,6,7,11,12; }@5,8,9,10⦊ // The remaining lines below have no coverage because `if true` (with the constant literal +41:5-41:11: @8[3]: _0 = std::result::Result::<(), u8>::Ok(move _25)">@5,8,9,10⦊ // The remaining lines below have no coverage because `if true` (with the constant literal // `true`) is guaranteed to execute the `then` block, which is also guaranteed to `return`. +41:5-41:11: @8[3]: _0 = std::result::Result::<(), u8>::Ok(move _25)"> // `true`) is guaranteed to execute the `then` block, which is also guaranteed to `return`. // Thankfully, in the normal case, conditions are not guaranteed ahead of time, and as shown +41:5-41:11: @8[3]: _0 = std::result::Result::<(), u8>::Ok(move _25)"> // Thankfully, in the normal case, conditions are not guaranteed ahead of time, and as shown // in other tests, the lines below would have coverage (which would show they had `0` +41:5-41:11: @8[3]: _0 = std::result::Result::<(), u8>::Ok(move _25)"> // in other tests, the lines below would have coverage (which would show they had `0` // executions, assuming the condition still evaluated to `true`). +41:5-41:11: @8[3]: _0 = std::result::Result::<(), u8>::Ok(move _25)"> // executions, assuming the condition still evaluated to `true`). +41:5-41:11: @8[3]: _0 = std::result::Result::<(), u8>::Ok(move _25)"> let _ = Firework { strength: 1000 }; +41:5-41:11: @8[3]: _0 = std::result::Result::<(), u8>::Ok(move _25)"> let _ = Firework { strength: 1000 }; +41:5-41:11: @8[3]: _0 = std::result::Result::<(), u8>::Ok(move _25)"> Ok(())⦉@5,8,9,10 +41:5-41:11: @8[3]: _0 = std::result::Result::<(), u8>::Ok(move _25)"> Ok(())⦉@5,8,9,10 }@13⦊‸⦉@13 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html index c4e99bd679d0..4908bc7b4a77 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.generics/generics.{impl#1}-drop.-------.InstrumentCoverage.0.html @@ -69,7 +69,7 @@ For revisions in Pull Requests (PR): -
@0,1,2,3⦊fn drop(&mut self) { - println!("BOOM times {}!!!", self.strength); - }⦉@0,1,2,3
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.if/if.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.if/if.main.-------.InstrumentCoverage.0.html index dd9ba4a190cd..d6eccf57846e 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.if/if.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.if/if.main.-------.InstrumentCoverage.0.html @@ -69,153 +69,153 @@ For revisions in Pull Requests (PR): -
@0,1,2,3⦊fn main() { - // Initialize test constants in a way that cannot be determined at compile time, to ensure - // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from - // dependent conditions. - let - is_true - = - std::env::args().len() - == - 1 - ; - let - mut - countdown - = - 0 - ; - if -@0,1,2,3⦊fn main() { - // Initialize test constants in a way that cannot be determined at compile time, to ensure - // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from - // dependent conditions. - let is_true = std::env::args().len() == 1; - - let mut countdown = 0; - if - @0,1,2⦊fn default_trait_func(&mut self) { - in_func(IN_CONST); - self.trait_func(IN_CONST); - }⦉@0,1,2
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main-in_func.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main-in_func.-------.InstrumentCoverage.0.html index 8b5257b02bbd..82724e5e8651 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main-in_func.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main-in_func.-------.InstrumentCoverage.0.html @@ -76,7 +76,7 @@ For revisions in Pull Requests (PR): 20:17-20:22: @0[8]: _6 = CheckedAdd(_4, _5) 20:17-20:22: @1[0]: _3 = move (_6.0: u32) 20:13-20:14: @1[3]: FakeRead(ForLet, _3) -21:18-21:26: @1[9]: _23 = const in_func::promoted[0] +21:18-21:26: @1[9]: _23 = const main::in_func::promoted[0] 21:18-21:26: @1[10]: _11 = &(*_23) 21:18-21:26: @1[11]: _10 = &(*_11) 21:18-21:26: @1[12]: _9 = move _10 as &[&str] (Pointer(Unsize)) @@ -86,13 +86,13 @@ For revisions in Pull Requests (PR): 21:9-21:30: @1[25]: _19 = (_17.0: &u32) 21:9-21:30: @1[28]: _21 = &(*_19) 21:9-21:30: @1[30]: _22 = <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)) -21:9-21:30: @1.Call: _20 = ArgumentV1::new::<u32>(move _21, move _22) -> [return: bb2, unwind: bb5] +21:9-21:30: @1.Call: _20 = std::fmt::ArgumentV1::new::<u32>(move _21, move _22) -> [return: bb2, unwind: bb5] 21:9-21:30: @2[2]: _16 = [move _20] 21:9-21:30: @2[5]: _15 = &_16 21:9-21:30: @2[6]: _14 = &(*_15) 21:9-21:30: @2[7]: _13 = move _14 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -21:9-21:30: @2.Call: _8 = Arguments::new_v1(move _9, move _13) -> [return: bb3, unwind: bb5] -21:9-21:30: @3.Call: _7 = _print(move _8) -> [return: bb4, unwind: bb5] +21:9-21:30: @2.Call: _8 = std::fmt::Arguments::new_v1(move _9, move _13) -> [return: bb3, unwind: bb5] +21:9-21:30: @3.Call: _7 = std::io::_print(move _8) -> [return: bb4, unwind: bb5] 21:9-21:30: @4[6]: _0 = const () 22:6-22:6: @4.Return: return">@0,1,2,3,4⦊fn in_func(a: u32) { let b = 1; let c = a + b; println!("c = {}", c) }⦉@0,1,2,3,4 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main-{impl#0}-trait_func.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main-{impl#0}-trait_func.-------.InstrumentCoverage.0.html index ee1e0339049e..b00a781a0a74 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main-{impl#0}-trait_func.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main-{impl#0}-trait_func.-------.InstrumentCoverage.0.html @@ -73,28 +73,28 @@ For revisions in Pull Requests (PR): 41:13-41:41: @0[2]: _4 = CheckedAdd(((*_1).0: u32), _3) 41:13-41:41: @1[0]: ((*_1).0: u32) = move (_4.0: u32) 42:21-42:41: @1[4]: _6 = ((*_1).0: u32) -42:13-42:42: @1.Call: _5 = in_func(move _6) -> [return: bb2, unwind: bb3] +42:13-42:42: @1.Call: _5 = main::in_func(move _6) -> [return: bb2, unwind: bb3] 40:45-43:10: @2[2]: _0 = const () 43:10-43:10: @2.Return: return">@0,1,2⦊fn trait_func(&mut self, incr: u32) { self.in_struct_field += incr; in_func(self.in_struct_field); }⦉@0,1,2 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html index d21710b7240d..4a1003dfbed3 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.inner_items/inner_items.main.-------.InstrumentCoverage.0.html @@ -73,33 +73,33 @@ For revisions in Pull Requests (PR): // 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 let @0,1,2,3⦊is_true = std::env::args().len() == 1; - - let mut countdown = 0; - type InType = String; if @6⦊is_true⦉@6 @7,9⦊{ in_func(countdown); }⦉@7,9@8⦊‸⦉@8 - let let @10,11⦊mut val = InStruct { - in_struct_field: 101, - }; - - val.default_trait_func(); -}⦉@10,11 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.lazy_boolean/lazy_boolean.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.lazy_boolean/lazy_boolean.main.-------.InstrumentCoverage.0.html index 0cfe2119fbc8..358e2e2bbba3 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.lazy_boolean/lazy_boolean.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.lazy_boolean/lazy_boolean.main.-------.InstrumentCoverage.0.html @@ -69,9 +69,9 @@ For revisions in Pull Requests (PR): -
@0,1,2,3⦊fn main() { - // Initialize test constants in a way that cannot be determined at compile time, to ensure - // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from - // dependent conditions. - let is_true = std::env::args().len() == 1; - - let (mut a, mut b, mut c) = (0, 0, 0); -@0,1,2,3⦊fn main() { @@ -102,14 +102,14 @@ For revisions in Pull Requests (PR): 24:5-24:34: @0[23]: FakeRead(ForMatchedPlace, _13) 24:5-24:34: @0[25]: _15 = (_13.0: &DebugTest) 24:5-24:34: @0[28]: _17 = &(*_15) -24:5-24:34: @0[30]: _18 = <DebugTest as Debug>::fmt as for<'r, 's, 't0> fn(&'r DebugTest, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -24:5-24:34: @0.Call: _16 = ArgumentV1::new::<DebugTest>(move _17, move _18) -> [return: bb1, unwind: bb4] +24:5-24:34: @0[30]: _18 = <DebugTest as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r DebugTest, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +24:5-24:34: @0.Call: _16 = std::fmt::ArgumentV1::new::<DebugTest>(move _17, move _18) -> [return: bb1, unwind: bb4] 24:5-24:34: @1[2]: _12 = [move _16] 24:5-24:34: @1[5]: _11 = &_12 24:5-24:34: @1[6]: _10 = &(*_11) 24:5-24:34: @1[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -24:5-24:34: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb4] -24:5-24:34: @2.Call: _3 = _print(move _4) -> [return: bb3, unwind: bb4] +24:5-24:34: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb4] +24:5-24:34: @2.Call: _3 = std::io::_print(move _4) -> [return: bb3, unwind: bb4] 24:5-24:34: @3[6]: _2 = const () 22:11-25:2: @3[8]: _0 = const () 25:2-25:2: @3.Return: return"> let debug_test = DebugTest; @@ -124,14 +124,14 @@ For revisions in Pull Requests (PR): 24:5-24:34: @0[23]: FakeRead(ForMatchedPlace, _13) 24:5-24:34: @0[25]: _15 = (_13.0: &DebugTest) 24:5-24:34: @0[28]: _17 = &(*_15) -24:5-24:34: @0[30]: _18 = <DebugTest as Debug>::fmt as for<'r, 's, 't0> fn(&'r DebugTest, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -24:5-24:34: @0.Call: _16 = ArgumentV1::new::<DebugTest>(move _17, move _18) -> [return: bb1, unwind: bb4] +24:5-24:34: @0[30]: _18 = <DebugTest as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r DebugTest, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +24:5-24:34: @0.Call: _16 = std::fmt::ArgumentV1::new::<DebugTest>(move _17, move _18) -> [return: bb1, unwind: bb4] 24:5-24:34: @1[2]: _12 = [move _16] 24:5-24:34: @1[5]: _11 = &_12 24:5-24:34: @1[6]: _10 = &(*_11) 24:5-24:34: @1[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -24:5-24:34: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb4] -24:5-24:34: @2.Call: _3 = _print(move _4) -> [return: bb3, unwind: bb4] +24:5-24:34: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb4] +24:5-24:34: @2.Call: _3 = std::io::_print(move _4) -> [return: bb3, unwind: bb4] 24:5-24:34: @3[6]: _2 = const () 22:11-25:2: @3[8]: _0 = const () 25:2-25:2: @3.Return: return"> println!("{:?}", debug_test); @@ -146,14 +146,14 @@ For revisions in Pull Requests (PR): 24:5-24:34: @0[23]: FakeRead(ForMatchedPlace, _13) 24:5-24:34: @0[25]: _15 = (_13.0: &DebugTest) 24:5-24:34: @0[28]: _17 = &(*_15) -24:5-24:34: @0[30]: _18 = <DebugTest as Debug>::fmt as for<'r, 's, 't0> fn(&'r DebugTest, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -24:5-24:34: @0.Call: _16 = ArgumentV1::new::<DebugTest>(move _17, move _18) -> [return: bb1, unwind: bb4] +24:5-24:34: @0[30]: _18 = <DebugTest as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r DebugTest, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +24:5-24:34: @0.Call: _16 = std::fmt::ArgumentV1::new::<DebugTest>(move _17, move _18) -> [return: bb1, unwind: bb4] 24:5-24:34: @1[2]: _12 = [move _16] 24:5-24:34: @1[5]: _11 = &_12 24:5-24:34: @1[6]: _10 = &(*_11) 24:5-24:34: @1[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -24:5-24:34: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb4] -24:5-24:34: @2.Call: _3 = _print(move _4) -> [return: bb3, unwind: bb4] +24:5-24:34: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb4] +24:5-24:34: @2.Call: _3 = std::io::_print(move _4) -> [return: bb3, unwind: bb4] 24:5-24:34: @3[6]: _2 = const () 22:11-25:2: @3[8]: _0 = const () 25:2-25:2: @3.Return: return">}⦉@0,1,2,3
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.loops_branches/loops_branches.{impl#0}-fmt.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.loops_branches/loops_branches.{impl#0}-fmt.-------.InstrumentCoverage.0.html index 1b4ba83f20f9..f6f08b6a7704 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.loops_branches/loops_branches.{impl#0}-fmt.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.loops_branches/loops_branches.{impl#0}-fmt.-------.InstrumentCoverage.0.html @@ -77,24 +77,24 @@ For revisions in Pull Requests (PR): }⦉@6,8 }@3⦊‸⦉@3 @9,10,11,12⦊write!(f, "error")⦉@9,10,11,12@9,10,11,12⦊write!(f, "error")⦉@9,10,11,12@14,16,17,18⦊?⦉@14,16,17,18; +15:31-15:32: @16.Call: _27 = <std::fmt::Error as std::convert::From<std::fmt::Error>>::from(move _28) -> [return: bb17, unwind: bb21]">@14,16,17,18⦊?⦉@14,16,17,18; } else @2⦊{ }⦉@2 @19⦊Ok(())⦉@19 +18:9-18:15: @19[4]: _0 = std::result::Result::<(), std::fmt::Error>::Ok(move _30)">@19⦊Ok(())⦉@19 }@20⦊‸⦉@20 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.match_or_pattern/match_or_pattern.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.match_or_pattern/match_or_pattern.main.-------.InstrumentCoverage.0.html index c7992614b5b6..013c292ce9a4 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.match_or_pattern/match_or_pattern.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.match_or_pattern/match_or_pattern.main.-------.InstrumentCoverage.0.html @@ -69,9 +69,9 @@ For revisions in Pull Requests (PR): -
@0,1,2,3⦊fn main() { - // Initialize test constants in a way that cannot be determined at compile time, to ensure - // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from - // dependent conditions. - let is_true = std::env::args().len() == 1; - - let mut a: u8 = 0; - let mut b: u8 = 0; -@0,1,2,3⦊fn main() { - let is_true = std::env::args().len() == 1; -@14,16⦊_⦉@14,16 in @10,11,12⦊0..50⦉@10,11,12 { if @14,16⦊a < 30⦉@14,16 { diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.overflow/overflow.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.overflow/overflow.main.-------.InstrumentCoverage.0.html index 6573abe30b8a..2a9b1b10efcd 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.overflow/overflow.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.overflow/overflow.main.-------.InstrumentCoverage.0.html @@ -89,13 +89,13 @@ For revisions in Pull Requests (PR): 20:13-20:44: @8[23]: _23 = (_21.0: &u32) 20:13-20:44: @8[26]: _25 = &(*_23) 20:13-20:44: @8[28]: _26 = <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)) -20:13-20:44: @8.Call: _24 = ArgumentV1::new::<u32>(move _25, move _26) -> [return: bb9, unwind: bb21] +20:13-20:44: @8.Call: _24 = std::fmt::ArgumentV1::new::<u32>(move _25, move _26) -> [return: bb9, unwind: bb21] 20:13-20:44: @9[2]: _20 = [move _24] 20:13-20:44: @9[5]: _19 = &_20 20:13-20:44: @9[6]: _18 = &(*_19) 20:13-20:44: @9[7]: _17 = move _18 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -20:13-20:44: @9.Call: _12 = Arguments::new_v1(move _13, move _17) -> [return: bb10, unwind: bb21] -20:13-20:44: @10.Call: _11 = _print(move _12) -> [return: bb11, unwind: bb21] +20:13-20:44: @9.Call: _12 = std::fmt::Arguments::new_v1(move _13, move _17) -> [return: bb10, unwind: bb21] +20:13-20:44: @10.Call: _11 = std::io::_print(move _12) -> [return: bb11, unwind: bb21] 20:13-20:44: @11[6]: _10 = const () 18:27-21:10: @11[8]: _6 = const ()">@6,8,9,10,11⦊{ let result = might_overflow(10); println!("Result: {}", result); }⦉@6,8,9,10,11 else if @7⦊countdown < 5⦉@7 @12,14,15,16,17⦊{ let result = might_overflow(1); println!("Result: {}", result); }⦉@12,14,15,16,17@13⦊‸⦉@13 @19,20⦊countdown -= 1⦉@19,20; } @4⦊Ok(()) }⦉@4
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.overflow/overflow.might_overflow.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.overflow/overflow.might_overflow.-------.InstrumentCoverage.0.html index f86cc4b2d2a0..c6043f0bd07f 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.overflow/overflow.might_overflow.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.overflow/overflow.might_overflow.-------.InstrumentCoverage.0.html @@ -82,8 +82,8 @@ For revisions in Pull Requests (PR): 6:9-6:49: @1[18]: _14 = &(*_60) 6:9-6:49: @1[19]: _13 = &(*_14) 6:9-6:49: @1[20]: _12 = move _13 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -6:9-6:49: @1.Call: _7 = Arguments::new_v1(move _8, move _12) -> [return: bb3, unwind: bb14] -6:9-6:49: @3.Call: _6 = _print(move _7) -> [return: bb4, unwind: bb14] +6:9-6:49: @1.Call: _7 = std::fmt::Arguments::new_v1(move _8, move _12) -> [return: bb3, unwind: bb14] +6:9-6:49: @3.Call: _6 = std::io::_print(move _7) -> [return: bb4, unwind: bb14] 6:9-6:49: @4[5]: _5 = const () 5:19-7:6: @4[7]: _2 = const ()">@1,3,4⦊{ println!("this will probably overflow"); }⦉@1,3,4@2⦊‸⦉@2 let @5,6,7,8,9,10,11,12,13⦊add_to = u32::MAX - 5; @@ -175,16 +175,16 @@ For revisions in Pull Requests (PR): 9:5-9:56: @6[29]: _34 = (_30.1: &u32) 9:5-9:56: @6[32]: _36 = &(*_33) 9:5-9:56: @6[34]: _37 = <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)) -9:5-9:56: @6.Call: _35 = ArgumentV1::new::<u32>(move _36, move _37) -> [return: bb7, unwind: bb14] +9:5-9:56: @6.Call: _35 = std::fmt::ArgumentV1::new::<u32>(move _36, move _37) -> [return: bb7, unwind: bb14] 9:5-9:56: @7[4]: _39 = &(*_34) 9:5-9:56: @7[6]: _40 = <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)) -9:5-9:56: @7.Call: _38 = ArgumentV1::new::<u32>(move _39, move _40) -> [return: bb8, unwind: bb14] +9:5-9:56: @7.Call: _38 = std::fmt::ArgumentV1::new::<u32>(move _39, move _40) -> [return: bb8, unwind: bb14] 9:5-9:56: @8[2]: _29 = [move _35, move _38] 9:5-9:56: @8[7]: _28 = &_29 9:5-9:56: @8[8]: _27 = &(*_28) 9:5-9:56: @8[9]: _26 = move _27 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -9:5-9:56: @8.Call: _21 = Arguments::new_v1(move _22, move _26) -> [return: bb9, unwind: bb14] -9:5-9:56: @9.Call: _20 = _print(move _21) -> [return: bb10, unwind: bb14] +9:5-9:56: @8.Call: _21 = std::fmt::Arguments::new_v1(move _22, move _26) -> [return: bb9, unwind: bb14] +9:5-9:56: @9.Call: _20 = std::io::_print(move _21) -> [return: bb10, unwind: bb14] 9:5-9:56: @10[6]: _19 = const () 10:18-10:24: @10[10]: _42 = _1 10:27-10:33: @10[12]: _43 = _17 @@ -201,8 +201,8 @@ For revisions in Pull Requests (PR): 11:5-11:49: @11[22]: _54 = &(*_57) 11:5-11:49: @11[23]: _53 = &(*_54) 11:5-11:49: @11[24]: _52 = move _53 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -11:5-11:49: @11.Call: _47 = Arguments::new_v1(move _48, move _52) -> [return: bb12, unwind: bb14] -11:5-11:49: @12.Call: _46 = _print(move _47) -> [return: bb13, unwind: bb14] +11:5-11:49: @11.Call: _47 = std::fmt::Arguments::new_v1(move _48, move _52) -> [return: bb12, unwind: bb14] +11:5-11:49: @12.Call: _46 = std::io::_print(move _47) -> [return: bb13, unwind: bb14] 11:5-11:49: @13[5]: _45 = const () 12:5-12:11: @13[7]: _0 = _41 13:2-13:2: @13.Return: return"> println!("does {} + {} overflow?", add_to, to_add); @@ -221,16 +221,16 @@ For revisions in Pull Requests (PR): 9:5-9:56: @6[29]: _34 = (_30.1: &u32) 9:5-9:56: @6[32]: _36 = &(*_33) 9:5-9:56: @6[34]: _37 = <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)) -9:5-9:56: @6.Call: _35 = ArgumentV1::new::<u32>(move _36, move _37) -> [return: bb7, unwind: bb14] +9:5-9:56: @6.Call: _35 = std::fmt::ArgumentV1::new::<u32>(move _36, move _37) -> [return: bb7, unwind: bb14] 9:5-9:56: @7[4]: _39 = &(*_34) 9:5-9:56: @7[6]: _40 = <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)) -9:5-9:56: @7.Call: _38 = ArgumentV1::new::<u32>(move _39, move _40) -> [return: bb8, unwind: bb14] +9:5-9:56: @7.Call: _38 = std::fmt::ArgumentV1::new::<u32>(move _39, move _40) -> [return: bb8, unwind: bb14] 9:5-9:56: @8[2]: _29 = [move _35, move _38] 9:5-9:56: @8[7]: _28 = &_29 9:5-9:56: @8[8]: _27 = &(*_28) 9:5-9:56: @8[9]: _26 = move _27 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -9:5-9:56: @8.Call: _21 = Arguments::new_v1(move _22, move _26) -> [return: bb9, unwind: bb14] -9:5-9:56: @9.Call: _20 = _print(move _21) -> [return: bb10, unwind: bb14] +9:5-9:56: @8.Call: _21 = std::fmt::Arguments::new_v1(move _22, move _26) -> [return: bb9, unwind: bb14] +9:5-9:56: @9.Call: _20 = std::io::_print(move _21) -> [return: bb10, unwind: bb14] 9:5-9:56: @10[6]: _19 = const () 10:18-10:24: @10[10]: _42 = _1 10:27-10:33: @10[12]: _43 = _17 @@ -247,8 +247,8 @@ For revisions in Pull Requests (PR): 11:5-11:49: @11[22]: _54 = &(*_57) 11:5-11:49: @11[23]: _53 = &(*_54) 11:5-11:49: @11[24]: _52 = move _53 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -11:5-11:49: @11.Call: _47 = Arguments::new_v1(move _48, move _52) -> [return: bb12, unwind: bb14] -11:5-11:49: @12.Call: _46 = _print(move _47) -> [return: bb13, unwind: bb14] +11:5-11:49: @11.Call: _47 = std::fmt::Arguments::new_v1(move _48, move _52) -> [return: bb12, unwind: bb14] +11:5-11:49: @12.Call: _46 = std::io::_print(move _47) -> [return: bb13, unwind: bb14] 11:5-11:49: @13[5]: _45 = const () 12:5-12:11: @13[7]: _0 = _41 13:2-13:2: @13.Return: return"> let result = to_add + add_to; @@ -267,16 +267,16 @@ For revisions in Pull Requests (PR): 9:5-9:56: @6[29]: _34 = (_30.1: &u32) 9:5-9:56: @6[32]: _36 = &(*_33) 9:5-9:56: @6[34]: _37 = <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)) -9:5-9:56: @6.Call: _35 = ArgumentV1::new::<u32>(move _36, move _37) -> [return: bb7, unwind: bb14] +9:5-9:56: @6.Call: _35 = std::fmt::ArgumentV1::new::<u32>(move _36, move _37) -> [return: bb7, unwind: bb14] 9:5-9:56: @7[4]: _39 = &(*_34) 9:5-9:56: @7[6]: _40 = <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)) -9:5-9:56: @7.Call: _38 = ArgumentV1::new::<u32>(move _39, move _40) -> [return: bb8, unwind: bb14] +9:5-9:56: @7.Call: _38 = std::fmt::ArgumentV1::new::<u32>(move _39, move _40) -> [return: bb8, unwind: bb14] 9:5-9:56: @8[2]: _29 = [move _35, move _38] 9:5-9:56: @8[7]: _28 = &_29 9:5-9:56: @8[8]: _27 = &(*_28) 9:5-9:56: @8[9]: _26 = move _27 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -9:5-9:56: @8.Call: _21 = Arguments::new_v1(move _22, move _26) -> [return: bb9, unwind: bb14] -9:5-9:56: @9.Call: _20 = _print(move _21) -> [return: bb10, unwind: bb14] +9:5-9:56: @8.Call: _21 = std::fmt::Arguments::new_v1(move _22, move _26) -> [return: bb9, unwind: bb14] +9:5-9:56: @9.Call: _20 = std::io::_print(move _21) -> [return: bb10, unwind: bb14] 9:5-9:56: @10[6]: _19 = const () 10:18-10:24: @10[10]: _42 = _1 10:27-10:33: @10[12]: _43 = _17 @@ -293,8 +293,8 @@ For revisions in Pull Requests (PR): 11:5-11:49: @11[22]: _54 = &(*_57) 11:5-11:49: @11[23]: _53 = &(*_54) 11:5-11:49: @11[24]: _52 = move _53 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -11:5-11:49: @11.Call: _47 = Arguments::new_v1(move _48, move _52) -> [return: bb12, unwind: bb14] -11:5-11:49: @12.Call: _46 = _print(move _47) -> [return: bb13, unwind: bb14] +11:5-11:49: @11.Call: _47 = std::fmt::Arguments::new_v1(move _48, move _52) -> [return: bb12, unwind: bb14] +11:5-11:49: @12.Call: _46 = std::io::_print(move _47) -> [return: bb13, unwind: bb14] 11:5-11:49: @13[5]: _45 = const () 12:5-12:11: @13[7]: _0 = _41 13:2-13:2: @13.Return: return"> println!("continuing after overflow check"); @@ -313,16 +313,16 @@ For revisions in Pull Requests (PR): 9:5-9:56: @6[29]: _34 = (_30.1: &u32) 9:5-9:56: @6[32]: _36 = &(*_33) 9:5-9:56: @6[34]: _37 = <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)) -9:5-9:56: @6.Call: _35 = ArgumentV1::new::<u32>(move _36, move _37) -> [return: bb7, unwind: bb14] +9:5-9:56: @6.Call: _35 = std::fmt::ArgumentV1::new::<u32>(move _36, move _37) -> [return: bb7, unwind: bb14] 9:5-9:56: @7[4]: _39 = &(*_34) 9:5-9:56: @7[6]: _40 = <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)) -9:5-9:56: @7.Call: _38 = ArgumentV1::new::<u32>(move _39, move _40) -> [return: bb8, unwind: bb14] +9:5-9:56: @7.Call: _38 = std::fmt::ArgumentV1::new::<u32>(move _39, move _40) -> [return: bb8, unwind: bb14] 9:5-9:56: @8[2]: _29 = [move _35, move _38] 9:5-9:56: @8[7]: _28 = &_29 9:5-9:56: @8[8]: _27 = &(*_28) 9:5-9:56: @8[9]: _26 = move _27 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -9:5-9:56: @8.Call: _21 = Arguments::new_v1(move _22, move _26) -> [return: bb9, unwind: bb14] -9:5-9:56: @9.Call: _20 = _print(move _21) -> [return: bb10, unwind: bb14] +9:5-9:56: @8.Call: _21 = std::fmt::Arguments::new_v1(move _22, move _26) -> [return: bb9, unwind: bb14] +9:5-9:56: @9.Call: _20 = std::io::_print(move _21) -> [return: bb10, unwind: bb14] 9:5-9:56: @10[6]: _19 = const () 10:18-10:24: @10[10]: _42 = _1 10:27-10:33: @10[12]: _43 = _17 @@ -339,8 +339,8 @@ For revisions in Pull Requests (PR): 11:5-11:49: @11[22]: _54 = &(*_57) 11:5-11:49: @11[23]: _53 = &(*_54) 11:5-11:49: @11[24]: _52 = move _53 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -11:5-11:49: @11.Call: _47 = Arguments::new_v1(move _48, move _52) -> [return: bb12, unwind: bb14] -11:5-11:49: @12.Call: _46 = _print(move _47) -> [return: bb13, unwind: bb14] +11:5-11:49: @11.Call: _47 = std::fmt::Arguments::new_v1(move _48, move _52) -> [return: bb12, unwind: bb14] +11:5-11:49: @12.Call: _46 = std::io::_print(move _47) -> [return: bb13, unwind: bb14] 11:5-11:49: @13[5]: _45 = const () 12:5-12:11: @13[7]: _0 = _41 13:2-13:2: @13.Return: return"> result @@ -359,16 +359,16 @@ For revisions in Pull Requests (PR): 9:5-9:56: @6[29]: _34 = (_30.1: &u32) 9:5-9:56: @6[32]: _36 = &(*_33) 9:5-9:56: @6[34]: _37 = <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)) -9:5-9:56: @6.Call: _35 = ArgumentV1::new::<u32>(move _36, move _37) -> [return: bb7, unwind: bb14] +9:5-9:56: @6.Call: _35 = std::fmt::ArgumentV1::new::<u32>(move _36, move _37) -> [return: bb7, unwind: bb14] 9:5-9:56: @7[4]: _39 = &(*_34) 9:5-9:56: @7[6]: _40 = <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)) -9:5-9:56: @7.Call: _38 = ArgumentV1::new::<u32>(move _39, move _40) -> [return: bb8, unwind: bb14] +9:5-9:56: @7.Call: _38 = std::fmt::ArgumentV1::new::<u32>(move _39, move _40) -> [return: bb8, unwind: bb14] 9:5-9:56: @8[2]: _29 = [move _35, move _38] 9:5-9:56: @8[7]: _28 = &_29 9:5-9:56: @8[8]: _27 = &(*_28) 9:5-9:56: @8[9]: _26 = move _27 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -9:5-9:56: @8.Call: _21 = Arguments::new_v1(move _22, move _26) -> [return: bb9, unwind: bb14] -9:5-9:56: @9.Call: _20 = _print(move _21) -> [return: bb10, unwind: bb14] +9:5-9:56: @8.Call: _21 = std::fmt::Arguments::new_v1(move _22, move _26) -> [return: bb9, unwind: bb14] +9:5-9:56: @9.Call: _20 = std::io::_print(move _21) -> [return: bb10, unwind: bb14] 9:5-9:56: @10[6]: _19 = const () 10:18-10:24: @10[10]: _42 = _1 10:27-10:33: @10[12]: _43 = _17 @@ -385,8 +385,8 @@ For revisions in Pull Requests (PR): 11:5-11:49: @11[22]: _54 = &(*_57) 11:5-11:49: @11[23]: _53 = &(*_54) 11:5-11:49: @11[24]: _52 = move _53 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -11:5-11:49: @11.Call: _47 = Arguments::new_v1(move _48, move _52) -> [return: bb12, unwind: bb14] -11:5-11:49: @12.Call: _46 = _print(move _47) -> [return: bb13, unwind: bb14] +11:5-11:49: @11.Call: _47 = std::fmt::Arguments::new_v1(move _48, move _52) -> [return: bb12, unwind: bb14] +11:5-11:49: @12.Call: _46 = std::io::_print(move _47) -> [return: bb13, unwind: bb14] 11:5-11:49: @13[5]: _45 = const () 12:5-12:11: @13[7]: _0 = _41 13:2-13:2: @13.Return: return">}⦉@5,6,7,8,9,10,11,12,13 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.panic_unwind/panic_unwind.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.panic_unwind/panic_unwind.main.-------.InstrumentCoverage.0.html index c9d189c00c0b..5b097f118e3a 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.panic_unwind/panic_unwind.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.panic_unwind/panic_unwind.main.-------.InstrumentCoverage.0.html @@ -93,10 +93,10 @@ For revisions in Pull Requests (PR): 21:9-21:23: @14[0]: _1 = move (_13.0: i32)">@13,14⦊countdown -= 1⦉@13,14; } @4⦊Ok(()) }⦉@4 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.panic_unwind/panic_unwind.might_panic.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.panic_unwind/panic_unwind.might_panic.-------.InstrumentCoverage.0.html index 86d9875b47cb..32988629ba0e 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.panic_unwind/panic_unwind.might_panic.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.panic_unwind/panic_unwind.might_panic.-------.InstrumentCoverage.0.html @@ -81,10 +81,10 @@ For revisions in Pull Requests (PR): 6:9-6:34: @1[18]: _13 = &(*_32) 6:9-6:34: @1[19]: _12 = &(*_13) 6:9-6:34: @1[20]: _11 = move _12 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -6:9-6:34: @1.Call: _6 = Arguments::new_v1(move _7, move _11) -> [return: bb3, unwind: bb7] -6:9-6:34: @3.Call: _5 = _print(move _6) -> [return: bb4, unwind: bb7] +6:9-6:34: @1.Call: _6 = std::fmt::Arguments::new_v1(move _7, move _11) -> [return: bb3, unwind: bb7] +6:9-6:34: @3.Call: _5 = std::io::_print(move _6) -> [return: bb4, unwind: bb7] 6:9-6:34: @4[5]: _4 = const () -7:9-7:26: @4.Call: begin_panic::<&str>(const "panics") -> bb7">@1,3,4⦊println!("panicking..."); +7:9-7:26: @4.Call: std::rt::begin_panic::<&str>(const "panics") -> bb7">@1,3,4⦊println!("panicking..."); panic!("panics");⦉@1,3,4 +7:9-7:26: @4.Call: std::rt::begin_panic::<&str>(const "panics") -> bb7"> panic!("panics");⦉@1,3,4 } else @2,5,6⦊{ @@ -124,8 +124,8 @@ For revisions in Pull Requests (PR): 9:9-9:33: @2[18]: _27 = &(*_30) 9:9-9:33: @2[19]: _26 = &(*_27) 9:9-9:33: @2[20]: _25 = move _26 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -9:9-9:33: @2.Call: _20 = Arguments::new_v1(move _21, move _25) -> [return: bb5, unwind: bb7] -9:9-9:33: @5.Call: _19 = _print(move _20) -> [return: bb6, unwind: bb7] +9:9-9:33: @2.Call: _20 = std::fmt::Arguments::new_v1(move _21, move _25) -> [return: bb5, unwind: bb7] +9:9-9:33: @5.Call: _19 = std::io::_print(move _20) -> [return: bb6, unwind: bb7] 9:9-9:33: @6[5]: _18 = const () 8:12-10:6: @6[7]: _0 = const () 11:2-11:2: @6.Return: return"> println!("Don't Panic"); @@ -139,8 +139,8 @@ For revisions in Pull Requests (PR): 9:9-9:33: @2[18]: _27 = &(*_30) 9:9-9:33: @2[19]: _26 = &(*_27) 9:9-9:33: @2[20]: _25 = move _26 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -9:9-9:33: @2.Call: _20 = Arguments::new_v1(move _21, move _25) -> [return: bb5, unwind: bb7] -9:9-9:33: @5.Call: _19 = _print(move _20) -> [return: bb6, unwind: bb7] +9:9-9:33: @2.Call: _20 = std::fmt::Arguments::new_v1(move _21, move _25) -> [return: bb5, unwind: bb7] +9:9-9:33: @5.Call: _19 = std::io::_print(move _20) -> [return: bb6, unwind: bb7] 9:9-9:33: @6[5]: _18 = const () 8:12-10:6: @6[7]: _0 = const () 11:2-11:2: @6.Return: return"> } @@ -154,8 +154,8 @@ For revisions in Pull Requests (PR): 9:9-9:33: @2[18]: _27 = &(*_30) 9:9-9:33: @2[19]: _26 = &(*_27) 9:9-9:33: @2[20]: _25 = move _26 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -9:9-9:33: @2.Call: _20 = Arguments::new_v1(move _21, move _25) -> [return: bb5, unwind: bb7] -9:9-9:33: @5.Call: _19 = _print(move _20) -> [return: bb6, unwind: bb7] +9:9-9:33: @2.Call: _20 = std::fmt::Arguments::new_v1(move _21, move _25) -> [return: bb5, unwind: bb7] +9:9-9:33: @5.Call: _19 = std::io::_print(move _20) -> [return: bb6, unwind: bb7] 9:9-9:33: @6[5]: _18 = const () 8:12-10:6: @6[7]: _0 = const () 11:2-11:2: @6.Return: return">}⦉@2,5,6 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.main.-------.InstrumentCoverage.0.html index 6d9d63deccf1..3e307c4f460d 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.main.-------.InstrumentCoverage.0.html @@ -81,7 +81,7 @@ For revisions in Pull Requests (PR): 25:49-25:62: @2[20]: _16 = &_2 25:64-25:77: @2[24]: _19 = &_1 25:80-25:93: @2[26]: _20 = &_2 -25:64-25:93: @2.Call: _18 = <Version as PartialOrd>::lt(move _19, move _20) -> [return: bb3, unwind: bb9] +25:64-25:93: @2.Call: _18 = <Version as std::cmp::PartialOrd>::lt(move _19, move _20) -> [return: bb3, unwind: bb9] 25:64-25:93: @3[2]: _17 = &_18 25:5-25:95: @3[3]: _14 = (move _15, move _16, move _17) 25:5-25:95: @3[7]: FakeRead(ForMatchedPlace, _14) @@ -89,20 +89,20 @@ For revisions in Pull Requests (PR): 25:5-25:95: @3[11]: _22 = (_14.1: &Version) 25:5-25:95: @3[13]: _23 = (_14.2: &bool) 25:5-25:95: @3[16]: _25 = &(*_21) -25:5-25:95: @3[18]: _26 = <Version as Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @3.Call: _24 = ArgumentV1::new::<Version>(move _25, move _26) -> [return: bb4, unwind: bb9] +25:5-25:95: @3[18]: _26 = <Version as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +25:5-25:95: @3.Call: _24 = std::fmt::ArgumentV1::new::<Version>(move _25, move _26) -> [return: bb4, unwind: bb9] 25:5-25:95: @4[4]: _28 = &(*_22) -25:5-25:95: @4[6]: _29 = <Version as Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @4.Call: _27 = ArgumentV1::new::<Version>(move _28, move _29) -> [return: bb5, unwind: bb9] +25:5-25:95: @4[6]: _29 = <Version as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +25:5-25:95: @4.Call: _27 = std::fmt::ArgumentV1::new::<Version>(move _28, move _29) -> [return: bb5, unwind: bb9] 25:5-25:95: @5[4]: _31 = &(*_23) 25:5-25:95: @5[6]: _32 = <bool as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r bool, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @5.Call: _30 = ArgumentV1::new::<bool>(move _31, move _32) -> [return: bb6, unwind: bb9] +25:5-25:95: @5.Call: _30 = std::fmt::ArgumentV1::new::<bool>(move _31, move _32) -> [return: bb6, unwind: bb9] 25:5-25:95: @6[2]: _13 = [move _24, move _27, move _30] 25:5-25:95: @6[9]: _12 = &_13 25:5-25:95: @6[10]: _11 = &(*_12) 25:5-25:95: @6[11]: _10 = move _11 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -25:5-25:95: @6.Call: _5 = Arguments::new_v1(move _6, move _10) -> [return: bb7, unwind: bb9] -25:5-25:95: @7.Call: _4 = _print(move _5) -> [return: bb8, unwind: bb9] +25:5-25:95: @6.Call: _5 = std::fmt::Arguments::new_v1(move _6, move _10) -> [return: bb7, unwind: bb9] +25:5-25:95: @7.Call: _4 = std::io::_print(move _5) -> [return: bb8, unwind: bb9] 25:5-25:95: @8[7]: _3 = const () 21:11-26:2: @8[9]: _0 = const () 26:2-26:2: @8.Return: return">@0,1,2,3,4,5,6,7,8⦊fn main() { @@ -118,7 +118,7 @@ For revisions in Pull Requests (PR): 25:49-25:62: @2[20]: _16 = &_2 25:64-25:77: @2[24]: _19 = &_1 25:80-25:93: @2[26]: _20 = &_2 -25:64-25:93: @2.Call: _18 = <Version as PartialOrd>::lt(move _19, move _20) -> [return: bb3, unwind: bb9] +25:64-25:93: @2.Call: _18 = <Version as std::cmp::PartialOrd>::lt(move _19, move _20) -> [return: bb3, unwind: bb9] 25:64-25:93: @3[2]: _17 = &_18 25:5-25:95: @3[3]: _14 = (move _15, move _16, move _17) 25:5-25:95: @3[7]: FakeRead(ForMatchedPlace, _14) @@ -126,20 +126,20 @@ For revisions in Pull Requests (PR): 25:5-25:95: @3[11]: _22 = (_14.1: &Version) 25:5-25:95: @3[13]: _23 = (_14.2: &bool) 25:5-25:95: @3[16]: _25 = &(*_21) -25:5-25:95: @3[18]: _26 = <Version as Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @3.Call: _24 = ArgumentV1::new::<Version>(move _25, move _26) -> [return: bb4, unwind: bb9] +25:5-25:95: @3[18]: _26 = <Version as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +25:5-25:95: @3.Call: _24 = std::fmt::ArgumentV1::new::<Version>(move _25, move _26) -> [return: bb4, unwind: bb9] 25:5-25:95: @4[4]: _28 = &(*_22) -25:5-25:95: @4[6]: _29 = <Version as Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @4.Call: _27 = ArgumentV1::new::<Version>(move _28, move _29) -> [return: bb5, unwind: bb9] +25:5-25:95: @4[6]: _29 = <Version as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +25:5-25:95: @4.Call: _27 = std::fmt::ArgumentV1::new::<Version>(move _28, move _29) -> [return: bb5, unwind: bb9] 25:5-25:95: @5[4]: _31 = &(*_23) 25:5-25:95: @5[6]: _32 = <bool as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r bool, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @5.Call: _30 = ArgumentV1::new::<bool>(move _31, move _32) -> [return: bb6, unwind: bb9] +25:5-25:95: @5.Call: _30 = std::fmt::ArgumentV1::new::<bool>(move _31, move _32) -> [return: bb6, unwind: bb9] 25:5-25:95: @6[2]: _13 = [move _24, move _27, move _30] 25:5-25:95: @6[9]: _12 = &_13 25:5-25:95: @6[10]: _11 = &(*_12) 25:5-25:95: @6[11]: _10 = move _11 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -25:5-25:95: @6.Call: _5 = Arguments::new_v1(move _6, move _10) -> [return: bb7, unwind: bb9] -25:5-25:95: @7.Call: _4 = _print(move _5) -> [return: bb8, unwind: bb9] +25:5-25:95: @6.Call: _5 = std::fmt::Arguments::new_v1(move _6, move _10) -> [return: bb7, unwind: bb9] +25:5-25:95: @7.Call: _4 = std::io::_print(move _5) -> [return: bb8, unwind: bb9] 25:5-25:95: @8[7]: _3 = const () 21:11-26:2: @8[9]: _0 = const () 26:2-26:2: @8.Return: return"> let version_3_2_1 = Version::new(3, 2, 1); @@ -155,7 +155,7 @@ For revisions in Pull Requests (PR): 25:49-25:62: @2[20]: _16 = &_2 25:64-25:77: @2[24]: _19 = &_1 25:80-25:93: @2[26]: _20 = &_2 -25:64-25:93: @2.Call: _18 = <Version as PartialOrd>::lt(move _19, move _20) -> [return: bb3, unwind: bb9] +25:64-25:93: @2.Call: _18 = <Version as std::cmp::PartialOrd>::lt(move _19, move _20) -> [return: bb3, unwind: bb9] 25:64-25:93: @3[2]: _17 = &_18 25:5-25:95: @3[3]: _14 = (move _15, move _16, move _17) 25:5-25:95: @3[7]: FakeRead(ForMatchedPlace, _14) @@ -163,20 +163,20 @@ For revisions in Pull Requests (PR): 25:5-25:95: @3[11]: _22 = (_14.1: &Version) 25:5-25:95: @3[13]: _23 = (_14.2: &bool) 25:5-25:95: @3[16]: _25 = &(*_21) -25:5-25:95: @3[18]: _26 = <Version as Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @3.Call: _24 = ArgumentV1::new::<Version>(move _25, move _26) -> [return: bb4, unwind: bb9] +25:5-25:95: @3[18]: _26 = <Version as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +25:5-25:95: @3.Call: _24 = std::fmt::ArgumentV1::new::<Version>(move _25, move _26) -> [return: bb4, unwind: bb9] 25:5-25:95: @4[4]: _28 = &(*_22) -25:5-25:95: @4[6]: _29 = <Version as Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @4.Call: _27 = ArgumentV1::new::<Version>(move _28, move _29) -> [return: bb5, unwind: bb9] +25:5-25:95: @4[6]: _29 = <Version as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +25:5-25:95: @4.Call: _27 = std::fmt::ArgumentV1::new::<Version>(move _28, move _29) -> [return: bb5, unwind: bb9] 25:5-25:95: @5[4]: _31 = &(*_23) 25:5-25:95: @5[6]: _32 = <bool as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r bool, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @5.Call: _30 = ArgumentV1::new::<bool>(move _31, move _32) -> [return: bb6, unwind: bb9] +25:5-25:95: @5.Call: _30 = std::fmt::ArgumentV1::new::<bool>(move _31, move _32) -> [return: bb6, unwind: bb9] 25:5-25:95: @6[2]: _13 = [move _24, move _27, move _30] 25:5-25:95: @6[9]: _12 = &_13 25:5-25:95: @6[10]: _11 = &(*_12) 25:5-25:95: @6[11]: _10 = move _11 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -25:5-25:95: @6.Call: _5 = Arguments::new_v1(move _6, move _10) -> [return: bb7, unwind: bb9] -25:5-25:95: @7.Call: _4 = _print(move _5) -> [return: bb8, unwind: bb9] +25:5-25:95: @6.Call: _5 = std::fmt::Arguments::new_v1(move _6, move _10) -> [return: bb7, unwind: bb9] +25:5-25:95: @7.Call: _4 = std::io::_print(move _5) -> [return: bb8, unwind: bb9] 25:5-25:95: @8[7]: _3 = const () 21:11-26:2: @8[9]: _0 = const () 26:2-26:2: @8.Return: return"> let version_3_3_0 = Version::new(3, 3, 0); @@ -192,7 +192,7 @@ For revisions in Pull Requests (PR): 25:49-25:62: @2[20]: _16 = &_2 25:64-25:77: @2[24]: _19 = &_1 25:80-25:93: @2[26]: _20 = &_2 -25:64-25:93: @2.Call: _18 = <Version as PartialOrd>::lt(move _19, move _20) -> [return: bb3, unwind: bb9] +25:64-25:93: @2.Call: _18 = <Version as std::cmp::PartialOrd>::lt(move _19, move _20) -> [return: bb3, unwind: bb9] 25:64-25:93: @3[2]: _17 = &_18 25:5-25:95: @3[3]: _14 = (move _15, move _16, move _17) 25:5-25:95: @3[7]: FakeRead(ForMatchedPlace, _14) @@ -200,20 +200,20 @@ For revisions in Pull Requests (PR): 25:5-25:95: @3[11]: _22 = (_14.1: &Version) 25:5-25:95: @3[13]: _23 = (_14.2: &bool) 25:5-25:95: @3[16]: _25 = &(*_21) -25:5-25:95: @3[18]: _26 = <Version as Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @3.Call: _24 = ArgumentV1::new::<Version>(move _25, move _26) -> [return: bb4, unwind: bb9] +25:5-25:95: @3[18]: _26 = <Version as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +25:5-25:95: @3.Call: _24 = std::fmt::ArgumentV1::new::<Version>(move _25, move _26) -> [return: bb4, unwind: bb9] 25:5-25:95: @4[4]: _28 = &(*_22) -25:5-25:95: @4[6]: _29 = <Version as Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @4.Call: _27 = ArgumentV1::new::<Version>(move _28, move _29) -> [return: bb5, unwind: bb9] +25:5-25:95: @4[6]: _29 = <Version as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +25:5-25:95: @4.Call: _27 = std::fmt::ArgumentV1::new::<Version>(move _28, move _29) -> [return: bb5, unwind: bb9] 25:5-25:95: @5[4]: _31 = &(*_23) 25:5-25:95: @5[6]: _32 = <bool as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r bool, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @5.Call: _30 = ArgumentV1::new::<bool>(move _31, move _32) -> [return: bb6, unwind: bb9] +25:5-25:95: @5.Call: _30 = std::fmt::ArgumentV1::new::<bool>(move _31, move _32) -> [return: bb6, unwind: bb9] 25:5-25:95: @6[2]: _13 = [move _24, move _27, move _30] 25:5-25:95: @6[9]: _12 = &_13 25:5-25:95: @6[10]: _11 = &(*_12) 25:5-25:95: @6[11]: _10 = move _11 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -25:5-25:95: @6.Call: _5 = Arguments::new_v1(move _6, move _10) -> [return: bb7, unwind: bb9] -25:5-25:95: @7.Call: _4 = _print(move _5) -> [return: bb8, unwind: bb9] +25:5-25:95: @6.Call: _5 = std::fmt::Arguments::new_v1(move _6, move _10) -> [return: bb7, unwind: bb9] +25:5-25:95: @7.Call: _4 = std::io::_print(move _5) -> [return: bb8, unwind: bb9] 25:5-25:95: @8[7]: _3 = const () 21:11-26:2: @8[9]: _0 = const () 26:2-26:2: @8.Return: return"> @@ -229,7 +229,7 @@ For revisions in Pull Requests (PR): 25:49-25:62: @2[20]: _16 = &_2 25:64-25:77: @2[24]: _19 = &_1 25:80-25:93: @2[26]: _20 = &_2 -25:64-25:93: @2.Call: _18 = <Version as PartialOrd>::lt(move _19, move _20) -> [return: bb3, unwind: bb9] +25:64-25:93: @2.Call: _18 = <Version as std::cmp::PartialOrd>::lt(move _19, move _20) -> [return: bb3, unwind: bb9] 25:64-25:93: @3[2]: _17 = &_18 25:5-25:95: @3[3]: _14 = (move _15, move _16, move _17) 25:5-25:95: @3[7]: FakeRead(ForMatchedPlace, _14) @@ -237,20 +237,20 @@ For revisions in Pull Requests (PR): 25:5-25:95: @3[11]: _22 = (_14.1: &Version) 25:5-25:95: @3[13]: _23 = (_14.2: &bool) 25:5-25:95: @3[16]: _25 = &(*_21) -25:5-25:95: @3[18]: _26 = <Version as Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @3.Call: _24 = ArgumentV1::new::<Version>(move _25, move _26) -> [return: bb4, unwind: bb9] +25:5-25:95: @3[18]: _26 = <Version as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +25:5-25:95: @3.Call: _24 = std::fmt::ArgumentV1::new::<Version>(move _25, move _26) -> [return: bb4, unwind: bb9] 25:5-25:95: @4[4]: _28 = &(*_22) -25:5-25:95: @4[6]: _29 = <Version as Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @4.Call: _27 = ArgumentV1::new::<Version>(move _28, move _29) -> [return: bb5, unwind: bb9] +25:5-25:95: @4[6]: _29 = <Version as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +25:5-25:95: @4.Call: _27 = std::fmt::ArgumentV1::new::<Version>(move _28, move _29) -> [return: bb5, unwind: bb9] 25:5-25:95: @5[4]: _31 = &(*_23) 25:5-25:95: @5[6]: _32 = <bool as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r bool, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @5.Call: _30 = ArgumentV1::new::<bool>(move _31, move _32) -> [return: bb6, unwind: bb9] +25:5-25:95: @5.Call: _30 = std::fmt::ArgumentV1::new::<bool>(move _31, move _32) -> [return: bb6, unwind: bb9] 25:5-25:95: @6[2]: _13 = [move _24, move _27, move _30] 25:5-25:95: @6[9]: _12 = &_13 25:5-25:95: @6[10]: _11 = &(*_12) 25:5-25:95: @6[11]: _10 = move _11 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -25:5-25:95: @6.Call: _5 = Arguments::new_v1(move _6, move _10) -> [return: bb7, unwind: bb9] -25:5-25:95: @7.Call: _4 = _print(move _5) -> [return: bb8, unwind: bb9] +25:5-25:95: @6.Call: _5 = std::fmt::Arguments::new_v1(move _6, move _10) -> [return: bb7, unwind: bb9] +25:5-25:95: @7.Call: _4 = std::io::_print(move _5) -> [return: bb8, unwind: bb9] 25:5-25:95: @8[7]: _3 = const () 21:11-26:2: @8[9]: _0 = const () 26:2-26:2: @8.Return: return"> println!("{:?} < {:?} = {}", version_3_2_1, version_3_3_0, version_3_2_1 < version_3_3_0); @@ -266,7 +266,7 @@ For revisions in Pull Requests (PR): 25:49-25:62: @2[20]: _16 = &_2 25:64-25:77: @2[24]: _19 = &_1 25:80-25:93: @2[26]: _20 = &_2 -25:64-25:93: @2.Call: _18 = <Version as PartialOrd>::lt(move _19, move _20) -> [return: bb3, unwind: bb9] +25:64-25:93: @2.Call: _18 = <Version as std::cmp::PartialOrd>::lt(move _19, move _20) -> [return: bb3, unwind: bb9] 25:64-25:93: @3[2]: _17 = &_18 25:5-25:95: @3[3]: _14 = (move _15, move _16, move _17) 25:5-25:95: @3[7]: FakeRead(ForMatchedPlace, _14) @@ -274,20 +274,20 @@ For revisions in Pull Requests (PR): 25:5-25:95: @3[11]: _22 = (_14.1: &Version) 25:5-25:95: @3[13]: _23 = (_14.2: &bool) 25:5-25:95: @3[16]: _25 = &(*_21) -25:5-25:95: @3[18]: _26 = <Version as Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @3.Call: _24 = ArgumentV1::new::<Version>(move _25, move _26) -> [return: bb4, unwind: bb9] +25:5-25:95: @3[18]: _26 = <Version as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +25:5-25:95: @3.Call: _24 = std::fmt::ArgumentV1::new::<Version>(move _25, move _26) -> [return: bb4, unwind: bb9] 25:5-25:95: @4[4]: _28 = &(*_22) -25:5-25:95: @4[6]: _29 = <Version as Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @4.Call: _27 = ArgumentV1::new::<Version>(move _28, move _29) -> [return: bb5, unwind: bb9] +25:5-25:95: @4[6]: _29 = <Version as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r Version, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +25:5-25:95: @4.Call: _27 = std::fmt::ArgumentV1::new::<Version>(move _28, move _29) -> [return: bb5, unwind: bb9] 25:5-25:95: @5[4]: _31 = &(*_23) 25:5-25:95: @5[6]: _32 = <bool as std::fmt::Display>::fmt as for<'r, 's, 't0> fn(&'r bool, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -25:5-25:95: @5.Call: _30 = ArgumentV1::new::<bool>(move _31, move _32) -> [return: bb6, unwind: bb9] +25:5-25:95: @5.Call: _30 = std::fmt::ArgumentV1::new::<bool>(move _31, move _32) -> [return: bb6, unwind: bb9] 25:5-25:95: @6[2]: _13 = [move _24, move _27, move _30] 25:5-25:95: @6[9]: _12 = &_13 25:5-25:95: @6[10]: _11 = &(*_12) 25:5-25:95: @6[11]: _10 = move _11 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -25:5-25:95: @6.Call: _5 = Arguments::new_v1(move _6, move _10) -> [return: bb7, unwind: bb9] -25:5-25:95: @7.Call: _4 = _print(move _5) -> [return: bb8, unwind: bb9] +25:5-25:95: @6.Call: _5 = std::fmt::Arguments::new_v1(move _6, move _10) -> [return: bb7, unwind: bb9] +25:5-25:95: @7.Call: _4 = std::io::_print(move _5) -> [return: bb8, unwind: bb9] 25:5-25:95: @8[7]: _3 = const () 21:11-26:2: @8[9]: _0 = const () 26:2-26:2: @8.Return: return">}⦉@0,1,2,3,4,5,6,7,8 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-ge-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-ge-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html index 47f9ab2bd5e7..3954fc3d0bd9 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-ge-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-ge-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html @@ -74,9 +74,9 @@ For revisions in Pull Requests (PR): 8:5-8:17: @0[4]: _3 = &(*_4) 8:5-8:17: @0[7]: _6 = &(*(*(_1.1: &&usize))) 8:5-8:17: @0[8]: _5 = &(*_6) -8:5-8:17: @0.Call: _2 = <usize as PartialOrd>::partial_cmp(move _3, move _5) -> [return: bb1, unwind: bb3] -8:5-8:17: @1[3]: _7 = Less -8:5-8:17: @1.Call: _0 = Option::<std::cmp::Ordering>::unwrap_or(move _2, move _7) -> [return: bb2, unwind: bb3] +8:5-8:17: @0.Call: _2 = <usize as std::cmp::PartialOrd>::partial_cmp(move _3, move _5) -> [return: bb1, unwind: bb3] +8:5-8:17: @1[3]: _7 = std::cmp::Ordering::Less +8:5-8:17: @1.Call: _0 = std::option::Option::<std::cmp::Ordering>::unwrap_or(move _2, move _7) -> [return: bb2, unwind: bb3] 8:5-8:17: @2.Return: return">@0,1,2⦊patch: usize⦉@0,1,2 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-ge-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-ge-{closure#0}.-------.InstrumentCoverage.0.html index 9f0c29c50bf1..86e18b3dbfd7 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-ge-{closure#0}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-ge-{closure#0}.-------.InstrumentCoverage.0.html @@ -74,9 +74,9 @@ For revisions in Pull Requests (PR): 7:5-7:17: @0[5]: _4 = &(*_5) 7:5-7:17: @0[8]: _7 = &(*(*(_1.1: &&usize))) 7:5-7:17: @0[9]: _6 = &(*_7) -7:5-7:17: @0.Call: _3 = <usize as PartialOrd>::partial_cmp(move _4, move _6) -> [return: bb1, unwind: bb4] -7:5-7:17: @1[3]: _8 = Equal -7:5-7:17: @1.Call: _2 = Option::<std::cmp::Ordering>::unwrap_or(move _3, move _8) -> [return: bb2, unwind: bb4] +7:5-7:17: @0.Call: _3 = <usize as std::cmp::PartialOrd>::partial_cmp(move _4, move _6) -> [return: bb1, unwind: bb4] +7:5-7:17: @1[3]: _8 = std::cmp::Ordering::Equal +7:5-7:17: @1.Call: _2 = std::option::Option::<std::cmp::Ordering>::unwrap_or(move _3, move _8) -> [return: bb2, unwind: bb4] 7:5-7:17: @2[4]: _10 = &(*(_1.2: &&usize)) 7:5-7:17: @2[6]: _11 = &(*(_1.3: &&usize))">@0,1,2,3⦊‸⦉@0,1,2,3minor: usize diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-ge.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-ge.-------.InstrumentCoverage.0.html index 60a832b2e2a8..652dc2770811 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-ge.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-ge.-------.InstrumentCoverage.0.html @@ -81,9 +81,9 @@ For revisions in Pull Requests (PR): 4:39-4:49: @0[21]: _13 = &(*_14) 4:39-4:49: @0[24]: _16 = &(*_3) 4:39-4:49: @0[25]: _15 = &(*_16) -4:39-4:49: @0.Call: _12 = <usize as PartialOrd>::partial_cmp(move _13, move _15) -> [return: bb1, unwind: bb5] -4:39-4:49: @1[3]: _17 = Equal -4:39-4:49: @1.Call: _11 = Option::<std::cmp::Ordering>::unwrap_or(move _12, move _17) -> [return: bb2, unwind: bb5] +4:39-4:49: @0.Call: _12 = <usize as std::cmp::PartialOrd>::partial_cmp(move _13, move _15) -> [return: bb1, unwind: bb5] +4:39-4:49: @1[3]: _17 = std::cmp::Ordering::Equal +4:39-4:49: @1.Call: _11 = std::option::Option::<std::cmp::Ordering>::unwrap_or(move _12, move _17) -> [return: bb2, unwind: bb5] 4:39-4:49: @2[4]: _19 = &_7 4:39-4:49: @2[6]: _20 = &_4 4:39-4:49: @2[8]: _21 = &_8 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-gt-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-gt-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html index 2b9a13fe0603..57fc5d8d6ded 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-gt-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-gt-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html @@ -74,9 +74,9 @@ For revisions in Pull Requests (PR): 8:5-8:17: @0[4]: _3 = &(*_4) 8:5-8:17: @0[7]: _6 = &(*(*(_1.1: &&usize))) 8:5-8:17: @0[8]: _5 = &(*_6) -8:5-8:17: @0.Call: _2 = <usize as PartialOrd>::partial_cmp(move _3, move _5) -> [return: bb1, unwind: bb3] -8:5-8:17: @1[3]: _7 = Less -8:5-8:17: @1.Call: _0 = Option::<std::cmp::Ordering>::unwrap_or(move _2, move _7) -> [return: bb2, unwind: bb3] +8:5-8:17: @0.Call: _2 = <usize as std::cmp::PartialOrd>::partial_cmp(move _3, move _5) -> [return: bb1, unwind: bb3] +8:5-8:17: @1[3]: _7 = std::cmp::Ordering::Less +8:5-8:17: @1.Call: _0 = std::option::Option::<std::cmp::Ordering>::unwrap_or(move _2, move _7) -> [return: bb2, unwind: bb3] 8:5-8:17: @2.Return: return">@0,1,2⦊patch: usize⦉@0,1,2 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-gt-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-gt-{closure#0}.-------.InstrumentCoverage.0.html index ff7e783dd68c..6fbcdff5ab7f 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-gt-{closure#0}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-gt-{closure#0}.-------.InstrumentCoverage.0.html @@ -74,9 +74,9 @@ For revisions in Pull Requests (PR): 7:5-7:17: @0[5]: _4 = &(*_5) 7:5-7:17: @0[8]: _7 = &(*(*(_1.1: &&usize))) 7:5-7:17: @0[9]: _6 = &(*_7) -7:5-7:17: @0.Call: _3 = <usize as PartialOrd>::partial_cmp(move _4, move _6) -> [return: bb1, unwind: bb4] -7:5-7:17: @1[3]: _8 = Equal -7:5-7:17: @1.Call: _2 = Option::<std::cmp::Ordering>::unwrap_or(move _3, move _8) -> [return: bb2, unwind: bb4] +7:5-7:17: @0.Call: _3 = <usize as std::cmp::PartialOrd>::partial_cmp(move _4, move _6) -> [return: bb1, unwind: bb4] +7:5-7:17: @1[3]: _8 = std::cmp::Ordering::Equal +7:5-7:17: @1.Call: _2 = std::option::Option::<std::cmp::Ordering>::unwrap_or(move _3, move _8) -> [return: bb2, unwind: bb4] 7:5-7:17: @2[4]: _10 = &(*(_1.2: &&usize)) 7:5-7:17: @2[6]: _11 = &(*(_1.3: &&usize))">@0,1,2,3⦊‸⦉@0,1,2,3minor: usize diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-gt.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-gt.-------.InstrumentCoverage.0.html index f6b9dc9776f9..37f2661cf180 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-gt.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-gt.-------.InstrumentCoverage.0.html @@ -81,9 +81,9 @@ For revisions in Pull Requests (PR): 4:39-4:49: @0[21]: _13 = &(*_14) 4:39-4:49: @0[24]: _16 = &(*_3) 4:39-4:49: @0[25]: _15 = &(*_16) -4:39-4:49: @0.Call: _12 = <usize as PartialOrd>::partial_cmp(move _13, move _15) -> [return: bb1, unwind: bb5] -4:39-4:49: @1[3]: _17 = Equal -4:39-4:49: @1.Call: _11 = Option::<std::cmp::Ordering>::unwrap_or(move _12, move _17) -> [return: bb2, unwind: bb5] +4:39-4:49: @0.Call: _12 = <usize as std::cmp::PartialOrd>::partial_cmp(move _13, move _15) -> [return: bb1, unwind: bb5] +4:39-4:49: @1[3]: _17 = std::cmp::Ordering::Equal +4:39-4:49: @1.Call: _11 = std::option::Option::<std::cmp::Ordering>::unwrap_or(move _12, move _17) -> [return: bb2, unwind: bb5] 4:39-4:49: @2[4]: _19 = &_7 4:39-4:49: @2[6]: _20 = &_4 4:39-4:49: @2[8]: _21 = &_8 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-le-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-le-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html index 5c95a635f071..5789988c9916 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-le-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-le-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html @@ -74,9 +74,9 @@ For revisions in Pull Requests (PR): 8:5-8:17: @0[4]: _3 = &(*_4) 8:5-8:17: @0[7]: _6 = &(*(*(_1.1: &&usize))) 8:5-8:17: @0[8]: _5 = &(*_6) -8:5-8:17: @0.Call: _2 = <usize as PartialOrd>::partial_cmp(move _3, move _5) -> [return: bb1, unwind: bb3] -8:5-8:17: @1[3]: _7 = Greater -8:5-8:17: @1.Call: _0 = Option::<std::cmp::Ordering>::unwrap_or(move _2, move _7) -> [return: bb2, unwind: bb3] +8:5-8:17: @0.Call: _2 = <usize as std::cmp::PartialOrd>::partial_cmp(move _3, move _5) -> [return: bb1, unwind: bb3] +8:5-8:17: @1[3]: _7 = std::cmp::Ordering::Greater +8:5-8:17: @1.Call: _0 = std::option::Option::<std::cmp::Ordering>::unwrap_or(move _2, move _7) -> [return: bb2, unwind: bb3] 8:5-8:17: @2.Return: return">@0,1,2⦊patch: usize⦉@0,1,2 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-le-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-le-{closure#0}.-------.InstrumentCoverage.0.html index 6eb894a166a0..de7c38bc9c4f 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-le-{closure#0}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-le-{closure#0}.-------.InstrumentCoverage.0.html @@ -74,9 +74,9 @@ For revisions in Pull Requests (PR): 7:5-7:17: @0[5]: _4 = &(*_5) 7:5-7:17: @0[8]: _7 = &(*(*(_1.1: &&usize))) 7:5-7:17: @0[9]: _6 = &(*_7) -7:5-7:17: @0.Call: _3 = <usize as PartialOrd>::partial_cmp(move _4, move _6) -> [return: bb1, unwind: bb4] -7:5-7:17: @1[3]: _8 = Equal -7:5-7:17: @1.Call: _2 = Option::<std::cmp::Ordering>::unwrap_or(move _3, move _8) -> [return: bb2, unwind: bb4] +7:5-7:17: @0.Call: _3 = <usize as std::cmp::PartialOrd>::partial_cmp(move _4, move _6) -> [return: bb1, unwind: bb4] +7:5-7:17: @1[3]: _8 = std::cmp::Ordering::Equal +7:5-7:17: @1.Call: _2 = std::option::Option::<std::cmp::Ordering>::unwrap_or(move _3, move _8) -> [return: bb2, unwind: bb4] 7:5-7:17: @2[4]: _10 = &(*(_1.2: &&usize)) 7:5-7:17: @2[6]: _11 = &(*(_1.3: &&usize))">@0,1,2,3⦊‸⦉@0,1,2,3minor: usize diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-le.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-le.-------.InstrumentCoverage.0.html index fb7e520faf1d..1f3068868f61 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-le.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-le.-------.InstrumentCoverage.0.html @@ -81,9 +81,9 @@ For revisions in Pull Requests (PR): 4:39-4:49: @0[21]: _13 = &(*_14) 4:39-4:49: @0[24]: _16 = &(*_3) 4:39-4:49: @0[25]: _15 = &(*_16) -4:39-4:49: @0.Call: _12 = <usize as PartialOrd>::partial_cmp(move _13, move _15) -> [return: bb1, unwind: bb5] -4:39-4:49: @1[3]: _17 = Equal -4:39-4:49: @1.Call: _11 = Option::<std::cmp::Ordering>::unwrap_or(move _12, move _17) -> [return: bb2, unwind: bb5] +4:39-4:49: @0.Call: _12 = <usize as std::cmp::PartialOrd>::partial_cmp(move _13, move _15) -> [return: bb1, unwind: bb5] +4:39-4:49: @1[3]: _17 = std::cmp::Ordering::Equal +4:39-4:49: @1.Call: _11 = std::option::Option::<std::cmp::Ordering>::unwrap_or(move _12, move _17) -> [return: bb2, unwind: bb5] 4:39-4:49: @2[4]: _19 = &_7 4:39-4:49: @2[6]: _20 = &_4 4:39-4:49: @2[8]: _21 = &_8 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-lt-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-lt-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html index b2b3e172d53d..746daab5ac1c 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-lt-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-lt-{closure#0}-{closure#0}.-------.InstrumentCoverage.0.html @@ -74,9 +74,9 @@ For revisions in Pull Requests (PR): 8:5-8:17: @0[4]: _3 = &(*_4) 8:5-8:17: @0[7]: _6 = &(*(*(_1.1: &&usize))) 8:5-8:17: @0[8]: _5 = &(*_6) -8:5-8:17: @0.Call: _2 = <usize as PartialOrd>::partial_cmp(move _3, move _5) -> [return: bb1, unwind: bb3] -8:5-8:17: @1[3]: _7 = Greater -8:5-8:17: @1.Call: _0 = Option::<std::cmp::Ordering>::unwrap_or(move _2, move _7) -> [return: bb2, unwind: bb3] +8:5-8:17: @0.Call: _2 = <usize as std::cmp::PartialOrd>::partial_cmp(move _3, move _5) -> [return: bb1, unwind: bb3] +8:5-8:17: @1[3]: _7 = std::cmp::Ordering::Greater +8:5-8:17: @1.Call: _0 = std::option::Option::<std::cmp::Ordering>::unwrap_or(move _2, move _7) -> [return: bb2, unwind: bb3] 8:5-8:17: @2.Return: return">@0,1,2⦊patch: usize⦉@0,1,2 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-lt-{closure#0}.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-lt-{closure#0}.-------.InstrumentCoverage.0.html index e54849345b7f..0867a7ad3641 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-lt-{closure#0}.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-lt-{closure#0}.-------.InstrumentCoverage.0.html @@ -74,9 +74,9 @@ For revisions in Pull Requests (PR): 7:5-7:17: @0[5]: _4 = &(*_5) 7:5-7:17: @0[8]: _7 = &(*(*(_1.1: &&usize))) 7:5-7:17: @0[9]: _6 = &(*_7) -7:5-7:17: @0.Call: _3 = <usize as PartialOrd>::partial_cmp(move _4, move _6) -> [return: bb1, unwind: bb4] -7:5-7:17: @1[3]: _8 = Equal -7:5-7:17: @1.Call: _2 = Option::<std::cmp::Ordering>::unwrap_or(move _3, move _8) -> [return: bb2, unwind: bb4] +7:5-7:17: @0.Call: _3 = <usize as std::cmp::PartialOrd>::partial_cmp(move _4, move _6) -> [return: bb1, unwind: bb4] +7:5-7:17: @1[3]: _8 = std::cmp::Ordering::Equal +7:5-7:17: @1.Call: _2 = std::option::Option::<std::cmp::Ordering>::unwrap_or(move _3, move _8) -> [return: bb2, unwind: bb4] 7:5-7:17: @2[4]: _10 = &(*(_1.2: &&usize)) 7:5-7:17: @2[6]: _11 = &(*(_1.3: &&usize))">@0,1,2,3⦊‸⦉@0,1,2,3minor: usize diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-lt.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-lt.-------.InstrumentCoverage.0.html index f111ad0045a1..abcd7147c6fb 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-lt.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#2}-lt.-------.InstrumentCoverage.0.html @@ -81,9 +81,9 @@ For revisions in Pull Requests (PR): 4:39-4:49: @0[21]: _13 = &(*_14) 4:39-4:49: @0[24]: _16 = &(*_3) 4:39-4:49: @0[25]: _15 = &(*_16) -4:39-4:49: @0.Call: _12 = <usize as PartialOrd>::partial_cmp(move _13, move _15) -> [return: bb1, unwind: bb5] -4:39-4:49: @1[3]: _17 = Equal -4:39-4:49: @1.Call: _11 = Option::<std::cmp::Ordering>::unwrap_or(move _12, move _17) -> [return: bb2, unwind: bb5] +4:39-4:49: @0.Call: _12 = <usize as std::cmp::PartialOrd>::partial_cmp(move _13, move _15) -> [return: bb1, unwind: bb5] +4:39-4:49: @1[3]: _17 = std::cmp::Ordering::Equal +4:39-4:49: @1.Call: _11 = std::option::Option::<std::cmp::Ordering>::unwrap_or(move _12, move _17) -> [return: bb2, unwind: bb5] 4:39-4:49: @2[4]: _19 = &_7 4:39-4:49: @2[6]: _20 = &_4 4:39-4:49: @2[8]: _21 = &_8 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#7}-fmt.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#7}-fmt.-------.InstrumentCoverage.0.html index 94c77025ecf1..5b9e070864b4 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#7}-fmt.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#7}-fmt.-------.InstrumentCoverage.0.html @@ -76,7 +76,7 @@ For revisions in Pull Requests (PR): 4:17-4:22: @0[9]: _7 = &mut (*_2) 4:17-4:22: @0[12]: _9 = const "Version" 4:17-4:22: @0[13]: _8 = &(*_9) -4:17-4:22: @0.Call: _6 = Formatter::debug_struct(move _7, move _8) -> [return: bb1, unwind: bb6] +4:17-4:22: @0.Call: _6 = std::fmt::Formatter::debug_struct(move _7, move _8) -> [return: bb1, unwind: bb6] 4:17-4:22: @1[2]: FakeRead(ForLet, _6) 4:17-4:22: @1[7]: _12 = &mut _6 4:17-4:22: @1[8]: _11 = &mut (*_12) @@ -86,7 +86,7 @@ For revisions in Pull Requests (PR): 4:17-4:22: @1[18]: _17 = &_18 4:17-4:22: @1[19]: _16 = &(*_17) 4:17-4:22: @1[20]: _15 = move _16 as &dyn std::fmt::Debug (Pointer(Unsize)) -4:17-4:22: @1.Call: _10 = DebugStruct::field(move _11, move _13, move _15) -> [return: bb2, unwind: bb6] +4:17-4:22: @1.Call: _10 = std::fmt::DebugStruct::field(move _11, move _13, move _15) -> [return: bb2, unwind: bb6] 4:17-4:22: @2[11]: _21 = &mut _6 4:17-4:22: @2[12]: _20 = &mut (*_21) 4:17-4:22: @2[15]: _23 = const "minor" @@ -95,7 +95,7 @@ For revisions in Pull Requests (PR): 4:17-4:22: @2[22]: _26 = &_27 4:17-4:22: @2[23]: _25 = &(*_26) 4:17-4:22: @2[24]: _24 = move _25 as &dyn std::fmt::Debug (Pointer(Unsize)) -4:17-4:22: @2.Call: _19 = DebugStruct::field(move _20, move _22, move _24) -> [return: bb3, unwind: bb6] +4:17-4:22: @2.Call: _19 = std::fmt::DebugStruct::field(move _20, move _22, move _24) -> [return: bb3, unwind: bb6] 4:17-4:22: @3[11]: _30 = &mut _6 4:17-4:22: @3[12]: _29 = &mut (*_30) 4:17-4:22: @3[15]: _32 = const "patch" @@ -104,10 +104,10 @@ For revisions in Pull Requests (PR): 4:17-4:22: @3[22]: _35 = &_36 4:17-4:22: @3[23]: _34 = &(*_35) 4:17-4:22: @3[24]: _33 = move _34 as &dyn std::fmt::Debug (Pointer(Unsize)) -4:17-4:22: @3.Call: _28 = DebugStruct::field(move _29, move _31, move _33) -> [return: bb4, unwind: bb6] +4:17-4:22: @3.Call: _28 = std::fmt::DebugStruct::field(move _29, move _31, move _33) -> [return: bb4, unwind: bb6] 4:17-4:22: @4[10]: _38 = &mut _6 4:17-4:22: @4[11]: _37 = &mut (*_38) -4:17-4:22: @4.Call: _0 = DebugStruct::finish(move _37) -> [return: bb5, unwind: bb6] +4:17-4:22: @4.Call: _0 = std::fmt::DebugStruct::finish(move _37) -> [return: bb5, unwind: bb6] 4:22-4:22: @5.Return: return">@0,1,2,3,4,5⦊Debug⦉@0,1,2,3,4,5 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#8}-clone.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#8}-clone.-------.InstrumentCoverage.0.html index 27a2ab71827a..f1c983933432 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#8}-clone.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.partial_eq/partial_eq.{impl#8}-clone.-------.InstrumentCoverage.0.html @@ -75,13 +75,13 @@ For revisions in Pull Requests (PR): 4:10-4:15: @0[6]: _4 = &((*_1).2: usize) 4:10-4:15: @0[10]: _7 = &(*_2) 4:10-4:15: @0[11]: _6 = &(*_7) -4:10-4:15: @0.Call: _5 = <usize as Clone>::clone(move _6) -> [return: bb1, unwind: bb4] +4:10-4:15: @0.Call: _5 = <usize as std::clone::Clone>::clone(move _6) -> [return: bb1, unwind: bb4] 4:10-4:15: @1[4]: _10 = &(*_3) 4:10-4:15: @1[5]: _9 = &(*_10) -4:10-4:15: @1.Call: _8 = <usize as Clone>::clone(move _9) -> [return: bb2, unwind: bb4] +4:10-4:15: @1.Call: _8 = <usize as std::clone::Clone>::clone(move _9) -> [return: bb2, unwind: bb4] 4:10-4:15: @2[4]: _13 = &(*_4) 4:10-4:15: @2[5]: _12 = &(*_13) -4:10-4:15: @2.Call: _11 = <usize as Clone>::clone(move _12) -> [return: bb3, unwind: bb4] +4:10-4:15: @2.Call: _11 = <usize as std::clone::Clone>::clone(move _12) -> [return: bb3, unwind: bb4] 4:10-4:15: @3[1]: _0 = Version { major: move _5, minor: move _8, patch: move _11 } 4:15-4:15: @3.Return: return">@0,1,2,3⦊Clone⦉@0,1,2,3 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.simple_loop/simple_loop.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.simple_loop/simple_loop.main.-------.InstrumentCoverage.0.html index f528b698d440..6b911eea3412 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.simple_loop/simple_loop.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.simple_loop/simple_loop.main.-------.InstrumentCoverage.0.html @@ -69,81 +69,81 @@ For revisions in Pull Requests (PR): -
@0,1,2,3⦊fn main() { - // Initialize test constants in a way that cannot be determined at compile time, to ensure - // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from - // dependent conditions. - let is_true = std::env::args().len() == 1; - - let mut countdown = 0; - - if -@0,1,2,3⦊fn main() { - // Initialize test constants in a way that cannot be determined at compile time, to ensure - // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from - // dependent conditions. - let is_true = std::env::args().len() == 1; - - let mut countdown = 1; - in @8,9,10⦊0..2⦉@8,9,10 { let z diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.try_error_result/try_error_result.call.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.try_error_result/try_error_result.call.-------.InstrumentCoverage.0.html index 917909ac6e62..a8a3139334c9 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.try_error_result/try_error_result.call.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.try_error_result/try_error_result.call.-------.InstrumentCoverage.0.html @@ -72,10 +72,10 @@ For revisions in Pull Requests (PR):
@0⦊fn call(return_error: bool) -> Result<(),()> { if return_error⦉@0 { @1⦊Err(())⦉@1 +6:9-6:16: @1[2]: _0 = std::result::Result::<(), ()>::Err(move _3)">@1⦊Err(())⦉@1 } else { @2⦊Ok(())⦉@2 +8:9-8:15: @2[2]: _0 = std::result::Result::<(), ()>::Ok(move _4)">@2⦊Ok(())⦉@2 } }@3⦊‸⦉@3
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.try_error_result/try_error_result.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.try_error_result/try_error_result.main.-------.InstrumentCoverage.0.html index 96fa9db4d9dc..5b0c5cb072f0 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.try_error_result/try_error_result.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.try_error_result/try_error_result.main.-------.InstrumentCoverage.0.html @@ -84,7 +84,7 @@ For revisions in Pull Requests (PR): in @2,3,4⦊0..10⦉@2,3,4 { { @10,12,13⦊call(/*return_error=*/ true)⦉@10,12,13@15,17,18,19⦊?⦉@15,17,18,19; +27:41-27:42: @17.Call: _26 = <() as std::convert::From<()>>::from(move _27) -> [return: bb18, unwind: bb39]">@15,17,18,19⦊?⦉@15,17,18,19; @14,20,21⦊call(/*return_error=*/ false)⦉@14,20,21@23,25,26,27⦊?⦉@23,25,26,27; +28:42-28:43: @25.Call: _35 = <() as std::convert::From<()>>::from(move _36) -> [return: bb26, unwind: bb39]">@23,25,26,27⦊?⦉@23,25,26,27; } else { @11,28,29⦊call(/*return_error=*/ false)⦉@11,28,29@31,33,34,35⦊?⦉@31,33,34,35; +32:42-32:43: @33.Call: _44 = <() as std::convert::From<()>>::from(move _45) -> [return: bb34, unwind: bb39]">@31,33,34,35⦊?⦉@31,33,34,35; } } @5⦊Ok(())⦉@5 +35:5-35:11: @5[10]: _0 = std::result::Result::<(), ()>::Ok(move _47)">@5⦊Ok(())⦉@5 }@38⦊‸⦉@38
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.unused_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.unused_function.-------.InstrumentCoverage.0.html index 4af7b1798662..65e21ecef13b 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.unused_function.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.unused_function.-------.InstrumentCoverage.0.html @@ -69,36 +69,36 @@ For revisions in Pull Requests (PR): -
@0,1,2,3⦊pub fn unused_function() { - let is_true = std::env::args().len() == 1; - let mut countdown = 2; -@0,1,2,3,4⦊pub fn unused_generic_function<T: Debug>(arg: T) { @@ -98,14 +98,14 @@ For revisions in Pull Requests (PR): 34:5-34:56: @0[20]: FakeRead(ForMatchedPlace, _13) 34:5-34:56: @0[22]: _15 = (_13.0: &T) 34:5-34:56: @0[25]: _17 = &(*_15) -34:5-34:56: @0[27]: _18 = <T as Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -34:5-34:56: @0.Call: _16 = ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] +34:5-34:56: @0[27]: _18 = <T as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +34:5-34:56: @0.Call: _16 = std::fmt::ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] 34:5-34:56: @1[2]: _12 = [move _16] 34:5-34:56: @1[5]: _11 = &_12 34:5-34:56: @1[6]: _10 = &(*_11) 34:5-34:56: @1[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -34:5-34:56: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] -34:5-34:56: @2.Call: _3 = _print(move _4) -> [return: bb3, unwind: bb5] +34:5-34:56: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] +34:5-34:56: @2.Call: _3 = std::io::_print(move _4) -> [return: bb3, unwind: bb5] 34:5-34:56: @3[6]: _2 = const () 33:50-35:2: @3[8]: _0 = const () 35:2-35:2: @4.Return: return"> println!("unused_generic_function with {:?}", arg); @@ -118,14 +118,14 @@ For revisions in Pull Requests (PR): 34:5-34:56: @0[20]: FakeRead(ForMatchedPlace, _13) 34:5-34:56: @0[22]: _15 = (_13.0: &T) 34:5-34:56: @0[25]: _17 = &(*_15) -34:5-34:56: @0[27]: _18 = <T as Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -34:5-34:56: @0.Call: _16 = ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] +34:5-34:56: @0[27]: _18 = <T as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +34:5-34:56: @0.Call: _16 = std::fmt::ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] 34:5-34:56: @1[2]: _12 = [move _16] 34:5-34:56: @1[5]: _11 = &_12 34:5-34:56: @1[6]: _10 = &(*_11) 34:5-34:56: @1[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -34:5-34:56: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] -34:5-34:56: @2.Call: _3 = _print(move _4) -> [return: bb3, unwind: bb5] +34:5-34:56: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] +34:5-34:56: @2.Call: _3 = std::io::_print(move _4) -> [return: bb3, unwind: bb5] 34:5-34:56: @3[6]: _2 = const () 33:50-35:2: @3[8]: _0 = const () 35:2-35:2: @4.Return: return">}⦉@0,1,2,3,4
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.unused_private_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.unused_private_function.-------.InstrumentCoverage.0.html index 6424e03fc711..78228594e375 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.unused_private_function.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.unused_private_function.-------.InstrumentCoverage.0.html @@ -69,36 +69,36 @@ For revisions in Pull Requests (PR): -
@0,1,2,3⦊fn unused_private_function() { - let is_true = std::env::args().len() == 1; - let mut countdown = 2; -@0,1,2,3,4,5,6,7,8⦊fn use_this_lib_crate() { @@ -88,10 +88,10 @@ For revisions in Pull Requests (PR): 58:20-58:36: @2[6]: (*_6) = [const 5_i32, const 6_i32, const 7_i32, const 8_i32] 58:20-58:36: @2[7]: _5 = move _6 58:20-58:36: @2[8]: _4 = move _5 as std::boxed::Box<[i32]> (Pointer(Unsize)) -58:20-58:36: @4.Call: _3 = slice::<impl [i32]>::into_vec::<std::alloc::Global>(move _4) -> [return: bb5, unwind: bb12] +58:20-58:36: @4.Call: _3 = std::slice::<impl [i32]>::into_vec::<std::alloc::Global>(move _4) -> [return: bb5, unwind: bb12] 58:9-58:17: @5[1]: FakeRead(ForLet, _3) 59:52-59:60: @5[4]: _8 = move _3 -59:5-59:61: @5.Call: _7 = used_only_from_this_lib_crate_generic_function::<Vec<i32>>(move _8) -> [return: bb6, unwind: bb9] +59:5-59:61: @5.Call: _7 = used_only_from_this_lib_crate_generic_function::<std::vec::Vec<i32>>(move _8) -> [return: bb6, unwind: bb9] 60:5-60:91: @6.Call: _9 = used_only_from_this_lib_crate_generic_function::<&str>(const "used ONLY from library used_crate.rs") -> [return: bb7, unwind: bb10] 53:25-61:2: @7[1]: _0 = const () 61:2-61:2: @8.Return: return"> used_from_bin_crate_and_lib_crate_generic_function("used from library used_crate.rs"); @@ -101,10 +101,10 @@ For revisions in Pull Requests (PR): 58:20-58:36: @2[6]: (*_6) = [const 5_i32, const 6_i32, const 7_i32, const 8_i32] 58:20-58:36: @2[7]: _5 = move _6 58:20-58:36: @2[8]: _4 = move _5 as std::boxed::Box<[i32]> (Pointer(Unsize)) -58:20-58:36: @4.Call: _3 = slice::<impl [i32]>::into_vec::<std::alloc::Global>(move _4) -> [return: bb5, unwind: bb12] +58:20-58:36: @4.Call: _3 = std::slice::<impl [i32]>::into_vec::<std::alloc::Global>(move _4) -> [return: bb5, unwind: bb12] 58:9-58:17: @5[1]: FakeRead(ForLet, _3) 59:52-59:60: @5[4]: _8 = move _3 -59:5-59:61: @5.Call: _7 = used_only_from_this_lib_crate_generic_function::<Vec<i32>>(move _8) -> [return: bb6, unwind: bb9] +59:5-59:61: @5.Call: _7 = used_only_from_this_lib_crate_generic_function::<std::vec::Vec<i32>>(move _8) -> [return: bb6, unwind: bb9] 60:5-60:91: @6.Call: _9 = used_only_from_this_lib_crate_generic_function::<&str>(const "used ONLY from library used_crate.rs") -> [return: bb7, unwind: bb10] 53:25-61:2: @7[1]: _0 = const () 61:2-61:2: @8.Return: return"> used_with_same_type_from_bin_crate_and_lib_crate_generic_function( @@ -114,10 +114,10 @@ For revisions in Pull Requests (PR): 58:20-58:36: @2[6]: (*_6) = [const 5_i32, const 6_i32, const 7_i32, const 8_i32] 58:20-58:36: @2[7]: _5 = move _6 58:20-58:36: @2[8]: _4 = move _5 as std::boxed::Box<[i32]> (Pointer(Unsize)) -58:20-58:36: @4.Call: _3 = slice::<impl [i32]>::into_vec::<std::alloc::Global>(move _4) -> [return: bb5, unwind: bb12] +58:20-58:36: @4.Call: _3 = std::slice::<impl [i32]>::into_vec::<std::alloc::Global>(move _4) -> [return: bb5, unwind: bb12] 58:9-58:17: @5[1]: FakeRead(ForLet, _3) 59:52-59:60: @5[4]: _8 = move _3 -59:5-59:61: @5.Call: _7 = used_only_from_this_lib_crate_generic_function::<Vec<i32>>(move _8) -> [return: bb6, unwind: bb9] +59:5-59:61: @5.Call: _7 = used_only_from_this_lib_crate_generic_function::<std::vec::Vec<i32>>(move _8) -> [return: bb6, unwind: bb9] 60:5-60:91: @6.Call: _9 = used_only_from_this_lib_crate_generic_function::<&str>(const "used ONLY from library used_crate.rs") -> [return: bb7, unwind: bb10] 53:25-61:2: @7[1]: _0 = const () 61:2-61:2: @8.Return: return"> "used from library used_crate.rs", @@ -127,10 +127,10 @@ For revisions in Pull Requests (PR): 58:20-58:36: @2[6]: (*_6) = [const 5_i32, const 6_i32, const 7_i32, const 8_i32] 58:20-58:36: @2[7]: _5 = move _6 58:20-58:36: @2[8]: _4 = move _5 as std::boxed::Box<[i32]> (Pointer(Unsize)) -58:20-58:36: @4.Call: _3 = slice::<impl [i32]>::into_vec::<std::alloc::Global>(move _4) -> [return: bb5, unwind: bb12] +58:20-58:36: @4.Call: _3 = std::slice::<impl [i32]>::into_vec::<std::alloc::Global>(move _4) -> [return: bb5, unwind: bb12] 58:9-58:17: @5[1]: FakeRead(ForLet, _3) 59:52-59:60: @5[4]: _8 = move _3 -59:5-59:61: @5.Call: _7 = used_only_from_this_lib_crate_generic_function::<Vec<i32>>(move _8) -> [return: bb6, unwind: bb9] +59:5-59:61: @5.Call: _7 = used_only_from_this_lib_crate_generic_function::<std::vec::Vec<i32>>(move _8) -> [return: bb6, unwind: bb9] 60:5-60:91: @6.Call: _9 = used_only_from_this_lib_crate_generic_function::<&str>(const "used ONLY from library used_crate.rs") -> [return: bb7, unwind: bb10] 53:25-61:2: @7[1]: _0 = const () 61:2-61:2: @8.Return: return"> ); @@ -140,10 +140,10 @@ For revisions in Pull Requests (PR): 58:20-58:36: @2[6]: (*_6) = [const 5_i32, const 6_i32, const 7_i32, const 8_i32] 58:20-58:36: @2[7]: _5 = move _6 58:20-58:36: @2[8]: _4 = move _5 as std::boxed::Box<[i32]> (Pointer(Unsize)) -58:20-58:36: @4.Call: _3 = slice::<impl [i32]>::into_vec::<std::alloc::Global>(move _4) -> [return: bb5, unwind: bb12] +58:20-58:36: @4.Call: _3 = std::slice::<impl [i32]>::into_vec::<std::alloc::Global>(move _4) -> [return: bb5, unwind: bb12] 58:9-58:17: @5[1]: FakeRead(ForLet, _3) 59:52-59:60: @5[4]: _8 = move _3 -59:5-59:61: @5.Call: _7 = used_only_from_this_lib_crate_generic_function::<Vec<i32>>(move _8) -> [return: bb6, unwind: bb9] +59:5-59:61: @5.Call: _7 = used_only_from_this_lib_crate_generic_function::<std::vec::Vec<i32>>(move _8) -> [return: bb6, unwind: bb9] 60:5-60:91: @6.Call: _9 = used_only_from_this_lib_crate_generic_function::<&str>(const "used ONLY from library used_crate.rs") -> [return: bb7, unwind: bb10] 53:25-61:2: @7[1]: _0 = const () 61:2-61:2: @8.Return: return"> let some_vec = vec![5, 6, 7, 8]; @@ -153,10 +153,10 @@ For revisions in Pull Requests (PR): 58:20-58:36: @2[6]: (*_6) = [const 5_i32, const 6_i32, const 7_i32, const 8_i32] 58:20-58:36: @2[7]: _5 = move _6 58:20-58:36: @2[8]: _4 = move _5 as std::boxed::Box<[i32]> (Pointer(Unsize)) -58:20-58:36: @4.Call: _3 = slice::<impl [i32]>::into_vec::<std::alloc::Global>(move _4) -> [return: bb5, unwind: bb12] +58:20-58:36: @4.Call: _3 = std::slice::<impl [i32]>::into_vec::<std::alloc::Global>(move _4) -> [return: bb5, unwind: bb12] 58:9-58:17: @5[1]: FakeRead(ForLet, _3) 59:52-59:60: @5[4]: _8 = move _3 -59:5-59:61: @5.Call: _7 = used_only_from_this_lib_crate_generic_function::<Vec<i32>>(move _8) -> [return: bb6, unwind: bb9] +59:5-59:61: @5.Call: _7 = used_only_from_this_lib_crate_generic_function::<std::vec::Vec<i32>>(move _8) -> [return: bb6, unwind: bb9] 60:5-60:91: @6.Call: _9 = used_only_from_this_lib_crate_generic_function::<&str>(const "used ONLY from library used_crate.rs") -> [return: bb7, unwind: bb10] 53:25-61:2: @7[1]: _0 = const () 61:2-61:2: @8.Return: return"> used_only_from_this_lib_crate_generic_function(some_vec); @@ -166,10 +166,10 @@ For revisions in Pull Requests (PR): 58:20-58:36: @2[6]: (*_6) = [const 5_i32, const 6_i32, const 7_i32, const 8_i32] 58:20-58:36: @2[7]: _5 = move _6 58:20-58:36: @2[8]: _4 = move _5 as std::boxed::Box<[i32]> (Pointer(Unsize)) -58:20-58:36: @4.Call: _3 = slice::<impl [i32]>::into_vec::<std::alloc::Global>(move _4) -> [return: bb5, unwind: bb12] +58:20-58:36: @4.Call: _3 = std::slice::<impl [i32]>::into_vec::<std::alloc::Global>(move _4) -> [return: bb5, unwind: bb12] 58:9-58:17: @5[1]: FakeRead(ForLet, _3) 59:52-59:60: @5[4]: _8 = move _3 -59:5-59:61: @5.Call: _7 = used_only_from_this_lib_crate_generic_function::<Vec<i32>>(move _8) -> [return: bb6, unwind: bb9] +59:5-59:61: @5.Call: _7 = used_only_from_this_lib_crate_generic_function::<std::vec::Vec<i32>>(move _8) -> [return: bb6, unwind: bb9] 60:5-60:91: @6.Call: _9 = used_only_from_this_lib_crate_generic_function::<&str>(const "used ONLY from library used_crate.rs") -> [return: bb7, unwind: bb10] 53:25-61:2: @7[1]: _0 = const () 61:2-61:2: @8.Return: return"> used_only_from_this_lib_crate_generic_function("used ONLY from library used_crate.rs"); @@ -179,10 +179,10 @@ For revisions in Pull Requests (PR): 58:20-58:36: @2[6]: (*_6) = [const 5_i32, const 6_i32, const 7_i32, const 8_i32] 58:20-58:36: @2[7]: _5 = move _6 58:20-58:36: @2[8]: _4 = move _5 as std::boxed::Box<[i32]> (Pointer(Unsize)) -58:20-58:36: @4.Call: _3 = slice::<impl [i32]>::into_vec::<std::alloc::Global>(move _4) -> [return: bb5, unwind: bb12] +58:20-58:36: @4.Call: _3 = std::slice::<impl [i32]>::into_vec::<std::alloc::Global>(move _4) -> [return: bb5, unwind: bb12] 58:9-58:17: @5[1]: FakeRead(ForLet, _3) 59:52-59:60: @5[4]: _8 = move _3 -59:5-59:61: @5.Call: _7 = used_only_from_this_lib_crate_generic_function::<Vec<i32>>(move _8) -> [return: bb6, unwind: bb9] +59:5-59:61: @5.Call: _7 = used_only_from_this_lib_crate_generic_function::<std::vec::Vec<i32>>(move _8) -> [return: bb6, unwind: bb9] 60:5-60:91: @6.Call: _9 = used_only_from_this_lib_crate_generic_function::<&str>(const "used ONLY from library used_crate.rs") -> [return: bb7, unwind: bb10] 53:25-61:2: @7[1]: _0 = const () 61:2-61:2: @8.Return: return">}⦉@0,1,2,3,4,5,6,7,8
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html index 8b994a6962b8..61a709c4729f 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html @@ -78,14 +78,14 @@ For revisions in Pull Requests (PR): 26:5-26:83: @0[20]: FakeRead(ForMatchedPlace, _13) 26:5-26:83: @0[22]: _15 = (_13.0: &T) 26:5-26:83: @0[25]: _17 = &(*_15) -26:5-26:83: @0[27]: _18 = <T as Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -26:5-26:83: @0.Call: _16 = ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] +26:5-26:83: @0[27]: _18 = <T as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +26:5-26:83: @0.Call: _16 = std::fmt::ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] 26:5-26:83: @1[2]: _12 = [move _16] 26:5-26:83: @1[5]: _11 = &_12 26:5-26:83: @1[6]: _10 = &(*_11) 26:5-26:83: @1[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -26:5-26:83: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] -26:5-26:83: @2.Call: _3 = _print(move _4) -> [return: bb3, unwind: bb5] +26:5-26:83: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] +26:5-26:83: @2.Call: _3 = std::io::_print(move _4) -> [return: bb3, unwind: bb5] 26:5-26:83: @3[6]: _2 = const () 25:77-27:2: @3[8]: _0 = const () 27:2-27:2: @4.Return: return">@0,1,2,3,4⦊pub fn used_from_bin_crate_and_lib_crate_generic_function<T: Debug>(arg: T) { @@ -98,14 +98,14 @@ For revisions in Pull Requests (PR): 26:5-26:83: @0[20]: FakeRead(ForMatchedPlace, _13) 26:5-26:83: @0[22]: _15 = (_13.0: &T) 26:5-26:83: @0[25]: _17 = &(*_15) -26:5-26:83: @0[27]: _18 = <T as Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -26:5-26:83: @0.Call: _16 = ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] +26:5-26:83: @0[27]: _18 = <T as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +26:5-26:83: @0.Call: _16 = std::fmt::ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] 26:5-26:83: @1[2]: _12 = [move _16] 26:5-26:83: @1[5]: _11 = &_12 26:5-26:83: @1[6]: _10 = &(*_11) 26:5-26:83: @1[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -26:5-26:83: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] -26:5-26:83: @2.Call: _3 = _print(move _4) -> [return: bb3, unwind: bb5] +26:5-26:83: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] +26:5-26:83: @2.Call: _3 = std::io::_print(move _4) -> [return: bb3, unwind: bb5] 26:5-26:83: @3[6]: _2 = const () 25:77-27:2: @3[8]: _0 = const () 27:2-27:2: @4.Return: return"> println!("used_from_bin_crate_and_lib_crate_generic_function with {:?}", arg); @@ -118,14 +118,14 @@ For revisions in Pull Requests (PR): 26:5-26:83: @0[20]: FakeRead(ForMatchedPlace, _13) 26:5-26:83: @0[22]: _15 = (_13.0: &T) 26:5-26:83: @0[25]: _17 = &(*_15) -26:5-26:83: @0[27]: _18 = <T as Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -26:5-26:83: @0.Call: _16 = ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] +26:5-26:83: @0[27]: _18 = <T as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +26:5-26:83: @0.Call: _16 = std::fmt::ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] 26:5-26:83: @1[2]: _12 = [move _16] 26:5-26:83: @1[5]: _11 = &_12 26:5-26:83: @1[6]: _10 = &(*_11) 26:5-26:83: @1[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -26:5-26:83: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] -26:5-26:83: @2.Call: _3 = _print(move _4) -> [return: bb3, unwind: bb5] +26:5-26:83: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] +26:5-26:83: @2.Call: _3 = std::io::_print(move _4) -> [return: bb3, unwind: bb5] 26:5-26:83: @3[6]: _2 = const () 25:77-27:2: @3[8]: _0 = const () 27:2-27:2: @4.Return: return">}⦉@0,1,2,3,4 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_function.-------.InstrumentCoverage.0.html index d35f191b64e8..974a24b2c6d4 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_function.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_function.-------.InstrumentCoverage.0.html @@ -73,25 +73,25 @@ For revisions in Pull Requests (PR): // 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 let @0,1,2,3⦊is_true = std::env::args().len() == 1; - let mut countdown = 0; -@0,1,2,3,4⦊pub fn used_only_from_bin_crate_generic_function<T: Debug>(arg: T) { @@ -98,14 +98,14 @@ For revisions in Pull Requests (PR): 18:5-18:74: @0[20]: FakeRead(ForMatchedPlace, _13) 18:5-18:74: @0[22]: _15 = (_13.0: &T) 18:5-18:74: @0[25]: _17 = &(*_15) -18:5-18:74: @0[27]: _18 = <T as Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -18:5-18:74: @0.Call: _16 = ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] +18:5-18:74: @0[27]: _18 = <T as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +18:5-18:74: @0.Call: _16 = std::fmt::ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] 18:5-18:74: @1[2]: _12 = [move _16] 18:5-18:74: @1[5]: _11 = &_12 18:5-18:74: @1[6]: _10 = &(*_11) 18:5-18:74: @1[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -18:5-18:74: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] -18:5-18:74: @2.Call: _3 = _print(move _4) -> [return: bb3, unwind: bb5] +18:5-18:74: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] +18:5-18:74: @2.Call: _3 = std::io::_print(move _4) -> [return: bb3, unwind: bb5] 18:5-18:74: @3[6]: _2 = const () 17:68-19:2: @3[8]: _0 = const () 19:2-19:2: @4.Return: return"> println!("used_only_from_bin_crate_generic_function with {:?}", arg); @@ -118,14 +118,14 @@ For revisions in Pull Requests (PR): 18:5-18:74: @0[20]: FakeRead(ForMatchedPlace, _13) 18:5-18:74: @0[22]: _15 = (_13.0: &T) 18:5-18:74: @0[25]: _17 = &(*_15) -18:5-18:74: @0[27]: _18 = <T as Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -18:5-18:74: @0.Call: _16 = ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] +18:5-18:74: @0[27]: _18 = <T as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +18:5-18:74: @0.Call: _16 = std::fmt::ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] 18:5-18:74: @1[2]: _12 = [move _16] 18:5-18:74: @1[5]: _11 = &_12 18:5-18:74: @1[6]: _10 = &(*_11) 18:5-18:74: @1[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -18:5-18:74: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] -18:5-18:74: @2.Call: _3 = _print(move _4) -> [return: bb3, unwind: bb5] +18:5-18:74: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] +18:5-18:74: @2.Call: _3 = std::io::_print(move _4) -> [return: bb3, unwind: bb5] 18:5-18:74: @3[6]: _2 = const () 17:68-19:2: @3[8]: _0 = const () 19:2-19:2: @4.Return: return">}⦉@0,1,2,3,4 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_only_from_this_lib_crate_generic_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_only_from_this_lib_crate_generic_function.-------.InstrumentCoverage.0.html index 76bc057dd00a..63944eb9ab38 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_only_from_this_lib_crate_generic_function.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_only_from_this_lib_crate_generic_function.-------.InstrumentCoverage.0.html @@ -78,14 +78,14 @@ For revisions in Pull Requests (PR): 22:5-22:79: @0[20]: FakeRead(ForMatchedPlace, _13) 22:5-22:79: @0[22]: _15 = (_13.0: &T) 22:5-22:79: @0[25]: _17 = &(*_15) -22:5-22:79: @0[27]: _18 = <T as Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -22:5-22:79: @0.Call: _16 = ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] +22:5-22:79: @0[27]: _18 = <T as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +22:5-22:79: @0.Call: _16 = std::fmt::ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] 22:5-22:79: @1[2]: _12 = [move _16] 22:5-22:79: @1[5]: _11 = &_12 22:5-22:79: @1[6]: _10 = &(*_11) 22:5-22:79: @1[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -22:5-22:79: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] -22:5-22:79: @2.Call: _3 = _print(move _4) -> [return: bb3, unwind: bb5] +22:5-22:79: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] +22:5-22:79: @2.Call: _3 = std::io::_print(move _4) -> [return: bb3, unwind: bb5] 22:5-22:79: @3[6]: _2 = const () 21:73-23:2: @3[8]: _0 = const () 23:2-23:2: @4.Return: return">@0,1,2,3,4⦊pub fn used_only_from_this_lib_crate_generic_function<T: Debug>(arg: T) { @@ -98,14 +98,14 @@ For revisions in Pull Requests (PR): 22:5-22:79: @0[20]: FakeRead(ForMatchedPlace, _13) 22:5-22:79: @0[22]: _15 = (_13.0: &T) 22:5-22:79: @0[25]: _17 = &(*_15) -22:5-22:79: @0[27]: _18 = <T as Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -22:5-22:79: @0.Call: _16 = ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] +22:5-22:79: @0[27]: _18 = <T as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +22:5-22:79: @0.Call: _16 = std::fmt::ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] 22:5-22:79: @1[2]: _12 = [move _16] 22:5-22:79: @1[5]: _11 = &_12 22:5-22:79: @1[6]: _10 = &(*_11) 22:5-22:79: @1[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -22:5-22:79: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] -22:5-22:79: @2.Call: _3 = _print(move _4) -> [return: bb3, unwind: bb5] +22:5-22:79: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] +22:5-22:79: @2.Call: _3 = std::io::_print(move _4) -> [return: bb3, unwind: bb5] 22:5-22:79: @3[6]: _2 = const () 21:73-23:2: @3[8]: _0 = const () 23:2-23:2: @4.Return: return"> println!("used_only_from_this_lib_crate_generic_function with {:?}", arg); @@ -118,14 +118,14 @@ For revisions in Pull Requests (PR): 22:5-22:79: @0[20]: FakeRead(ForMatchedPlace, _13) 22:5-22:79: @0[22]: _15 = (_13.0: &T) 22:5-22:79: @0[25]: _17 = &(*_15) -22:5-22:79: @0[27]: _18 = <T as Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -22:5-22:79: @0.Call: _16 = ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] +22:5-22:79: @0[27]: _18 = <T as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +22:5-22:79: @0.Call: _16 = std::fmt::ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] 22:5-22:79: @1[2]: _12 = [move _16] 22:5-22:79: @1[5]: _11 = &_12 22:5-22:79: @1[6]: _10 = &(*_11) 22:5-22:79: @1[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -22:5-22:79: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] -22:5-22:79: @2.Call: _3 = _print(move _4) -> [return: bb3, unwind: bb5] +22:5-22:79: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] +22:5-22:79: @2.Call: _3 = std::io::_print(move _4) -> [return: bb3, unwind: bb5] 22:5-22:79: @3[6]: _2 = const () 21:73-23:2: @3[8]: _0 = const () 23:2-23:2: @4.Return: return">}⦉@0,1,2,3,4 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_with_same_type_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_with_same_type_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html index a2f4b7e19ebd..b146180fbd15 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_with_same_type_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.used_crate/used_crate.used_with_same_type_from_bin_crate_and_lib_crate_generic_function.-------.InstrumentCoverage.0.html @@ -78,14 +78,14 @@ For revisions in Pull Requests (PR): 30:5-30:98: @0[20]: FakeRead(ForMatchedPlace, _13) 30:5-30:98: @0[22]: _15 = (_13.0: &T) 30:5-30:98: @0[25]: _17 = &(*_15) -30:5-30:98: @0[27]: _18 = <T as Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -30:5-30:98: @0.Call: _16 = ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] +30:5-30:98: @0[27]: _18 = <T as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +30:5-30:98: @0.Call: _16 = std::fmt::ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] 30:5-30:98: @1[2]: _12 = [move _16] 30:5-30:98: @1[5]: _11 = &_12 30:5-30:98: @1[6]: _10 = &(*_11) 30:5-30:98: @1[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -30:5-30:98: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] -30:5-30:98: @2.Call: _3 = _print(move _4) -> [return: bb3, unwind: bb5] +30:5-30:98: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] +30:5-30:98: @2.Call: _3 = std::io::_print(move _4) -> [return: bb3, unwind: bb5] 30:5-30:98: @3[6]: _2 = const () 29:92-31:2: @3[8]: _0 = const () 31:2-31:2: @4.Return: return">@0,1,2,3,4⦊pub fn used_with_same_type_from_bin_crate_and_lib_crate_generic_function<T: Debug>(arg: T) { @@ -98,14 +98,14 @@ For revisions in Pull Requests (PR): 30:5-30:98: @0[20]: FakeRead(ForMatchedPlace, _13) 30:5-30:98: @0[22]: _15 = (_13.0: &T) 30:5-30:98: @0[25]: _17 = &(*_15) -30:5-30:98: @0[27]: _18 = <T as Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -30:5-30:98: @0.Call: _16 = ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] +30:5-30:98: @0[27]: _18 = <T as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +30:5-30:98: @0.Call: _16 = std::fmt::ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] 30:5-30:98: @1[2]: _12 = [move _16] 30:5-30:98: @1[5]: _11 = &_12 30:5-30:98: @1[6]: _10 = &(*_11) 30:5-30:98: @1[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -30:5-30:98: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] -30:5-30:98: @2.Call: _3 = _print(move _4) -> [return: bb3, unwind: bb5] +30:5-30:98: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] +30:5-30:98: @2.Call: _3 = std::io::_print(move _4) -> [return: bb3, unwind: bb5] 30:5-30:98: @3[6]: _2 = const () 29:92-31:2: @3[8]: _0 = const () 31:2-31:2: @4.Return: return"> println!("used_with_same_type_from_bin_crate_and_lib_crate_generic_function with {:?}", arg); @@ -118,14 +118,14 @@ For revisions in Pull Requests (PR): 30:5-30:98: @0[20]: FakeRead(ForMatchedPlace, _13) 30:5-30:98: @0[22]: _15 = (_13.0: &T) 30:5-30:98: @0[25]: _17 = &(*_15) -30:5-30:98: @0[27]: _18 = <T as Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) -30:5-30:98: @0.Call: _16 = ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] +30:5-30:98: @0[27]: _18 = <T as std::fmt::Debug>::fmt as for<'r, 's, 't0> fn(&'r T, &'s mut std::fmt::Formatter<'t0>) -> std::result::Result<(), std::fmt::Error> (Pointer(ReifyFnPointer)) +30:5-30:98: @0.Call: _16 = std::fmt::ArgumentV1::new::<T>(move _17, move _18) -> [return: bb1, unwind: bb5] 30:5-30:98: @1[2]: _12 = [move _16] 30:5-30:98: @1[5]: _11 = &_12 30:5-30:98: @1[6]: _10 = &(*_11) 30:5-30:98: @1[7]: _9 = move _10 as &[std::fmt::ArgumentV1] (Pointer(Unsize)) -30:5-30:98: @1.Call: _4 = Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] -30:5-30:98: @2.Call: _3 = _print(move _4) -> [return: bb3, unwind: bb5] +30:5-30:98: @1.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -> [return: bb2, unwind: bb5] +30:5-30:98: @2.Call: _3 = std::io::_print(move _4) -> [return: bb3, unwind: bb5] 30:5-30:98: @3[6]: _2 = const () 29:92-31:2: @3[8]: _0 = const () 31:2-31:2: @4.Return: return">}⦉@0,1,2,3,4 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.uses_crate/uses_crate.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.uses_crate/uses_crate.main.-------.InstrumentCoverage.0.html index acb2c7d63f51..28cf051ecf87 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.uses_crate/uses_crate.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.uses_crate/uses_crate.main.-------.InstrumentCoverage.0.html @@ -69,124 +69,124 @@ For revisions in Pull Requests (PR): -
@0,1,2,3,4,5,6,7,8,9⦊fn main() { - used_crate::used_function(); - let some_vec = vec![1, 2, 3, 4]; - used_crate::used_only_from_bin_crate_generic_function(&some_vec); - used_crate::used_only_from_bin_crate_generic_function("used from bin uses_crate.rs"); - used_crate::used_from_bin_crate_and_lib_crate_generic_function(some_vec); - used_crate::used_with_same_type_from_bin_crate_and_lib_crate_generic_function("interesting?"); -}⦉@0,1,2,3,4,5,6,7,8,9
diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.while_early_ret/while_early_ret.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.while_early_ret/while_early_ret.main.-------.InstrumentCoverage.0.html index 06f2d8884068..fcb5418e1d0c 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.while_early_ret/while_early_ret.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.while_early_ret/while_early_ret.main.-------.InstrumentCoverage.0.html @@ -102,11 +102,11 @@ For revisions in Pull Requests (PR): 18:21-20:22: @6[3]: _10 = Gt(move _11, const 8_i32)"> 8⦉@6 { @8⦊Ok(())⦉@8 +22:21-22:27: @8[2]: _0 = std::result::Result::<(), u8>::Ok(move _12)">@8⦊Ok(())⦉@8 } else { - @9⦊Err(1)⦉@9 + @9⦊Err(1)⦉@9 } ; } ; } @4⦊Ok(())⦉@4 +35:5-35:11: @4[5]: _0 = std::result::Result::<(), u8>::Ok(move _15)">@4⦊Ok(())⦉@4 }@12⦊‸⦉@12 diff --git a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.yield/yield.main.-------.InstrumentCoverage.0.html b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.yield/yield.main.-------.InstrumentCoverage.0.html index 99e56393ea59..4c0c0d562b84 100644 --- a/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.yield/yield.main.-------.InstrumentCoverage.0.html +++ b/src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.yield/yield.main.-------.InstrumentCoverage.0.html @@ -76,26 +76,26 @@ For revisions in Pull Requests (PR): }; match @0,1,2⦊Pin::new(&mut generator).resume(()) { GeneratorState::Yielded(1)⦉@0,1,2 => @4,6,7,8⦊{}⦉@4,6,7,8 - _ => @5⦊panic!("unexpected value from resume")⦉@5, + _ => @5⦊panic!("unexpected value from resume")⦉@5, } match @4,6,7,8⦊Pin::new(&mut generator).resume(())⦉@4,6,7,8 { - GeneratorState::Complete(@10,11⦊"foo"⦉@10,11) => @12,13,14,15⦊{}⦉@12,13,14,15 - _ => @9⦊panic!("unexpected value from resume")⦉@9, + GeneratorState::Complete(@10,11⦊"foo"⦉@10,11) => @12,13,14,15⦊{}⦉@12,13,14,15 + _ => @9⦊panic!("unexpected value from resume")⦉@9, } let @12,13,14,15⦊mut generator⦉@12,13,14,15 = || { @@ -106,32 +106,32 @@ For revisions in Pull Requests (PR): }; match @12,13,14,15⦊Pin::new(&mut generator).resume(()) { GeneratorState::Yielded(1)⦉@12,13,14,15 => @17,19,20,21⦊{}⦉@17,19,20,21 - _ => @18⦊panic!("unexpected value from resume")⦉@18, + _ => @18⦊panic!("unexpected value from resume")⦉@18, } match @17,19,20,21⦊Pin::new(&mut generator).resume(()) { GeneratorState::Yielded(2)⦉@17,19,20,21 => @23,25⦊{}⦉@23,25 - _ => @24⦊panic!("unexpected value from resume")⦉@24, + _ => @24⦊panic!("unexpected value from resume")⦉@24, } }@23,25⦊‸⦉@23,25