Make clippy happy

hickory-dns · Feb 3, 2021 · d751b41 · d751b41
1 parent 9198206
commit d751b41
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/crates/resolver/src/name_server/connection_provider.rs b/crates/resolver/src/name_server/connection_provider.rs
@@ -208,7 +208,8 @@ where
 
 #[cfg(feature = "dns-over-tls")]
 /// Predefined type for TLS client stream
-type TlsClientStream<S> = TcpClientStream<AsyncIoTokioAsStd<TokioTlsStream<proto::iocompat::AsyncIoStdAsTokio<S>>>>;
+type TlsClientStream<S> =
+    TcpClientStream<AsyncIoTokioAsStd<TokioTlsStream<proto::iocompat::AsyncIoStdAsTokio<S>>>>;
 
 /// The variants of all supported connections for the Resolver
 #[allow(clippy::large_enum_variant, clippy::type_complexity)]

diff --git a/tests/integration-tests/tests/server_future_tests.rs b/tests/integration-tests/tests/server_future_tests.rs
@@ -7,7 +7,6 @@ use std::time::Duration;
 
 use futures::{future, Future, FutureExt};
 use tokio::net::TcpListener;
-use tokio::net::TcpStream as TokioTcpStream;
 use tokio::net::UdpSocket;
 use tokio::runtime::Runtime;
 
@@ -16,8 +15,8 @@ use trust_dns_client::op::*;
 use trust_dns_client::rr::*;
 use trust_dns_client::tcp::TcpClientConnection;
 use trust_dns_client::udp::UdpClientConnection;
+use trust_dns_proto::error::ProtoError;
 use trust_dns_proto::xfer::DnsRequestSender;
-use trust_dns_proto::{error::ProtoError, iocompat::AsyncIoTokioAsStd};
 
 use trust_dns_server::authority::{Authority, Catalog};
 use trust_dns_server::ServerFuture;
@@ -199,7 +198,7 @@ fn lazy_tls_client(
     ipaddr: SocketAddr,
     dns_name: String,
     cert_der: Vec<u8>,
-) -> TlsClientConnection<AsyncIoTokioAsStd<TokioTcpStream>> {
+) -> TlsClientConnection<trust_dns_proto::iocompat::AsyncIoTokioAsStd<tokio::net::TcpStream>> {
     use rustls::{Certificate, ClientConfig};
 
     let trust_chain = Certificate(cert_der);