From db57316e14a663c2da9af66cd831b3df767efeb3 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Sun, 29 Aug 2021 20:36:06 +0200
Subject: [PATCH] refactor(lib): Clean up cfg usage

---
 src/common/mod.rs    | 7 +------
 src/lib.rs           | 4 ++--
 src/server/mod.rs    | 8 ++------
 src/server/server.rs | 6 ++----
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/common/mod.rs b/src/common/mod.rs
index 050c61d1..c017154a 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -25,12 +25,7 @@ pub(crate) mod watch;
 
 #[cfg(all(feature = "client", any(feature = "http1", feature = "http2")))]
 pub(crate) use self::lazy::{lazy, Started as Lazy};
-#[cfg(any(
-    feature = "client",
-    feature = "http1",
-    feature = "http2",
-    feature = "runtime"
-))]
+#[cfg(any(feature = "http1", feature = "http2", feature = "runtime"))]
 pub(crate) use self::never::Never;
 pub(crate) use self::task::Poll;
 
diff --git a/src/lib.rs b/src/lib.rs
index 3c072723..a85a2769 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -93,7 +93,7 @@ cfg_proto! {
 }
 
 cfg_feature! {
-    #![all(feature = "client")]
+    #![feature = "client"]
 
     pub mod client;
     #[cfg(any(feature = "http1", feature = "http2"))]
@@ -102,7 +102,7 @@ cfg_feature! {
 }
 
 cfg_feature! {
-    #![all(feature = "server")]
+    #![feature = "server"]
 
     pub mod server;
     #[cfg(any(feature = "http1", feature = "http2"))]
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 690c8127..6f691f61 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -157,10 +157,6 @@ cfg_feature! {
     pub mod conn;
     mod server;
     mod shutdown;
-
-    cfg_feature! {
-        #![feature = "tcp"]
-
-        mod tcp;
-    }
+    #[cfg(feature = "tcp")]
+    mod tcp;
 }
diff --git a/src/server/server.rs b/src/server/server.rs
index bdd51780..810ac712 100644
--- a/src/server/server.rs
+++ b/src/server/server.rs
@@ -353,8 +353,7 @@ impl<I, E> Builder<I, E> {
     /// # Cargo Feature
     ///
     /// Requires the `runtime` cargo feature to be enabled.
-    #[cfg(feature = "runtime")]
-    #[cfg(feature = "http2")]
+    #[cfg(all(feature = "runtime", feature = "http2"))]
     #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_keep_alive_interval(mut self, interval: impl Into<Option<Duration>>) -> Self {
         self.protocol.http2_keep_alive_interval(interval);
@@ -371,8 +370,7 @@ impl<I, E> Builder<I, E> {
     /// # Cargo Feature
     ///
     /// Requires the `runtime` cargo feature to be enabled.
-    #[cfg(feature = "runtime")]
-    #[cfg(feature = "http2")]
+    #[cfg(all(feature = "runtime", feature = "http2"))]
     #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn http2_keep_alive_timeout(mut self, timeout: Duration) -> Self {
         self.protocol.http2_keep_alive_timeout(timeout);