Commit acc822a
committed
Auto merge of rust-lang#97111 - JohnTitor:rollup-x3vjf6u, r=JohnTitor
Rollup of 7 pull requests
Successful merges:
- rust-lang#96329 (Add a couple tests for rust-lang#90887 fixes)
- rust-lang#97009 (Allow `unused_macro_rules` in path tests)
- rust-lang#97075 (Add regression test for rust-lang#81804)
- rust-lang#97079 (Change `Successors` to `impl Iterator<Item = BasicBlock>`)
- rust-lang#97080 (remove the `RelateResultCompare` trait)
- rust-lang#97093 (Migrate `maybe_recover_from_bad_type_plus` diagnostic)
- rust-lang#97102 (Update function pointer call error message)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup1 file changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
114 | 114 | | |
115 | 115 | | |
116 | 116 | | |
117 | | - | |
| 117 | + | |
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
| |||
440 | 440 | | |
441 | 441 | | |
442 | 442 | | |
443 | | - | |
| 443 | + | |
444 | 444 | | |
445 | 445 | | |
446 | 446 | | |
| |||
0 commit comments