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

Remove async_closure feature usage

Browse source
This commit is contained in:
tyranron 2019-10-10 00:07:10 +02:00
parent 639c29e91e
commit 5d3ed9ac72
No known key found for this signature in database
GPG key ID: 762E144FB230A4F0
9 changed files with 74 additions and 108 deletions
examples/warp_async/src
main.rs
integration_tests/async_await/src
main.rs
juniper/src
lib.rs
juniper_benchmarks/src
lib.rs
juniper_codegen/src
derive_object.rsimpl_object.rsutil.rs
juniper_rocket/src
lib.rs
juniper_warp/src
lib.rs

2
examples/warp_async/src/main.rs
View file

@ -2,8 +2,6 @@
//! This example demonstrates async/await usage with warp. //! This example demonstrates async/await usage with warp.
//! NOTE: this uses tokio 0.1 , not the alpha tokio 0.2. //! NOTE: this uses tokio 0.1 , not the alpha tokio 0.2.
#![feature(async_closure)]
use juniper::{EmptyMutation, RootNode, FieldError}; use juniper::{EmptyMutation, RootNode, FieldError};
use warp::{http::Response, Filter}; use warp::{http::Response, Filter};

2
integration_tests/async_await/src/main.rs
View file

@ -1,5 +1,3 @@
#![feature(async_closure)]
use juniper::{graphql_value, RootNode, Value}; use juniper::{graphql_value, RootNode, Value};
#[derive(juniper::GraphQLEnum)] #[derive(juniper::GraphQLEnum)]

1
juniper/src/lib.rs
View file

@ -91,7 +91,6 @@ Juniper has not reached 1.0 yet, thus some API instability should be expected.
#![doc(html_root_url = "https://docs.rs/juniper/0.13.1")] #![doc(html_root_url = "https://docs.rs/juniper/0.13.1")]
#![warn(missing_docs)] #![warn(missing_docs)]
#![cfg_attr(feature = "async", feature(async_closure))]
#[doc(hidden)] #[doc(hidden)]
pub extern crate serde; pub extern crate serde;

2
juniper_benchmarks/src/lib.rs
View file

@ -1,5 +1,3 @@
#![feature(async_closure)]
use juniper::{ use juniper::{
object, DefaultScalarValue, ExecutionError, FieldError, GraphQLEnum, Value, Variables, object, DefaultScalarValue, ExecutionError, FieldError, GraphQLEnum, Value, Variables,
}; };

2
juniper_codegen/src/derive_object.rs
View file

@ -59,7 +59,7 @@ pub fn build_derive_object(ast: syn::DeriveInput, is_internal: bool) -> TokenStr
description: field_attrs.description, description: field_attrs.description,
deprecation: field_attrs.deprecation, deprecation: field_attrs.deprecation,
resolver_code, resolver_code,
resolver_code_async: None, is_async: false,
}) })
} }
}); });

29
juniper_codegen/src/impl_object.rs
View file

