diff options
| author | Carl Lerche <me@carllerche.com> | 2019-10-29 15:11:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-29 15:11:31 -0700 |
| commit | 2b909d6805990abf0bc2a5dea9e7267ff87df704 (patch) | |
| tree | de255969c720c294af754b3840efabff3e6d69a0 /tokio/src/net/unix | |
| parent | c62ef2d232dea1535a8e22484fa2ca083f03e903 (diff) | |
sync: move into `tokio` crate (#1705)
A step towards collapsing Tokio sub crates into a single `tokio`
crate (#1318).
The sync implementation is now provided by the main `tokio` crate.
Functionality can be opted out of by using the various net related
feature flags.
Diffstat (limited to 'tokio/src/net/unix')
| -rw-r--r-- | tokio/src/net/unix/incoming.rs | 2 | ||||
| -rw-r--r-- | tokio/src/net/unix/listener.rs | 1 | ||||
| -rw-r--r-- | tokio/src/net/unix/mod.rs | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/tokio/src/net/unix/incoming.rs b/tokio/src/net/unix/incoming.rs index 542b5e1d..a66f21da 100644 --- a/tokio/src/net/unix/incoming.rs +++ b/tokio/src/net/unix/incoming.rs @@ -1,5 +1,3 @@ -#![cfg(feature = "async-traits")] - use super::{UnixListener, UnixStream}; use futures_core::ready; diff --git a/tokio/src/net/unix/listener.rs b/tokio/src/net/unix/listener.rs index 3a36dc90..3cf8eff3 100644 --- a/tokio/src/net/unix/listener.rs +++ b/tokio/src/net/unix/listener.rs @@ -90,7 +90,6 @@ impl UnixListener { /// /// This method returns an implementation of the `Stream` trait which /// resolves to the sockets the are accepted on this listener. - #[cfg(feature = "async-traits")] pub fn incoming(self) -> super::Incoming { super::Incoming::new(self) } diff --git a/tokio/src/net/unix/mod.rs b/tokio/src/net/unix/mod.rs index 4447ca5c..977e3a0f 100644 --- a/tokio/src/net/unix/mod.rs +++ b/tokio/src/net/unix/mod.rs @@ -6,7 +6,6 @@ mod datagram; pub use self::datagram::UnixDatagram; mod incoming; -#[cfg(feature = "async-traits")] pub use self::incoming::Incoming; mod listener; |