Move dns module to crate root.

Author: horned-sphere

client/fixture/src/lib.rs

@@ -17,7 +17,7 @@ use swimos_form::Form;
 use swimos_model::{Text, Value};
 use swimos_recon::parser::parse_recognize;
 use swimos_recon::print_recon;
-use swimos_remote::net::dns::{BoxDnsResolver, DnsResolver};
+use swimos_remote::dns::{BoxDnsResolver, DnsResolver};
 use swimos_remote::net::{
     ClientConnections, ConnResult, ConnectionError, IoResult, Listener, ListenerError, Scheme,
 };

client/swimos_client/src/lib.rs

@@ -37,7 +37,7 @@ use swimos_downlink::{
     MapValue, NotYetSyncedError, ValueDownlinkModel, ValueDownlinkSet,
 };
 use swimos_form::Form;
-use swimos_remote::net::dns::Resolver;
+use swimos_remote::dns::Resolver;
 use swimos_remote::net::plain::TokioPlainTextNetworking;
 use swimos_remote::net::ClientConnections;
 use swimos_runtime::downlink::{DownlinkOptions, DownlinkRuntimeConfig};

runtime/swimos_remote/src/net/dns.rs renamed to runtime/swimos_remote/src/dns.rs

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+pub mod dns;
 mod error;
 pub mod net;
 mod task;

runtime/swimos_remote/src/lib.rs

@@ -28,9 +28,8 @@ use futures::Stream;
 use std::io;
 use tokio::io::{AsyncRead, AsyncWrite};
 
-use self::dns::BoxDnsResolver;
+use crate::dns::BoxDnsResolver;
 
-pub mod dns;
 pub mod plain;
 
 #[cfg(test)]

runtime/swimos_remote/src/net/mod.rs

@@ -15,7 +15,7 @@
 use std::net::SocketAddr;
 use std::pin::Pin;
 
-use crate::net::dns::{DnsResolver, Resolver};
+use crate::dns::{DnsResolver, Resolver};
 use crate::net::Scheme;
 use crate::net::{IoResult, Listener};
 use futures::future::BoxFuture;
@@ -28,8 +28,8 @@ use tokio::net::{TcpListener, TcpStream};
 
 use thiserror::Error;
 
-use super::dns::BoxDnsResolver;
 use super::{ClientConnections, ConnResult, ListenerResult, ServerConnections};
+use crate::dns::BoxDnsResolver;
 
 /// Implementation of [`ExternalConnections`] using [`TcpListener`] and [`TcpStream`] from Tokio.
 #[derive(Debug, Clone)]

runtime/swimos_remote/src/net/plain.rs

@@ -17,10 +17,8 @@ use std::{net::SocketAddr, sync::Arc};
 use futures::{future::BoxFuture, FutureExt};
 use rustls::{OwnedTrustAnchor, RootCertStore, ServerName};
 
-use crate::net::{
-    dns::{BoxDnsResolver, DnsResolver, Resolver},
-    ClientConnections, ConnResult, ConnectionError, IoResult, Scheme,
-};
+use crate::dns::{BoxDnsResolver, DnsResolver, Resolver};
+use crate::net::{ClientConnections, ConnResult, ConnectionError, IoResult, Scheme};
 use tokio::net::TcpStream;
 use tokio_rustls::{TlsConnector, TlsStream};
 

runtime/swimos_remote/src/tls/net/client.rs

@@ -19,10 +19,9 @@ mod tests;
 
 use std::net::SocketAddr;
 
+use crate::dns::BoxDnsResolver;
 use crate::net::plain::TokioPlainTextNetworking;
-use crate::net::{
-    dns::BoxDnsResolver, ClientConnections, ConnResult, IoResult, Scheme, ServerConnections,
-};
+use crate::net::{ClientConnections, ConnResult, IoResult, Scheme, ServerConnections};
 pub use client::RustlsClientNetworking;
 use futures::future::Either;
 use futures::TryFutureExt;

runtime/swimos_remote/src/tls/net/mod.rs

@@ -14,9 +14,8 @@
 
 use std::{net::SocketAddr, path::PathBuf, sync::Arc, time::Duration};
 
-use crate::net::{
-    dns::Resolver, ClientConnections, ConnectionError, Listener, ListenerError, Scheme,
-};
+use crate::dns::Resolver;
+use crate::net::{ClientConnections, ConnectionError, Listener, ListenerError, Scheme};
 use futures::{future::join, StreamExt};
 
 use crate::tls::{