Skip to content

Commit 4a9b78a

Browse files
committed
Part-way there
1 parent 143a177 commit 4a9b78a

27 files changed

+1033
-1460
lines changed

Cargo.toml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license = "MIT/Apache-2.0"
77
name = "mysql_async"
88
readme = "README.md"
99
repository = "https://github.com/blackbeam/mysql_async"
10-
version = "0.20.0"
10+
version = "0.21.0-alpha.1"
1111
exclude = ["test/*"]
1212
edition = "2018"
1313

@@ -19,19 +19,20 @@ crossbeam = "0.7"
1919
failure = "0.1"
2020
failure_derive = "0.1"
2121
fnv = "1"
22-
futures = "0.1.18"
22+
futures-core-preview = "0.3.0-alpha.18"
23+
futures-util-preview = "0.3.0-alpha.18"
24+
futures-sink-preview = "0.3.0-alpha.18"
2325
mysql_common = "0.18"
24-
native-tls = { version = "0.2", optional = true }
26+
native-tls = "0.2"
2527
percent-encoding = "2.1.0"
28+
pin-project = { version = "0.4.0-alpha.8", features = ["project_attr"] }
2629
regex = "1"
2730
serde = "1"
2831
serde_json = "1"
29-
tokio = "0.1.9"
30-
tokio-codec = "0.1"
31-
tokio-io = "0.1"
32-
tokio-named-pipes = "0.1"
33-
tokio-uds = "0.2"
34-
tokio-sync = "0.1"
32+
# we only need rt-full for tokio::spawn
33+
tokio = { version = "0.2.0-alpha.4", default-features = false, features = ["codec", "io", "net", "sync", "fs", "rt-full"] }
34+
#tokio-named-pipes = "0.1"
35+
tokio-tls = "0.3.0-alpha.4"
3536
twox-hash = "1"
3637
url = "2.1"
3738

@@ -40,11 +41,16 @@ lazy_static = "1"
4041

4142
[features]
4243
nightly = []
43-
ssl = ['native-tls']
4444

4545
[lib]
4646
name = "mysql_async"
4747
path = "src/lib.rs"
4848

4949
[profile.bench]
5050
debug = true
51+
52+
[patch.crates-io]
53+
tokio-tls = { git = "https://github.com/tokio-rs/tokio.git", branch = "jonhoo/tokio-tls-inner" }
54+
55+
[patch.'https://github.com/tokio-rs/tokio.git']
56+
tokio-io = "0.2.0-alpha.4"

0 commit comments

Comments
 (0)