Skip to content

Bump to tokio 1.0 and hyper 0.14 #3117

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

Merged
merged 3 commits into from
Jan 14, 2021
Merged

Bump to tokio 1.0 and hyper 0.14 #3117

merged 3 commits into from
Jan 14, 2021

Conversation

jtgeibel
Copy link
Member

@jtgeibel jtgeibel commented Dec 24, 2020

To avoid pulling in 2 versions of tokio at once:

r? @ghost

bors added a commit that referenced this pull request Dec 31, 2020
Update backend dependencies

Pin `conduit-hyper` to the current version and do a `cargo update`. The version is pinned to avoid pulling in `tokio 1.0` until some remaining items in #3117 are resolved.

r? `@Turbo87`
@bors
Copy link
Contributor

bors commented Dec 31, 2020

☔ The latest upstream changes (presumably #3149) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Contributor

bors commented Jan 3, 2021

☔ The latest upstream changes (presumably #3156) made this pull request unmergeable. Please resolve the merge conflicts.

@jtgeibel jtgeibel force-pushed the tokio-1.0 branch 3 times, most recently from 2d42412 to ba88d9c Compare January 5, 2021 22:19
@Turbo87
Copy link
Member

Turbo87 commented Jan 14, 2021

@jtgeibel I've updated sentry to v0.22 which includes the necessary subdependency updates. I guess that means we could merge this PR now?

@jtgeibel jtgeibel changed the title WIP: Bump to tokio 1.0 and hyper 0.14 Bump to tokio 1.0 and hyper 0.14 Jan 14, 2021
@jtgeibel jtgeibel marked this pull request as ready for review January 14, 2021 12:55
@jtgeibel
Copy link
Member Author

I've updated sentry to v0.22

Awesome, that was the last thing I was waiting for!

r? @Turbo87

@Turbo87
Copy link
Member

Turbo87 commented Jan 14, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Jan 14, 2021

📌 Commit da3250f has been approved by Turbo87

@bors
Copy link
Contributor

bors commented Jan 14, 2021

⌛ Testing commit da3250f with merge 90bb83b...

@bors
Copy link
Contributor

bors commented Jan 14, 2021

☀️ Test successful - checks-actions
Approved by: Turbo87
Pushing 90bb83b to master...

@bors bors merged commit 90bb83b into rust-lang:master Jan 14, 2021
@jtgeibel jtgeibel deleted the tokio-1.0 branch January 14, 2021 22:22
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.

3 participants