diff options
| author | bors <bors@rust-lang.org> | 2025-05-27 18:59:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-27 18:59:47 +0000 |
| commit | 45f256d9d7cffb66185c0bf1b8a864cba79db90c (patch) | |
| tree | 4944e765bd2e520e4de9e977a78e769099e06de4 /tests/mir-opt/coverage/instrument_coverage.main.InstrumentCoverage.diff | |
| parent | c583fa6d8425dbb38fe5d1dbd007f9ca8e4aa128 (diff) | |
| parent | c7d0a61e2211dd3821933aae7ab83e9e0b043f37 (diff) | |
| download | rust-45f256d9d7cffb66185c0bf1b8a864cba79db90c.tar.gz rust-45f256d9d7cffb66185c0bf1b8a864cba79db90c.zip | |
Auto merge of #141662 - matthiaskrgr:rollup-9kt4zj7, r=matthiaskrgr
Rollup of 8 pull requests
Successful merges:
- rust-lang/rust#141312 (Add From<TryLockError> for io::Error)
- rust-lang/rust#141495 (Rename `{GenericArg,Term}::unpack()` to `kind()`)
- rust-lang/rust#141602 (triagebot: label LLVM submodule changes with `A-LLVM`)
- rust-lang/rust#141632 (remove `visit_mt` from `ast::mut_visit`)
- rust-lang/rust#141640 (test: convert version_check ui test to run-make)
- rust-lang/rust#141645 (bump fluent-* crates)
- rust-lang/rust#141650 (coverage: Revert "unused local file IDs" due to empty function names)
- rust-lang/rust#141654 (tests: mark option-niche-eq as fixed on LLVM 21)
Failed merges:
- rust-lang/rust#141430 (remove `visit_clobber` and move `DummyAstNode` to `rustc_expand`)
- rust-lang/rust#141636 (avoid some usages of `&mut P<T>` in AST visitors)
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.diff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/mir-opt/coverage/instrument_coverage.main.InstrumentCoverage.diff b/tests/mir-opt/coverage/instrument_coverage.main.InstrumentCoverage.diff index b2bb2375aee..980c5e202ff 100644 --- a/tests/mir-opt/coverage/instrument_coverage.main.InstrumentCoverage.diff +++ b/tests/mir-opt/coverage/instrument_coverage.main.InstrumentCoverage.diff @@ -10,8 +10,8 @@ + coverage Code { bcb: bcb0 } => $DIR/instrument_coverage.rs:13:1: 13:10 (#0); + coverage Code { bcb: bcb1 } => $DIR/instrument_coverage.rs:15:12: 15:15 (#0); + coverage Code { bcb: bcb2 } => $DIR/instrument_coverage.rs:16:13: 16:18 (#0); -+ coverage Code { bcb: bcb3 } => $DIR/instrument_coverage.rs:17:9: 17:10 (#0); -+ coverage Code { bcb: bcb2 } => $DIR/instrument_coverage.rs:19:1: 19:2 (#0); ++ coverage Code { bcb: bcb3 } => $DIR/instrument_coverage.rs:17:10: 17:10 (#0); ++ coverage Code { bcb: bcb2 } => $DIR/instrument_coverage.rs:19:2: 19:2 (#0); + bb0: { + Coverage::VirtualCounter(bcb0); |