Skip to content

Commit aa44090

Browse files
committed
Update futures-preview/tokio
1 parent 1b5d65d commit aa44090

File tree

5 files changed

+20
-19
lines changed

5 files changed

+20
-19
lines changed

postgres-native-tls/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ default = ["runtime"]
1616
runtime = ["tokio-postgres/runtime"]
1717

1818
[dependencies]
19-
futures-preview = "=0.3.0-alpha.17"
19+
futures-preview = "=0.3.0-alpha.18"
2020
native-tls = "0.2"
21-
tokio-io = "=0.2.0-alpha.1"
22-
tokio-tls = "=0.3.0-alpha.1"
21+
tokio-io = "=0.2.0-alpha.2"
22+
tokio-tls = "=0.3.0-alpha.2"
2323
tokio-postgres = { version = "0.4.0-rc.1", path = "../tokio-postgres", default-features = false }
2424

2525
[dev-dependencies]
26-
tokio = "=0.2.0-alpha.1"
26+
tokio = "=0.2.0-alpha.2"
2727
postgres = { version = "0.16.0-rc.1", path = "../postgres" }

postgres-openssl/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ default = ["runtime"]
1616
runtime = ["tokio-postgres/runtime"]
1717

1818
[dependencies]
19-
futures-preview = "=0.3.0-alpha.17"
19+
futures-preview = "=0.3.0-alpha.18"
2020
openssl = "0.10"
21-
tokio-io = "=0.2.0-alpha.1"
22-
tokio-openssl = "=0.4.0-alpha.1"
21+
tokio-io = "=0.2.0-alpha.2"
22+
tokio-openssl = "=0.4.0-alpha.2"
2323
tokio-postgres = { version = "0.4.0-rc.1", path = "../tokio-postgres", default-features = false }
2424

2525
[dev-dependencies]
26-
tokio = "=0.2.0-alpha.1"
26+
tokio = "=0.2.0-alpha.2"
2727
postgres = { version = "0.16.0-rc.1", path = "../postgres" }

postgres/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ runtime = ["tokio-postgres/runtime", "tokio", "lazy_static", "log"]
3030
[dependencies]
3131
bytes = "0.4"
3232
fallible-iterator = "0.2"
33-
futures-preview = "=0.3.0-alpha.17"
33+
futures-preview = "=0.3.0-alpha.18"
3434
pin-utils = "=0.1.0-alpha.4"
3535
tokio-postgres = { version = "0.4.0-rc.2", path = "../tokio-postgres", default-features = false }
36-
tokio-executor = "=0.2.0-alpha.1"
36+
tokio-executor = "=0.2.0-alpha.2"
3737

38-
tokio = { version = "=0.2.0-alpha.1", optional = true }
38+
tokio = { version = "=0.2.0-alpha.2", optional = true }
3939
lazy_static = { version = "1.0", optional = true }
4040
log = { version = "0.4", optional = true }
4141

4242
[dev-dependencies]
43-
tokio = "=0.2.0-alpha.1"
43+
tokio = "=0.2.0-alpha.2"

tokio-postgres/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ circle-ci = { repository = "sfackler/rust-postgres" }
2121

2222
[features]
2323
default = ["runtime"]
24-
runtime = ["tokio/rt-full", "tokio/tcp", "tokio/uds", "tokio-threadpool", "lazy_static"]
24+
runtime = ["tokio/rt-full", "tokio/tcp", "tokio/uds", "tokio-executor", "lazy_static"]
2525

2626
"with-bit-vec-0_5" = ["bit-vec-05"]
2727
"with-chrono-0_4" = ["chrono-04"]
@@ -33,16 +33,16 @@ with-serde_json-1 = ["serde-1", "serde_json-1"]
3333
[dependencies]
3434
bytes = "0.4"
3535
fallible-iterator = "0.2"
36-
futures-preview = { version = "=0.3.0-alpha.17", features = ["nightly", "async-await"] }
36+
futures-preview = { version = "=0.3.0-alpha.18", features = ["nightly", "async-await"] }
3737
log = "0.4"
3838
parking_lot = "0.9"
3939
percent-encoding = "1.0"
4040
pin-utils = "=0.1.0-alpha.4"
4141
phf = "0.7.23"
4242
postgres-protocol = { version = "0.4.1", path = "../postgres-protocol" }
43-
tokio = { version = "=0.2.0-alpha.1", default-features = false, features = ["io", "codec"] }
43+
tokio = { version = "=0.2.0-alpha.2", default-features = false, features = ["io", "codec"] }
4444

45-
tokio-threadpool = { version = "=0.2.0-alpha.1", optional = true }
45+
tokio-executor = { version = "=0.2.0-alpha.2", optional = true }
4646
lazy_static = { version = "1.0", optional = true }
4747

4848
bit-vec-05 = { version = "0.5", package = "bit-vec", optional = true }
@@ -54,5 +54,5 @@ serde_json-1 = { version = "1.0", package = "serde_json", optional = true }
5454
uuid-07 = { version = "0.7", package = "uuid", optional = true }
5555

5656
[dev-dependencies]
57-
tokio = "=0.2.0-alpha.1"
57+
tokio = "=0.2.0-alpha.2"
5858
env_logger = "0.5"

tokio-postgres/src/connect_socket.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
use crate::config::Host;
22
use crate::{Error, Socket};
3-
use std::vec;
43
use futures::channel::oneshot;
54
use futures::future;
65
use std::future::Future;
76
use std::net::{IpAddr, SocketAddr, ToSocketAddrs};
87
use std::time::Duration;
8+
use std::vec;
99
use std::{io, thread};
1010
use tokio::net::TcpStream;
1111
#[cfg(unix)]
1212
use tokio::net::UnixStream;
1313
use tokio::timer::Timeout;
14+
use tokio_executor::threadpool;
1415

1516
pub(crate) async fn connect_socket(
1617
host: &Host,
@@ -67,7 +68,7 @@ pub(crate) async fn connect_socket(
6768
async fn dns(host: &str, port: u16) -> io::Result<vec::IntoIter<SocketAddr>> {
6869
// if we're running on a threadpool, use its blocking support
6970
if let Ok(r) =
70-
future::poll_fn(|_| tokio_threadpool::blocking(|| (host, port).to_socket_addrs())).await
71+
future::poll_fn(|_| threadpool::blocking(|| (host, port).to_socket_addrs())).await
7172
{
7273
return r;
7374
}

0 commit comments

Comments
 (0)