summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlice Ryhl <alice@ryhl.io>2020-10-05 19:33:15 +0200
committerGitHub <noreply@github.com>2020-10-05 10:33:15 -0700
commitaa171f2aa9593f64e78bde2c679a4c9bd9d9d163 (patch)
tree09998d736e1d352a65bf94012e6c93c7be481226
parentc23c1ecbcbd7ff8e1ee137f691eddad31aa39331 (diff)
stream: remove bytes from public API (#2908)
-rw-r--r--tokio/src/stream/collect.rs39
-rw-r--r--tokio/tests/stream_collect.rs35
2 files changed, 0 insertions, 74 deletions
diff --git a/tokio/src/stream/collect.rs b/tokio/src/stream/collect.rs
index 3f91a6f2..1aafc303 100644
--- a/tokio/src/stream/collect.rs
+++ b/tokio/src/stream/collect.rs
@@ -1,6 +1,5 @@
use crate::stream::Stream;
-use bytes::{Buf, BufMut, Bytes, BytesMut};
use core::future::Future;
use core::marker::PhantomPinned;
use core::mem;
@@ -205,44 +204,6 @@ where
}
}
-impl<T: Buf> FromStream<T> for Bytes {}
-
-impl<T: Buf> sealed::FromStreamPriv<T> for Bytes {
- type InternalCollection = BytesMut;
-
- fn initialize(_: sealed::Internal, _lower: usize, _upper: Option<usize>) -> BytesMut {
- BytesMut::new()
- }
-
- fn extend(_: sealed::Internal, collection: &mut BytesMut, item: T) -> bool {
- collection.put(item);
- true
- }
-
- fn finalize(_: sealed::Internal, collection: &mut BytesMut) -> Bytes {
- mem::replace(collection, BytesMut::new()).freeze()
- }
-}
-
-impl<T: Buf> FromStream<T> for BytesMut {}
-
-impl<T: Buf> sealed::FromStreamPriv<T> for BytesMut {
- type InternalCollection = BytesMut;
-
- fn initialize(_: sealed::Internal, _lower: usize, _upper: Option<usize>) -> BytesMut {
- BytesMut::new()
- }
-
- fn extend(_: sealed::Internal, collection: &mut BytesMut, item: T) -> bool {
- collection.put(item);
- true
- }
-
- fn finalize(_: sealed::Internal, collection: &mut BytesMut) -> BytesMut {
- mem::replace(collection, BytesMut::new())
- }
-}
-
pub(crate) mod sealed {
#[doc(hidden)]
pub trait FromStreamPriv<T> {
diff --git a/tokio/tests/stream_collect.rs b/tokio/tests/stream_collect.rs
index 70051e7f..7ab1a34e 100644
--- a/tokio/tests/stream_collect.rs
+++ b/tokio/tests/stream_collect.rs
@@ -2,8 +2,6 @@ use tokio::stream::{self, StreamExt};
use tokio::sync::mpsc;
use tokio_test::{assert_pending, assert_ready, assert_ready_err, assert_ready_ok, task};
-use bytes::{Bytes, BytesMut};
-
#[allow(clippy::let_unit_value)]
#[tokio::test]
async fn empty_unit() {
@@ -26,18 +24,6 @@ async fn empty_box_slice() {
}
#[tokio::test]
-async fn empty_bytes() {
- let coll: Bytes = stream::empty::<&[u8]>().collect().await;
- assert!(coll.is_empty());
-}
-
-#[tokio::test]
-async fn empty_bytes_mut() {
- let coll: BytesMut = stream::empty::<&[u8]>().collect().await;
- assert!(coll.is_empty());
-}
-
-#[tokio::test]
async fn empty_string() {
let coll: String = stream::empty::<&str>().collect().await;
assert!(coll.is_empty());
@@ -113,27 +99,6 @@ async fn collect_str_items() {
}
#[tokio::test]
-async fn collect_bytes() {
- let (tx, rx) = mpsc::unbounded_channel();
- let mut fut = task::spawn(rx.collect::<Bytes>());
-
- assert_pending!(fut.poll());
-
- tx.send(&b"hello "[..]).unwrap();
- assert!(fut.is_woken());
- assert_pending!(fut.poll());
-
- tx.send(&b"world"[..]).unwrap();
- assert!(fut.is_woken());
- assert_pending!(fut.poll());
-
- drop(tx);
- assert!(fut.is_woken());
- let coll = assert_ready!(fut.poll());
- assert_eq!(&b"hello world"[..], coll);
-}
-
-#[tokio::test]
async fn collect_results_ok() {
let (tx, rx) = mpsc::unbounded_channel();
let mut fut = task::spawn(rx.collect::<Result<String, &str>>());