Merge pull request #178 from h-michael/clippy

Fix clippy warning

Author: tomhoule

graphql_client/examples/github/src/main.rs

@@ -42,7 +42,7 @@ struct Env {
 }
 
 fn parse_repo_name(repo_name: &str) -> Result<(&str, &str), failure::Error> {
-    let mut parts = repo_name.split("/");
+    let mut parts = repo_name.split('/');
     match (parts.next(), parts.next()) {
         (Some(owner), Some(name)) => Ok((owner, name)),
         _ => Err(format_err!("wrong format for the repository name param (we expect something like facebook/graphql)"))

graphql_client_cli/src/generate.rs

@@ -9,9 +9,9 @@ pub fn generate_code(
     schema_path: PathBuf,
     selected_operation: String,
     additional_derives: Option<String>,
-    deprecation_strategy: Option<String>,
+    deprecation_strategy: &Option<String>,
     no_formatting: bool,
-    output: PathBuf,
+    output: &PathBuf,
 ) -> Result<(), failure::Error> {
     let deprecation_strategy = deprecation_strategy.as_ref().map(|s| s.as_str());
     let deprecation_strategy = match deprecation_strategy {

graphql_client_cli/src/introspect_schema.rs

@@ -49,7 +49,8 @@ pub fn introspect_schema(
     }
 
     let json: serde_json::Value = res.json()?;
-    Ok(serde_json::to_writer_pretty(out, &json)?)
+    serde_json::to_writer_pretty(out, &json)?;
+    Ok(())
 }
 
 fn construct_headers() -> HeaderMap {

graphql_client_cli/src/main.rs

@@ -83,9 +83,9 @@ fn main() -> Result<(), failure::Error> {
             schema_path,
             selected_operation,
             additional_derives,
-            deprecation_strategy,
+            &deprecation_strategy,
             no_formatting,
-            output,
+            &output,
         ),
     }
 }

graphql_client_codegen/src/codegen.rs

@@ -12,12 +12,9 @@ use selection::Selection;
 pub(crate) fn select_operation(query: &query::Document, struct_name: &str) -> Option<Operation> {
     let mut operations: Vec<Operation> = Vec::new();
 
-    for definition in query.definitions.iter() {
-        match definition {
-            query::Definition::Operation(op) => {
-                operations.push(op.into());
-            }
-            _ => (),
+    for definition in &query.definitions {
+        if let query::Definition::Operation(op) = definition {
+            operations.push(op.into());
         }
     }
 

graphql_client_codegen/src/lib.rs

@@ -84,9 +84,7 @@ pub fn generate_module_token_stream(
     let response_derives = options.additional_derives;
 
     // The user can determine what to do about deprecations.
-    let deprecation_strategy = options
-        .deprecation_strategy
-        .unwrap_or(deprecation::DeprecationStrategy::default());
+    let deprecation_strategy = options.deprecation_strategy.unwrap_or_default();
 
     // We need to qualify the query with the path to the crate it is part of
     let (query_string, query) = {

graphql_client_codegen/src/query.rs

@@ -31,9 +31,9 @@ impl QueryContext {
     }
 
     pub(crate) fn require(&self, typename_: &str) {
-        self.fragments
-            .get(typename_)
-            .map(|fragment| fragment.is_required.set(true));
+        if let Some(fragment) = self.fragments.get(typename_) {
+            fragment.is_required.set(true)
+        }
     }
 
     /// For testing only. creates an empty QueryContext with an empty Schema.
@@ -121,7 +121,7 @@ impl QueryContext {
                     && !derive.to_string().contains("Deserialize")
             }).collect();
 
-        if enum_derives.len() > 0 {
+        if !enum_derives.is_empty() {
             quote! {
                 #[derive( #(#enum_derives),* )]
             }

graphql_client_codegen/src/schema.rs

@@ -235,7 +235,7 @@ impl ::std::convert::From<::introspection_response::IntrospectionResponse> for S
                             name.clone(),
                             Scalar {
                                 name,
-                                description: ty.description.as_ref().map(|d| d.clone()),
+                                description: ty.description.as_ref().cloned(),
                                 is_required: false.into(),
                             },
                         );
@@ -262,7 +262,7 @@ impl ::std::convert::From<::introspection_response::IntrospectionResponse> for S
                     for implementing in ty
                         .interfaces
                         .clone()
-                        .unwrap_or_else(|| Vec::new())
+                        .unwrap_or_else(Vec::new)
                         .into_iter()
                         .filter_map(|t| t)
                         .map(|t| t.type_ref.name)

graphql_client_codegen/src/unions.rs

@@ -25,11 +25,13 @@ enum UnionError {
     MissingTypename { union_name: String },
 }
 
+type UnionVariantResult = Result<(Vec<TokenStream>, Vec<TokenStream>, Vec<String>), failure::Error>;
+
 pub(crate) fn union_variants(
     selection: &Selection,
     query_context: &QueryContext,
     prefix: &str,
-) -> Result<(Vec<TokenStream>, Vec<TokenStream>, Vec<String>), failure::Error> {
+) -> UnionVariantResult {
     let mut children_definitions = Vec::new();
     let mut used_variants = Vec::with_capacity(selection.0.len());
 

graphql_query_derive/src/lib.rs

@@ -40,8 +40,7 @@ fn build_query_and_schema_path(
 fn build_graphql_client_derive_options(input: &syn::DeriveInput) -> GraphQLClientDeriveOptions {
     let response_derives = attributes::extract_attr(input, "response_derives").ok();
     // The user can determine what to do about deprecations.
-    let deprecation_strategy = deprecation::extract_deprecation_strategy(input)
-        .unwrap_or(deprecation::DeprecationStrategy::default());
+    let deprecation_strategy = deprecation::extract_deprecation_strategy(input).unwrap_or_default();
 
     GraphQLClientDeriveOptions {
         struct_name: input.ident.to_string(),