Fixes

heim-rs · May 28, 2020 · ff3a1d8 · ff3a1d8
1 parent 47f093e
commit ff3a1d8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/heim-net/src/sys/unix/nic.rs b/heim-net/src/sys/unix/nic.rs
@@ -63,14 +63,13 @@ impl Nic {
 }
 
 pub async fn nic() -> Result<impl Stream<Item = Result<Nic>>> {
-    let iter = ifaddrs::getifaddrs()?
-        .filter_map(|addr| {
-            if addr.address.is_some() {
-                Some(Ok(Nic(addr)))
-            } else {
-                None
-            }
-        });
+    let iter = ifaddrs::getifaddrs()?.filter_map(|addr| {
+        if addr.address.is_some() {
+            Some(Ok(Nic(addr)))
+        } else {
+            None
+        }
+    });
 
     Ok(stream::iter(iter))
 }
@@ -80,11 +79,9 @@ impl From<&socket::SockAddr> for Address {
         use nix::sys::socket::SockAddr::*;
 
         match *s {
-            Inet(addr) => {
-                match addr.to_std() {
-                    SocketAddr::V4(addr) => Address::Inet(addr),
-                    SocketAddr::V6(addr) => Address::Inet6(addr),
-                }
+            Inet(addr) => match addr.to_std() {
+                SocketAddr::V4(addr) => Address::Inet(addr),
+                SocketAddr::V6(addr) => Address::Inet6(addr),
             },
             Link(addr) => Address::Link(MacAddr::from(addr.addr())),
             other => unimplemented!("Unknown sockaddr: {:?}", other),

diff --git a/heim-net/src/sys/windows/nic.rs b/heim-net/src/sys/windows/nic.rs
@@ -51,7 +51,7 @@ impl Nic {
     }
 }
 
-pub fn nic() -> impl Stream<Item = Result<Nic>> {
+pub async fn nic() -> Result<impl Stream<Item = Result<Nic>>> {
     // TODO: Stub
-    stream::iter(vec![])
+    Ok(stream::empty())
 }