Merge 1.25.1 into 1.28.x #5735
Merged
Merge 1.25.1 into 1.28.x #5735
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
Some of these changes will be progressively reverted as we merge this into newer branches.
This cherry-picks: * chore: remove ntapi dev-dependency * time: fix repeatedly_reset_entry_inserted_as_expired test
Darksonn
added a commit
to Darksonn/tokio
that referenced
this pull request
May 27, 2023
Darksonn
force-pushed
the
alice/merge-1.25.1
branch
from
83b8512
to
eaa61ff
Compare
Merged
taiki-e
approved these changes
May 27, 2023
Noah-Kennedy
approved these changes
May 27, 2023
Darksonn
force-pushed
the
alice/merge-1.25.1
branch
from
eaa61ff
to
1605279
Compare
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.
Seventh PR in a sequence related to tokio-rs/mio#1673.
This reverts most of the ci fixes from previous branches.
Depends on #5734.
MUST BE MERGED ON THE COMMAND-LINE.