mirror of
https://github.com/tokio-rs/tokio.git
synced 2026-08-29 00:00:11 +02:00
Move stream items into tokio-stream (#3277)
This change removes all references to `Stream` from within the `tokio` crate and moves them into a new `tokio-stream` crate. Most types have had their `impl Stream` removed as well in-favor of their inherent methods. Closes #2870
This commit is contained in:
@@ -7,6 +7,10 @@ use tokio_test::assert_ok;
|
||||
use std::thread;
|
||||
use std::time::Duration;
|
||||
|
||||
mod support {
|
||||
pub(crate) mod mpsc_stream;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn basic_blocking() {
|
||||
// Run a few times
|
||||
@@ -165,7 +169,8 @@ fn coop_disabled_in_block_in_place() {
|
||||
.build()
|
||||
.unwrap();
|
||||
|
||||
let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
|
||||
let (tx, rx) = support::mpsc_stream::unbounded_channel_stream();
|
||||
|
||||
for i in 0..200 {
|
||||
tx.send(i).unwrap();
|
||||
}
|
||||
@@ -175,7 +180,7 @@ fn coop_disabled_in_block_in_place() {
|
||||
let jh = tokio::spawn(async move {
|
||||
tokio::task::block_in_place(move || {
|
||||
futures::executor::block_on(async move {
|
||||
use tokio::stream::StreamExt;
|
||||
use tokio_stream::StreamExt;
|
||||
assert_eq!(rx.fold(0, |n, _| n + 1).await, 200);
|
||||
})
|
||||
})
|
||||
@@ -195,7 +200,8 @@ fn coop_disabled_in_block_in_place_in_block_on() {
|
||||
thread::spawn(move || {
|
||||
let outer = tokio::runtime::Runtime::new().unwrap();
|
||||
|
||||
let (tx, rx) = tokio::sync::mpsc::unbounded_channel();
|
||||
let (tx, rx) = support::mpsc_stream::unbounded_channel_stream();
|
||||
|
||||
for i in 0..200 {
|
||||
tx.send(i).unwrap();
|
||||
}
|
||||
@@ -204,7 +210,7 @@ fn coop_disabled_in_block_in_place_in_block_on() {
|
||||
outer.block_on(async move {
|
||||
tokio::task::block_in_place(move || {
|
||||
futures::executor::block_on(async move {
|
||||
use tokio::stream::StreamExt;
|
||||
use tokio_stream::StreamExt;
|
||||
assert_eq!(rx.fold(0, |n, _| n + 1).await, 200);
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user