diff --git a/bincode-transport/Cargo.toml b/bincode-transport/Cargo.toml index 70ab758..47e4c32 100644 --- a/bincode-transport/Cargo.toml +++ b/bincode-transport/Cargo.toml @@ -14,6 +14,7 @@ description = "A bincode-based transport for tarpc services." [dependencies] bincode = "1" +futures-preview = { git = "https://github.com/rust-lang-nursery/futures-rs", features = ["compat"] } futures_legacy = { version = "0.1", package = "futures" } pin-utils = "0.1.0-alpha.4" rpc = { package = "tarpc-lib", version = "0.3", path = "../rpc", features = ["serde1"] } @@ -22,11 +23,7 @@ tokio-io = "0.1" async-bincode = "0.4" tokio-tcp = "0.1" -[target.'cfg(not(test))'.dependencies] -futures-preview = { git = "https://github.com/rust-lang-nursery/futures-rs", features = ["compat"] } - [dev-dependencies] -futures-preview = { git = "https://github.com/rust-lang-nursery/futures-rs", features = ["compat"] } env_logger = "0.6" humantime = "1.0" libtest = "0.0.1" diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 9b517de..b9125d4 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -18,6 +18,7 @@ serde1 = ["trace/serde", "serde", "serde/derive"] [dependencies] fnv = "1.0" +futures-preview = { git = "https://github.com/rust-lang-nursery/futures-rs", features = ["compat"] } humantime = "1.0" log = "0.4" parking_lot = "0.7" @@ -27,11 +28,7 @@ tokio-timer = "0.2" trace = { package = "tarpc-trace", version = "0.2", path = "../trace" } serde = { optional = true, version = "1.0" } -[target.'cfg(not(test))'.dependencies] -futures-preview = { git = "https://github.com/rust-lang-nursery/futures-rs", features = ["compat"] } - [dev-dependencies] -futures-preview = { git = "https://github.com/rust-lang-nursery/futures-rs", features = ["compat"] } futures-test-preview = { git = "https://github.com/rust-lang-nursery/futures-rs" } env_logger = "0.6" tokio = "0.1" diff --git a/tarpc/Cargo.toml b/tarpc/Cargo.toml index c5ab8fb..8a497c0 100644 --- a/tarpc/Cargo.toml +++ b/tarpc/Cargo.toml @@ -19,19 +19,16 @@ serde1 = ["rpc/serde1", "serde", "serde/derive"] travis-ci = { repository = "google/tarpc" } [dependencies] +futures-preview = { git = "https://github.com/rust-lang-nursery/futures-rs", features = ["compat"] } log = "0.4" serde = { optional = true, version = "1.0" } -tarpc-plugins = { path = "../plugins", version = "0.5.0" } rpc = { package = "tarpc-lib", path = "../rpc", version = "0.3" } - -[target.'cfg(not(test))'.dependencies] -futures-preview = { git = "https://github.com/rust-lang-nursery/futures-rs" } +tarpc-plugins = { path = "../plugins", version = "0.5.0" } [dev-dependencies] bincode = "1" bytes = { version = "0.4", features = ["serde"] } humantime = "1.0" -futures-preview = { git = "https://github.com/rust-lang-nursery/futures-rs", features = ["compat"] } bincode-transport = { package = "tarpc-bincode-transport", version = "0.4", path = "../bincode-transport" } env_logger = "0.6" libtest = "0.0.1"