remove SchemaType assoc type from scalar traits

Author: obmarg

cynic-codegen/src/fragment_derive/fragment_impl.rs

@@ -283,12 +283,10 @@ impl quote::ToTokens for FieldSelection<'_> {
                 }
             }
             FieldKind::Scalar if self.flatten => quote_spanned! { self.span =>
-                <#aligned_type as cynic::schema::IsOutputScalar<#aligned_type>>::SchemaType
+                #aligned_type
             },
             FieldKind::Scalar => quote_spanned! { self.span =>
-                <#aligned_type as cynic::schema::IsOutputScalar<
-                    <#field_marker_type_path as cynic::schema::Field>::Type
-                >>::SchemaType
+                <#field_marker_type_path as cynic::schema::Field>::Type
             },
             FieldKind::Enum => quote_spanned! { self.span =>
                 <#aligned_type as cynic::Enum>::SchemaType

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

@@ -1,6 +1,7 @@
 ---
 source: cynic-codegen/src/fragment_derive/tests.rs
 expression: "format_code(format!(\"{}\", tokens))"
+snapshot_kind: text
 ---
 #[automatically_derived]
 impl cynic::QueryFragment for MyQuery {
@@ -11,7 +12,7 @@ impl cynic::QueryFragment for MyQuery {
         mut builder: cynic::queries::SelectionBuilder<'_, Self::SchemaType, Self::VariablesFields>,
     ) {
         #![allow(unused_mut)]
-        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 > () ;
+        let mut field_builder = builder . select_field :: < schema :: __fields :: Query :: __typename , < schema :: __fields :: Query :: __typename as cynic :: schema :: Field > :: Type > () ;
         if builder.is_feature_enabled("2018") {
             let mut field_builder = builder . select_field :: < schema :: __fields :: Query :: filteredPosts , < Vec < BlogPostOutput > as cynic :: QueryFragment > :: SchemaType > () ;
             <Vec<BlogPostOutput> as cynic::QueryFragment>::query(field_builder.select_children());
@@ -94,4 +95,3 @@ impl<'de> cynic::serde::Deserialize<'de> for MyQuery {
         )
     }
 }
-

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

@@ -1,6 +1,7 @@
 ---
 source: cynic-codegen/src/fragment_derive/tests.rs
 expression: "format_code(format!(\"{}\", tokens))"
+snapshot_kind: text
 ---
 #[automatically_derived]
 impl cynic::QueryFragment for Film {
@@ -11,7 +12,7 @@ impl cynic::QueryFragment for Film {
         mut builder: cynic::queries::SelectionBuilder<'_, Self::SchemaType, Self::VariablesFields>,
     ) {
         #![allow(unused_mut)]
-        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 , > () ;
+        let mut field_builder = builder . select_flattened_field :: < schema :: __fields :: Film :: producers , Vec < String > , < schema :: __fields :: Film :: producers as cynic :: schema :: Field > :: Type , > () ;
     }
     fn name() -> Option<std::borrow::Cow<'static, str>> {
         Some(std::borrow::Cow::Borrowed("Film"))
@@ -75,4 +76,3 @@ impl<'de> cynic::serde::Deserialize<'de> for Film {
         )
     }
 }
-

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

@@ -1,6 +1,7 @@
 ---
 source: cynic-codegen/src/fragment_derive/tests.rs
 expression: "format_code(format!(\"{}\", tokens))"
+snapshot_kind: text
 ---
 #[automatically_derived]
 impl cynic::QueryFragment for BlogPostOutput {
@@ -11,7 +12,7 @@ impl cynic::QueryFragment for BlogPostOutput {
         mut builder: cynic::queries::SelectionBuilder<'_, Self::SchemaType, Self::VariablesFields>,
     ) {
         #![allow(unused_mut)]
-        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 > () ;
+        let mut field_builder = builder . select_field :: < schema :: __fields :: BlogPost :: hasMetadata , < schema :: __fields :: BlogPost :: hasMetadata as cynic :: schema :: Field > :: Type > () ;
         let mut field_builder = builder . select_field :: < schema :: __fields :: BlogPost :: author , < AuthorOutput as cynic :: QueryFragment > :: SchemaType > () ;
         <AuthorOutput as cynic::QueryFragment>::query(field_builder.select_children());
     }
@@ -93,4 +94,3 @@ impl<'de> cynic::serde::Deserialize<'de> for BlogPostOutput {
         )
     }
 }
-

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

@@ -1,6 +1,7 @@
 ---
 source: cynic-codegen/src/fragment_derive/tests.rs
 expression: "format_code(format!(\"{}\", tokens))"
