itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2026-03-27 13:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: update actix-rt, remove tokio 0.2 from workspace

Browse Source
This commit is contained in:
Ryan Leckey
2021-01-10 11:34:39 -08:00
parent 7144ebc8a0
commit 6adf743225
3 changed files with 51 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sqlx-core/Cargo.toml
View File

@@ -30,7 +30,7 @@ async = ["futures-util", "futures-io", "futures-core"]
# async runtimes
async-std = ["async", "_async-std"]
actix = ["async", "actix-rt", "tokio_02", "async-compat_02"]
actix = ["async", "actix-rt", "_tokio", "async-compat"]
tokio = ["async", "_tokio", "async-compat"]
# mock runtime; intended for testing drivers
@@ -38,13 +38,11 @@ _mock = ["conquer-once", "parking_lot", "crossbeam"]
[dependencies]
log = "0.4.11"
actix-rt = { version = "1.1", optional = true }
actix-rt = { version = "2.0.0-beta.2", optional = true }
_async-std = { version = "1.8", optional = true, package = "async-std" }
futures-util = { version = "0.3", optional = true, features = ["io"] }
_tokio = { version = "1.0", optional = true, package = "tokio", features = ["net"] }
tokio_02 = { version = "0.2", optional = true, package = "tokio", features = ["net"] }
async-compat = { version = "*", git = "https://github.com/taiki-e/async-compat", branch = "tokio1", optional = true }
async-compat_02 = { version = "0.1", optional = true, package = "async-compat" }
futures-io = { version = "0.3", optional = true }
futures-core = { version = "0.3", optional = true }
bytes = "1.0"

2
sqlx-core/src/runtime/actix.rs
View File

@@ -1,7 +1,7 @@
use std::io;
use actix_rt::net::TcpStream;
use async_compat_02::Compat;
use async_compat::Compat;
use futures_util::io::{Read, Write};
use futures_util::{future::BoxFuture, AsyncReadExt, AsyncWriteExt, FutureExt, TryFutureExt};