Resolve a semantic conflict between #5608 and #5628. #5660
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
Resolves a semantic conflict between tokio-rs#5608 and tokio-rs#5628. ref: https://discord.com/channels/500028886025895936/500336346770964480/1100809662208675982
Darksonn
added
A-tokio
|
GitHub branch protection's "Require pull requests to be up-to-date" setting would also have prevented this, I believe. |
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.
This PR resolves a semantic conflict between #5608 and #5628. Both PRs modified
tokio/src/runtime/task/list.rs:OwnedTasks::innerOwnedTasks::for_each(that forwards to afor_eachonOwnedTasks::inner)Because these changes did not occur close together, they did not pose a merge conflict for either PR; rather, a semantic conflict.
This PR fixes the semantic conflict, but does not fix that CI allows such conflicts to occur. To resolve that, this repo would need to adopt something like bors.
Further discussion: https://discord.com/channels/500028886025895936/500336346770964480/1100809662208675982