Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade tokio-util to bytes 0.6 #3052

Merged
merged 2 commits into from
Oct 27, 2020
Merged

Conversation

djc
Copy link
Contributor

@djc djc commented Oct 26, 2020

Motivation

Would like to use tokio-util with the latest bytes release (which tokio-0.3 now also depends on).

Solution

In order to make this work, it seems to be required to move poll_read_buf() into AsyncReadExt rather than duplicating it in tokio-util. This actually seems helpful too, so looks like a win-win to me.

Use poll_read_buf() implementations from tokio proper.
@Darksonn Darksonn added the A-tokio-util Area: The tokio-util crate label Oct 26, 2020
Copy link
Member

@taiki-e taiki-e left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -7,7 +7,7 @@ name = "tokio-util"
# - Cargo.toml
# - Update CHANGELOG.md.
# - Create "v0.2.x" git tag.
version = "0.4.0"
version = "0.5.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It may be preferable to split this (bump crate version) into separate PRs (but personally either is fine).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mm, we will need a release preparation PR in any case.

@Darksonn Darksonn merged commit fe2b997 into tokio-rs:master Oct 27, 2020
carllerche added a commit that referenced this pull request Oct 27, 2020
carllerche added a commit that referenced this pull request Oct 27, 2020
This reverts commit fe2b997.

We are avoiding adding poll_read_buf to tokio itself for now. The patch is
reverted now in order to not block the v0.3.2 release (#3059).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-tokio-util Area: The tokio-util crate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants