From cf41840573f7cea5815eb5802c5a50978d1b6f9e Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Mon, 7 Oct 2019 19:21:18 +0200
Subject: [PATCH] We can use Default::default() instead of tokio's Handle

What kind of magic is that?
---
 Cargo.toml      | 1 -
 src/main.rs     | 3 +--
 src/resolver.rs | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index bc0699b..2ab7762 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,6 @@ serde_derive = "1.0.101"
 serde-big-array = "0.2.0"
 siphasher = "0.3.1"
 tokio = "=0.2.0-alpha.6"
-tokio-net = "=0.2.0-alpha.6"
 toml = "0.5.3"
 
 [dependencies.hyper]
diff --git a/src/main.rs b/src/main.rs
index 9854551..b6fafa2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -75,7 +75,6 @@ use tokio::net::{TcpListener, TcpStream, UdpSocket};
 use tokio::prelude::*;
 use tokio::runtime::Runtime;
 use tokio::sync::oneshot;
-use tokio_net::driver::Handle;
 
 #[derive(Debug)]
 struct UdpClientCtx {
@@ -222,7 +221,7 @@ async fn tls_proxy(
     .bind(&globals.external_addr)?
     .to_tcp_stream()?;
     let mut ext_socket =
-        TcpStream::connect_std(std_socket, tls_upstream_addr, &Handle::default()).await?;
+        TcpStream::connect_std(std_socket, tls_upstream_addr, &Default::default()).await?;
     let (mut erh, mut ewh) = ext_socket.split();
     let (mut rh, mut wh) = client_connection.split();
     ewh.write_all(&binlen).await?;
diff --git a/src/resolver.rs b/src/resolver.rs
index 598f49e..e66a2f4 100644
--- a/src/resolver.rs
+++ b/src/resolver.rs
@@ -10,7 +10,6 @@ use std::hash::Hasher;
 use std::net::SocketAddr;
 use tokio::net::{TcpStream, UdpSocket};
 use tokio::prelude::*;
-use tokio_net::driver::Handle;
 
 pub async fn resolve_udp(
     globals: &Globals,
@@ -67,7 +66,7 @@ pub async fn resolve_tcp(
     .bind(&globals.external_addr)?
     .to_tcp_stream()?;
     let mut ext_socket =
-        TcpStream::connect_std(std_socket, &globals.upstream_addr, &Handle::default()).await?;
+        TcpStream::connect_std(std_socket, &globals.upstream_addr, &Default::default()).await?;
     ext_socket.set_nodelay(true)?;
     let mut binlen = [0u8, 0];
     BigEndian::write_u16(&mut binlen[..], packet.len() as u16);