about summary refs log tree commit diff
path: root/tests/mir-opt/coverage/instrument_coverage.main.InstrumentCoverage.diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-05-20 18:04:19 +0000
committerbors <bors@rust-lang.org>2024-05-20 18:04:19 +0000
commitbe71fd477243f253a735bb35e0cd23cc528cf30a (patch)
treec9e82040cf28f18b0cbd9f0187b7d4b0dea5ecdd /tests/mir-opt/coverage/instrument_coverage.main.InstrumentCoverage.diff
parent474bee7bf540db9344ca975298b6c1646a74b772 (diff)
parent1640225b9d15da64e6af922b4dc3573b337138d0 (diff)
downloadrust-be71fd477243f253a735bb35e0cd23cc528cf30a.tar.gz
rust-be71fd477243f253a735bb35e0cd23cc528cf30a.zip
Auto merge of #125331 - matthiaskrgr:rollup-4kfrh4n, r=matthiaskrgr
Rollup of 7 pull requests

Successful merges:

 - #124682 (Suggest setting lifetime in borrowck error involving types with elided lifetimes)
 - #124917 (Check whether the next_node is else-less if in get_return_block)
 - #125106 (coverage: Memoize and simplify counter expressions)
 - #125173 (Remove `Rvalue::CheckedBinaryOp`)
 - #125305 (add some codegen tests for issue 120493)
 - #125314 ( Add an experimental feature gate for global registration)
 - #125318 (Migrate `run-make/rustdoc-scrape-examples-whitespace` to `rmake.rs`)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'tests/mir-opt/coverage/instrument_coverage.main.InstrumentCoverage.diff')
-rw-r--r--tests/mir-opt/coverage/instrument_coverage.main.InstrumentCoverage.diff6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/mir-opt/coverage/instrument_coverage.main.InstrumentCoverage.diff b/tests/mir-opt/coverage/instrument_coverage.main.InstrumentCoverage.diff
index 3606a9e3932..01876b494c5 100644
--- a/tests/mir-opt/coverage/instrument_coverage.main.InstrumentCoverage.diff
+++ b/tests/mir-opt/coverage/instrument_coverage.main.InstrumentCoverage.diff
@@ -8,12 +8,11 @@
       let mut _3: !;
   
 +     coverage ExpressionId(0) => Expression { lhs: Counter(0), op: Add, rhs: Counter(1) };
-+     coverage ExpressionId(1) => Expression { lhs: Expression(0), op: Subtract, rhs: Counter(1) };
 +     coverage Code(Counter(0)) => $DIR/instrument_coverage.rs:10:1 - 10:11;
 +     coverage Code(Expression(0)) => $DIR/instrument_coverage.rs:11:5 - 12:17;
-+     coverage Code(Expression(1)) => $DIR/instrument_coverage.rs:13:13 - 13:18;
++     coverage Code(Counter(0)) => $DIR/instrument_coverage.rs:13:13 - 13:18;
 +     coverage Code(Counter(1)) => $DIR/instrument_coverage.rs:14:10 - 14:11;
-+     coverage Code(Expression(1)) => $DIR/instrument_coverage.rs:16:1 - 16:2;
++     coverage Code(Counter(0)) => $DIR/instrument_coverage.rs:16:1 - 16:2;
 + 
       bb0: {
 +         Coverage::CounterIncrement(0);
@@ -35,7 +34,6 @@
       }
   
       bb4: {
-+         Coverage::ExpressionUsed(1);
           _0 = const ();
           StorageDead(_2);
           return;