Review notes on wasi port

src/net/tcp/listener.rs

@@ -9,8 +9,9 @@ use std::{fmt, io};
 
 use crate::io_source::IoSource;
 use crate::net::TcpStream;
-#[cfg(any(unix, target_os = "wasi"))]
+#[cfg(unix)]
 use crate::sys::tcp::set_reuseaddr;
+#[cfg(not(target_os = "wasi"))]
 use crate::sys::tcp::{bind, listen, new_for_addr};
 use crate::{event, sys, Interest, Registry, Token};
 
@@ -54,6 +55,7 @@ impl TcpListener {
     /// 2. Set the `SO_REUSEADDR` option on the socket on Unix.
     /// 3. Bind the socket to the specified address.
     /// 4. Calls `listen` on the socket to prepare it to receive new connections.
+    #[cfg(not(target_os = "wasi"))]
     pub fn bind(addr: SocketAddr) -> io::Result<TcpListener> {
         let socket = new_for_addr(addr)?;
         #[cfg(any(unix, target_os = "wasi"))]

src/net/tcp/stream.rs

@@ -9,6 +9,7 @@ use std::os::wasi::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
 use std::os::windows::io::{AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket};
 
 use crate::io_source::IoSource;
+#[cfg(not(target_os = "wasi"))]
 use crate::sys::tcp::{connect, new_for_addr};
 use crate::{event, Interest, Registry, Token};
 
@@ -75,6 +76,7 @@ impl TcpStream {
     ///  5. Now the stream can be used.
     ///
     /// [read interest]: Interest::READABLE
+    #[cfg(not(target_os = "wasi"))]
     pub fn connect(addr: SocketAddr) -> io::Result<TcpStream> {
         let socket = new_for_addr(addr)?;
         #[cfg(any(unix, target_os = "wasi"))]

src/sys/wasi/mod.rs

@@ -23,9 +23,16 @@ use std::time::Duration;
 use crate::{Interest, Token};
 
 cfg_net! {
-    mod net;
-
-    pub(crate) use net::tcp;
+    pub(crate) mod tcp {
+        use std::io;
+        use std::net::{self, SocketAddr};
+
+        pub(crate) fn accept(listener: &net::TcpListener) -> io::Result<(net::TcpStream, SocketAddr)> {
+            let (stream, addr) = listener.accept()?;
+            stream.set_nonblocking(true)?;
+            Ok((stream, addr))
+        }
+    }
 }
 
 /// Unique id for use as `SelectorId`.
@@ -184,10 +191,12 @@ impl Selector {
         };
         if let Some(index) = subscriptions.iter().position(predicate) {
             subscriptions.swap_remove(index);
+            /* NOTE: can't have read and write subscriptions.
             // We might have two subscriptions (read and write).
             if let Some(index) = subscriptions.iter().skip(index).position(predicate) {
                 subscriptions.swap_remove(index);
             }
+            */
             Ok(())
         } else {
             Err(io::ErrorKind::NotFound.into())