yume/juniper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update most crates to futures 0.3, add todos on not updated crates

Browse source
This commit is contained in:
nWacky 2019-11-12 14:33:12 +03:00 committed by theduke
parent cf99495368
commit a5580a939d
7 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/warp_async/Cargo.toml
View file

@ -10,7 +10,7 @@ edition = "2018"
log = "0.4.8"
env_logger = "0.6.2"
warp = "0.1.19"
futures-preview = { version = "0.3.0-alpha.19", features = ["async-await", "compat"] }
futures = { version = "0.3.1", features = ["compat"] }
reqwest = "0.9.19"
juniper_codegen = { git = "https://github.com/graphql-rust/juniper", branch = "async-await", features = ["async"] }

2
integration_tests/async_await/Cargo.toml
View file

@ -8,5 +8,5 @@ edition = "2018"
[dependencies]
juniper = { path = "../../juniper", features = ["async"] }
futures-preview = "=0.3.0-alpha.19"
futures = "=0.3.1"
tokio = "=0.2.0-alpha.6"

4
juniper/Cargo.toml
View file

@ -24,7 +24,7 @@ harness = false
path = "benches/bench.rs"
[features]
async = ["juniper_codegen/async", "futures-preview"]
async = ["juniper_codegen/async", "futures"]
expose-test-schema = []
default = [
"chrono",
@ -38,7 +38,7 @@ juniper_codegen = { version = "0.14.1", path = "../juniper_codegen" }
async-trait = "0.1.16"
chrono = { version = "0.4.0", optional = true }
fnv = "1.0.3"
futures-preview = { version = "=0.3.0-alpha.19", optional = true }
futures = { version = "=0.3.1", optional = true }
indexmap = { version = "1.0.0", features = ["serde-1"] }
serde = { version = "1.0.8" }
serde_derive = { version = "1.0.2" }

2
juniper_benchmarks/Cargo.toml
View file

@ -12,7 +12,7 @@ harness = false
[dependencies]
juniper = { path = "../juniper", features = ["async"] }
futures-preview = "=0.3.0-alpha.19"
futures = "=0.3.1"
[dev-dependencies]
criterion = "0.2.11"

2
juniper_rocket/Cargo.toml
View file

@ -20,7 +20,7 @@ serde_json = { version = "1.0.2" }
serde_derive = { version = "1.0.2" }
juniper = { version = "0.14.1", default-features = false, path = "../juniper"}
futures03 = { version = "=0.3.0-alpha.19", package = "futures-preview", features = ["compat"] }
futures = { version = "=0.3.1", features = ["compat"] }
rocket = { git = "https://github.com/SergioBenitez/Rocket", branch = "async" }
tokio = "=0.2.0-alpha.6"

4
juniper_rocket/src/lib.rs
View file

@ -62,7 +62,7 @@ use juniper::{
use juniper::GraphQLTypeAsync;
#[cfg(feature = "async")]
use futures03::future::{FutureExt, TryFutureExt};
use futures::future::{FutureExt, TryFutureExt};
#[derive(Debug, serde_derive::Deserialize, PartialEq)]
#[serde(untagged)]
@ -135,7 +135,7 @@ where
.map(|request| request.execute_async(root_node, context))
.collect::<Vec<_>>();
GraphQLBatchResponse::Batch(futures03::future::join_all(futures).await)
GraphQLBatchResponse::Batch(futures::future::join_all(futures).await)
}
}
}

5
juniper_warp/Cargo.toml
View file

@ -17,11 +17,12 @@ juniper = { version = "0.14.1", path = "../juniper", default-features = false }
serde_json = "1.0.24"
serde_derive = "1.0.75"
failure = "0.1.2"
futures = "0.1.23"
# TODO: rebase juniper_warp to futures 3 once warp supports it
futures = "0.1.29"
serde = "1.0.75"
tokio-threadpool = "0.1.7"
futures03 = { version = "=0.3.0-alpha.19", optional = true, package = "futures-preview", features = ["compat"] }
futures03 = { version = "=0.3.1", optional = true, package = "futures", features = ["compat"] }
[dev-dependencies]
juniper = { version = "0.14.1", path = "../juniper", features = ["expose-test-schema", "serde_json"] }