Merge pull request #56 from dtolnay-contrib/tonic

Expose choice of supported tonic version

Cargo.toml

@@ -10,16 +10,20 @@ license = "Apache-2.0"
 edition = "2018"
 exclude = ["test_fixture"]
 
-[features]
-tonic-conn = ["tonic"]
-
 [dependencies]
 bytes = "1.3.0"
 futures = "0.3"
 libc = "0.2.138"
 vsock = "0.5.1"
 tokio = { version = "1", features = ["net", "sync"] }
-tonic = { version = ">= 0.5.0, < 0.13.0", optional = true }
+tonic05 = { package = "tonic", version = "0.5", optional = true }
+tonic06 = { package = "tonic", version = "0.6", optional = true }
+tonic07 = { package = "tonic", version = "0.7", optional = true }
+tonic08 = { package = "tonic", version = "0.8", optional = true }
+tonic09 = { package = "tonic", version = "0.9", optional = true }
+tonic010 = { package = "tonic", version = "0.10", optional = true }
+tonic011 = { package = "tonic", version = "0.11", optional = true }
+tonic012 = { package = "tonic", version = "0.12", optional = true }
 
 [dev-dependencies]
 sha2 = "0.10.6"

src/lib.rs

@@ -19,14 +19,11 @@
 mod listener;
 mod split;
 mod stream;
-#[cfg(feature = "tonic-conn")]
 mod tonic_support;
 
 pub use listener::{Incoming, VsockListener};
 pub use split::{OwnedReadHalf, OwnedWriteHalf, ReadHalf, WriteHalf};
 pub use stream::VsockStream;
-#[cfg(feature = "tonic-conn")]
-#[cfg_attr(docsrs, doc(cfg(feature = "tonic-conn")))]
 pub use tonic_support::VsockConnectInfo;
 #[cfg(any(target_os = "linux", target_os = "android"))]
 pub use vsock::VMADDR_CID_LOCAL;

src/tonic_support.rs

@@ -1,34 +1,44 @@
-use tonic::transport::server::Connected;
-
-use crate::{VsockAddr, VsockStream};
+use crate::VsockAddr;
 
 /// Connection info for a Vsock Stream.
 ///
-/// See [`Connected`] for more details.
+/// See [`Connected`][tonic012::transport::server::Connected] for more details.
 ///
-#[cfg_attr(docsrs, doc(cfg(feature = "tonic-conn")))]
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct VsockConnectInfo {
     peer_addr: Option<VsockAddr>,
 }
 
-#[cfg_attr(docsrs, doc(cfg(feature = "tonic-conn")))]
 impl VsockConnectInfo {
     /// Return the remote address the IO resource is connected too.
     pub fn peer_addr(&self) -> Option<VsockAddr> {
         self.peer_addr
     }
 }
 
-/// Allow consumers of VsockStream to check that it is connected and valid before use.
-///
-#[cfg_attr(docsrs, doc(cfg(feature = "tonic-conn")))]
-impl Connected for VsockStream {
-    type ConnectInfo = VsockConnectInfo;
+macro_rules! tonic_connected {
+    ($tonic_version:ident $cfg:literal) => {
+        /// Allow consumers of VsockStream to check that it is connected and valid before use.
+        ///
+        #[cfg(feature = $cfg)]
+        #[cfg_attr(docsrs, doc(cfg(feature = $cfg)))]
+        impl $tonic_version::transport::server::Connected for crate::VsockStream {
+            type ConnectInfo = VsockConnectInfo;
 
-    fn connect_info(&self) -> Self::ConnectInfo {
-        VsockConnectInfo {
-            peer_addr: self.peer_addr().ok(),
+            fn connect_info(&self) -> Self::ConnectInfo {
+                VsockConnectInfo {
+                    peer_addr: self.peer_addr().ok(),
+                }
+            }
         }
-    }
+    };
 }
+
+tonic_connected!(tonic05 "tonic05");
+tonic_connected!(tonic06 "tonic06");
+tonic_connected!(tonic07 "tonic07");
+tonic_connected!(tonic08 "tonic08");
+tonic_connected!(tonic09 "tonic09");
+tonic_connected!(tonic010 "tonic010");
+tonic_connected!(tonic011 "tonic011");
+tonic_connected!(tonic012 "tonic012");