mirror of
https://github.com/tokio-rs/tokio.git
synced 2026-08-29 00:00:11 +02:00
Limit futures dependency to Stream via feature flag (#1774)
In an effort to reach API stability, the `tokio` crate is shedding its
_public_ dependencies on crates that are either a) do not provide a
stable (1.0+) release with longevity guarantees or b) match the `tokio`
release cadence. Of course, implementing `std` traits fits the
requirements.
The on exception, for now, is the `Stream` trait found in `futures_core`.
It is expected that this trait will not change much and be moved into `std.
Since Tokio is not yet going reaching 1.0, I feel that it is acceptable to maintain
a dependency on this trait given how foundational it is.
Since the `Stream` implementation is optional, types that are logically
streams provide `async fn next_*` functions to obtain the next value.
Avoiding the `next()` name prevents fn conflicts with `StreamExt::next()`.
Additionally, some misc cleanup is also done:
- `tokio::io::io` -> `tokio::io::util`.
- `delay` -> `delay_until`.
- `Timeout::new` -> `timeout(...)`.
- `signal::ctrl_c()` returns a future instead of a stream.
- `{tcp,unix}::Incoming` is removed (due to lack of `Stream` trait).
- `time::Throttle` is removed (due to lack of `Stream` trait).
- Fix: `mpsc::UnboundedSender::send(&self)` (no more conflict with `Sink` fns).
This commit is contained in:
Carl Lerche
+153
-188
@@ -4,41 +4,6 @@ use tokio::sync::watch;
|
||||
use tokio_test::task::spawn;
|
||||
use tokio_test::{assert_pending, assert_ready};
|
||||
|
||||
#[test]
|
||||
fn single_rx_recv_ref() {
|
||||
let (tx, mut rx) = watch::channel("one");
|
||||
|
||||
{
|
||||
let mut t = spawn(rx.recv_ref());
|
||||
let v = assert_ready!(t.poll()).unwrap();
|
||||
assert_eq!(*v, "one");
|
||||
}
|
||||
|
||||
{
|
||||
let mut t = spawn(rx.recv_ref());
|
||||
|
||||
assert_pending!(t.poll());
|
||||
|
||||
tx.broadcast("two").unwrap();
|
||||
|
||||
assert!(t.is_woken());
|
||||
|
||||
let v = assert_ready!(t.poll()).unwrap();
|
||||
assert_eq!(*v, "two");
|
||||
}
|
||||
|
||||
{
|
||||
let mut t = spawn(rx.recv_ref());
|
||||
|
||||
assert_pending!(t.poll());
|
||||
|
||||
drop(tx);
|
||||
|
||||
let res = assert_ready!(t.poll());
|
||||
assert!(res.is_none());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn single_rx_recv() {
|
||||
let (tx, mut rx) = watch::channel("one");
|
||||
@@ -74,9 +39,161 @@ fn single_rx_recv() {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn multi_rx() {
|
||||
let (tx, mut rx1) = watch::channel("one");
|
||||
let mut rx2 = rx1.clone();
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx1.recv());
|
||||
let mut t2 = spawn(rx2.recv());
|
||||
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert_eq!(res.unwrap(), "one");
|
||||
|
||||
let res = assert_ready!(t2.poll());
|
||||
assert_eq!(res.unwrap(), "one");
|
||||
}
|
||||
|
||||
let mut t2 = spawn(rx2.recv());
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx1.recv());
|
||||
|
||||
assert_pending!(t1.poll());
|
||||
assert_pending!(t2.poll());
|
||||
|
||||
tx.broadcast("two").unwrap();
|
||||
|
||||
assert!(t1.is_woken());
|
||||
assert!(t2.is_woken());
|
||||
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert_eq!(res.unwrap(), "two");
|
||||
}
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx1.recv());
|
||||
|
||||
assert_pending!(t1.poll());
|
||||
|
||||
tx.broadcast("three").unwrap();
|
||||
|
||||
assert!(t1.is_woken());
|
||||
assert!(t2.is_woken());
|
||||
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert_eq!(res.unwrap(), "three");
|
||||
|
||||
let res = assert_ready!(t2.poll());
|
||||
assert_eq!(res.unwrap(), "three");
|
||||
}
|
||||
|
||||
drop(t2);
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx1.recv());
|
||||
let mut t2 = spawn(rx2.recv());
|
||||
|
||||
assert_pending!(t1.poll());
|
||||
assert_pending!(t2.poll());
|
||||
|
||||
tx.broadcast("four").unwrap();
|
||||
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert_eq!(res.unwrap(), "four");
|
||||
drop(t1);
|
||||
|
||||
let mut t1 = spawn(rx1.recv());
|
||||
assert_pending!(t1.poll());
|
||||
|
||||
drop(tx);
|
||||
|
||||
assert!(t1.is_woken());
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert!(res.is_none());
|
||||
|
||||
let res = assert_ready!(t2.poll());
|
||||
assert_eq!(res.unwrap(), "four");
|
||||
|
||||
drop(t2);
|
||||
let mut t2 = spawn(rx2.recv());
|
||||
let res = assert_ready!(t2.poll());
|
||||
assert!(res.is_none());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rx_observes_final_value() {
|
||||
// Initial value
|
||||
|
||||
let (tx, mut rx) = watch::channel("one");
|
||||
drop(tx);
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx.recv());
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert_eq!(res.unwrap(), "one");
|
||||
}
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx.recv());
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert!(res.is_none());
|
||||
}
|
||||
|
||||
// Sending a value
|
||||
|
||||
let (tx, mut rx) = watch::channel("one");
|
||||
|
||||
tx.broadcast("two").unwrap();
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx.recv());
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert_eq!(res.unwrap(), "two");
|
||||
}
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx.recv());
|
||||
assert_pending!(t1.poll());
|
||||
|
||||
tx.broadcast("three").unwrap();
|
||||
drop(tx);
|
||||
|
||||
assert!(t1.is_woken());
|
||||
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert_eq!(res.unwrap(), "three");
|
||||
}
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx.recv());
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert!(res.is_none());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn poll_close() {
|
||||
let (mut tx, rx) = watch::channel("one");
|
||||
|
||||
{
|
||||
let mut t = spawn(tx.closed());
|
||||
assert_pending!(t.poll());
|
||||
|
||||
drop(rx);
|
||||
|
||||
assert!(t.is_woken());
|
||||
assert_ready!(t.poll());
|
||||
}
|
||||
|
||||
assert!(tx.broadcast("two").is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn stream_impl() {
|
||||
use tokio::prelude::*;
|
||||
use futures::StreamExt;
|
||||
|
||||
let (tx, mut rx) = watch::channel("one");
|
||||
|
||||
@@ -110,155 +227,3 @@ fn stream_impl() {
|
||||
assert!(res.is_none());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn multi_rx() {
|
||||
let (tx, mut rx1) = watch::channel("one");
|
||||
let mut rx2 = rx1.clone();
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx1.recv_ref());
|
||||
let mut t2 = spawn(rx2.recv_ref());
|
||||
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert_eq!(*res.unwrap(), "one");
|
||||
|
||||
let res = assert_ready!(t2.poll());
|
||||
assert_eq!(*res.unwrap(), "one");
|
||||
}
|
||||
|
||||
let mut t2 = spawn(rx2.recv_ref());
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx1.recv_ref());
|
||||
|
||||
assert_pending!(t1.poll());
|
||||
assert_pending!(t2.poll());
|
||||
|
||||
tx.broadcast("two").unwrap();
|
||||
|
||||
assert!(t1.is_woken());
|
||||
assert!(t2.is_woken());
|
||||
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert_eq!(*res.unwrap(), "two");
|
||||
}
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx1.recv_ref());
|
||||
|
||||
assert_pending!(t1.poll());
|
||||
|
||||
tx.broadcast("three").unwrap();
|
||||
|
||||
assert!(t1.is_woken());
|
||||
assert!(t2.is_woken());
|
||||
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert_eq!(*res.unwrap(), "three");
|
||||
|
||||
let res = assert_ready!(t2.poll());
|
||||
assert_eq!(*res.unwrap(), "three");
|
||||
}
|
||||
|
||||
drop(t2);
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx1.recv_ref());
|
||||
let mut t2 = spawn(rx2.recv_ref());
|
||||
|
||||
assert_pending!(t1.poll());
|
||||
assert_pending!(t2.poll());
|
||||
|
||||
tx.broadcast("four").unwrap();
|
||||
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert_eq!(*res.unwrap(), "four");
|
||||
drop(t1);
|
||||
|
||||
let mut t1 = spawn(rx1.recv_ref());
|
||||
assert_pending!(t1.poll());
|
||||
|
||||
drop(tx);
|
||||
|
||||
assert!(t1.is_woken());
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert!(res.is_none());
|
||||
|
||||
let res = assert_ready!(t2.poll());
|
||||
assert_eq!(*res.unwrap(), "four");
|
||||
|
||||
drop(t2);
|
||||
let mut t2 = spawn(rx2.recv_ref());
|
||||
let res = assert_ready!(t2.poll());
|
||||
assert!(res.is_none());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rx_observes_final_value() {
|
||||
// Initial value
|
||||
|
||||
let (tx, mut rx) = watch::channel("one");
|
||||
drop(tx);
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx.recv_ref());
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert_eq!(*res.unwrap(), "one");
|
||||
}
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx.recv_ref());
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert!(res.is_none());
|
||||
}
|
||||
|
||||
// Sending a value
|
||||
|
||||
let (tx, mut rx) = watch::channel("one");
|
||||
|
||||
tx.broadcast("two").unwrap();
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx.recv_ref());
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert_eq!(*res.unwrap(), "two");
|
||||
}
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx.recv_ref());
|
||||
assert_pending!(t1.poll());
|
||||
|
||||
tx.broadcast("three").unwrap();
|
||||
drop(tx);
|
||||
|
||||
assert!(t1.is_woken());
|
||||
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert_eq!(*res.unwrap(), "three");
|
||||
}
|
||||
|
||||
{
|
||||
let mut t1 = spawn(rx.recv_ref());
|
||||
let res = assert_ready!(t1.poll());
|
||||
assert!(res.is_none());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn poll_close() {
|
||||
let (mut tx, rx) = watch::channel("one");
|
||||
|
||||
{
|
||||
let mut t = spawn(tx.closed());
|
||||
assert_pending!(t.poll());
|
||||
|
||||
drop(rx);
|
||||
|
||||
assert!(t.is_woken());
|
||||
assert_ready!(t.poll());
|
||||
}
|
||||
|
||||
assert!(tx.broadcast("two").is_err());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user