diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-08-31 07:52:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-31 07:52:43 +0200 |
| commit | 0b628350432718510e65b4d9d1596898bb79a239 (patch) | |
| tree | 13225c5c1e7b718d86562d87c28c1d2776bcd948 /compiler/rustc_mir_transform/src/coverage/debug.rs | |
| parent | 008c21c9779fd1e3632d9fe908b8afc0c421b26c (diff) | |
| parent | 72725529e19dcf52efd1fc1507e20a9c35371963 (diff) | |
| download | rust-0b628350432718510e65b4d9d1596898bb79a239.tar.gz rust-0b628350432718510e65b4d9d1596898bb79a239.zip | |
Rollup merge of #115373 - lqd:come-on-bors, r=compiler-errors
Fix bors missing a commit when merging #115355 bors incorrectly merged an outdated version of PR #115355 (via rollup #115370): - it [recorded r+](https://github.com/rust-lang/rust/pull/115355#issuecomment-1698372365) as approving commit https://github.com/rust-lang/rust/commit/325b585259871c99093b2a2e9463f941b8aa0ceb, and thus merged the original revision https://github.com/rust-lang/rust/commit/7762ac7bb5ac10046a5a9ee838480a78bf150237 - but the branch at the time was at commit https://github.com/rust-lang/rust/commit/eefa07d69baad3207ad520da8590fb44ef989416, so bors missed the `compiler/rustc_trait_selection/src/solve/search_graph/mod.rs` cleanup in commit https://github.com/rust-lang/rust/pull/115355/commits/0e1e964a349681504e7103d4ec70aca5616222fc 😓 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 #115355 in the git history) r? ``@compiler-errors``
Diffstat (limited to 'compiler/rustc_mir_transform/src/coverage/debug.rs')
0 files changed, 0 insertions, 0 deletions