anna/async-graphql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused idx parameter on subscription

Browse Source
This commit is contained in:
Koxiaet 2020-09-13 08:13:56 +01:00
parent 06a52dc936
commit d4eed93ad4
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
derive/src/merged_subscription.rs
View File

@ -84,8 +84,8 @@ pub fn generate(object_args: &args::Object, input: &DeriveInput) -> Result<Token
#[allow(clippy::all, clippy::pedantic)]
#[#crate_name::async_trait::async_trait]
impl #crate_name::SubscriptionType for #ident {
async fn create_field_stream(&self, idx: usize, ctx: &#crate_name::Context<'_>, schema_env: #crate_name::SchemaEnv, query_env: #crate_name::QueryEnv) -> #crate_name::Result<::std::pin::Pin<Box<dyn #crate_name::futures::Stream<Item = #crate_name::Response> + Send>>> {
#create_merged_obj.create_field_stream(idx, ctx, schema_env, query_env).await
async fn create_field_stream(&self, ctx: &#crate_name::Context<'_>, schema_env: #crate_name::SchemaEnv, query_env: #crate_name::QueryEnv) -> #crate_name::Result<::std::pin::Pin<Box<dyn #crate_name::futures::Stream<Item = #crate_name::Response> + Send>>> {
#create_merged_obj.create_field_stream(ctx, schema_env, query_env).await
}
}
};

1
derive/src/subscription.rs
View File

@ -346,7 +346,6 @@ pub fn generate(object_args: &args::Object, item_impl: &mut ItemImpl) -> Result<
impl #crate_name::SubscriptionType for #self_ty #where_clause {
async fn create_field_stream(
&self,
idx: usize,
ctx: &#crate_name::Context<'_>,
schema_env: #crate_name::SchemaEnv,
query_env: #crate_name::QueryEnv,

7
src/subscription/subscription_type.rs
View File

@ -16,7 +16,6 @@ pub trait SubscriptionType: Type {
#[doc(hidden)]
async fn create_field_stream(
&self,
idx: usize,
ctx: &Context<'_>,
schema_env: SchemaEnv,
query_env: QueryEnv,
@ -37,7 +36,7 @@ where
Subscription: SubscriptionType + Send + Sync + 'static + Sized,
{
Box::pin(async move {
for (idx, selection) in ctx.item.node.items.iter().enumerate() {
for selection in &ctx.item.node.items {
if ctx.is_skip(selection.node.directives())? {
continue;
}
@ -46,7 +45,6 @@ where
schema
.subscription
.create_field_stream(
idx,
&ctx.with_field(field),
schema.env.clone(),
environment.clone(),
@ -105,11 +103,10 @@ where
impl<T: SubscriptionType + Send + Sync> SubscriptionType for &T {
async fn create_field_stream(
&self,
idx: usize,
ctx: &Context<'_>,
schema_env: SchemaEnv,
query_env: QueryEnv,
) -> Result<Pin<Box<dyn Stream<Item = Response> + Send>>> {
T::create_field_stream(*self, idx, ctx, schema_env, query_env).await
T::create_field_stream(*self, ctx, schema_env, query_env).await
}
}

1
src/types/empty_subscription.rs
View File

@ -37,7 +37,6 @@ impl SubscriptionType for EmptySubscription {
async fn create_field_stream(
&self,
_idx: usize,
_ctx: &Context<'_>,
_schema_env: SchemaEnv,
_query_env: QueryEnv,

5
src/types/merged_object.rs
View File

@ -109,14 +109,13 @@ where
{
async fn create_field_stream(
&self,
idx: usize,
ctx: &Context<'_>,
schema_env: SchemaEnv,
query_env: QueryEnv,
) -> Result<Pin<Box<dyn Stream<Item = Response> + Send>>> {
match self
.0
.create_field_stream(idx, ctx, schema_env.clone(), query_env.clone())
.create_field_stream(ctx, schema_env.clone(), query_env.clone())
.await
{
Ok(value) => Ok(value),
@ -125,7 +124,7 @@ where
..
}) => {
self.1
.create_field_stream(idx, ctx, schema_env, query_env)
.create_field_stream(ctx, schema_env, query_env)
.await
}
Err(err) => Err(err),