net: merge tcp, udp, uds features to net feature (#2943)

1 files changed, 26 insertions, 46 deletions

diff --git a/tokio/src/macros/cfg.rs b/tokio/src/macros/cfg.rs
index 83102da6..849fb42b 100644
--- a/tokio/src/macros/cfg.rs
+++ b/tokio/src/macros/cfg.rs
@@ -20,13 +20,11 @@ macro_rules! cfg_atomic_waker_impl {
     ($($item:item)*) => {
         $(
             #[cfg(any(
+                feature = "net",
                 feature = "process",
                 feature = "rt-util",
                 feature = "signal",
-                feature = "tcp",
                 feature = "time",
-                feature = "udp",
-                feature = "uds",
             ))]
             #[cfg(not(loom))]
             $item
@@ -64,18 +62,14 @@ macro_rules! cfg_io_driver {
     ($($item:item)*) => {
         $(
             #[cfg(any(
+                feature = "net",
                 feature = "process",
                 all(unix, feature = "signal"),
-                feature = "tcp",
-                feature = "udp",
-                feature = "uds",
             ))]
             #[cfg_attr(docsrs, doc(cfg(any(
+                feature = "net",
                 feature = "process",
                 all(unix, feature = "signal"),
-                feature = "tcp",
-                feature = "udp",
-                feature = "uds",
             ))))]
             $item
         )*
@@ -86,11 +80,9 @@ macro_rules! cfg_not_io_driver {
     ($($item:item)*) => {
         $(
             #[cfg(not(any(
+                feature = "net",
                 feature = "process",
                 all(unix, feature = "signal"),
-                feature = "tcp",
-                feature = "udp",
-                feature = "uds",
             )))]
             $item
         )*
@@ -100,7 +92,7 @@ macro_rules! cfg_not_io_driver {
 macro_rules! cfg_io_readiness {
     ($($item:item)*) => {
         $(
-            #[cfg(any(feature = "udp", feature = "uds", feature = "tcp"))]
+            #[cfg(feature = "net")]
             $item
         )*
     }
@@ -155,6 +147,26 @@ macro_rules! cfg_macros {
     }
 }
 
+macro_rules! cfg_net {
+    ($($item:item)*) => {
+        $(
+            #[cfg(feature = "net")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "net")))]
+            $item
+        )*
+    }
+}
+
+macro_rules! cfg_net_unix {
+    ($($item:item)*) => {
+        $(
+            #[cfg(all(unix, feature = "net"))]
+            #[cfg_attr(docsrs, doc(cfg(feature = "net")))]
+            $item
+        )*
+    }
+}
+
 macro_rules! cfg_process {
     ($($item:item)*) => {
         $(
@@ -300,16 +312,6 @@ macro_rules! cfg_not_rt_threaded {
     }
 }
 
-macro_rules! cfg_tcp {
-    ($($item:item)*) => {
-        $(
-            #[cfg(feature = "tcp")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "tcp")))]
-            $item
-        )*
-    }
-}
-
 macro_rules! cfg_test_util {
     ($($item:item)*) => {
         $(
@@ -342,26 +344,6 @@ macro_rules! cfg_not_time {
     }
 }
 
-macro_rules! cfg_udp {
-    ($($item:item)*) => {
-        $(
-            #[cfg(feature = "udp")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "udp")))]
-            $item
-        )*
-    }
-}
-
-macro_rules! cfg_uds {
-    ($($item:item)*) => {
-        $(
-            #[cfg(all(unix, feature = "uds"))]
-            #[cfg_attr(docsrs, doc(cfg(feature = "uds")))]
-            $item
-        )*
-    }
-}
-
 macro_rules! cfg_trace {
     ($($item:item)*) => {
         $(
@@ -388,16 +370,14 @@ macro_rules! cfg_coop {
                     feature = "dns",
                     feature = "fs",
                     feature = "io-std",
+                    feature = "net",
                     feature = "process",
                     feature = "rt-core",
                     feature = "rt-util",
                     feature = "signal",
                     feature = "sync",
                     feature = "stream",
-                    feature = "tcp",
                     feature = "time",
-                    feature = "udp",
-                    feature = "uds",
                     ))]
             $item
         )*