diff options
author | Carl Lerche <me@carllerche.com> | 2019-11-15 22:11:13 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-15 22:11:13 -0800 |
commit | 8a7e57786a5dca139f5b4261685e22991ded0859 (patch) | |
tree | b69d1c48f8a760a58fc7ccfe0376d9812a88d303 /tokio/src/net/tcp/listener.rs | |
parent | 930679587ae42e4df3113159ccf33fb5923dd73a (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).
Diffstat (limited to 'tokio/src/net/tcp/listener.rs')
-rw-r--r-- | tokio/src/net/tcp/listener.rs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tokio/src/net/tcp/listener.rs b/tokio/src/net/tcp/listener.rs index b4bf4fcb..c0e7f1b3 100644 --- a/tokio/src/net/tcp/listener.rs +++ b/tokio/src/net/tcp/listener.rs @@ -1,9 +1,8 @@ +use crate::future::poll_fn; use crate::net::tcp::{Incoming, TcpStream}; use crate::net::util::PollEvented; use crate::net::ToSocketAddrs; -use futures_core::ready; -use futures_util::future::poll_fn; use std::convert::TryFrom; use std::fmt; use std::io; @@ -12,9 +11,6 @@ use std::task::{Context, Poll}; /// An I/O object representing a TCP socket listening for incoming connections. /// -/// This object can be converted into a stream of incoming connections for -/// various forms of processing. -/// /// # Examples /// /// ```no_run @@ -126,7 +122,8 @@ impl TcpListener { poll_fn(|cx| self.poll_accept(cx)).await } - pub(crate) fn poll_accept( + #[doc(hidden)] // TODO: document + pub fn poll_accept( &mut self, cx: &mut Context<'_>, ) -> Poll<io::Result<(TcpStream, SocketAddr)>> { @@ -242,7 +239,7 @@ impl TcpListener { /// necessarily fatal ‒ for example having too many open file descriptors or the other side /// closing the connection while it waits in an accept queue. These would terminate the stream /// if not handled in any way. - pub fn incoming(self) -> Incoming { + pub fn incoming(&mut self) -> Incoming<'_> { Incoming::new(self) } |