+snapshot_kind: text
 ---
 #[automatically_derived]
 impl cynic::QueryFragment for Film {
@@ -11,7 +12,7 @@ impl cynic::QueryFragment for Film {
         mut builder: cynic::queries::SelectionBuilder<'_, Self::SchemaType, Self::VariablesFields>,
     ) {
         #![allow(unused_mut)]
-        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 > () ;
+        let mut field_builder = builder . select_field :: < schema :: __fields :: Film :: releaseDate , < schema :: __fields :: Film :: releaseDate as cynic :: schema :: Field > :: Type > () ;
         <FilmDetails as cynic::QueryFragment>::query(
             builder
                 .inline_fragment()
@@ -37,4 +38,3 @@ impl<'de> cynic::serde::Deserialize<'de> for Film {
         })
     }
 }
-

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

@@ -1,6 +1,7 @@
 ---
 source: cynic-codegen/src/fragment_derive/tests.rs
 expression: "format_code(format!(\"{}\", tokens))"
+snapshot_kind: text
 ---
 #[automatically_derived]
 impl cynic::QueryFragment for Film {
@@ -16,7 +17,7 @@ impl cynic::QueryFragment for Film {
                 .inline_fragment()
                 .select_children::<<FilmDetails as cynic::QueryFragment>::VariablesFields>(),
         );
-        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 > () ;
+        let mut field_builder = builder . select_field :: < schema :: __fields :: Film :: releaseDate , < schema :: __fields :: Film :: releaseDate as cynic :: schema :: Field > :: Type > () ;
     }
     fn name() -> Option<std::borrow::Cow<'static, str>> {
         Some(std::borrow::Cow::Borrowed("Film"))
@@ -37,4 +38,3 @@ impl<'de> cynic::serde::Deserialize<'de> for Film {
         })
     }
 }
-

cynic-codegen/src/scalar_derive/mod.rs

@@ -83,8 +83,6 @@ pub fn scalar_derive_impl(input: ScalarDeriveInput) -> Result<TokenStream, syn::
 
         #[automatically_derived]
         impl #impl_generics_with_ser cynic::schema::IsScalar<#marker_ident> for #ident #ty_generics #where_clause_with_ser {
-            type SchemaType = #marker_ident;
-
             fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
             where
                 S: cynic::serde::Serializer
@@ -95,8 +93,6 @@ pub fn scalar_derive_impl(input: ScalarDeriveInput) -> Result<TokenStream, syn::
 
         #[automatically_derived]
         impl #impl_generics_with_de cynic::schema::IsOutputScalar<'de, #marker_ident> for #ident #ty_generics #where_clause_with_de {
-            type SchemaType = #marker_ident;
-
             fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
             where
                 D: cynic::serde::Deserializer<'de>,

cynic-codegen/src/scalar_derive/snapshots/cynic_codegen__scalar_derive__tests__snapshot_scalar_derive.snap

@@ -23,7 +23,6 @@ impl<'de> cynic::serde::Deserialize<'de> for DateTime {
 }
 #[automatically_derived]
 impl cynic::schema::IsScalar<schema::DateTime> for DateTime {
-    type SchemaType = schema::DateTime;
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: cynic::serde::Serializer,
@@ -33,7 +32,6 @@ impl cynic::schema::IsScalar<schema::DateTime> for DateTime {
 }
 #[automatically_derived]
 impl<'de> cynic::schema::IsOutputScalar<'de, schema::DateTime> for DateTime {
-    type SchemaType = schema::DateTime;
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
         D: cynic::serde::Deserializer<'de>,

cynic/src/lib.rs

@@ -236,8 +236,6 @@ macro_rules! impl_scalar {
     ($type:path, $type_lock:ident, $schema_module:ident $(:: $schema_module_rest : ident)*) => {
         #[automatically_derived]
         impl $crate::schema::IsScalar<$schema_module$(::$schema_module_rest)*::$type_lock> for $type {
-            type SchemaType = $schema_module$(::$schema_module_rest)*::$type_lock;
-
             fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
             where
                 S: $crate::serde::Serializer
@@ -248,8 +246,6 @@ macro_rules! impl_scalar {
 
         #[automatically_derived]
         impl<'de> $crate::schema::IsOutputScalar<'de, $schema_module$(::$schema_module_rest)*::$type_lock> for $type {
-            type SchemaType = $schema_module$(::$schema_module_rest)*::$type_lock;
-
             fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
             where
                 D: $crate::serde::Deserializer<'de>