Make juniper_rocket_async replace juniper_rocket (#955)

* Make juniper_rocket_async replace juniper_rocket

Now that rocket v0.5 is async and in rc, merge the two juniper projects.

Fixes #947.

* Remove println

Author: LegNeato

Cargo.toml

@@ -14,7 +14,6 @@ members = [
   "juniper_hyper",
   "juniper_iron",
   "juniper_rocket",
-  "juniper_rocket_async",
   "juniper_subscriptions",
   "juniper_graphql_ws",
   "juniper_warp",

Makefile.toml

@@ -12,7 +12,7 @@ CARGO_MAKE_CARGO_ALL_FEATURES = ""
 [tasks.release]
 condition = { env_set = [ "RELEASE_LEVEL" ] }
 workspace = false
-env = { "CARGO_MAKE_WORKSPACE_SKIP_MEMBERS" = "integration_tests/*;examples/*;juniper_benchmarks;juniper_rocket_async" }
+env = { "CARGO_MAKE_WORKSPACE_SKIP_MEMBERS" = "integration_tests/*;examples/*;juniper_benchmarks;" }
 run_task = { name = "release-INTERNAL", fork = true }
 
 
@@ -39,7 +39,7 @@ args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/releas
 [tasks.release-dry-run]
 condition = { env_set = [ "RELEASE_LEVEL" ] }
 workspace = false
-env = { "CARGO_MAKE_WORKSPACE_SKIP_MEMBERS" = "integration_tests/*;examples/*;juniper_benchmarks;juniper_rocket_async" }
+env = { "CARGO_MAKE_WORKSPACE_SKIP_MEMBERS" = "integration_tests/*;examples/*;juniper_benchmarks;" }
 run_task = { name = "release-dry-run-INTERNAL", fork = true }
 
 [tasks.release-some-dry-run]
@@ -53,7 +53,7 @@ run_task = { name = "release-some-dry-run-INTERNAL", fork = true }
 [tasks.release-dry-run-INTERNAL]
 private = true
 condition = { env_set = [ "RELEASE_LEVEL" ] }
-env = { "CARGO_MAKE_WORKSPACE_SKIP_MEMBERS" = "integration_tests/*;examples/*;juniper_benchmarks;juniper_rocket_async" }
+env = { "CARGO_MAKE_WORKSPACE_SKIP_MEMBERS" = "integration_tests/*;examples/*;juniper_benchmarks;" }
 description = "Run `cargo-release --dry-run` for every crate"
 command = "cargo-release"
 args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/release.toml", "--dry-run", "${RELEASE_LEVEL}"]
@@ -68,7 +68,7 @@ args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/releas
 [tasks.release-local-test]
 condition = { env_set = [ "RELEASE_LEVEL" ] }
 workspace = false
-env = { "CARGO_MAKE_WORKSPACE_SKIP_MEMBERS" = "integration_tests/*;examples/*;juniper_benchmarks;juniper_rocket_async" }
+env = { "CARGO_MAKE_WORKSPACE_SKIP_MEMBERS" = "integration_tests/*;examples/*;juniper_benchmarks;" }
 run_task = { name = "release-local-test-INTERNAL", fork = true }
 
 

juniper/release.toml

@@ -21,9 +21,6 @@ pre-release-replacements = [
   # Rocket
   {file="../juniper_rocket/Cargo.toml", min=0, search="juniper = \\{ version = \"[^\"]+\"", replace="juniper = { version = \"{{version}}\""},
   {file="../juniper_rocket/Cargo.toml", min=0, search="\\[dev-dependencies\\.juniper\\]\nversion = \"[^\"]+\"", replace="[dev-dependencies.juniper]\nversion = \"{{version}}\""},
-  # Rocket Async
-  {file="../juniper_rocket_async/Cargo.toml", min=0, search="juniper = \\{ version = \"[^\"]+\"", replace="juniper = { version = \"{{version}}\""},
-  {file="../juniper_rocket_async/Cargo.toml", min=0, search="\\[dev-dependencies\\.juniper\\]\nversion = \"[^\"]+\"", replace="[dev-dependencies.juniper]\nversion = \"{{version}}\""},
   # Warp
   {file="../juniper_warp/Cargo.toml", min=0, search="juniper = \\{ version = \"[^\"]+\"", replace="juniper = { version = \"{{version}}\""},
   {file="../juniper_warp/Cargo.toml", min=0, search="\\[dev-dependencies\\.juniper\\]\nversion = \"[^\"]+\"", replace="[dev-dependencies.juniper]\nversion = \"{{version}}\""},

juniper_rocket/CHANGELOG.md

@@ -1,5 +1,6 @@
 # master
 
+- Require async rocket support (`rocket` >= 0.5-rc1).
 - Compatibility with the latest `juniper`.
 
 # [[0.7.1] 2021-06-07](https://github.com/graphql-rust/juniper/releases/tag/juniper_rocket-0.7.1)

juniper_rocket/Cargo.toml

@@ -12,8 +12,9 @@ documentation = "https://docs.rs/juniper_rocket"
 repository = "https://github.com/graphql-rust/juniper"
 
 [dependencies]
-juniper = { version = "0.15.6", path = "../juniper", default-features = false}
-rocket = { version = "0.4.10", default-features = false }
+futures = "0.3.1"
+juniper = { version = "0.15.6", path = "../juniper", default-features = false }
+rocket = { version = "0.5.0-rc.1", default-features = false }
 serde_json = "1.0.2"
 
 [dev-dependencies]

juniper_rocket/Makefile.toml

@@ -1,11 +1,8 @@
-#![feature(decl_macro, proc_macro_hygiene)]
-
-use rocket::{response::content, State};
-
 use juniper::{
     tests::fixtures::starwars::schema::{Database, Query},
     EmptyMutation, EmptySubscription, RootNode,
 };
+use rocket::{response::content, Rocket, State};
 
 type Schema = RootNode<'static, Query, EmptyMutation<Database>, EmptySubscription<Database>>;
 
@@ -16,24 +13,25 @@ fn graphiql() -> content::Html<String> {
 
 #[rocket::get("/graphql?<request>")]
 fn get_graphql_handler(
-    context: State<Database>,
+    context: &State<Database>,
     request: juniper_rocket::GraphQLRequest,
-    schema: State<Schema>,
+    schema: &State<Schema>,
 ) -> juniper_rocket::GraphQLResponse {
-    request.execute_sync(&schema, &context)
+    request.execute_sync(&*schema, &*context)
 }
 
 #[rocket::post("/graphql", data = "<request>")]
 fn post_graphql_handler(
-    context: State<Database>,
+    context: &State<Database>,
     request: juniper_rocket::GraphQLRequest,
-    schema: State<Schema>,
+    schema: &State<Schema>,
 ) -> juniper_rocket::GraphQLResponse {
-    request.execute_sync(&schema, &context)
+    request.execute_sync(&*schema, &*context)
 }
 
-fn main() {
-    rocket::ignite()
+#[rocket::main]
+async fn main() {
+    Rocket::build()
         .manage(Database::new())
         .manage(Schema::new(
             Query,
@@ -44,5 +42,7 @@ fn main() {
             "/",
             rocket::routes![graphiql, get_graphql_handler, post_graphql_handler],
         )
-        .launch();
+        .launch()
+        .await
+        .expect("server to launch");
 }