diff options
author | Gurwinder Singh <vargwin@gmail.com> | 2019-07-15 23:13:54 +0530 |
---|---|---|
committer | Carl Lerche <me@carllerche.com> | 2019-07-15 10:43:54 -0700 |
commit | 83273b8b50fd4e7a68c83f9086e2f1bd513174d7 (patch) | |
tree | 904db56e391293e4ddf40e326a514ddb98d7b7c4 /tokio-io | |
parent | ca708d6d8783b4fc86ccc059fb7a40e14edfe812 (diff) |
chore: use ready macro from `futures-core` (#1300)
Diffstat (limited to 'tokio-io')
-rw-r--r-- | tokio-io/Cargo.toml | 1 | ||||
-rw-r--r-- | tokio-io/src/async_read.rs | 1 | ||||
-rw-r--r-- | tokio-io/src/async_write.rs | 1 | ||||
-rw-r--r-- | tokio-io/src/lib.rs | 9 |
4 files changed, 3 insertions, 9 deletions
diff --git a/tokio-io/Cargo.toml b/tokio-io/Cargo.toml index 8f420495..2561ac21 100644 --- a/tokio-io/Cargo.toml +++ b/tokio-io/Cargo.toml @@ -24,6 +24,7 @@ publish = false [dependencies] bytes = "0.4.7" log = "0.4" +futures-core-preview = "0.3.0-alpha.17" [dev-dependencies] pin-utils = "0.1.0-alpha.4" diff --git a/tokio-io/src/async_read.rs b/tokio-io/src/async_read.rs index 4eeaa7bb..1b7eaa6c 100644 --- a/tokio-io/src/async_read.rs +++ b/tokio-io/src/async_read.rs @@ -1,6 +1,7 @@ //use crate::split::{ReadHalf, WriteHalf}; //use crate::{framed, split, AsyncWrite}; use bytes::BufMut; +use futures_core::ready; use std::io; use std::ops::DerefMut; use std::pin::Pin; diff --git a/tokio-io/src/async_write.rs b/tokio-io/src/async_write.rs index 80ec74d1..7bcb4339 100644 --- a/tokio-io/src/async_write.rs +++ b/tokio-io/src/async_write.rs @@ -1,5 +1,6 @@ //use crate::AsyncRead; use bytes::Buf; +use futures_core::ready; use std::io; use std::ops::DerefMut; use std::pin::Pin; diff --git a/tokio-io/src/lib.rs b/tokio-io/src/lib.rs index 81a11f8f..165cc1ca 100644 --- a/tokio-io/src/lib.rs +++ b/tokio-io/src/lib.rs @@ -12,15 +12,6 @@ //! [found online]: https://tokio.rs/docs/ //! [low level details]: https://tokio.rs/docs/going-deeper-tokio/core-low-level/ -macro_rules! ready { - ($e:expr) => { - match $e { - ::std::task::Poll::Ready(t) => t, - ::std::task::Poll::Pending => return ::std::task::Poll::Pending, - } - }; -} - mod async_read; mod async_write; |