diff options
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | tokio-buf/Cargo.toml | 5 | ||||
-rw-r--r-- | tokio-buf/src/lib.rs | 20 | ||||
-rw-r--r-- | tokio-buf/tests/buf_stream.rs | 9 | ||||
-rw-r--r-- | tokio-buf/tests/chain.rs | 1 | ||||
-rw-r--r-- | tokio-buf/tests/collect.rs | 1 | ||||
-rw-r--r-- | tokio-buf/tests/iter.rs | 1 | ||||
-rw-r--r-- | tokio-buf/tests/limit.rs | 1 | ||||
-rw-r--r-- | tokio-buf/tests/stream.rs | 1 | ||||
-rw-r--r-- | tokio-buf/tests/string.rs | 1 | ||||
-rw-r--r-- | tokio-buf/tests/support.rs | 1 |
11 files changed, 26 insertions, 17 deletions
@@ -2,7 +2,7 @@ members = [ "tokio", - # "tokio-buf", + "tokio-buf", "tokio-codec", "tokio-current-thread", "tokio-executor", diff --git a/tokio-buf/Cargo.toml b/tokio-buf/Cargo.toml index f9f069ab..73edc7ae 100644 --- a/tokio-buf/Cargo.toml +++ b/tokio-buf/Cargo.toml @@ -24,11 +24,10 @@ publish = false [dependencies] bytes = "0.4.10" either = { version = "1.5", optional = true} -futures = "0.1.23" [features] -default = ["util"] -util = ["bytes/either", "either"] +# default = ["util"] +# util = ["bytes/either", "either"] [dev-dependencies] tokio-mock-task = "0.1.1" diff --git a/tokio-buf/src/lib.rs b/tokio-buf/src/lib.rs index 823bad49..fd24f6b9 100644 --- a/tokio-buf/src/lib.rs +++ b/tokio-buf/src/lib.rs @@ -15,20 +15,20 @@ //! instead of yielding arbitrary values, it only yields types that implement //! `Buf` (i.e, byte collections). -mod never; +// mod never; mod size_hint; -mod str; -mod u8; -#[cfg(feature = "util")] -pub mod util; +// mod str; +// mod u8; +// #[cfg(feature = "util")] +// pub mod util; pub use self::size_hint::SizeHint; -#[doc(inline)] -#[cfg(feature = "util")] -pub use crate::util::BufStreamExt; +// #[doc(inline)] +// #[cfg(feature = "util")] +// pub use crate::util::BufStreamExt; use bytes::Buf; -use futures::Poll; +use std::task::{Context, Poll}; /// An asynchronous stream of bytes. /// @@ -68,7 +68,7 @@ pub trait BufStream { /// /// Once a stream is finished, i.e. `Ready(None)` has been returned, further /// calls to `poll_buf` may result in a panic or other "bad behavior". - fn poll_buf(&mut self) -> Poll<Option<Self::Item>, Self::Error>; + fn poll_buf(&mut self, cx: &mut Context<'_>) -> Poll<Option<Result<Self::Item, Self::Error>>>; /// Returns the bounds on the remaining length of the stream. /// diff --git a/tokio-buf/tests/buf_stream.rs b/tokio-buf/tests/buf_stream.rs index a31826f0..9f3679b2 100644 --- a/tokio-buf/tests/buf_stream.rs +++ b/tokio-buf/tests/buf_stream.rs @@ -1,5 +1,8 @@ use tokio_buf::BufStream; -// Ensures that `BufStream` can be a trait object -#[allow(dead_code)] -fn obj(_: &mut dyn BufStream<Item = u32, Error = ()>) {} +#[test] +fn object_safe() { + // Ensures that `BufStream` can be a trait object + #[allow(dead_code)] + fn obj(_: &mut dyn BufStream<Item = u32, Error = ()>) {} +} diff --git a/tokio-buf/tests/chain.rs b/tokio-buf/tests/chain.rs index 798dd96c..153061b0 100644 --- a/tokio-buf/tests/chain.rs +++ b/tokio-buf/tests/chain.rs @@ -1,3 +1,4 @@ +#![cfg(feature = "broken")] #![cfg(feature = "util")] use futures::Async::*; diff --git a/tokio-buf/tests/collect.rs b/tokio-buf/tests/collect.rs index f9bb401c..c57bfde2 100644 --- a/tokio-buf/tests/collect.rs +++ b/tokio-buf/tests/collect.rs @@ -1,3 +1,4 @@ +#![cfg(feature = "broken")] #![cfg(feature = "util")] use bytes::Bytes; diff --git a/tokio-buf/tests/iter.rs b/tokio-buf/tests/iter.rs index 464ff461..d237a71b 100644 --- a/tokio-buf/tests/iter.rs +++ b/tokio-buf/tests/iter.rs @@ -1,3 +1,4 @@ +#![cfg(feature = "broken")] use futures::Async::*; use std::io::Cursor; use tokio_buf::{util, BufStream}; diff --git a/tokio-buf/tests/limit.rs b/tokio-buf/tests/limit.rs index d08a9083..2bce76b6 100644 --- a/tokio-buf/tests/limit.rs +++ b/tokio-buf/tests/limit.rs @@ -1,3 +1,4 @@ +#![cfg(feature = "broken")] #![cfg(feature = "util")] use futures::Async::*; diff --git a/tokio-buf/tests/stream.rs b/tokio-buf/tests/stream.rs index c7a394fc..06f2ee27 100644 --- a/tokio-buf/tests/stream.rs +++ b/tokio-buf/tests/stream.rs @@ -1,3 +1,4 @@ +#![cfg(feature = "broken")] use futures::sync::mpsc; use futures::Async::*; use std::io::Cursor; diff --git a/tokio-buf/tests/string.rs b/tokio-buf/tests/string.rs index 754a4a7e..995f6fe8 100644 --- a/tokio-buf/tests/string.rs +++ b/tokio-buf/tests/string.rs @@ -1,3 +1,4 @@ +#![cfg(feature = "broken")] use futures::Async::*; use std::fmt; use tokio_buf::BufStream; diff --git a/tokio-buf/tests/support.rs b/tokio-buf/tests/support.rs index a5e0f0b7..9a79489f 100644 --- a/tokio-buf/tests/support.rs +++ b/tokio-buf/tests/support.rs @@ -1,3 +1,4 @@ +#![cfg(feature = "broken")] #![allow(unused)] use bytes::Buf; |