@ -197,29 +197,10 @@ pub fn build_object(args: TokenStream, body: TokenStream, is_internal: bool) ->
} }
let body = &method.block; let body = &method.block;
let return_ty = &method.sig.output; let resolver_code = quote!(
#( #resolve_parts )*
let (resolver_code, resolver_code_async) = if is_async { #body
( );
quote!(),
Some(quote!(
(async move || #return_ty {
#( #resolve_parts )*
#body
})()
)),
)
} else {
(
quote!(
(|| #return_ty {
#( #resolve_parts )*
#body
})()
),
None,
)
};
let ident = &method.sig.ident; let ident = &method.sig.ident;
let name = attrs let name = attrs
@ -233,7 +214,7 @@ pub fn build_object(args: TokenStream, body: TokenStream, is_internal: bool) ->
description: attrs.description, description: attrs.description,
deprecation: attrs.deprecation, deprecation: attrs.deprecation,
resolver_code, resolver_code,
resolver_code_async, is_async,
}); });
} }
_ => { _ => {

142
juniper_codegen/src/util.rs
View file

@ -592,14 +592,7 @@ pub struct GraphQLTypeDefinitionField {
pub deprecation: Option<DeprecationAttr>, pub deprecation: Option<DeprecationAttr>,
pub args: Vec<GraphQLTypeDefinitionFieldArg>, pub args: Vec<GraphQLTypeDefinitionFieldArg>,
pub resolver_code: proc_macro2::TokenStream, pub resolver_code: proc_macro2::TokenStream,
pub resolver_code_async: Option<proc_macro2::TokenStream>, pub is_async: bool,
}
impl GraphQLTypeDefinitionField {
#[inline]
fn is_async(&self) -> bool {
self.resolver_code_async.is_some()
}
} }
/// Definition of a graphql type based on information extracted /// Definition of a graphql type based on information extracted
@ -633,7 +626,7 @@ pub struct GraphQLTypeDefiniton {
impl GraphQLTypeDefiniton { impl GraphQLTypeDefiniton {
fn has_async_field(&self) -> bool { fn has_async_field(&self) -> bool {
self.fields.iter().any(|field| field.is_async()) self.fields.iter().any(|field| field.is_async)
} }
pub fn into_tokens(self, juniper_crate_name: &str) -> proc_macro2::TokenStream { pub fn into_tokens(self, juniper_crate_name: &str) -> proc_macro2::TokenStream {
@ -706,7 +699,7 @@ impl GraphQLTypeDefiniton {
let name = &field.name; let name = &field.name;
let code = &field.resolver_code; let code = &field.resolver_code;
if field.is_async() { if field.is_async {
// TODO: better error message with field/type name. // TODO: better error message with field/type name.
quote!( quote!(
#name => { #name => {
@ -714,9 +707,10 @@ impl GraphQLTypeDefiniton {
}, },
) )
} else { } else {
let _type = &field._type;
quote!( quote!(
#name => { #name => {
let res = { #code }; let res: #_type = { #code };
#juniper_crate_name::IntoResolvable::into( #juniper_crate_name::IntoResolvable::into(
res, res,
executor.context() executor.context()
@ -805,74 +799,74 @@ impl GraphQLTypeDefiniton {
#[cfg(feature = "async")] #[cfg(feature = "async")]
let resolve_field_async = { let resolve_field_async = {
let resolve_matches_async = self.fields.iter().map(|field| { let resolve_matches_async = self.fields.iter().map(|field| {
let name = &field.name; let name = &field.name;
let _type = &field._type;
let code = &field.resolver_code;
if let Some(code) = field.resolver_code_async.as_ref() { if field.is_async {
quote!( quote!(
#name => { #name => {
let f = async move { let f = async move {
let res = { #code }.await; let res: #_type = async move { #code }.await;
let inner_res = #juniper_crate_name::IntoResolvable::into( let inner_res = #juniper_crate_name::IntoResolvable::into(
res, res,
executor.context() executor.context()
); );
match inner_res { match inner_res {
Ok(Some((ctx, r))) => { Ok(Some((ctx, r))) => {
let subexec = executor let subexec = executor
.replaced_context(ctx); .replaced_context(ctx);
subexec.resolve_with_ctx_async(&(), &r) subexec.resolve_with_ctx_async(&(), &r)
.await .await
}, },
Ok(None) => Ok(#juniper_crate_name::Value::null()), Ok(None) => Ok(#juniper_crate_name::Value::null()),
Err(e) => Err(e), Err(e) => Err(e),
} }
};
future::FutureExt::boxed(f)
},
)
} else {
let code = &field.resolver_code;
let inner = if !self.no_async {
quote!(
let f = async move {
match res2 {
Ok(Some((ctx, r))) => {
let sub = executor.replaced_context(ctx);
sub.resolve_with_ctx_async(&(), &r).await
},
Ok(None) => Ok(#juniper_crate_name::Value::null()),
Err(e) => Err(e),
}
};
future::FutureExt::boxed(f)
)
} else {
quote!(
let v = match res2 {
Ok(Some((ctx, r))) => executor.replaced_context(ctx).resolve_with_ctx(&(), &r),
Ok(None) => Ok(#juniper_crate_name::Value::null()),
Err(e) => Err(e),
};
future::FutureExt::boxed(future::ready(v))
)
}; };
future::FutureExt::boxed(f)
},
)
} else {
let inner = if !self.no_async {
quote!(
let f = async move {
match res2 {
Ok(Some((ctx, r))) => {
let sub = executor.replaced_context(ctx);
sub.resolve_with_ctx_async(&(), &r).await
},
Ok(None) => Ok(#juniper_crate_name::Value::null()),
Err(e) => Err(e),
}
};
future::FutureExt::boxed(f)
)
} else {
quote!(
let v = match res2 {
Ok(Some((ctx, r))) => executor.replaced_context(ctx).resolve_with_ctx(&(), &r),
Ok(None) => Ok(#juniper_crate_name::Value::null()),
Err(e) => Err(e),
};
future::FutureExt::boxed(future::ready(v))
)
};
quote!( quote!(
#name => { #name => {
let res = { #code }; let res: #_type = { #code };
let res2 = #juniper_crate_name::IntoResolvable::into( let res2 = #juniper_crate_name::IntoResolvable::into(
res, res,
executor.context() executor.context()
); );
#inner #inner
}, },
) )
} }
}); });
let mut where_async = where_clause.cloned().unwrap_or_else(|| parse_quote!(where));; let mut where_async = where_clause.cloned().unwrap_or_else(|| parse_quote!(where));
where_async where_async
.predicates .predicates

1
juniper_rocket/src/lib.rs
View file

@ -38,7 +38,6 @@ Check the LICENSE file for details.
#![doc(html_root_url = "https://docs.rs/juniper_rocket/0.2.0")] #![doc(html_root_url = "https://docs.rs/juniper_rocket/0.2.0")]
#![feature(decl_macro, proc_macro_hygiene)] #![feature(decl_macro, proc_macro_hygiene)]
#![cfg_attr(feature = "async", feature(async_closure))]
use std::{error::Error, io::Cursor}; use std::{error::Error, io::Cursor};

1
juniper_warp/src/lib.rs
View file

@ -39,7 +39,6 @@ Check the LICENSE file for details.
#![deny(missing_docs)] #![deny(missing_docs)]
#![deny(warnings)] #![deny(warnings)]
#![doc(html_root_url = "https://docs.rs/juniper_warp/0.2.0")] #![doc(html_root_url = "https://docs.rs/juniper_warp/0.2.0")]
#![cfg_attr(feature = "async", feature(async_closure))]
use futures::{future::poll_fn, Future}; use futures::{future::poll_fn, Future};
use serde::Deserialize; use serde::Deserialize;