Fix bors missing a commit when merging #115355 #115373
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fixes bors snafu where it merged an outdated commit and missed this change
rustbot
added
S-waiting-on-review
|
Some changes occurred to the core trait solver cc @rust-lang/initiative-trait-system-refactor |
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Aug 30, 2023
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`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 31, 2023
…iaskrgr Rollup of 3 pull requests Successful merges: - rust-lang#115373 (Fix bors missing a commit when merging rust-lang#115355) - rust-lang#115378 (`ignore-cross-compile` remaining tests that run binaries) - rust-lang#115393 (Make `termcolor` types public in `rustc_errors`) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
bors incorrectly merged an outdated version of PR #115355 (via rollup #115370):
compiler/rustc_trait_selection/src/solve/search_graph/mod.rscleanup in commit 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 #115355 in the git history)
r? @compiler-errors