Commit 0b62835
authored
Rollup merge of rust-lang#115373 - lqd:come-on-bors, r=compiler-errors
Fix bors missing a commit when merging rust-lang#115355
bors incorrectly merged an outdated version of PR rust-lang#115355 (via rollup rust-lang#115370):
- it [recorded r+](rust-lang#115355 (comment)) as approving commit rust-lang@325b585, and thus merged the original revision rust-lang@7762ac7
- but the branch at the time was at commit rust-lang@eefa07d, so bors missed the `compiler/rustc_trait_selection/src/solve/search_graph/mod.rs` cleanup in commit rust-lang@0e1e964 😓
Thankfully the change that bors missed was small, and this new PR corrects the situation (as I'd rather avoid having confusing multiple merge commits of PR rust-lang#115355 in the git history)
r? ``@compiler-errors``1 file changed
+1
-5
lines changedLines changed: 1 addition & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | 54 | | |
59 | 55 | | |
60 | | - | |
| 56 | + | |
61 | 57 | | |
62 | 58 | | |
63 | 59 | | |
| |||
0 commit comments