Resolve some todos in async-await branch

examples/warp_async/Cargo.toml

@@ -16,4 +16,3 @@ reqwest = "0.9.19"
 juniper_codegen = { git = "https://github.com/graphql-rust/juniper", branch = "async-await", features = ["async"] }
 juniper = { git = "https://github.com/graphql-rust/juniper", branch = "async-await", features = ["async"] }
 juniper_warp = { git = "https://github.com/graphql-rust/juniper", branch = "async-await", features = ["async"] }
-

examples/warp_async/src/main.rs

@@ -2,13 +2,11 @@
 //! This example demonstrates async/await usage with warp.
 //! NOTE: this uses tokio 0.1 , not the alpha tokio 0.2.
 
-use juniper::{EmptyMutation, RootNode, FieldError};
+use juniper::{EmptyMutation, FieldError, RootNode};
 use warp::{http::Response, Filter};
 
 #[derive(Clone)]
-struct Context {
-
-}
+struct Context {}
 impl juniper::Context for Context {}
 
 #[derive(juniper::GraphQLEnum, Clone, Copy)]
@@ -43,23 +41,24 @@ impl User {
     }
 }
 
-struct Query; 
+struct Query;
 
 #[juniper::object(Context = Context)]
 impl Query {
     async fn users() -> Vec<User> {
-        vec![
-            User{
-                id: 1,
-                kind: UserKind::Admin,
-                name: "user1".into(),
-            },
-        ]
+        vec![User {
+            id: 1,
+            kind: UserKind::Admin,
+            name: "user1".into(),
+        }]
     }
 
     /// Fetch a URL and return the response body text.
     async fn request(url: String) -> Result<String, FieldError> {
-        use futures::{ compat::{Stream01CompatExt, Future01CompatExt}, stream::TryStreamExt};
+        use futures::{
+            compat::{Future01CompatExt, Stream01CompatExt},
+            stream::TryStreamExt,
+        };
 
         let res = reqwest::r#async::Client::new()
             .get(&url)
@@ -95,7 +94,7 @@ fn main() {
 
     log::info!("Listening on 127.0.0.1:8080");
 
-    let state = warp::any().map(move || Context{} );
+    let state = warp::any().map(move || Context {});
     let graphql_filter = juniper_warp::make_graphql_filter_async(schema(), state.boxed());
 
     warp::serve(

integration_tests/juniper_tests/src/codegen/unions.rs

@@ -1,4 +1 @@
 
-
-
-

juniper/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 - No changes yet
 
+# [[0.14.1] 2019-10-24](https://github.com/graphql-rust/juniper/releases/tag/juniper-0.14.1)
+
+- Fix panic when an invalid scalar is used by a client [#434](https://github.com/graphql-rust/juniper/pull/434)
+- `EmptyMutation` now implements `Send` [#443](https://github.com/graphql-rust/juniper/pull/443)
+
 # [[0.14.0] 2019-09-29](https://github.com/graphql-rust/juniper/releases/tag/juniper-0.14.0)
 
 - Require `url` 2.x if `url` feature is enabled.

juniper/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "juniper"
-version = "0.14.0"
+version = "0.14.1"
 authors = [
     "Magnus Hallin <[email protected]>",
     "Christoph Herzog <[email protected]>",
@@ -33,20 +33,19 @@ default = [
 ]
 
 [dependencies]
-juniper_codegen = { version = "0.14.0", path = "../juniper_codegen"  }
+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 }
 indexmap = { version = "1.0.0", features = ["serde-1"] }
 serde = { version = "1.0.8" }
 serde_derive = { version = "1.0.2" }
-
-chrono = { version = "0.4.0", optional = true }
 serde_json = { version="1.0.2", optional = true }
 url = { version = "2", optional = true }
 uuid = { version = "0.7", optional = true }
 
-futures-preview = { version = "=0.3.0-alpha.19", optional = true }
-
 [dev-dependencies]
 bencher = "0.1.2"
 serde_json = { version = "1.0.2" }

juniper/src/lib.rs

@@ -88,7 +88,7 @@ Juniper has not reached 1.0 yet, thus some API instability should be expected.
 [chrono]: https://crates.io/crates/chrono
 
 */
-#![doc(html_root_url = "https://docs.rs/juniper/0.14.0")]
+#![doc(html_root_url = "https://docs.rs/juniper/0.14.1")]
 #![warn(missing_docs)]
 
 #[doc(hidden)]

juniper/src/macros/common.rs

@@ -7,7 +7,7 @@ macro_rules! __juniper_impl_trait {
         }
     ) => {
         impl<$($other,)*> $crate::$impl_trait<$crate::DefaultScalarValue> for $name {
-            $($body)*
+            $($body)+
         }
     };
     (
@@ -26,7 +26,7 @@ macro_rules! __juniper_impl_trait {
 
     (
         impl< <$generic:tt $(: $bound: tt)*> $(, $other: tt)* > $impl_trait:tt for $name:ty {
-            $($body:tt)*
+            $($body:tt)+
         }
     ) => {
        impl<$($other,)* $generic $(: $bound)*> $crate::$impl_trait<$generic> for $name
@@ -50,17 +50,17 @@ macro_rules! __juniper_impl_trait {
             $generic: $crate::ScalarValue,
             for<'__b> &'__b $generic: $crate::ScalarRefValue<'__b>,
        {
-           $($body)*
+           $($body)+
        }
     };
 
     (
         impl<$scalar:ty $(, $other: tt )*> $impl_trait:tt for $name:ty {
-            $($body:tt)*
+            $($body:tt)+
         }
     ) => {
         impl<$($other, )*> $crate::$impl_trait<$scalar> for $name {
-            $($body)*
+            $($body)+
         }
     };
     (
@@ -96,25 +96,6 @@ macro_rules! __juniper_insert_generic {
     };
 }
 
-// TODO: remove me.
-#[doc(hidden)]
-#[macro_export]
-macro_rules! __juniper_extract_generic {
-    (<$name:ident>) => {
-        $name
-    };
-    (
-        <$generic:tt $(: $bound: tt)*>
-    ) => {
-        $generic
-    };
-    (
-        $scalar: ty
-    ) => {
-        $scalar
-    };
-}
-
 #[doc(hidden)]
 #[macro_export]
 macro_rules! __juniper_parse_object_header {

juniper/src/macros/scalar.rs

@@ -423,12 +423,16 @@ macro_rules! graphql_scalar {
                 )
             {
 
-                fn resolve_async<'a>(
+                fn resolve_async<'a, 'async_trait>(
                     &'a self,
                     info: &'a Self::TypeInfo,
-                    selection_set: Option<&'a [$crate::Selection<$crate::__juniper_insert_generic!($($scalar)+)>]>,
-                    executor: &'a $crate::Executor<Self::Context, $crate::__juniper_insert_generic!($($scalar)+)>,
-                ) -> futures::future::BoxFuture<'a, $crate::Value<$crate::__juniper_insert_generic!($($scalar)+)>> {
+                    selection_set: Option<&'a [$crate::Selection<'a, $crate::__juniper_insert_generic!($($scalar)+)>]>,
+                    executor: &'a $crate::Executor<'a, Self::Context, $crate::__juniper_insert_generic!($($scalar)+)>,
+                ) -> futures::future::BoxFuture<'async_trait, $crate::Value<$crate::__juniper_insert_generic!($($scalar)+)>>
+                where
+                    'a: 'async_trait,
+                    Self: 'async_trait,
+                {
                     use $crate::GraphQLType;
                     use futures::future;
                     let v = self.resolve(info, selection_set, executor);

juniper/src/macros/tests/args.rs

@@ -73,13 +73,17 @@ impl Root {
         0
     }
 
-    // TODO: enable once [RFC 2565](https://github.com/rust-lang/rust/issues/60406) is implemented
-    // fn attr_arg_descr(#[doc = "The arg"] arg: i32) -> i32 { 0 }
-    // fn attr_arg_descr_collapse(
-    //     #[doc = "The arg"]
-    //     #[doc = "and more details"]
-    //     arg: i32,
-    // ) -> i32 { 0 }
+// TODO: enable once [this issue](https://github.com/graphql-rust/juniper/pull/441) is implemented
+//     fn attr_arg_descr(
+//        #[graphql(description = "The arg")]
+//        arg: i32) -> i32
+//     { 0 }
+//
+//    fn attr_arg_descr_collapse(
+//        #[graphql(description = "The first arg")]
+//        #[graphql(description = "and more details")]
+//         arg: i32,
+//     ) -> i32 { 0 }
 
     #[graphql(arguments(arg(default = 123,),))]
     fn arg_with_default(arg: i32) -> i32 {
@@ -559,73 +563,72 @@ fn introspect_field_multi_args_descr_trailing_comma() {
     });
 }
 
-// TODO: enable once [RFC 2565](https://github.com/rust-lang/rust/issues/60406) is implemented
-// #[test]
-// fn introspect_field_attr_arg_descr() {
-//     run_args_info_query("attrArgDescr", |args| {
-//         assert_eq!(args.len(), 1);
-
-//         assert!(args.contains(&Value::object(
-//             vec![
-//                 ("name", Value::scalar("arg")),
-//                 ("description", Value::scalar("The arg")),
-//                 ("defaultValue", Value::null()),
-//                 (
-//                     "type",
-//                     Value::object(
-//                         vec![
-//                             ("name", Value::null()),
-//                             (
-//                                 "ofType",
-//                                 Value::object(
-//                                     vec![("name", Value::scalar("Int"))].into_iter().collect(),
-//                                 ),
-//                             ),
-//                         ]
-//                         .into_iter()
-//                         .collect(),
-//                     ),
-//                 ),
-//             ]
-//             .into_iter()
-//             .collect(),
-//         )));
-//     });
-// }
-
-// TODO: enable once [RFC 2565](https://github.com/rust-lang/rust/issues/60406) is implemented
-// #[test]
-// fn introspect_field_attr_arg_descr_collapse() {
-//     run_args_info_query("attrArgDescrCollapse", |args| {
-//         assert_eq!(args.len(), 1);
-
-//         assert!(args.contains(&Value::object(
-//             vec![
-//                 ("name", Value::scalar("arg")),
-//                 ("description", Value::scalar("The arg\nand more details")),
-//                 ("defaultValue", Value::null()),
-//                 (
-//                     "type",
-//                     Value::object(
-//                         vec![
-//                             ("name", Value::null()),
-//                             (
-//                                 "ofType",
-//                                 Value::object(
-//                                     vec![("name", Value::scalar("Int"))].into_iter().collect(),
-//                                 ),
-//                             ),
-//                         ]
-//                         .into_iter()
-//                         .collect(),
-//                     ),
-//                 ),
-//             ]
-//             .into_iter()
-//             .collect(),
-//         )));
-//     });
-// }
+// TODO: enable once [this issue](https://github.com/graphql-rust/juniper/pull/441) is implemented
+//#[test]
+//fn introspect_field_attr_arg_descr() {
+//    run_args_info_query("attrArgDescr", |args| {
+//        assert_eq!(args.len(), 1);
+//
+//        assert!(args.contains(&Value::object(
+//            vec![
+//                ("name", Value::scalar("arg")),
+//                ("description", Value::scalar("The arg")),
+//                ("defaultValue", Value::null()),
+//                (
+//                    "type",
+//                    Value::object(
+//                        vec![
+//                            ("name", Value::null()),
+//                            (
+//                                "ofType",
+//                                Value::object(
+//                                    vec![("name", Value::scalar("Int"))].into_iter().collect(),
+//                                ),
+//                            ),
+//                        ]
+//                        .into_iter()
+//                        .collect(),
+//                    ),
+//                ),
+//            ]
+//            .into_iter()
+//            .collect(),
+//        )));
+//    });
+//}
+//
+//#[test]
+//fn introspect_field_attr_arg_descr_collapse() {
+//    run_args_info_query("attrArgDescrCollapse", |args| {
+//        assert_eq!(args.len(), 1);
+//
+//        assert!(args.contains(&Value::object(
+//            vec![
+//                ("name", Value::scalar("arg")),
+//                ("description", Value::scalar("The arg\nand more details")),
+//                ("defaultValue", Value::null()),
+//                (
+//                    "type",
+//                    Value::object(
+//                        vec![
+//                            ("name", Value::null()),
+//                            (
+//                                "ofType",
+//                                Value::object(
+//                                    vec![("name", Value::scalar("Int"))].into_iter().collect(),
+//                                ),
+//                            ),
+//                        ]
+//                        .into_iter()
+//                        .collect(),
+//                    ),
+//                ),
+//            ]
+//            .into_iter()
+//            .collect(),
+//        )));
+//    });
+//}
 
 #[test]
 fn introspect_field_arg_with_default() {

juniper/src/macros/tests/field.rs

@@ -95,13 +95,16 @@ impl Root {
         Ok(0)
     }
 
+    /*
+     * FIXME: make this work again
     fn with_return() -> i32 {
         return 0;
     }
 
     fn with_return_field_result() -> FieldResult<i32> {
         return Ok(0);
     }
+    */
 }
 
 graphql_interface!(Interface: () |&self| {