Merge branch 'async-await-resolve-some-todos' of https://github.com/instrumentisto/juniper into async-await-resolve-some-todos

# Conflicts:
#	examples/warp_async/Cargo.toml
#	juniper/src/macros/tests/args.rs
#	juniper_codegen/src/util.rs
[skip ci]

Author: nWacky

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)+
         }
     };
     (

juniper/src/macros/tests/union.rs

@@ -1,3 +1,12 @@
+use std::marker::PhantomData;
+
+use crate::{
+    ast::InputValue,
+    schema::model::RootNode,
+    types::scalars::EmptyMutation,
+    value::{DefaultScalarValue, Object, Value},
+};
+
 /*
 
 Syntax to validate:
@@ -35,6 +44,16 @@ enum WithGenerics<T> {
 enum DescriptionFirst {
     Concrete(Concrete),
 }
+enum ResolversFirst {
+    Concrete(Concrete),
+}
+
+enum CommasWithTrailing {
+    Concrete(Concrete),
+}
+enum ResolversWithTrailingComma {
+    Concrete(Concrete),
+}
 
 struct Root;
 

juniper_warp/src/lib.rs

@@ -41,15 +41,14 @@ Check the LICENSE file for details.
 #![doc(html_root_url = "https://docs.rs/juniper_warp/0.2.0")]
 
 use futures::{future::poll_fn, Future};
+use juniper::{DefaultScalarValue, InputValue, ScalarRefValue, ScalarValue};
 use serde::Deserialize;
 use std::sync::Arc;
 use warp::{filters::BoxedFilter, Filter};
 
 #[cfg(feature = "async")]
 use futures03::future::{FutureExt, TryFutureExt};
 
-use juniper::{DefaultScalarValue, InputValue, ScalarRefValue, ScalarValue};
-
 #[derive(Debug, serde_derive::Deserialize, PartialEq)]
 #[serde(untagged)]
 #[serde(bound = "InputValue<S>: Deserialize<'de>")]