Upgrade to Tokio v1 #725

Urhengulas · 2020-10-15T17:45:53Z

Dependencies which need to upgrade

hyper (feat(lib): Upgrade to Tokio 1.0 hyperium/hyper#2369)
tokio-rustls (Update to tokio 1.0 tokio-rs/tls#46)
tokio-tungstenite (Upgrade to tokio 1.0 snapview/tokio-tungstenite#142)

seanmonstar · 2020-10-15T18:13:51Z

Yep, needs to happen in hyper first: hyperium/hyper#2302

Urhengulas · 2020-10-15T18:36:11Z

Yep, needs to happen in hyper first: hyperium/hyper#2302

Yes, also saw that :)
The patch besides the hyper changes is quite small anyways.

bump-warp.patch

diff --git a/Cargo.toml b/Cargo.toml
index b40c2b5..89f681e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,7 +31,7 @@ scoped-tls = "1.0"
 serde = "1.0"
 serde_json = "1.0"
 serde_urlencoded = "0.7"
-tokio = { version = "0.2", features = ["fs", "stream", "sync", "time"] }
+tokio = { version = "0.3", features = ["fs", "stream", "sync", "time"] }
 tracing = { version = "0.1", default-features = false, features = ["log", "std"] }
 tracing-futures = { version = "0.2", default-features = false, features = ["std-future"] }
 tower-service = "0.3"
@@ -47,7 +47,7 @@ tracing-subscriber = "0.2.7"
 tracing-log = "0.1"
 serde_derive = "1.0"
 handlebars = "3.0.0"
-tokio = { version = "0.2", features = ["macros"] }
+tokio = { version = "0.3", features = ["full"] }
 listenfd = "0.3"
 
 [features]
diff --git a/src/filters/fs.rs b/src/filters/fs.rs
index 1f04f6b..d4b9fc8 100644
--- a/src/filters/fs.rs
+++ b/src/filters/fs.rs
@@ -22,7 +22,6 @@ use hyper::Body;
 use mime_guess;
 use percent_encoding::percent_decode_str;
 use tokio::fs::File as TkFile;
-use tokio::io::AsyncRead;
 
 use crate::filter::{Filter, FilterClone, One};
 use crate::reject::{self, Rejection};
diff --git a/src/filters/sse.rs b/src/filters/sse.rs
index 8c4eda5..9d58492 100644
--- a/src/filters/sse.rs
+++ b/src/filters/sse.rs
@@ -54,7 +54,7 @@ use hyper::Body;
 use pin_project::pin_project;
 use serde::Serialize;
 use serde_json;
-use tokio::time::{self, Delay};
+use tokio::time::{self, Sleep};
 
 use self::sealed::{
     BoxedServerSentEvent, EitherServerSentEvent, SseError, SseField, SseFormat, SseWrapper,
@@ -467,7 +467,7 @@ impl KeepAlive {
         S::Ok: ServerSentEvent + Send,
         S::Error: StdError + Send + Sync + 'static,
     {
-        let alive_timer = time::delay_for(self.max_interval);
+        let alive_timer = time::sleep(self.max_interval);
         SseKeepAlive {
             event_stream,
             comment_text: self.comment_text,
@@ -484,7 +484,7 @@ struct SseKeepAlive<S> {
     event_stream: S,
     comment_text: Cow<'static, str>,
     max_interval: Duration,
-    alive_timer: Delay,
+    alive_timer: Sleep,
 }
 
 #[doc(hidden)]
@@ -505,7 +505,7 @@ where
     let max_interval = keep_interval
         .into()
         .unwrap_or_else(|| Duration::from_secs(15));
-    let alive_timer = time::delay_for(max_interval);
+    let alive_timer = time::sleep(max_interval);
     SseKeepAlive {
         event_stream,
         comment_text: Cow::Borrowed(""),

jxs · 2020-10-16T07:38:15Z

there's also the dependency on tokio-tungstenite and tokio-rustls.
tokio-rustls already has a PR upgrading it: tokio-rs/tls#29

pomazanbohdan · 2020-10-25T09:13:18Z

seanmonstar/reqwest#1060

vn971 · 2020-11-10T16:07:21Z

Note that currently, warp can start with tokio being explicitly set to 0.3, and it will then fail at run-time. I wonder if we can/should tackle this problem so that it doesn't affect us in the future? E.g. so that the same run-time error cannot appear in future tokio releases (if applicable).

I'm really happy to see that the problem is being addressed in all the referenced projects though, thanks a lot for keeping it up-to-date!

Urhengulas · 2020-11-10T18:42:22Z

Note that currently, warp can start with tokio being explicitly set to 0.3, and it will then fail at run-time. I wonder if we can/should tackle this problem so that it doesn't affect us in the future? E.g. so that the same run-time error cannot appear in future tokio releases (if applicable).

I'm really happy to see that the problem is being addressed in all the referenced projects though, thanks a lot for keeping it up-to-date!

@vn971 That is a very good idea. I had this problem in my project, that I thought I successfully upgraded to tokio 0.3, but then it actually failed on runtime, since dependencies are using tokio 0.2.

What would be an approach to avoid that for the future? Let tokio check the dependency tree on compile-time?

MikailBag · 2020-11-14T08:03:40Z

For example, warp can explicitly take tokio::runtime::Handle for server construction. That way it's always visible in user code which tokio version is used by warp.

aknuds1 · 2020-11-28T16:39:56Z

Is this being worked on in a branch?

Urhengulas · 2020-11-29T00:59:20Z

Is this being worked on in a branch?

I started in #725, but feel free to take over :)

aknuds1 · 2020-11-29T08:58:27Z

@Urhengulas ok thanks, I will try.

aknuds1 · 2020-11-29T15:24:13Z

@Urhengulas I made my own PR, where I managed to get all tests to pass (cargo test --all-features): #753.

phungleson · 2020-12-12T04:48:41Z

Hey everyone, wonder if tokio 0.3.0 will be merged soon?

novacrazy · 2020-12-17T03:36:49Z

Likewise, just ran into issues with this that were mind-boggling until I realized the versions were different, and indeed a Tokio 0.2 reactor was not running, only 0.3

xue35 · 2020-12-21T11:02:01Z

I just noticed that examples/hello.rs does not run with tokio 0.3. Switching back to tokio 0.2 runs perfectly.

honsunrise · 2020-12-23T10:08:47Z

Are we ready to upgrade to tokio 0.3?

slyshykO · 2020-12-23T11:03:37Z

@hosunrise Think update to tokio 1.0 more likely :)
If also have in mind hyperium/hyper#2369

honsunrise · 2020-12-24T01:23:12Z

Wow tokio 1.0 is released 🚀🚀🚀🚀!!
So, are we ready to upgrade to tokio 1.0?

songday · 2020-12-24T01:52:17Z

@sinkuu Wow tokio 1.0 is released 🚀🚀🚀🚀!!
So, are we ready to upgrade to tokio 1.0?

Not yet, but I guess soon
Since hyper just released 0.14.1 which supports tokio 1.0 and tokio-rustls also upgraded
Only tokio-tungstenite left

simonsan · 2021-01-07T10:09:29Z

Would it make sense to widen the scope of this issue and jump to tokio-v1.0 directly?

hyper (feat(lib): Upgrade to Tokio 1.0 hyperium/hyper#2369)
tokio-rustls (Update to tokio 1.0 tokio-rs/tls#46)
tokio-tungstenite (Upgrade to tokio 1.0 snapview/tokio-tungstenite#142)

aknuds1 · 2021-01-07T10:32:41Z

@simonsan My PR upgrades to tokio 1.0.

simonsan · 2021-01-07T10:43:10Z

@simonsan My PR upgrades to tokio 1.0.

Is there an issue to relate to for tracking?

aknuds1 · 2021-01-07T10:44:14Z

@simonsan This issue.

songday · 2021-01-08T10:33:23Z

@sinkuu Wow tokio 1.0 is released 🚀🚀🚀🚀!!
So, are we ready to upgrade to tokio 1.0?

Not yet, but I guess soon
Since hyper just released 0.14.1 which supports tokio 1.0 and tokio-rustls also upgraded
Only tokio-tungstenite left

Currently, the last component tokio-tungstenite ( snapview/tokio-tungstenite#142 ) depends on tungstenite-rs ( snapview/tungstenite-rs#169 ) which depends on http
http v0.2.3 ( hyperium/http#463 ) will be released soon (I guess)

mraerino · 2021-01-09T15:20:46Z

tokio-tungstenite v0.13.0 has been released with the fix: snapview/tokio-tungstenite#142

bkontur · 2021-01-15T13:17:01Z

Hello, is there any date for release warp with new tokio?

extrawurst · 2021-01-15T23:28:47Z

It was merged!
Now we only need a release :)

Urhengulas added the feature New feature or request label Oct 15, 2020

Urhengulas mentioned this issue Oct 15, 2020

Bump tokio from 0.2 to 1.0 library-angels/code-library-backend#96

Closed

4 tasks

caulagi mentioned this issue Oct 17, 2020

Update tokio to 0.3 caulagi/rust-k8s-demo#191

Closed

julien1619 mentioned this issue Oct 20, 2020

Upgrade tokio to 1.0 Creatiwity/siren#178

Merged

4 tasks

This was referenced Oct 20, 2020

Update tokio requirement from 0.2.0 to 0.3.0 graphql-rust/juniper#788

Closed

Update tokio requirement from 0.2 to 0.3 graphql-rust/juniper#794

Closed

pomazanbohdan mentioned this issue Oct 25, 2020

Update tokio to 1.0 seanmonstar/reqwest#1060

Closed

MikeCamel mentioned this issue Oct 28, 2020

Update tokio requirement from 0.2 to 0.3 enarx-archive/enarx-keepmgr#10

Closed

markmandel mentioned this issue Oct 31, 2020

Upgrade to all dependencies. googleforgames/quilkin#123

Closed

jxs mentioned this issue Nov 17, 2020

Does Warp have a plan that support tokio 0.3 and bytes 0.6? #750

Closed

Urhengulas mentioned this issue Nov 29, 2020

Bump tokio from 0.2 to 0.3 #741

Closed

5 tasks

fanatid mentioned this issue Nov 30, 2020

Upgrade dependencies to tokio 1.0 vectordotdev/vector#5175

Closed

28 tasks

wpbrown mentioned this issue Dec 29, 2020

Upgrade to Tokio v1.0 blockcaptain/blockcaptain#19

Closed

7 tasks

udoprog mentioned this issue Jan 1, 2021

Upgrade to Tokio 1.0 udoprog/OxidizeBot#95

Merged

4 tasks

jonhoo mentioned this issue Jan 6, 2021

Update to tokio 1.0 jonhoo/fantoccini#114

Closed

aknuds1 mentioned this issue Jan 7, 2021

Upgrade to Tokio 1.0 #753

Merged

Urhengulas changed the title ~~Upgrade to Tokio v0.3~~ Upgrade to Tokio v1 Jan 7, 2021

mzabaluev mentioned this issue Jan 12, 2021

Port to tokio 1.0 input-output-hk/jormungandr#2621

Closed

3 tasks

seanmonstar closed this as completed in #753 Jan 15, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade to Tokio v1 #725

Upgrade to Tokio v1 #725

Urhengulas commented Oct 15, 2020 •

edited by jxs

seanmonstar commented Oct 15, 2020

Urhengulas commented Oct 15, 2020

jxs commented Oct 16, 2020

pomazanbohdan commented Oct 25, 2020

vn971 commented Nov 10, 2020 •

edited

Urhengulas commented Nov 10, 2020

MikailBag commented Nov 14, 2020

aknuds1 commented Nov 28, 2020

Urhengulas commented Nov 29, 2020

aknuds1 commented Nov 29, 2020

aknuds1 commented Nov 29, 2020

phungleson commented Dec 12, 2020

novacrazy commented Dec 17, 2020

xue35 commented Dec 21, 2020

honsunrise commented Dec 23, 2020

slyshykO commented Dec 23, 2020

honsunrise commented Dec 24, 2020 •

edited

songday commented Dec 24, 2020 •

edited

simonsan commented Jan 7, 2021 •

edited

aknuds1 commented Jan 7, 2021

simonsan commented Jan 7, 2021

aknuds1 commented Jan 7, 2021

songday commented Jan 8, 2021 •

edited

mraerino commented Jan 9, 2021

bkontur commented Jan 15, 2021

extrawurst commented Jan 15, 2021

Upgrade to Tokio v1 #725

Upgrade to Tokio v1 #725

Comments

Urhengulas commented Oct 15, 2020 • edited by jxs

seanmonstar commented Oct 15, 2020

Urhengulas commented Oct 15, 2020

jxs commented Oct 16, 2020

pomazanbohdan commented Oct 25, 2020

vn971 commented Nov 10, 2020 • edited

Urhengulas commented Nov 10, 2020

MikailBag commented Nov 14, 2020

aknuds1 commented Nov 28, 2020

Urhengulas commented Nov 29, 2020

aknuds1 commented Nov 29, 2020

aknuds1 commented Nov 29, 2020

phungleson commented Dec 12, 2020

novacrazy commented Dec 17, 2020

xue35 commented Dec 21, 2020

honsunrise commented Dec 23, 2020

slyshykO commented Dec 23, 2020

honsunrise commented Dec 24, 2020 • edited

songday commented Dec 24, 2020 • edited

simonsan commented Jan 7, 2021 • edited

aknuds1 commented Jan 7, 2021

simonsan commented Jan 7, 2021

aknuds1 commented Jan 7, 2021

songday commented Jan 8, 2021 • edited

mraerino commented Jan 9, 2021

bkontur commented Jan 15, 2021

extrawurst commented Jan 15, 2021

Urhengulas commented Oct 15, 2020 •

edited by jxs

vn971 commented Nov 10, 2020 •

edited

honsunrise commented Dec 24, 2020 •

edited

songday commented Dec 24, 2020 •

edited

simonsan commented Jan 7, 2021 •

edited

songday commented Jan 8, 2021 •

edited