Upgrade to Tokio 1.0

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "act-zero"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Diggory Blake <[email protected]>"]
 edition = "2018"
 description = "Ergonomic actor system"
@@ -21,13 +21,13 @@ tracing = ["tynm"]
 futures = "0.3.6"
 async-trait = "0.1.41"
 log = "0.4.11"
-tokio = { version = "0.2.22", features = ["rt-core", "time"], optional = true }
-async-std = { version = "1.6.5", optional = true }
+tokio = { version = "1.0.1", features = ["time", "net"], optional = true }
+async-std = { version = "1.8.0", optional = true }
 tynm = { version = "0.1.4", optional = true }
 
 [dev-dependencies]
-tokio = { version = "0.2.22", features = ["macros", "blocking"] }
-async-std = { version = "1.6.5", features = ["attributes"] }
+tokio = { version = "1.0.1", features = ["rt", "macros", "time"] }
+async-std = { version = "1.8.0", features = ["attributes"] }
 
 [[example]]
 name = "using_tokio"

src/actor.rs

@@ -13,7 +13,7 @@ use crate::Addr;
 
 /// The type of error returned by an actor method.
 pub type ActorError = Box<dyn Error + Send + Sync>;
-/// Short alias for a `Result<T, ActorError>`.
+/// Short alias for a `Result<Produces<T>, ActorError>`.
 pub type ActorResult<T> = Result<Produces<T>, ActorError>;
 
 /// A concrete type similar to a `BoxFuture<'static, Result<T, oneshot::Canceled>>`, but

src/runtimes/tokio.rs

@@ -27,9 +27,9 @@ impl Spawn for Runtime {
 }
 
 impl timer::SupportsTimers for Runtime {
-    type Delay = tokio::time::Delay;
+    type Delay = tokio::time::Sleep;
     fn delay(&self, deadline: Instant) -> Self::Delay {
-        tokio::time::delay_until(deadline.into())
+        tokio::time::sleep_until(deadline.into())
     }
 }
 

src/timer.rs

@@ -8,14 +8,14 @@ use std::time::{Duration, Instant};
 
 use async_trait::async_trait;
 use futures::future::FutureExt;
-use futures::select_biased;
+use futures::{pin_mut, select_biased};
 
 use crate::{send, upcast, Actor, ActorResult, Addr, AddrLike, WeakAddr};
 
 /// Timers can be used on runtimes implementing this trait.
 pub trait SupportsTimers {
     /// The type of future returned by `delay`.
-    type Delay: Future<Output = ()> + Send + Unpin + 'static;
+    type Delay: Future<Output = ()> + Send + 'static;
 
     /// Create a future which will complete when the deadline
     /// is passed.
@@ -268,8 +268,10 @@ impl<R: SupportsTimers> Timer<R> {
         f: impl FnOnce(A) -> F + Send + 'static,
     ) {
         let addr2 = addr.clone();
-        let mut delay = self.runtime.delay(deadline).fuse();
+        let delay = self.runtime.delay(deadline).fuse();
+
         addr.send_fut(async move {
+            pin_mut!(delay);
             if select_biased! {
                 _ = f(addr2.clone()).fuse() => true,
                 _ = delay => false,