summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Lerche <me@carllerche.com>2019-11-15 22:11:13 -0800
committerGitHub <noreply@github.com>2019-11-15 22:11:13 -0800
commit8a7e57786a5dca139f5b4261685e22991ded0859 (patch)
treeb69d1c48f8a760a58fc7ccfe0376d9812a88d303
parent930679587ae42e4df3113159ccf33fb5923dd73a (diff)
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).
-rw-r--r--examples/chat.rs16
-rw-r--r--examples/connect.rs10
-rw-r--r--examples/print_each_packet.rs2
-rw-r--r--examples/proxy.rs6
-rw-r--r--examples/udp-codec.rs5
-rw-r--r--tests-integration/tests/process_stdio.rs5
-rw-r--r--tokio-test/src/io.rs8
-rw-r--r--tokio-test/tests/block_on.rs4
-rw-r--r--tokio-tls/tests/smoke.rs6
-rw-r--r--tokio-util/Cargo.toml2
-rw-r--r--tokio-util/src/codec/length_delimited.rs1
-rw-r--r--tokio-util/tests/framed.rs1
-rw-r--r--tokio-util/tests/framed_read.rs3
-rw-r--r--tokio-util/tests/length_delimited.rs3
-rw-r--r--tokio-util/tests/udp.rs8
-rw-r--r--tokio/Cargo.toml10
-rw-r--r--tokio/src/fs/blocking.rs1
-rw-r--r--tokio/src/fs/file.rs3
-rw-r--r--tokio/src/fs/read_dir.rs50
-rw-r--r--tokio/src/future.rs69
-rw-r--r--tokio/src/future/maybe_done.rs76
-rw-r--r--tokio/src/future/mod.rs15
-rw-r--r--tokio/src/future/pending.rs44
-rw-r--r--tokio/src/future/poll_fn.rs38
-rw-r--r--tokio/src/future/ready.rs27
-rw-r--r--tokio/src/future/try_join.rs115
-rw-r--r--tokio/src/io/async_read.rs1
-rw-r--r--tokio/src/io/async_write.rs1
-rw-r--r--tokio/src/io/io/lines.rs70
-rw-r--r--tokio/src/io/io/split.rs67
-rw-r--r--tokio/src/io/mod.rs15
-rw-r--r--tokio/src/io/split.rs1
-rw-r--r--tokio/src/io/util/async_buf_read_ext.rs (renamed from tokio/src/io/io/async_buf_read_ext.rs)28
-rw-r--r--tokio/src/io/util/async_read_ext.rs (renamed from tokio/src/io/io/async_read_ext.rs)14
-rw-r--r--tokio/src/io/util/async_write_ext.rs (renamed from tokio/src/io/io/async_write_ext.rs)8
-rw-r--r--tokio/src/io/util/buf_reader.rs (renamed from tokio/src/io/io/buf_reader.rs)3
-rw-r--r--tokio/src/io/util/buf_stream.rs (renamed from tokio/src/io/io/buf_stream.rs)2
-rw-r--r--tokio/src/io/util/buf_writer.rs (renamed from tokio/src/io/io/buf_writer.rs)3
-rw-r--r--tokio/src/io/util/chain.rs (renamed from tokio/src/io/io/chain.rs)1
-rw-r--r--tokio/src/io/util/copy.rs (renamed from tokio/src/io/io/copy.rs)1
-rw-r--r--tokio/src/io/util/empty.rs (renamed from tokio/src/io/io/empty.rs)0
-rw-r--r--tokio/src/io/util/flush.rs (renamed from tokio/src/io/io/flush.rs)0
-rw-r--r--tokio/src/io/util/lines.rs113
-rw-r--r--tokio/src/io/util/mod.rs (renamed from tokio/src/io/io/mod.rs)66
-rw-r--r--tokio/src/io/util/read.rs (renamed from tokio/src/io/io/read.rs)0
-rw-r--r--tokio/src/io/util/read_exact.rs (renamed from tokio/src/io/io/read_exact.rs)1
-rw-r--r--tokio/src/io/util/read_line.rs (renamed from tokio/src/io/io/read_line.rs)3
-rw-r--r--tokio/src/io/util/read_to_end.rs (renamed from tokio/src/io/io/read_to_end.rs)1
-rw-r--r--tokio/src/io/util/read_to_string.rs (renamed from tokio/src/io/io/read_to_string.rs)3
-rw-r--r--tokio/src/io/util/read_until.rs (renamed from tokio/src/io/io/read_until.rs)1
-rw-r--r--tokio/src/io/util/repeat.rs (renamed from tokio/src/io/io/repeat.rs)0
-rw-r--r--tokio/src/io/util/shutdown.rs (renamed from tokio/src/io/io/shutdown.rs)0
-rw-r--r--tokio/src/io/util/sink.rs (renamed from tokio/src/io/io/sink.rs)0
-rw-r--r--tokio/src/io/util/split.rs111
-rw-r--r--tokio/src/io/util/take.rs (renamed from tokio/src/io/io/take.rs)1
-rw-r--r--tokio/src/io/util/write.rs (renamed from tokio/src/io/io/write.rs)0
-rw-r--r--tokio/src/io/util/write_all.rs (renamed from tokio/src/io/io/write_all.rs)1
-rw-r--r--tokio/src/lib.rs13
-rw-r--r--tokio/src/net/addr.rs9
-rw-r--r--tokio/src/net/tcp/incoming.rs25
-rw-r--r--tokio/src/net/tcp/listener.rs11
-rw-r--r--tokio/src/net/tcp/mod.rs8
-rw-r--r--tokio/src/net/tcp/stream.rs3
-rw-r--r--tokio/src/net/udp/socket.rs3
-rw-r--r--tokio/src/net/udp/split.rs4
-rw-r--r--tokio/src/net/unix/datagram.rs3
-rw-r--r--tokio/src/net/unix/incoming.rs26
-rw-r--r--tokio/src/net/unix/listener.rs9
-rw-r--r--tokio/src/net/unix/stream.rs3
-rw-r--r--tokio/src/net/util/poll_evented.rs3
-rw-r--r--tokio/src/prelude.rs15
-rw-r--r--tokio/src/process/mod.rs32
-rw-r--r--tokio/src/process/unix/mod.rs30
-rw-r--r--tokio/src/process/unix/reap.rs38
-rw-r--r--tokio/src/process/windows.rs8
-rw-r--r--tokio/src/runtime/mod.rs8
-rw-r--r--tokio/src/runtime/thread_pool/tests/pool.rs2
-rw-r--r--tokio/src/runtime/thread_pool/tests/queue.rs2
-rw-r--r--tokio/src/signal/ctrl_c.rs61
-rw-r--r--tokio/src/signal/mod.rs56
-rw-r--r--tokio/src/signal/registry.rs31
-rw-r--r--tokio/src/signal/unix.rs32
-rw-r--r--tokio/src/signal/windows.rs63
-rw-r--r--tokio/src/stream.rs78
-rw-r--r--tokio/src/sync/barrier.rs3
-rw-r--r--tokio/src/sync/mpsc/bounded.rs144
-rw-r--r--tokio/src/sync/mpsc/chan.rs98
-rw-r--r--tokio/src/sync/mpsc/error.rs86
-rw-r--r--tokio/src/sync/mpsc/mod.rs7
-rw-r--r--tokio/src/sync/mpsc/unbounded.rs102
-rw-r--r--tokio/src/sync/mutex.rs2
-rw-r--r--tokio/src/sync/oneshot.rs3
-rw-r--r--tokio/src/sync/tests/loom_atomic_waker.rs2
-rw-r--r--tokio/src/sync/tests/loom_mpsc.rs2
-rw-r--r--tokio/src/sync/tests/loom_oneshot.rs2
-rw-r--r--tokio/src/sync/tests/loom_semaphore.rs3
-rw-r--r--tokio/src/sync/watch.rs110
-rw-r--r--tokio/src/task/tests/loom.rs6
-rw-r--r--tokio/src/task/tests/task.rs2
-rw-r--r--tokio/src/time/clock.rs4
-rw-r--r--tokio/src/time/delay.rs54
-rw-r--r--tokio/src/time/delay_queue.rs23
-rw-r--r--tokio/src/time/driver/registration.rs8
-rw-r--r--tokio/src/time/interval.rs150
-rw-r--r--tokio/src/time/mod.rs32
-rw-r--r--tokio/src/time/tests/test_delay.rs52
-rw-r--r--tokio/src/time/tests/test_queue.rs2
-rw-r--r--tokio/src/time/throttle.rs17
-rw-r--r--tokio/src/time/timeout.rs195
-rw-r--r--tokio/tests/fs_dir.rs51
-rw-r--r--tokio/tests/fs_file_mocked.rs11
-rw-r--r--tokio/tests/io_lines.rs18
-rw-r--r--tokio/tests/net_driver.rs2
-rw-r--r--tokio/tests/process_issue_42.rs4
-rw-r--r--tokio/tests/rt_common.rs6
-rw-r--r--tokio/tests/signal_ctrl_c.rs7
-rw-r--r--tokio/tests/signal_drop_recv.rs5
-rw-r--r--tokio/tests/signal_drop_rt.rs5
-rw-r--r--tokio/tests/signal_drop_signal.rs5
-rw-r--r--tokio/tests/signal_multi_rt.rs5
-rw-r--r--tokio/tests/signal_notify_both.rs11
-rw-r--r--tokio/tests/signal_twice.rs6
-rw-r--r--tokio/tests/signal_usr1.rs5
-rw-r--r--tokio/tests/sync_errors.rs5
-rw-r--r--tokio/tests/sync_mpsc.rs113
-rw-r--r--tokio/tests/sync_watch.rs157
-rw-r--r--tokio/tests/time_interval.rs46
-rw-r--r--tokio/tests/time_rt.rs11
-rw-r--r--tokio/tests/time_throttle.rs68
-rw-r--r--tokio/tests/time_timeout.rs71
130 files changed, 1655 insertions, 1686 deletions
diff --git a/examples/chat.rs b/examples/chat.rs
index e0213afd..2553cc5e 100644
--- a/examples/chat.rs
+++ b/examples/chat.rs
@@ -116,18 +116,12 @@ impl Shared {
/// Send a `LineCodec` encoded message to every peer, except
/// for the sender.
- async fn broadcast(
- &mut self,
- sender: SocketAddr,
- message: &str,
- ) -> Result<(), mpsc::error::UnboundedSendError> {
+ async fn broadcast(&mut self, sender: SocketAddr, message: &str) {
for peer in self.peers.iter_mut() {
if *peer.0 != sender {
- peer.1.send(message.into()).await?;
+ let _ = peer.1.send(message.into());
}
}
-
- Ok(())
}
}
@@ -218,7 +212,7 @@ async fn process(
let mut state = state.lock().await;
let msg = format!("{} has joined the chat", username);
println!("{}", msg);
- state.broadcast(addr, &msg).await?;
+ state.broadcast(addr, &msg).await;
}
// Process incoming messages until our stream is exhausted by a disconnect.
@@ -230,7 +224,7 @@ async fn process(
let mut state = state.lock().await;
let msg = format!("{}: {}", username, msg);
- state.broadcast(addr, &msg).await?;
+ state.broadcast(addr, &msg).await;
}
// A message was received from a peer. Send it to the
// current user.
@@ -254,7 +248,7 @@ async fn process(
let msg = format!("{} has left the chat", username);
println!("{}", msg);
- state.broadcast(addr, &msg).await?;
+ state.broadcast(addr, &msg).await;
}
Ok(())
diff --git a/examples/connect.rs b/examples/connect.rs
index 38d81229..cb003d9d 100644
--- a/examples/connect.rs
+++ b/examples/connect.rs
@@ -20,7 +20,7 @@ use tokio::io;
use tokio::sync::{mpsc, oneshot};
use tokio_util::codec::{FramedRead, FramedWrite};
-use futures::{SinkExt, Stream, StreamExt};
+use futures::{Stream, StreamExt};
use std::env;
use std::error::Error;
use std::net::SocketAddr;
@@ -69,12 +69,14 @@ async fn run() -> Result<(), Box<dyn Error>> {
// Temporary work around for stdin blocking the stream
fn stdin() -> impl Stream<Item = Result<Vec<u8>, io::Error>> + Unpin {