chore(macros): remove some macro_rules indirection

It makes rust-analyzer choke completely and not see either cfg_http1 etc.
hyperium · Mar 19, 2021 · d735240 · d735240
1 parent 526e709
commit d735240
Showing 1 changed file with 39 additions and 25 deletions.
diff --git a/src/cfg.rs b/src/cfg.rs
@@ -23,40 +23,54 @@ macro_rules! cfg_proto {
     }
 }
 
-cfg_proto! {
-    macro_rules! cfg_http1 {
-        ($($item:item)*) => {
-            cfg_feature! {
-                #![feature = "http1"]
-                $($item)*
-            }
+#[cfg(all(
+    any(feature = "http1", feature = "http2"),
+    any(feature = "client", feature = "server"),
+))]
+macro_rules! cfg_http1 {
+    ($($item:item)*) => {
+        cfg_feature! {
+            #![feature = "http1"]
+            $($item)*
         }
     }
+}
 
-    macro_rules! cfg_http2 {
-        ($($item:item)*) => {
-            cfg_feature! {
-                #![feature = "http2"]
-                $($item)*
-            }
+#[cfg(all(
+    any(feature = "http1", feature = "http2"),
+    any(feature = "client", feature = "server"),
+))]
+macro_rules! cfg_http2 {
+    ($($item:item)*) => {
+        cfg_feature! {
+            #![feature = "http2"]
+            $($item)*
         }
     }
+}
 
-    macro_rules! cfg_client {
-        ($($item:item)*) => {
-            cfg_feature! {
-                #![feature = "client"]
-                $($item)*
-            }
+#[cfg(all(
+    any(feature = "http1", feature = "http2"),
+    any(feature = "client", feature = "server"),
+))]
+macro_rules! cfg_client {
+    ($($item:item)*) => {
+        cfg_feature! {
+            #![feature = "client"]
+            $($item)*
         }
     }
+}
 
-    macro_rules! cfg_server {
-        ($($item:item)*) => {
-            cfg_feature! {
-                #![feature = "server"]
-                $($item)*
-            }
+#[cfg(all(
+    any(feature = "http1", feature = "http2"),
+    any(feature = "client", feature = "server"),
+))]
+macro_rules! cfg_server {
+    ($($item:item)*) => {
+        cfg_feature! {
+            #![feature = "server"]
+            $($item)*
         }
     }
 }