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 to Tokio 1.0 #79

Merged
merged 6 commits into from
Dec 29, 2020
Merged

Conversation

nightkr
Copy link
Contributor

@nightkr nightkr commented Dec 23, 2020

Currently pulling in tokio-native-tls via a git dependency, since tokio-rs/tls#46 hasn't been released to crates.io yet.

Currently pulling in tokio-native-tls via a git dependency, since
tokio-rs/tls#46 hasn't been released to crates.io yet.
@lberrymage
Copy link

Supersedes #77 and #78

@benesch
Copy link

benesch commented Dec 24, 2020

tokio-native-tls v0.3.0 is out now, if you can update @teozkr!

@nightkr
Copy link
Contributor Author

nightkr commented Dec 24, 2020

Done @benesch

Cargo.toml Outdated Show resolved Hide resolved
Cargo.toml Outdated Show resolved Hide resolved
buf: &mut [u8],
) -> Poll<Result<usize, io::Error>> {
buf: &mut ReadBuf,
) -> Poll<Result<(), io::Error>> {

Choose a reason for hiding this comment

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

Suggested change
) -> Poll<Result<(), io::Error>> {
) -> Poll<io::Result<()>> {

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agreed, but I tried to keep these changes as minimal as possible for now. That kind of cleanup seems like a separate PR for me.

Copy link
Member

@seanmonstar seanmonstar left a comment

Choose a reason for hiding this comment

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

Awesome work, thank you!

@seanmonstar seanmonstar merged commit 83747a7 into hyperium:master Dec 29, 2020
@seanmonstar seanmonstar mentioned this pull request Dec 29, 2020
1 task
@nightkr nightkr deleted the chore/tokio-1.0 branch December 29, 2020 20:52
@nightkr nightkr mentioned this pull request Dec 29, 2020
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants