Update tokio

jD91mZM2 · Mar 16, 2021 · d8d0d03 · d8d0d03
1 parent 92fecea
commit d8d0d03
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 145 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/xidlehook-core/Cargo.toml b/xidlehook-core/Cargo.toml
@@ -17,7 +17,7 @@ log = "0.4.8"
 nix = "0.15.0"
 structopt = "0.3.5"
 xcb = { version = "0.9.0", features = ["x11", "screensaver"] }
-tokio = { version = "0.2.21", optional = true, features = ["time", "stream"] }
+tokio = { version = "1.3.0", optional = true, features = ["time"] }
 
 [dependencies.libpulse-binding]
 optional = true

diff --git a/xidlehook-core/src/lib.rs b/xidlehook-core/src/lib.rs
@@ -532,7 +532,7 @@ where
                     async_std::task::sleep(delay).await;
                     #[cfg(feature = "tokio")]
                     if cfg!(not(feature = "async-std")) {
-                        tokio::time::delay_for(delay).await;
+                        tokio::time::sleep(delay).await;
                     }
 
                     if let Some(time_difference) = sleep_start.elapsed().checked_sub(delay) {
@@ -552,8 +552,7 @@ where
                     async_std::future::pending::<()>().await;
                     #[cfg(feature = "tokio")]
                     if cfg!(not(feature = "async-std")) {
-                        use tokio::stream::StreamExt;
-                        tokio::stream::pending::<()>().next().await;
+                        std::future::pending::<()>().await;
                     }
                 },
                 Action::Quit => break,

diff --git a/xidlehook-daemon/Cargo.toml b/xidlehook-daemon/Cargo.toml
@@ -22,7 +22,7 @@ serde_json = "1.0.42"
 structopt = "0.3.5"
 xcb = { version = "0.9.0", features = ["x11", "screensaver"] }
 xidlehook-core = { version = "0.3.0", default-features = false, features = ["tokio"] }
-tokio = { version = "0.2.21", features = ["io-util", "macros", "rt-core", "signal", "stream", "sync", "uds"] }
+tokio = { version = "1.3.0", features = ["io-util", "macros", "signal", "sync", "net", "rt"] }
 
 [features]
 default = ["pulse"]