first pass of merging in warp (doesn't build)

crates/ipc/src/wasm.rs

@@ -6,9 +6,8 @@ use futures::{AsyncRead, AsyncWrite};
 use crate::ConnectionAddress;
 
 pub(crate) mod client {
-    use crate::client::{ClientError, InitializationError, Result};
-
     use super::*;
+    use crate::client::{ClientError, InitializationError, Result};
 
     pub async fn connect_client(
         _connection_address: ConnectionAddress,
@@ -20,7 +19,6 @@ pub(crate) mod client {
 }
 
 pub(crate) mod server {
-    use super::*;
     use crate::server::{InitializationError, Result, ServerError};
 
     /// "Fake" implementation. Note that because a `ConnectionListenerImpl` can't be instantiated,