[Austen Adler]: Update to tokio-1.0 patch

Patch by: https://austenadler.com/

Fortune for cryptohelpers's current commit: Small curse − 小凶

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cryptohelpers"
-version = "1.8.2"
+version = "1.8.3"
 license= "MIT"
 description = "Collection of helpers and simplifying functions for cryptography things"
 authors = ["Avril <flanchan@cumallover.me>"]
@@ -17,7 +17,7 @@ getrandom = {version = "0.1", optional = true }
 crc = {version = "1.8", optional = true }
 hex-literal = {version = "0.3", optional = true }
 libc = "0.2"
-tokio = {version = "0.2", features=["io-util"], optional=true}
+tokio = {version = "1", features=["io-util"], optional=true}
 serde_derive = {version = "1.0", optional = true}
 serde = {version = "1.0", optional = true}
 futures = {version = "0.3.8", optional=true}

src/aes.rs

@@ -14,12 +14,11 @@ use openssl::{
     },
 };
 #[cfg(feature="async")]
-use tokio::{
+use tokio::io::{
-    io::{
+    AsyncRead,
-	AsyncRead,
+    AsyncReadExt,
-	AsyncWrite,
+    AsyncWrite,
-    },
+    AsyncWriteExt,
-    prelude::*,
 };
 use getrandom::getrandom;
 

src/crc.rs

@@ -11,9 +11,9 @@ use crc::{
     Hasher64,
 };
 #[cfg(feature="async")]
-use tokio::{
+use tokio::io::{
-    prelude::*,
+    AsyncRead,
-    io::AsyncRead,
+    AsyncReadExt,
 };
 use consts::BUFFER_SIZE;
 

src/rsa/crypt.rs

@@ -13,12 +13,11 @@ use openssl::{
     pkey::HasPrivate,
 };
 #[cfg(feature="async")]
-use tokio::{
+use tokio::io::{
-    io::{
+    AsyncWrite,
-	AsyncWrite,
+    AsyncWriteExt,
-	AsyncRead,
+    AsyncRead,
-    },
+    AsyncReadExt,
-    prelude::*,
 };
 
 use consts::RSA_PADDING_NEEDS as PADDING_NEEDS;

src/rsa/private.rs

@@ -37,12 +37,11 @@ use openssl::{
     symm::Cipher,
 };
 #[cfg(feature="async")] 
-use tokio::{
+use tokio::io::{
-    io::{
+    AsyncWrite,
-	AsyncWrite,
+    AsyncWriteExt,
-	AsyncRead,
+    AsyncRead,
-    },
+    AsyncReadExt,
-    prelude::*,
 };
 
 /// Container for the private & public parts of an RSA key

src/rsa/public.rs

@@ -33,12 +33,11 @@ use openssl::{
     },
 };
 #[cfg(feature="async")]
-use tokio::{
+use tokio::io::{
-    io::{
+    AsyncWrite,
-	AsyncWrite,
+    AsyncWriteExt,
-	AsyncRead,
+    AsyncRead,
-    },
+    AsyncReadExt,
-    prelude::*,
 };
 
 /// Container for RSA public key components

src/rsa/sign.rs

@@ -27,11 +27,9 @@ use openssl::{
     },
 };
 #[cfg(feature="async")] 
-use tokio::{
+use tokio::io::{
-    io::{
+    AsyncRead,
-	AsyncRead,
+    AsyncReadExt,
-    },
-    prelude::*,
 };
 use consts::RSA_SIG_SIZE as SIZE;
 use consts::BUFFER_SIZE;

src/sha256.rs

@@ -10,9 +10,9 @@ use sha2::{
     Digest, Sha256,
 };
 #[cfg(feature="async")] 
-use tokio::{
+use tokio::io::{
-    io::AsyncRead,
+    AsyncRead,
-    prelude::*,
+    AsyncReadExt,
 };
 
 pub const SIZE: usize = consts::SHA256_SIZE;