fixup

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, StreamExt, TryStream, TryStreamExt};
+use n0_future::{Either, TryStream, TryStreamExt};
 #[cfg(not(target_os = "android"))]
 use netlink_packet_core::{NetlinkMessage, NLM_F_DUMP, NLM_F_REQUEST};
 #[cfg(not(target_os = "android"))]
@@ -183,6 +183,8 @@ fn get_route(
     mut handle: Handle,
     message: RouteMessage,
 ) -> impl TryStream<Ok = RouteMessage, Err = Error> {
+    use n0_future::StreamExt;
+
     let mut req = NetlinkMessage::from(RouteNetlinkMessage::GetRoute(message));
     req.header.flags = NLM_F_REQUEST | NLM_F_DUMP;
 
@@ -191,7 +193,7 @@ fn get_route(
             Either::Left(response.map(move |msg| Ok(try_rtnl!(msg, RouteNetlinkMessage::NewRoute))))
         }
         Err(e) => Either::Right(n0_future::stream::once::<Result<RouteMessage, Error>>(Err(
-            e,
+            Error::from(e),
         ))),
     }
 }
@@ -257,15 +259,17 @@ fn get_link(
     mut handle: Handle,
     message: LinkMessage,
 ) -> impl TryStream<Ok = LinkMessage, Err = Error> {
+    use n0_future::StreamExt;
+
     let mut req = NetlinkMessage::from(RouteNetlinkMessage::GetLink(message));
     req.header.flags = NLM_F_REQUEST;
 
     match handle.request(req, netlink_proto::sys::SocketAddr::new(0, 0)) {
         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>>(Err(
-            e,
+        Err(e) => Either::Right(n0_future::stream::once::<Result<LinkMessage, Error>>(Err(
+            Error::from(e),
         ))),
     }
 }