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/macros/cfg.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/macros/cfg.rs')
| -rw-r--r-- | tokio/src/macros/cfg.rs | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/tokio/src/macros/cfg.rs b/tokio/src/macros/cfg.rs index fedef7ad..27929119 100644 --- a/tokio/src/macros/cfg.rs +++ b/tokio/src/macros/cfg.rs @@ -6,7 +6,7 @@ macro_rules! cfg_block_on { $( #[cfg(any( feature = "fs", - feature = "dns", + feature = "net", feature = "io-std", feature = "rt", ))] @@ -32,16 +32,6 @@ macro_rules! cfg_atomic_waker_impl { } } -macro_rules! cfg_dns { - ($($item:item)*) => { - $( - #[cfg(feature = "dns")] - #[cfg_attr(docsrs, doc(cfg(feature = "dns")))] - $item - )* - } -} - macro_rules! cfg_fs { ($($item:item)*) => { $( @@ -338,7 +328,6 @@ macro_rules! cfg_coop { ($($item:item)*) => { $( #[cfg(any( - feature = "dns", feature = "fs", feature = "io-std", feature = "net", |