Add support for Tokio

Author: mehcode

.github/workflows/postgres.yml

@@ -50,9 +50,15 @@ jobs:
     # -----------------------------------------------------
 
     # Check that we build with TLS support (TODO: we need a postgres image with SSL certs to test)
-    - run: cargo check -p sqlx-core --no-default-features --features 'postgres macros uuid chrono tls'
+    - run: cargo check -p sqlx-core --no-default-features --features 'runtime-async-std postgres macros uuid chrono tls'
 
-    - run: cargo test -p sqlx --no-default-features --features 'postgres macros uuid chrono'
+    # Test on async-std
+    - run: cargo test -p sqlx --no-default-features --features 'runtime-async-std postgres macros uuid chrono'
+      env:
+        DATABASE_URL: postgres://postgres:postgres@localhost:${{ job.services.postgres.ports[5432] }}/postgres
+
+    # Test on tokio
+    - run: cargo test -p sqlx --no-default-features --features 'runtime-tokio postgres macros uuid chrono'
       env:
         DATABASE_URL: postgres://postgres:postgres@localhost:${{ job.services.postgres.ports[5432] }}/postgres
 

.github/workflows/rust.yml

@@ -32,9 +32,13 @@ jobs:
 
     # -----------------------------------------------------
 
-    - run: cargo check --all-features
+    - run: cargo check --no-default-features --features 'chrono uuid postgres mysql macros tls runtime-async-std'
 
-    - run: cargo test -p sqlx-core --all-features
+    - run: cargo check --no-default-features --features 'chrono uuid postgres mysql macros tls runtime-tokio'
+
+    - run: cargo test -p sqlx-core --no-default-features --features 'chrono uuid postgres mysql macros tls runtime-async-std'
+
+    - run: cargo test -p sqlx-core --no-default-features --features 'chrono uuid postgres mysql macros tls runtime-tokio'
 
     # Rust ------------------------------------------------
 

Cargo.lock

@@ -28,9 +28,13 @@ authors = [
 all-features = true
 
 [features]
-default = [ "macros" ]
+default = [ "macros", "runtime-async-std" ]
 macros = [ "sqlx-macros" ]
-tls = ["sqlx-core/tls"]
+tls = [ "sqlx-core/tls" ]
+
+# runtime
+runtime-async-std = [ "sqlx-core/runtime-async-std" ]
+runtime-tokio = [ "sqlx-core/runtime-tokio" ]
 
 # database
 postgres = [ "sqlx-core/postgres", "sqlx-macros/postgres" ]
@@ -49,6 +53,7 @@ anyhow = "1.0.26"
 futures = "0.3.1"
 env_logger = "0.7"
 async-std = { version = "1.4.0", features = [ "attributes" ] }
+tokio = { version = "0.2.0", features = [ "full" ] }
 dotenv = "0.15.0"
 
 [[test]]

Cargo.toml

@@ -20,11 +20,14 @@ default = []
 unstable = []
 postgres = [ "md-5", "sha2", "base64", "sha-1", "rand", "hmac" ]
 mysql = [ "sha-1", "sha2", "generic-array", "num-bigint", "base64", "digest", "rand" ]
-tls = ["async-native-tls"]
+tls = [ "async-native-tls" ]
+runtime-async-std = [ "async-native-tls/runtime-async-std", "async-std" ]
+runtime-tokio = [ "async-native-tls/runtime-tokio", "tokio" ]
 
 [dependencies]
-async-native-tls = { version = "0.3", optional = true }
-async-std = "1.4.0"
+async-native-tls = { version = "0.3", default-features = false, optional = true }
+async-std = { version = "1.4.0", optional = true }
+tokio = { version = "0.2", default-features = false, features = [ "dns", "fs", "time", "tcp" ], optional = true } 
 async-stream = { version = "0.2.0", default-features = false }
 base64 = { version = "0.11.0", default-features = false, optional = true, features = [ "std" ] }
 bitflags = { version = "1.2.1", default-features = false }

release.toml

@@ -1,10 +1,8 @@
-use async_std::io::{
-    prelude::{ReadExt, WriteExt},
-    Read, Write,
-};
 use std::io;
 use std::ops::{Deref, DerefMut};
 
+use crate::runtime::{AsyncRead, AsyncReadExt, AsyncWriteExt, AsyncWrite};
+
 const RBUF_SIZE: usize = 8 * 1024;
 
 pub struct BufStream<S> {
@@ -24,7 +22,7 @@ pub struct BufStream<S> {
 
 impl<S> BufStream<S>
 where
-    S: Read + Write + Unpin,
+    S: AsyncRead + AsyncWrite + Unpin,
 {
     pub fn new(stream: S) -> Self {
         Self {

sqlx-core/Cargo.toml

@@ -4,7 +4,6 @@ mod buf_stream;
 mod buf;
 mod buf_mut;
 mod byte_str;
-
 mod tls;
 
 pub use self::{