diff options
| author | Carl Lerche <me@carllerche.com> | 2020-10-12 16:06:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 16:06:02 -0700 |
| commit | 19233508806ddf22a14acf944426e0da8a401df8 (patch) | |
| tree | 5a204c0958ecc30f6ef05a464fb5446b398a7e46 /tokio/src/net/mod.rs | |
| parent | c90681bd8e629b5fde988b9f5be7b915e5cf8ae5 (diff) | |
meta: combine `net` and `dns`, use `parking_lot` (#2951)
This combines the `dns` and `net` feature flags. Previously, `dns` was
included as part of `net`. Given that is is rare that one would want
`dns` without `net`, DNS is now entirely gated w/ `net`.
The `parking_lot` feature is included as part of `full`.
Some misc docs are tweaked to reflect feature flag changes.
Diffstat (limited to 'tokio/src/net/mod.rs')
| -rw-r--r-- | tokio/src/net/mod.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tokio/src/net/mod.rs b/tokio/src/net/mod.rs index f355356f..b7365e6d 100644 --- a/tokio/src/net/mod.rs +++ b/tokio/src/net/mod.rs @@ -27,12 +27,10 @@ mod addr; pub(crate) use addr::to_socket_addrs; pub use addr::ToSocketAddrs; -cfg_dns! { +cfg_net! { mod lookup_host; pub use lookup_host::lookup_host; -} -cfg_net! { pub mod tcp; pub use tcp::listener::TcpListener; pub use tcp::socket::TcpSocket; |