Flattened net reexports.

Author: horned-sphere

client/fixture/src/lib.rs

@@ -19,10 +19,10 @@ use swimos_model::{Text, Value};
 use swimos_recon::parser::parse_recognize;
 use swimos_recon::print_recon;
 use swimos_remote::dns::{BoxDnsResolver, DnsResolver};
-use swimos_remote::net::{
+use swimos_remote::websocket::{RatchetError, WebsocketClient, WebsocketServer, WsOpenFuture};
+use swimos_remote::{
     ClientConnections, ConnResult, ConnectionError, Listener, ListenerError, Scheme,
 };
-use swimos_remote::websocket::{RatchetError, WebsocketClient, WebsocketServer, WsOpenFuture};
 use tokio::io::{AsyncRead, AsyncWrite, DuplexStream};
 use tokio::sync::mpsc;
 use tokio::sync::Mutex;

client/runtime/src/commander/mod.rs

@@ -22,7 +22,7 @@ use ratchet::{
 };
 use swimos_form::write::StructuralWritable;
 use swimos_recon::print_recon_compact;
-use swimos_remote::net::{BadUrl, SchemeHostPort};
+use swimos_remote::{BadUrl, SchemeHostPort};
 use thiserror::Error;
 use tokio::net::TcpStream;
 

client/runtime/src/pending.rs

@@ -26,7 +26,7 @@ use swimos_api::address::RelativeAddress;
 use swimos_client_api::DownlinkConfig;
 use swimos_messages::remote_protocol::AttachClient;
 use swimos_model::Text;
-use swimos_remote::net::Scheme;
+use swimos_remote::Scheme;
 use swimos_runtime::downlink::{DownlinkOptions, DownlinkRuntimeConfig};
 use tokio::sync::mpsc;
 

client/runtime/src/runtime.rs

@@ -25,10 +25,7 @@ use std::net::SocketAddr;
 use std::num::NonZeroUsize;
 use std::sync::Arc;
 use swimos_messages::remote_protocol::AttachClient;
-use swimos_remote::{
-    net::{Scheme, SchemeHostPort},
-    websocket::WebsocketClient,
-};
+use swimos_remote::{websocket::WebsocketClient, Scheme, SchemeHostPort};
 use tokio::sync::{mpsc, oneshot, Notify};
 use tokio::task::{JoinError, JoinHandle};
 use tracing::{debug, error, info, trace};
@@ -41,7 +38,7 @@ use crate::transport::{Transport, TransportHandle};
 use swimos_api::{address::Address, agent::DownlinkKind, error::DownlinkFailureReason};
 use swimos_client_api::{Downlink, DownlinkConfig};
 use swimos_model::Text;
-use swimos_remote::net::ClientConnections;
+use swimos_remote::ClientConnections;
 use swimos_runtime::downlink::{AttachAction, DownlinkOptions, DownlinkRuntimeConfig};
 use swimos_utilities::byte_channel::{byte_channel, ByteReader, ByteWriter};
 use swimos_utilities::trigger;

client/runtime/src/tests.rs

@@ -28,7 +28,7 @@ use ratchet::{
 };
 use swimos_agent_protocol::MapMessage;
 use swimos_messages::remote_protocol::AttachClient;
-use swimos_remote::net::{Scheme, SchemeHostPort};
+use swimos_remote::{Scheme, SchemeHostPort};
 use tokio::io::{duplex, AsyncWriteExt};
 use tokio::spawn;
 use tokio::sync::mpsc::unbounded_channel;

client/runtime/src/transport.rs

@@ -25,9 +25,9 @@ use std::net::SocketAddr;
 use std::num::NonZeroUsize;
 use std::time::Duration;
 use swimos_messages::remote_protocol::AttachClient;
-use swimos_remote::net::{ClientConnections, Scheme, SchemeHostPort};
 use swimos_remote::websocket::WebsocketClient;
 use swimos_remote::RemoteTask;
+use swimos_remote::{ClientConnections, Scheme, SchemeHostPort};
 use swimos_utilities::trigger;
 use tokio::select;
 use tokio::sync::{mpsc, oneshot};

client/swimos_client/src/lib.rs

@@ -38,8 +38,8 @@ use swimos_downlink::{
 };
 use swimos_form::Form;
 use swimos_remote::dns::Resolver;
-use swimos_remote::net::ClientConnections;
 use swimos_remote::plain::TokioPlainTextNetworking;
+use swimos_remote::ClientConnections;
 use swimos_runtime::downlink::{DownlinkOptions, DownlinkRuntimeConfig};
 #[cfg(feature = "tls")]
 use swimos_tls::{ClientConfig as TlsConfig, RustlsClientNetworking, TlsError};

runtime/swimos_remote/src/lib.rs

@@ -13,15 +13,19 @@
 // limitations under the License.
 
 pub mod dns;
-pub mod net;
+mod net;
+pub mod plain;
 mod task;
+#[cfg(feature = "tls")]
+pub mod tls;
 mod ws;
 
 pub use task::RemoteTask;
 
-pub mod plain;
-#[cfg(feature = "tls")]
-pub mod tls;
+pub use net::{
+    BadUrl, ClientConnections, ConnResult, ConnectionError, ExternalConnections, Listener,
+    ListenerError, ListenerResult, Scheme, SchemeHostPort, ServerConnections,
+};
 
 pub mod websocket {
 

runtime/swimos_runtime/src/agent/mod.rs

@@ -29,7 +29,7 @@ use swimos_api::{
     persistence::NodePersistence,
 };
 use swimos_model::Text;
-use swimos_remote::net::SchemeHostPort;
+use swimos_remote::SchemeHostPort;
 use swimos_utilities::{
     byte_channel::{ByteReader, ByteWriter},
     future::RetryStrategy,

runtime/swimos_runtime/src/agent/task/external_links/mod.rs

@@ -28,7 +28,7 @@ use swimos_api::{
 };
 use swimos_messages::protocol::{RawRequestMessageEncoder, RequestMessage};
 use swimos_model::Text;
-use swimos_remote::net::SchemeHostPort;
+use swimos_remote::SchemeHostPort;
 use swimos_utilities::{
     byte_channel::{byte_channel, ByteReader, ByteWriter},
     encoding::BytesStr,