From 4325f5cc053b5a9ec394d1a5838c0db0fda97a7a Mon Sep 17 00:00:00 2001
From: Elena Frank <elena.frank@protonmail.com>
Date: Sun, 16 Oct 2022 12:22:55 +0200
Subject: [PATCH] transports/quic: follow libp2p#2962

---
 Cargo.toml | 10 ++++------
 src/lib.rs | 13 ++++++-------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2c2c83b986b..ba3d653b546 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,8 +33,7 @@ full = [
     "ping",
     "plaintext",
     "pnet",
-    "quic-async-std",
-    "quic-tokio",
+    "quic",
     "relay",
     "rendezvous",
     "request-response",
@@ -71,8 +70,7 @@ noise = ["dep:libp2p-noise"]
 ping = ["dep:libp2p-ping", "libp2p-metrics?/ping"]
 plaintext = ["dep:libp2p-plaintext"]
 pnet = ["dep:libp2p-pnet"]
-quic-async-std = ["dep:libp2p-quic", "libp2p-quic?/async-std"]
-quic-tokio = ["dep:libp2p-quic", "libp2p-quic?/tokio"]
+quic = ["dep:libp2p-quic"]
 relay = ["dep:libp2p-relay", "libp2p-metrics?/relay"]
 request-response = ["dep:libp2p-request-response"]
 rendezvous = ["dep:libp2p-rendezvous"]
@@ -89,8 +87,8 @@ secp256k1 = ["libp2p-core/secp256k1"]
 rsa = ["libp2p-core/rsa"]
 ecdsa = ["libp2p-core/ecdsa"]
 serde = ["libp2p-core/serde", "libp2p-kad?/serde", "libp2p-gossipsub?/serde"]
-tokio = ["libp2p-mdns?/tokio", "libp2p-tcp?/tokio", "libp2p-dns?/tokio"]
-async-std = ["libp2p-mdns?/async-io", "libp2p-tcp?/async-io", "libp2p-dns?/async-std"]
+tokio = ["libp2p-mdns?/tokio", "libp2p-tcp?/tokio", "libp2p-dns?/tokio", "libp2p-quic?/tokio"]
+async-std = ["libp2p-mdns?/async-io", "libp2p-tcp?/async-io", "libp2p-dns?/async-std", "libp2p-quic?/async-std"]
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/src/lib.rs b/src/lib.rs
index 36193112378..5a819dbc555 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -145,14 +145,13 @@ pub use libp2p_plaintext as plaintext;
 #[cfg_attr(docsrs, doc(cfg(feature = "pnet")))]
 #[doc(inline)]
 pub use libp2p_pnet as pnet;
-#[cfg(any(feature = "quic-async-std", feature = "quic-tokio"))]
-#[cfg_attr(
-    docsrs,
-    doc(cfg(any(feature = "quic-async-std", feature = "quic-tokio")))
-)]
+#[cfg(feature = "quic")]
+#[cfg_attr(docsrs, doc(cfg(feature = "quic")))]
 #[cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))]
-#[doc(inline)]
-pub use libp2p_quic as quic;
+pub mod quic {
+    #[doc(inline)]
+    pub use libp2p_quic::*;
+}
 #[cfg(feature = "relay")]
 #[cfg_attr(docsrs, doc(cfg(feature = "relay")))]
 #[doc(inline)]