Make internal Request an enum

Also drop tuple conversions; preparing for a Batch variant.

netlink-proto/src/handle.rs

@@ -39,7 +39,11 @@ where
         destination: SocketAddr,
     ) -> Result<impl Stream<Item = NetlinkMessage<T>>, Error<T>> {
         let (tx, rx) = unbounded::<NetlinkMessage<T>>();
-        let request = Request::from((message, destination, tx));
+        let request = Request::Single {
+            message,
+            destination,
+            metadata: tx,
+        };
         debug!("handle: forwarding new request to connection");
         UnboundedSender::unbounded_send(&self.requests_tx, request).map_err(|e| {
             // the channel is unbounded, so it can't be full. If this
@@ -61,7 +65,11 @@ where
         destination: SocketAddr,
     ) -> Result<(), Error<T>> {
         let (tx, _rx) = unbounded::<NetlinkMessage<T>>();
-        let request = Request::from((message, destination, tx));
+        let request = Request::Single {
+            message,
+            destination,
+            metadata: tx,
+        };
         debug!("handle: forwarding new request to connection");
         UnboundedSender::unbounded_send(&self.requests_tx, request)
             .map_err(|_| ErrorKind::ConnectionClosed.into())

netlink-proto/src/protocol/protocol.rs

@@ -131,7 +131,7 @@ where
     }
 
     pub fn request(&mut self, request: Request<T, M>) {
-        let Request {
+        let Request::Single {
             mut message,
             metadata,
             destination,

netlink-proto/src/protocol/request.rs

@@ -7,32 +7,10 @@ use netlink_packet_core::NetlinkMessage;
 use crate::sys::SocketAddr;
 
 #[derive(Debug)]
-pub(crate) struct Request<T, M> {
-    pub metadata: M,
-    pub message: NetlinkMessage<T>,
-    pub destination: SocketAddr,
-}
-
-impl<T, M> From<(NetlinkMessage<T>, SocketAddr, M)> for Request<T, M>
-where
-    T: Debug,
-    M: Debug,
-{
-    fn from(parts: (NetlinkMessage<T>, SocketAddr, M)) -> Self {
-        Request {
-            message: parts.0,
-            destination: parts.1,
-            metadata: parts.2,
-        }
-    }
-}
-
-impl<T, M> From<Request<T, M>> for (NetlinkMessage<T>, SocketAddr, M)
-where
-    T: Debug,
-    M: Debug,
-{
-    fn from(req: Request<T, M>) -> (NetlinkMessage<T>, SocketAddr, M) {
-        (req.message, req.destination, req.metadata)
-    }
+pub(crate) enum Request<T, M> {
+    Single {
+        metadata: M,
+        message: NetlinkMessage<T>,
+        destination: SocketAddr,
+    },
 }