Commit 44614a2
committed
Auto merge of #154412 - JonathanBrouwer:rollup-4EpQJse, r=JonathanBrouwer
Rollup of 2 pull requests
Successful merges:
- rust-lang/rust#154229 (Ensure `ErasedData` only implements appropriate auto traits)
- rust-lang/rust#154409 (Update `try_blocks` to a new tracking issue number)1 file changed
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11576 | 11576 | | |
11577 | 11577 | | |
11578 | 11578 | | |
11579 | | - | |
| 11579 | + | |
11580 | 11580 | | |
11581 | | - | |
| 11581 | + | |
11582 | 11582 | | |
11583 | 11583 | | |
11584 | 11584 | | |
| |||
11590 | 11590 | | |
11591 | 11591 | | |
11592 | 11592 | | |
11593 | | - | |
| 11593 | + | |
11594 | 11594 | | |
11595 | 11595 | | |
11596 | 11596 | | |
11597 | 11597 | | |
11598 | 11598 | | |
11599 | 11599 | | |
11600 | | - | |
| 11600 | + | |
11601 | 11601 | | |
11602 | 11602 | | |
11603 | 11603 | | |
| |||
0 commit comments