Skip to content

Commit 5a35b9f

Browse files
committed
fixed some more stuff
1 parent a7455ae commit 5a35b9f

17 files changed

+208
-84
lines changed

cynic-codegen/src/fragment_derive/deserialize_impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ impl quote::ToTokens for StandardDeserializeImpl<'_> {
113113
let mut trailer = quote! {};
114114

115115
if matches!(f.inner_kind, Some(FieldKind::Scalar)) {
116-
ty = quote! { cynic::__private::ScalarDeseralize<#ty, <#field_marker as cynic::schema::Field>::Type> };
116+
ty = quote! { cynic::__private::ScalarDeserialize<#ty, <#field_marker as cynic::schema::Field>::Type> };
117117
trailer.append_all(quote! { .into_inner() });
118118
}
119119

cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__argument_and_rename.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ impl<'de> cynic::serde::Deserialize<'de> for MyQuery {
6363
if post.is_some() {
6464
return Err(cynic::serde::de::Error::duplicate_field("post"));
6565
}
66-
post = Some(__map.next_value()?);
66+
post = Some(__map.next_value::<Option<BlogPostOutput>>()?);
6767
}
6868
__FragmentDeriveField::posts => {
6969
if posts.is_some() {
7070
return Err(cynic::serde::de::Error::duplicate_field("allPosts"));
7171
}
72-
posts = Some(__map.next_value()?);
72+
posts = Some(__map.next_value::<Vec<BlogPostOutput>>()?);
7373
}
7474
__FragmentDeriveField::__Other => {
7575
__map.next_value::<cynic::serde::de::IgnoredAny>()?;

cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__argument_literals.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ impl<'de> cynic::serde::Deserialize<'de> for MyQuery {
8282
"filteredPosts",
8383
));
8484
}
85-
filteredPosts = Some(__map.next_value()?);
85+
filteredPosts = Some(__map.next_value::<Vec<BlogPostOutput>>()?);
8686
}
8787
__FragmentDeriveField::__Other => {
8888
__map.next_value::<cynic::serde::de::IgnoredAny>()?;

cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__feature_flagging.snap

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ impl cynic::QueryFragment for MyQuery {
1111
mut builder: cynic::queries::SelectionBuilder<'_, Self::SchemaType, Self::VariablesFields>,
1212
) {
1313
#![allow(unused_mut)]
14-
let mut field_builder = builder
15-
.select_field::<schema::__fields::Query::__typename, <String as cynic::schema::IsScalar<
16-
<schema::__fields::Query::__typename as cynic::schema::Field>::Type,
17-
>>::SchemaType>();
14+
let mut field_builder = builder . select_field :: < schema :: __fields :: Query :: __typename , < String as cynic :: schema :: IsOutputScalar < < schema :: __fields :: Query :: __typename as cynic :: schema :: Field > :: Type >> :: SchemaType > () ;
1815
if builder.is_feature_enabled("2018") {
1916
let mut field_builder = builder . select_field :: < schema :: __fields :: Query :: filteredPosts , < Vec < BlogPostOutput > as cynic :: QueryFragment > :: SchemaType > () ;
2017
<Vec<BlogPostOutput> as cynic::QueryFragment>::query(field_builder.select_children());
@@ -62,15 +59,15 @@ impl<'de> cynic::serde::Deserialize<'de> for MyQuery {
6259
if __typename.is_some() {
6360
return Err(cynic::serde::de::Error::duplicate_field("__typename"));
6461
}
65-
__typename = Some(__map.next_value()?);
62+
__typename = Some (__map . next_value :: < cynic :: __private :: ScalarDeserialize < String , < schema :: __fields :: Query :: __typename as cynic :: schema :: Field > :: Type > > () ? . into_inner ()) ;
6663
}
6764
__FragmentDeriveField::filteredPosts => {
6865
if filteredPosts.is_some() {
6966
return Err(cynic::serde::de::Error::duplicate_field(
7067
"filteredPosts",
7168
));
7269
}
73-
filteredPosts = Some(__map.next_value()?);
70+
filteredPosts = Some(__map.next_value::<Vec<BlogPostOutput>>()?);
7471
}
7572
__FragmentDeriveField::__Other => {
7673
__map.next_value::<cynic::serde::de::IgnoredAny>()?;

cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__flatten_attr.snap

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ impl cynic::QueryFragment for Film {
1111
mut builder: cynic::queries::SelectionBuilder<'_, Self::SchemaType, Self::VariablesFields>,
1212
) {
1313
#![allow(unused_mut)]
14-
let mut field_builder = builder . select_flattened_field :: < schema :: __fields :: Film :: producers , < Vec < String > as cynic :: schema :: IsScalar < Vec < String > >> :: SchemaType , < schema :: __fields :: Film :: producers as cynic :: schema :: Field > :: Type , > () ;
14+
let mut field_builder = builder . select_flattened_field :: < schema :: __fields :: Film :: producers , < Vec < String > as cynic :: schema :: IsOutputScalar < Vec < String > >> :: SchemaType , < schema :: __fields :: Film :: producers as cynic :: schema :: Field > :: Type , > () ;
1515
}
1616
fn name() -> Option<std::borrow::Cow<'static, str>> {
1717
Some(std::borrow::Cow::Borrowed("Film"))
@@ -52,11 +52,7 @@ impl<'de> cynic::serde::Deserialize<'de> for Film {
5252
if producers.is_some() {
5353
return Err(cynic::serde::de::Error::duplicate_field("producers"));
5454
}
55-
producers = Some(
56-
__map
57-
.next_value::<cynic::__private::Flattened<Vec<String>>>()?
58-
.into_inner(),
59-
);
55+
producers = Some (__map . next_value :: < cynic :: __private :: Flattened < cynic :: __private :: ScalarDeserialize < Vec < String > , < schema :: __fields :: Film :: producers as cynic :: schema :: Field > :: Type > > > () ? . into_inner () . into_inner ()) ;
6056
}
6157
__FragmentDeriveField::__Other => {
6258
__map.next_value::<cynic::serde::de::IgnoredAny>()?;

cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__not_sure.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ impl<'de> cynic::serde::Deserialize<'de> for MyQuery {
9292
"filteredPosts",
9393
));
9494
}
95-
filteredPosts = Some(__map.next_value()?);
95+
filteredPosts = Some(__map.next_value::<Vec<BlogPostOutput>>()?);
9696
}
9797
__FragmentDeriveField::__Other => {
9898
__map.next_value::<cynic::serde::de::IgnoredAny>()?;

cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__simple_struct.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ impl cynic::QueryFragment for BlogPostOutput {
1111
mut builder: cynic::queries::SelectionBuilder<'_, Self::SchemaType, Self::VariablesFields>,
1212
) {
1313
#![allow(unused_mut)]
14-
let mut field_builder = builder . select_field :: < schema :: __fields :: BlogPost :: hasMetadata , < Option < bool > as cynic :: schema :: IsScalar < < schema :: __fields :: BlogPost :: hasMetadata as cynic :: schema :: Field > :: Type >> :: SchemaType > () ;
14+
let mut field_builder = builder . select_field :: < schema :: __fields :: BlogPost :: hasMetadata , < Option < bool > as cynic :: schema :: IsOutputScalar < < schema :: __fields :: BlogPost :: hasMetadata as cynic :: schema :: Field > :: Type >> :: SchemaType > () ;
1515
let mut field_builder = builder . select_field :: < schema :: __fields :: BlogPost :: author , < AuthorOutput as cynic :: QueryFragment > :: SchemaType > () ;
1616
<AuthorOutput as cynic::QueryFragment>::query(field_builder.select_children());
1717
}
@@ -59,13 +59,13 @@ impl<'de> cynic::serde::Deserialize<'de> for BlogPostOutput {
5959
"hasMetadata",
6060
));
6161
}
62-
has_metadata = Some(__map.next_value()?);
62+
has_metadata = Some (__map . next_value :: < cynic :: __private :: ScalarDeserialize < Option < bool > , < schema :: __fields :: BlogPost :: hasMetadata as cynic :: schema :: Field > :: Type > > () ? . into_inner ()) ;
6363
}
6464
__FragmentDeriveField::author => {
6565
if author.is_some() {
6666
return Err(cynic::serde::de::Error::duplicate_field("author"));
6767
}
68-
author = Some(__map.next_value()?);
68+
author = Some(__map.next_value::<AuthorOutput>()?);
6969
}
7070
__FragmentDeriveField::__Other => {
7171
__map.next_value::<cynic::serde::de::IgnoredAny>()?;

cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__spread_attr_multi_field1.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ impl cynic::QueryFragment for Film {
1111
mut builder: cynic::queries::SelectionBuilder<'_, Self::SchemaType, Self::VariablesFields>,
1212
) {
1313
#![allow(unused_mut)]
14-
let mut field_builder = builder . select_field :: < schema :: __fields :: Film :: releaseDate , < Option < String > as cynic :: schema :: IsScalar < < schema :: __fields :: Film :: releaseDate as cynic :: schema :: Field > :: Type >> :: SchemaType > () ;
14+
let mut field_builder = builder . select_field :: < schema :: __fields :: Film :: releaseDate , < Option < String > as cynic :: schema :: IsOutputScalar < < schema :: __fields :: Film :: releaseDate as cynic :: schema :: Field > :: Type >> :: SchemaType > () ;
1515
<FilmDetails as cynic::QueryFragment>::query(
1616
builder
1717
.inline_fragment()

cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__spread_attr_multi_field2.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ impl cynic::QueryFragment for Film {
1616
.inline_fragment()
1717
.select_children::<<FilmDetails as cynic::QueryFragment>::VariablesFields>(),
1818
);
19-
let mut field_builder = builder . select_field :: < schema :: __fields :: Film :: releaseDate , < Option < String > as cynic :: schema :: IsScalar < < schema :: __fields :: Film :: releaseDate as cynic :: schema :: Field > :: Type >> :: SchemaType > () ;
19+
let mut field_builder = builder . select_field :: < schema :: __fields :: Film :: releaseDate , < Option < String > as cynic :: schema :: IsOutputScalar < < schema :: __fields :: Film :: releaseDate as cynic :: schema :: Field > :: Type >> :: SchemaType > () ;
2020
}
2121
fn name() -> Option<std::borrow::Cow<'static, str>> {
2222
Some(std::borrow::Cow::Borrowed("Film"))

cynic-codegen/src/fragment_derive/snapshots/cynic_codegen__fragment_derive__tests__variable_in_argument.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ impl<'de> cynic::serde::Deserialize<'de> for MyQuery {
6060
"filteredPosts",
6161
));
6262
}
63-
filteredPosts = Some(__map.next_value()?);
63+
filteredPosts = Some(__map.next_value::<Vec<BlogPostOutput>>()?);
6464
}
6565
__FragmentDeriveField::__Other => {
6666
__map.next_value::<cynic::serde::de::IgnoredAny>()?;

0 commit comments

Comments
 (0)