Revert "Support wsl. (libp2p#9)"

This reverts commit 9eb63c1.

Cargo.toml

@@ -9,13 +9,17 @@ description = "crossplatform asynchronous network watcher"
 repository = "https://github.com/dvc94ch/if-watch"
 
 [dependencies]
-async-io = "1.3.1"
 futures-lite = "1.11.3"
-if-addrs = "0.6.5" # used by fallback and windows
 ipnet = "2.3.0"
 libc = "0.2.86"
 log = "0.4.14"
 
+[target.'cfg(not(windows))'.dependencies]
+async-io = "1.3.1"
+
+[target.'cfg(not(target_os = "linux"))'.dependencies]
+if-addrs = "0.6.5"
+
 [target.'cfg(windows)'.dependencies]
 futures = { version = "0.3.13", default-features = false }
 winapi = { version = "0.3.9", features = ["netioapi", "ntdef", "winerror", "ws2def"] }

src/fallback.rs

@@ -3,10 +3,10 @@ use async_io::Timer;
 use futures_lite::Stream;
 use if_addrs::IfAddr;
 use ipnet::{IpNet, Ipv4Net, Ipv6Net};
+use std::io::Result;
 use std::{
-    collections::{hash_set::Iter, HashSet, VecDeque},
+    collections::{HashSet, VecDeque},
     future::Future,
-    io::Result,
     pin::Pin,
     task::{Context, Poll},
     time::{Duration, Instant},
@@ -51,7 +51,7 @@ impl IfWatcher {
         Ok(())
     }
 
-    pub fn iter(&self) -> Iter<'_, IpNet> {
+    pub fn iter(&self) -> impl Iterator<Item = &IpNet> {
         self.addrs.iter()
     }
 }

src/lib.rs

@@ -8,6 +8,10 @@ use std::io::Result;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
+#[cfg(not(any(unix, windows)))]
+compile_error!("Only Unix and Windows are supported");
+
+#[cfg(not(any(target_os = "linux", windows)))]
 mod fallback;
 #[cfg(target_os = "linux")]
 mod unix;
@@ -32,40 +36,25 @@ pub enum IfEvent {
 
 /// Watches for interface changes.
 #[derive(Debug)]
-pub enum IfWatcher {
-    /// Uses platform api.
-    Platform(platform_impl::IfWatcher),
-    /// Polling fallback.
-    Fallback(fallback::IfWatcher),
-}
+pub struct IfWatcher(platform_impl::IfWatcher);
 
 impl IfWatcher {
     /// Create a watcher
     pub async fn new() -> Result<Self> {
-        if std::env::var_os("WSL_DISTRO_NAME").is_none() {
-            Ok(Self::Platform(platform_impl::IfWatcher::new().await?))
-        } else {
-            Ok(Self::Fallback(fallback::IfWatcher::new().await?))
-        }
+        Ok(Self(platform_impl::IfWatcher::new().await?))
     }
 
     /// Iterate over current networks.
     pub fn iter(&self) -> impl Iterator<Item = &IpNet> {
-        match self {
-            Self::Platform(watcher) => watcher.iter(),
-            Self::Fallback(watcher) => watcher.iter(),
-        }
+        self.0.iter()
     }
 }
 
 impl Future for IfWatcher {
     type Output = Result<IfEvent>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
-        match &mut *self {
-            Self::Platform(watcher) => Pin::new(watcher).poll(cx),
-            Self::Fallback(watcher) => Pin::new(watcher).poll(cx),
-        }
+        Pin::new(&mut self.0).poll(cx)
     }
 }
 

src/unix.rs

@@ -25,13 +25,11 @@ use crate::IfEvent;
 use async_io::Async;
 use futures_lite::Future;
 use ipnet::IpNet;
-use std::{
-    collections::{hash_set::Iter, HashSet, VecDeque},
-    io::Result,
-    os::unix::prelude::*,
-    pin::Pin,
-    task::{Context, Poll},
-};
+use std::collections::{HashSet, VecDeque};
+use std::io::Result;
+use std::os::unix::prelude::*;
+use std::pin::Pin;
+use std::task::{Context, Poll};
 
 mod aligned_buffer;
 
@@ -85,7 +83,7 @@ impl IfWatcher {
     }
 
     /// Returns an iterator of ip's.
-    pub fn iter(&self) -> Iter<'_, IpNet> {
+    pub fn iter(&self) -> impl Iterator<Item = &IpNet> {
         self.addrs.iter()
     }
 }

src/windows.rs

@@ -3,7 +3,7 @@ use futures::task::AtomicWaker;
 use if_addrs::IfAddr;
 use ipnet::{IpNet, Ipv4Net, Ipv6Net};
 use std::{
-    collections::{hash_set::Iter, HashSet, VecDeque},
+    collections::{HashSet, VecDeque},
     future::Future,
     io::Result,
     pin::Pin,
@@ -70,7 +70,7 @@ impl IfWatcher {
         Ok(())
     }
 
-    pub fn iter(&self) -> Iter<'_, IpNet> {
+    pub fn iter(&self) -> impl Iterator<Item = &IpNet> {
         self.addrs.iter()
     }
 }