add support for tokio & improve net crate api

1 files changed, 5 insertions, 6 deletions

diff --git a/core/src/async_util/timeout.rs b/core/src/async_util/timeout.rs
index cf3c490..9ac64c8 100644
--- a/core/src/async_util/timeout.rs
+++ b/core/src/async_util/timeout.rs
@@ -1,10 +1,9 @@
 use std::{future::Future, time::Duration};
 
-use smol::Timer;
-
-use super::{select, Either};
 use crate::{error::Error, Result};
 
+use super::{select, sleep, Either};
+
 /// Waits for a future to complete or times out if it exceeds a specified
 /// duration.
 ///
@@ -26,7 +25,7 @@ pub async fn timeout<T, F>(delay: Duration, future1: F) -> Result<T>
 where
     F: Future<Output = T>,
 {
-    let result = select(Timer::after(delay), future1).await;
+    let result = select(sleep(delay), future1).await;
 
     match result {
         Either::Left(_) => Err(Error::Timeout),
@@ -41,11 +40,11 @@ mod tests {
 
     #[test]
     fn test_timeout() {
-        smol::block_on(async move {
+        crate::async_runtime::block_on(async move {
             let fut = future::pending::<()>();
             assert!(timeout(Duration::from_millis(10), fut).await.is_err());
 
-            let fut = smol::Timer::after(Duration::from_millis(10));
+            let fut = sleep(Duration::from_millis(10));
             assert!(timeout(Duration::from_millis(50), fut).await.is_ok())
         });
     }