general refactoring

Author: danieleades

graphql_client_cli/src/generate.rs

@@ -90,7 +90,7 @@ pub(crate) fn generate_code(params: CliCodegenParams) -> CliResult<()> {
         options.set_custom_scalars_module(custom_scalars_module);
     }
 
-    let gen = generate_module_token_stream(query_path.clone(), &schema_path, options)
+    let gen = generate_module_token_stream(&query_path, &schema_path, &options)
         .map_err(|err| Error::message(format!("Error generating module code: {err}")))?;
 
     let generated_code = format!("{WARNING_SUPPRESSION}\n{gen}");

graphql_client_codegen/src/lib.rs

@@ -96,11 +96,11 @@ fn get_set_schema_from_file(schema_path: &std::path::Path) -> Schema {
 
 /// Generates Rust code given a path to a query file, a path to a schema file, and options.
 pub fn generate_module_token_stream(
-    query_path: std::path::PathBuf,
+    query_path: &std::path::Path,
     schema_path: &std::path::Path,
-    options: GraphQLClientCodegenOptions,
+    options: &GraphQLClientCodegenOptions,
 ) -> Result<TokenStream, BoxError> {
-    let query = get_set_query_from_file(query_path.as_path());
+    let query = get_set_query_from_file(query_path);
     let schema = get_set_schema_from_file(schema_path);
 
     generate_module_token_stream_inner(&query, &schema, options)
@@ -110,7 +110,7 @@ pub fn generate_module_token_stream(
 pub fn generate_module_token_stream_from_string(
     query_string: &str,
     schema_path: &std::path::Path,
-    options: GraphQLClientCodegenOptions,
+    options: &GraphQLClientCodegenOptions,
 ) -> Result<TokenStream, BoxError> {
     let query = (query_string.to_string(), query_document(query_string)?);
     let schema = get_set_schema_from_file(schema_path);
@@ -122,7 +122,7 @@ pub fn generate_module_token_stream_from_string(
 fn generate_module_token_stream_inner(
     query: &(String, QueryDocument),
     schema: &Schema,
-    options: GraphQLClientCodegenOptions,
+    options: &GraphQLClientCodegenOptions,
 ) -> Result<TokenStream, BoxError> {
     let (query_string, query_document) = query;
 
@@ -157,7 +157,7 @@ fn generate_module_token_stream_inner(
             schema,
             resolved_query: &query,
             operation: &operation.1.name,
-            options: &options,
+            options,
         }
         .to_token_stream()?;
         modules.push(generated);

graphql_client_codegen/src/schema.rs

@@ -362,15 +362,12 @@ impl Schema {
     }
 
     fn find_type_id(&self, type_name: &str) -> TypeId {
-        match self.names.get(type_name) {
-            Some(id) => *id,
-            None => {
-                panic!(
-                    "graphql-client-codegen internal error: failed to resolve TypeId for `{}°.",
-                    type_name
-                );
-            }
-        }
+        self.names.get(type_name).copied().unwrap_or_else(|| {
+            panic!(
+                "graphql-client-codegen internal error: failed to resolve TypeId for `{}°.",
+                type_name
+            )
+        })
     }
 }
 

graphql_client_codegen/src/schema/json_conversion.rs

@@ -172,7 +172,7 @@ fn ingest_interface(schema: &mut Schema, iface: &mut FullType) {
                 schema,
                 &mut field.type_.as_mut().expect("take field type").type_ref,
             ),
-            deprecation: if let Some(true) = field.is_deprecated {
+            deprecation: if field.is_deprecated == Some(true) {
                 Some(field.deprecation_reason.clone())
             } else {
                 None
@@ -207,7 +207,7 @@ fn ingest_object(schema: &mut Schema, object: &mut FullType) {
                 schema,
                 &mut field.type_.as_mut().expect("take field type").type_ref,
             ),
-            deprecation: if let Some(true) = field.is_deprecated {
+            deprecation: if field.is_deprecated == Some(true) {
                 Some(field.deprecation_reason.clone())
             } else {
                 None

graphql_client_codegen/src/tests/mod.rs

@@ -23,7 +23,7 @@ fn schema_with_keywords_works() {
     let options = GraphQLClientCodegenOptions::new(CodegenMode::Cli);
 
     let generated_tokens =
-        generate_module_token_stream_from_string(query_string, &schema_path, options)
+        generate_module_token_stream_from_string(query_string, &schema_path, &options)
             .expect("Generate keywords module");
 
     let generated_code = generated_tokens.to_string();
@@ -52,7 +52,7 @@ fn fragments_other_variant_should_generate_unknown_other_variant() {
     options.set_fragments_other_variant(true);
 
     let generated_tokens =
-        generate_module_token_stream_from_string(query_string, &schema_path, options)
+        generate_module_token_stream_from_string(query_string, &schema_path, &options)
             .expect("Generate foobars module");
 
     let generated_code = generated_tokens.to_string();
@@ -80,7 +80,7 @@ fn fragments_other_variant_false_should_not_generate_unknown_other_variant() {
     options.set_fragments_other_variant(false);
 
     let generated_tokens =
-        generate_module_token_stream_from_string(query_string, &schema_path, options)
+        generate_module_token_stream_from_string(query_string, &schema_path, &options)
             .expect("Generate foobars module token stream");
 
     let generated_code = generated_tokens.to_string();
@@ -108,7 +108,7 @@ fn skip_serializing_none_should_generate_serde_skip_serializing() {
     options.set_skip_serializing_none(true);
 
     let generated_tokens =
-        generate_module_token_stream_from_string(query_string, &schema_path, options)
+        generate_module_token_stream_from_string(query_string, &schema_path, &options)
             .expect("Generate foobars module");
 
     let generated_code = generated_tokens.to_string();

graphql_query_derive/src/lib.rs

@@ -29,7 +29,7 @@ fn graphql_query_derive_inner(
     let (query_path, schema_path) = build_query_and_schema_path(&ast)?;
     let options = build_graphql_client_derive_options(&ast, query_path.clone())?;
 
-    generate_module_token_stream(query_path, &schema_path, options)
+    generate_module_token_stream(&query_path, &schema_path, &options)
         .map(Into::into)
         .map_err(|err| {
             syn::Error::new_spanned(ast, format!("Failed to generate GraphQLQuery impl: {err}"))