2 files changed, 57 insertions, 52 deletions

diff --git a/src/reader.rs b/src/reader.rs
index b3bb2dd..1439a17 100644
--- a/src/reader.rs
+++ b/src/reader.rs
@@ -401,37 +401,6 @@ where
 }
 
 #[cfg(any(feature = "futures-io", feature = "tokio-io"))]
-pub trait IntoBufferedAsyncRead {
-    type Target: AsyncReadExact;
-
-    fn into_buffered(self, capacity: usize) -> Self::Target;
-}
-
-#[cfg(all(feature = "futures-io", not(feature = "tokio-io")))]
-impl<R> IntoBufferedAsyncRead for R
-where
-    R: futures::io::AsyncRead + Send + Sync + Unpin,
-{
-    type Target = futures::io::BufReader<R>;
-
-    fn into_buffered(self, capacity: usize) -> Self::Target {
-        futures::io::BufReader::with_capacity(capacity, self)
-    }
-}
-
-#[cfg(feature = "tokio-io")]
-impl<R> IntoBufferedAsyncRead for R
-where
-    R: tokio::io::AsyncRead + Send + Sync + Unpin,
-{
-    type Target = tokio::io::BufReader<R>;
-
-    fn into_buffered(self, capacity: usize) -> Self::Target {
-        tokio::io::BufReader::with_capacity(capacity, self)
-    }
-}
-
-#[cfg(any(feature = "futures-io", feature = "tokio-io"))]
 #[async_trait]
 pub trait AsyncReadExact: Unpin + Sync + Send {
     async fn read_exact(&mut self, to: &mut [u8]) -> Result<(), io::Error>;
diff --git a/src/tcp.rs b/src/tcp.rs
index bd88885..f16a3c3 100644
--- a/src/tcp.rs
+++ b/src/tcp.rs
@@ -6,14 +6,30 @@ use std::io::BufReader as StdBufReader;
 use std::net::TcpStream;
 
 #[cfg(any(feature = "futures-io", feature = "tokio-io"))]
-use crate::{CraftAsyncReader, CraftAsyncWriter, IntoBufferedAsyncRead};
+use crate::{CraftAsyncReader, CraftAsyncWriter};
+
+#[cfg(feature = "tokio-io")]
+use tokio::{
+    net::{
+        TcpStream as TokioTcpStream,
+        tcp::{
+            OwnedReadHalf as TokioReadHalf,
+            OwnedWriteHalf as TokioWriteHalf,
+        },
+        ToSocketAddrs as TokioToSocketAddrs,
+    },
+    io::{
+        BufReader as TokioBufReader,
+        Error as TokioIoError,
+    },
+};
 
 pub const BUF_SIZE: usize = 8192;
 
 pub type CraftTcpConnection = CraftConnection<StdBufReader<TcpStream>, TcpStream>;
 
-impl CraftConnection<StdBufReader<TcpStream>, TcpStream> {
-    pub fn connect_server_std(to: String) -> Result<Self, std::io::Error> {
+impl CraftTcpConnection {
+    pub fn connect_server_std<A>(to: A) -> Result<Self, std::io::Error> where A: std::net::ToSocketAddrs {
         Self::from_std(TcpStream::connect(to)?, PacketDirection::ClientBound)
     }
 
@@ -43,32 +59,52 @@ impl CraftConnection<StdBufReader<TcpStream>, TcpStream> {
     }
 }
 
-#[cfg(any(feature = "futures-io", feature = "tokio-io"))]
-impl<R, W> CraftConnection<R, W>
-where
-    CraftReader<R>: CraftAsyncReader,
-    CraftWriter<W>: CraftAsyncWriter,
-{
-    pub fn from_unbuffered_async<U>(tuple: (U, W), read_direction: PacketDirection) -> Self
+#[cfg(feature = "tokio-io")]
+pub type CraftTokioConnection = CraftConnection<TokioBufReader<TokioReadHalf>, TokioWriteHalf>;
+
+#[cfg(feature = "tokio-io")]
+impl CraftTokioConnection {
+    pub async fn connect_server_tokio<A>(
+        to: A
+    ) -> Result<Self, TokioIoError>
     where
-        U: IntoBufferedAsyncRead<Target = R>,
+        A: TokioToSocketAddrs
     {
-        Self::from_unbuffered_async_with_state(tuple, read_direction, State::Handshaking)
+        let conn = TokioTcpStream::connect(to).await?;
+        conn.set_nodelay(true)?;
+        let (reader, writer) = conn.into_split();
+        let reader = TokioBufReader::with_capacity(BUF_SIZE, reader);
+        Ok(Self::from_async((reader, writer), PacketDirection::ClientBound))
     }
+}
 
-    pub fn from_unbuffered_async_with_state<U>(
-        tuple: (U, W),
-        read_direction: PacketDirection,
-        state: State,
-    ) -> Self
+#[cfg(feature = "tokio-io")]
+pub type CraftUnbufferedTokioConnection = CraftConnection<TokioReadHalf, TokioWriteHalf>;
+
+#[cfg(feature = "tokio-io")]
+impl CraftUnbufferedTokioConnection {
+    pub async fn connect_server_tokio_unbuffered<A>(
+        to: A
+    ) -> Result<Self, TokioIoError>
     where
-        U: IntoBufferedAsyncRead<Target = R>,
+        A: TokioToSocketAddrs
     {
-        let (ru, writer) = tuple;
-        let reader = ru.into_buffered(BUF_SIZE);
-        Self::from_async_with_state((reader, writer), read_direction, state)
+        let conn = TokioTcpStream::connect(to).await?;
+        conn.set_nodelay(true)?;
+
+        Ok(Self::from_async(
+            conn.into_split(),
+            PacketDirection::ClientBound,
+        ))
     }
+}
 
+#[cfg(any(feature = "futures-io", feature = "tokio-io"))]
+impl<R, W> CraftConnection<R, W>
+where
+    CraftReader<R>: CraftAsyncReader,
+    CraftWriter<W>: CraftAsyncWriter,
+{
     pub fn from_async(tuple: (R, W), read_direction: PacketDirection) -> Self {
         Self::from_async_with_state(tuple, read_direction, State::Handshaking)
     }