Merge branch 'master' into object-safe-graphqltype

Author: tyranron

docs/book/content/types/scalars.md

@@ -27,6 +27,8 @@ Juniper has built-in support for:
   spec](http://facebook.github.io/graphql/#sec-ID) as a type that is serialized
   as a string but can be parsed from both a string and an integer.
 
+Note that there is no built-in support for `i64`/`u64`, as the GraphQL spec [doesn't define any built-in scalars for `i64`/`u64` by default](https://spec.graphql.org/June2018/#sec-Int). You may wish to leverage a [custom GraphQL scalar](#custom-scalars) in your schema to support them.
+
 **Third party types**:
 
 Juniper has built-in support for a few additional types from common third party

juniper_rocket_async/examples/rocket_server.rs

@@ -32,7 +32,8 @@ fn post_graphql_handler(
     request.execute_sync(&schema, &context)
 }
 
-fn main() {
+#[rocket::main]
+async fn main() {
     rocket::ignite()
         .manage(Database::new())
         .manage(Schema::new(
@@ -45,5 +46,6 @@ fn main() {
             rocket::routes![graphiql, get_graphql_handler, post_graphql_handler],
         )
         .launch()
+        .await
         .expect("server to launch");
 }

juniper_rocket_async/src/lib.rs

@@ -325,25 +325,15 @@ where
     }
 }
 
-use rocket::futures::future::BoxFuture;
-
-impl<'r> Responder<'r> for GraphQLResponse {
-    fn respond_to<'a, 'x>(self, _req: &'r Request<'a>) -> BoxFuture<'x, response::Result<'r>>
-    where
-        'a: 'x,
-        'r: 'x,
-        Self: 'x,
-    {
+impl<'r, 'o: 'r> Responder<'r, 'o> for GraphQLResponse {
+    fn respond_to(self, _req: &'r Request<'_>) -> response::Result<'o> {
         let GraphQLResponse(status, body) = self;
 
-        Box::pin(async move {
-            Ok(Response::build()
-                .header(ContentType::new("application", "json"))
-                .status(status)
-                .sized_body(Cursor::new(body))
-                .await
-                .finalize())
-        })
+        Response::build()
+            .header(ContentType::new("application", "json"))
+            .status(status)
+            .sized_body(body.len(), Cursor::new(body))
+            .ok()
     }
 }
 
@@ -528,10 +518,10 @@ mod tests {
         }
     }
 
-    #[test]
-    fn test_rocket_integration() {
+    #[tokio::test]
+    async fn test_rocket_integration() {
         let rocket = make_rocket();
-        let client = Client::new(rocket).expect("valid rocket");
+        let client = Client::new(rocket).await.expect("valid rocket");
         let integration = TestRocketIntegration { client };
 
         http_tests::run_http_test_suite(&integration);
@@ -551,7 +541,7 @@ mod tests {
 
         let rocket = make_rocket_without_routes()
             .mount("/", routes![post_graphql_assert_operation_name_handler]);
-        let client = Client::new(rocket).expect("valid rocket");
+        let client = Client::new(rocket).await.expect("valid rocket");
 
         let resp = client
             .post("/")
@@ -583,14 +573,13 @@ mod tests {
             .expect("No content type header from handler")
             .to_string();
         let body = response
-            .body()
-            .expect("No body returned from GraphQL handler")
-            .into_string()
-            .await;
+            .body_string()
+            .await
+            .expect("No body returned from GraphQL handler");
 
         http_tests::TestResponse {
             status_code,
-            body,
+            body: Some(body),
             content_type,
         }
     }

juniper_subscriptions/src/lib.rs

@@ -187,8 +187,8 @@ where
                 ready_vec.push(None);
             }
 
-            let stream = futures::stream::poll_fn(
-                move |mut ctx| -> Poll<Option<GraphQLResponse<'static, S>>> {
+            let stream =
+                futures::stream::poll_fn(move |mut ctx| -> Poll<Option<GraphQLResponse<'a, S>>> {
                     let mut obj_iterator = object.iter_mut();
 
                     // Due to having to modify `ready_vec` contents (by-move pattern)
@@ -246,8 +246,7 @@ where
                     } else {
                         Poll::Pending
                     }
-                },
-            );
+                });
 
             Box::pin(stream)
         }