fixups

Author: dignifiedquire

netwatch/src/interfaces/linux.rs

@@ -1,7 +1,7 @@
 //! Linux-specific network interfaces implementations.
 
 #[cfg(not(target_os = "android"))]
-use n0_future::{Either, TryStream, TryStreamExt};
+use n0_future::{Either, StreamExt, TryStream, TryStreamExt};
 #[cfg(not(target_os = "android"))]
 use netlink_packet_core::{NetlinkMessage, NLM_F_DUMP, NLM_F_REQUEST};
 #[cfg(not(target_os = "android"))]
@@ -37,8 +37,12 @@ pub enum Error {
     #[cfg(not(target_os = "android"))]
     #[error("netlink")]
     Netlink(#[from] NetlinkError),
+    #[cfg(not(target_os = "android"))]
     #[error("unexpected netlink message")]
     UnexpectedNetlinkMessage,
+    #[cfg(not(target_os = "android"))]
+    #[error("netlink error message: {0:?}")]
+    NetlinkErrorMessage(netlink_packet_core::error::ErrorMessage),
 }
 
 pub async fn default_route() -> Option<DefaultRouteDetails> {
@@ -104,7 +108,7 @@ macro_rules! try_rtnl {
         let (header, payload) = $msg.into_parts();
         match payload {
             NetlinkPayload::InnerMessage($message_type(msg)) => msg,
-            NetlinkPayload::Error(err) => return Err(Error::from(err)),
+            NetlinkPayload::Error(err) => return Err(Error::NetlinkErrorMessage(err)),
             _ => return Err(Error::UnexpectedNetlinkMessage),
         }
     }};
@@ -186,7 +190,9 @@ fn get_route(
         Ok(response) => {
             Either::Left(response.map(move |msg| Ok(try_rtnl!(msg, RouteNetlinkMessage::NewRoute))))
         }
-        Err(e) => Either::Right(n0_future::stream::once::<Result<RouteMessage, Error>>(e)),
+        Err(e) => Either::Right(n0_future::stream::once::<Result<RouteMessage, Error>>(Err(
+            e,
+        ))),
     }
 }
 
@@ -258,7 +264,9 @@ fn get_link(
         Ok(response) => {
             Either::Left(response.map(move |msg| Ok(try_rtnl!(msg, RouteNetlinkMessage::NewLink))))
         }
-        Err(e) => Either::Right(n0_future::stream::once::<Result<RouteMessage, Error>>(e)),
+        Err(e) => Either::Right(n0_future::stream::once::<Result<RouteMessage, Error>>(Err(
+            e,
+        ))),
     }
 }