Merge pull request #440 from nickwesselman/ci-fix

surma · web-flow · commit 9d67402007b4 · 2023-01-12T13:48:35.000Z
Fix the repo CI
diff --git a/graphql-introspection-query/src/introspection_response.rs b/graphql-introspection-query/src/introspection_response.rs
@@ -78,7 +78,7 @@ impl<'de> Deserialize<'de> for __DirectiveLocation {
     }
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum __TypeKind {
     SCALAR,
     OBJECT,
diff --git a/graphql_client/src/lib.rs b/graphql_client/src/lib.rs
@@ -99,7 +99,7 @@ pub struct QueryBody<Variables> {
 }
 
 /// Represents a location inside a query string. Used in errors. See [`Error`].
-#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize, PartialEq, Eq)]
 pub struct Location {
     /// The line number in the query string where the error originated (starting from 1).
     pub line: i32,
@@ -108,7 +108,7 @@ pub struct Location {
 }
 
 /// Part of a path in a query. It can be an object key or an array index. See [`Error`].
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(untagged)]
 pub enum PathFragment {
     /// A key inside an object
@@ -193,7 +193,7 @@ impl Display for PathFragment {
 /// #     Ok(())
 /// # }
 /// ```
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 pub struct Error {
     /// The human-readable error message. This is the only required field.
     pub message: String,
@@ -288,7 +288,7 @@ impl Display for Error {
 /// #     Ok(())
 /// # }
 /// ```
-#[derive(Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub struct Response<Data> {
     /// The absent, partial or complete response data.
     pub data: Option<Data>,
diff --git a/graphql_client/tests/extern_enums.rs b/graphql_client/tests/extern_enums.rs
@@ -6,7 +6,7 @@ use serde::Deserialize;
  *
  * They rename the fields to use SCREAMING_SNAKE_CASE for deserialization, as it is the standard for GraphQL enums.
  */
-#[derive(Deserialize, Debug, PartialEq)]
+#[derive(Deserialize, Debug, PartialEq, Eq)]
 #[serde(rename_all = "SCREAMING_SNAKE_CASE")]
 pub enum Direction {
     North,
@@ -15,7 +15,7 @@ pub enum Direction {
     West,
 }
 
-#[derive(Deserialize, Debug, PartialEq)]
+#[derive(Deserialize, Debug, PartialEq, Eq)]
 #[serde(rename_all = "SCREAMING_SNAKE_CASE")]
 pub enum DistanceUnit {
     Meter,
@@ -39,7 +39,7 @@ pub struct SingleExternEnumQuery;
 #[graphql(
     schema_path = "tests/extern_enums/schema.graphql",
     query_path = "tests/extern_enums/multiple_extern_enums_query.graphql",
-    response_derives = "Debug, PartialEq",
+    response_derives = "Debug, PartialEq, Eq",
     extern_enums("Direction", "DistanceUnit")
 )]
 pub struct MultipleExternEnumsQuery;
diff --git a/graphql_client/tests/input_object_variables.rs b/graphql_client/tests/input_object_variables.rs
@@ -29,7 +29,7 @@ type Email = String;
 #[graphql(
     query_path = "tests/input_object_variables/input_object_variables_query_defaults.graphql",
     schema_path = "tests/input_object_variables/input_object_variables_schema.graphql",
-    response_derives = "Debug, PartialEq"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct DefaultInputObjectVariablesQuery;
 
@@ -52,7 +52,7 @@ fn input_object_variables_default() {
 #[graphql(
     query_path = "tests/input_object_variables/input_object_variables_query.graphql",
     schema_path = "tests/input_object_variables/input_object_variables_schema.graphql",
-    response_derives = "Debug, PartialEq"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct RecursiveInputQuery;
 
@@ -78,7 +78,7 @@ fn recursive_input_objects_can_be_constructed() {
 #[graphql(
     query_path = "tests/input_object_variables/input_object_variables_query.graphql",
     schema_path = "tests/input_object_variables/input_object_variables_schema.graphql",
-    response_derives = "Debug, PartialEq"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct InputCaseTestsQuery;
 
@@ -96,7 +96,7 @@ fn input_objects_are_all_snake_case() {
 #[graphql(
     query_path = "tests/input_object_variables/input_object_variables_query.graphql",
     schema_path = "tests/input_object_variables/input_object_variables_schema.graphql",
-    response_derives = "Debug, PartialEq"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct IndirectlyRecursiveInputQuery;
 
@@ -123,7 +123,7 @@ fn indirectly_recursive_input_objects_can_be_constructed() {
     query_path = "tests/input_object_variables/input_object_variables_query.graphql",
     schema_path = "tests/input_object_variables/input_object_variables_schema.graphql",
     variables_derives = "Default",
-    response_derives = "Debug, PartialEq"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct RustNameQuery;
 
diff --git a/graphql_client/tests/input_object_variables/input_object_variables_schema.graphql b/graphql_client/tests/input_object_variables/input_object_variables_schema.graphql
@@ -49,7 +49,11 @@ type CaseTestResult {
 }
 
 type InputObjectVariablesQuery {
-  echo(message: Message!, options: Options = { pgpSignature: true }, extern: String = ""): EchoResult
+  echo(
+    message: Message!
+    options: Options = { pgpSignature: true }
+    extern: String = ""
+  ): EchoResult
   testQueryCase(caseTestInput: CaseTestInput!): CaseTestResult
   saveRecursiveInput(recursiveInput: RecursiveInput!): Category
 }
diff --git a/graphql_client/tests/interfaces.rs b/graphql_client/tests/interfaces.rs
@@ -6,7 +6,7 @@ const RESPONSE: &str = include_str!("interfaces/interface_response.json");
 #[graphql(
     query_path = "tests/interfaces/interface_query.graphql",
     schema_path = "tests/interfaces/interface_schema.graphql",
-    response_derives = "Debug, PartialEq"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct InterfaceQuery;
 
@@ -57,7 +57,7 @@ fn interface_deserialization() {
 #[graphql(
     query_path = "tests/interfaces/interface_not_on_everything_query.graphql",
     schema_path = "tests/interfaces/interface_schema.graphql",
-    response_derives = "Debug,PartialEq"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct InterfaceNotOnEverythingQuery;
 
@@ -111,7 +111,7 @@ fn interface_not_on_everything_deserialization() {
 #[graphql(
     query_path = "tests/interfaces/interface_with_fragment_query.graphql",
     schema_path = "tests/interfaces/interface_schema.graphql",
-    response_derives = "Debug,PartialEq"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct InterfaceWithFragmentQuery;
 
diff --git a/graphql_client/tests/introspection.rs b/graphql_client/tests/introspection.rs
@@ -4,7 +4,7 @@ use graphql_client::*;
 #[graphql(
     query_path = "tests/introspection/introspection_query.graphql",
     schema_path = "tests/introspection/introspection_schema.graphql",
-    response_derives = "Debug,PartialEq"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct IntrospectionQuery;
 
diff --git a/graphql_client/tests/json_schema.rs b/graphql_client/tests/json_schema.rs
@@ -7,7 +7,7 @@ type Uuid = String;
 #[graphql(
     query_path = "tests/json_schema/query.graphql",
     schema_path = "tests/json_schema/schema_1.json",
-    response_derives = "Debug,PartialEq"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct WithSchema1;
 
diff --git a/graphql_client/tests/more_derives.rs b/graphql_client/tests/more_derives.rs
@@ -4,7 +4,7 @@ use graphql_client::*;
 #[graphql(
     schema_path = "tests/more_derives/schema.graphql",
     query_path = "tests/more_derives/query.graphql",
-    response_derives = "Debug, PartialEq, std::cmp::PartialOrd"
+    response_derives = "Debug, PartialEq, Eq, std::cmp::PartialOrd"
 )]
 pub struct MoreDerives;
 
diff --git a/graphql_client/tests/operation_selection.rs b/graphql_client/tests/operation_selection.rs
@@ -4,15 +4,15 @@ use graphql_client::GraphQLQuery;
 #[graphql(
     query_path = "tests/operation_selection/queries.graphql",
     schema_path = "tests/operation_selection/schema.graphql",
-    response_derives = "Debug,PartialEq"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct Heights;
 
 #[derive(GraphQLQuery)]
 #[graphql(
     query_path = "tests/operation_selection/queries.graphql",
     schema_path = "tests/operation_selection/schema.graphql",
-    response_derives = "Debug,PartialEq"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct Echo;
 
diff --git a/graphql_client/tests/skip_serializing_none/schema.graphql b/graphql_client/tests/skip_serializing_none/schema.graphql
@@ -12,7 +12,7 @@ input Param {
 }
 
 input Author {
-  id: String,
+  id: String
   name: String!
 }
 
diff --git a/graphql_client/tests/subscriptions.rs b/graphql_client/tests/subscriptions.rs
@@ -15,7 +15,7 @@ const RESPONSE: &str = include_str!("subscription/subscription_query_response.js
 #[graphql(
     schema_path = "tests/subscription/subscription_schema.graphql",
     query_path = "tests/subscription/subscription_query.graphql",
-    response_derives = "Debug, PartialEq"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct SubscriptionQuery;
 
diff --git a/graphql_client/tests/type_refining_fragments.rs b/graphql_client/tests/type_refining_fragments.rs
@@ -4,15 +4,15 @@ use graphql_client::*;
 #[graphql(
     query_path = "tests/interfaces/interface_with_type_refining_fragment_query.graphql",
     schema_path = "tests/interfaces/interface_schema.graphql",
-    response_derives = "Debug, PartialEq"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct QueryOnInterface;
 
 #[derive(GraphQLQuery)]
 #[graphql(
     query_path = "tests/unions/type_refining_fragment_on_union_query.graphql",
     schema_path = "tests/unions/union_schema.graphql",
-    response_derives = "PartialEq, Debug"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct QueryOnUnion;
 
diff --git a/graphql_client/tests/union_query.rs b/graphql_client/tests/union_query.rs
@@ -7,23 +7,23 @@ const FRAGMENT_AND_MORE_RESPONSE: &str = include_str!("unions/fragment_and_more_
 #[graphql(
     query_path = "tests/unions/union_query.graphql",
     schema_path = "tests/unions/union_schema.graphql",
-    response_derives = "PartialEq, Debug"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct UnionQuery;
 
 #[derive(GraphQLQuery)]
 #[graphql(
     query_path = "tests/unions/union_query.graphql",
     schema_path = "tests/unions/union_schema.graphql",
-    response_derives = "PartialEq, Debug"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct FragmentOnUnion;
 
 #[derive(GraphQLQuery)]
 #[graphql(
     query_path = "tests/unions/union_query.graphql",
     schema_path = "tests/unions/union_schema.graphql",
-    response_derives = "PartialEq, Debug"
+    response_derives = "Debug, PartialEq, Eq"
 )]
 pub struct FragmentAndMoreOnUnion;
 
diff --git a/graphql_client_cli/src/introspect_schema.rs b/graphql_client_cli/src/introspect_schema.rs
@@ -80,7 +80,7 @@ fn construct_headers() -> HeaderMap {
     headers
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub struct Header {
     name: String,
     value: String,
diff --git a/graphql_client_codegen/src/deprecation.rs b/graphql_client_codegen/src/deprecation.rs
@@ -1,5 +1,5 @@
 /// Whether an item is deprecated, with context.
-#[derive(Debug, PartialEq, Hash, Clone)]
+#[derive(Debug, PartialEq, Eq, Hash, Clone)]
 pub enum DeprecationStatus {
     /// Not deprecated
     Current,
@@ -8,7 +8,7 @@ pub enum DeprecationStatus {
 }
 
 /// The available deprecation strategies.
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum DeprecationStrategy {
     /// Allow use of deprecated items in queries, and say nothing.
     Allow,
diff --git a/graphql_client_codegen/src/lib.rs b/graphql_client_codegen/src/lib.rs
@@ -207,9 +207,9 @@ fn derive_operation_not_found_error(
         .collect();
     let available_operations: String = available_operations.join(", ");
 
-    return format!(
+    format!(
         "The struct name does not match any defined operation in the query file.\nStruct name: {}\nDefined operations: {}",
         struct_ident,
         available_operations,
-    );
+    )
 }
diff --git a/graphql_client_codegen/src/normalization.rs b/graphql_client_codegen/src/normalization.rs
@@ -2,7 +2,7 @@ use heck::ToUpperCamelCase;
 use std::borrow::Cow;
 
 /// Normalization conventions available for generated code.
-#[derive(Debug, PartialEq, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub enum Normalization {
     /// Use naming conventions from the schema.
     None,
diff --git a/graphql_client_codegen/src/tests/foobars_query.graphql b/graphql_client_codegen/src/tests/foobars_query.graphql
@@ -1,16 +1,16 @@
 query FooBarsQuery {
+  fooBars {
     fooBars {
-        fooBars {
-            __typename
-            ... on Foo {
-                fooField
-            }
-            ... on Bar {
-                barField
-            }
-            ... on FooBar {
-                fooBarField
-            }
-        }
+      __typename
+      ... on Foo {
+        fooField
+      }
+      ... on Bar {
+        barField
+      }
+      ... on FooBar {
+        fooBarField
+      }
     }
+  }
 }
diff --git a/graphql_client_codegen/src/tests/foobars_schema.graphql b/graphql_client_codegen/src/tests/foobars_schema.graphql
@@ -1,28 +1,28 @@
 schema {
-    query: Query
-    mutation: Mutation
+  query: Query
+  mutation: Mutation
 }
 
 directive @defer on FIELD
 
 type Query {
-    fooBars: Self
+  fooBars: Self
 }
 
 type Self {
-    fooBars: Result
+  fooBars: Result
 }
 
 union Result = Foo | Bar | FooBar
 
 type Foo {
-    fooField: String!
+  fooField: String!
 }
 
 type Bar {
-    barField: String!
+  barField: String!
 }
 
 type FooBar {
-    fooBarField: String!
+  fooBarField: String!
 }
diff --git a/graphql_query_derive/src/attributes.rs b/graphql_query_derive/src/attributes.rs
@@ -32,7 +32,7 @@ pub fn ident_exists(ast: &syn::DeriveInput, ident: &str) -> Result<(), syn::Erro
     }
 
     Err(syn::Error::new_spanned(
-        &ast,
+        ast,
         format!("Ident `{}` not found", ident),
     ))
 }
@@ -61,7 +61,7 @@ pub fn extract_attr(ast: &syn::DeriveInput, attr: &str) -> Result<String, syn::E
     }
 
     Err(syn::Error::new_spanned(
-        &ast,
+        ast,
         format!("Attribute `{}` not found", attr),
     ))
 }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ impl<'de> Deserialize<'de> for __DirectiveLocation {`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`81`		`-#[derive(Clone, Debug, PartialEq)]`
	`81`	`+#[derive(Clone, Debug, PartialEq, Eq)]`
`82`	`82`	`pub enum __TypeKind {`
`83`	`83`	`SCALAR,`
`84`	`84`	`OBJECT,`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,11 @@ type CaseTestResult {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`type InputObjectVariablesQuery {`
`52`		`- echo(message: Message!, options: Options = { pgpSignature: true }, extern: String = ""): EchoResult`
	`52`	`+ echo(`
	`53`	`+ message: Message!`
	`54`	`+ options: Options = { pgpSignature: true }`
	`55`	`+ extern: String = ""`
	`56`	`+ ): EchoResult`
`53`	`57`	`testQueryCase(caseTestInput: CaseTestInput!): CaseTestResult`
`54`	`58`	`saveRecursiveInput(recursiveInput: RecursiveInput!): Category`
`55`	`59`	`}`