Merge pull request #40 from tomhoule/clippy

Fix most clippy warnings

Author: tomhoule

graphql_client_cli/.gitignore

@@ -0,0 +1 @@
+/target

graphql_query_derive/src/constants.rs

@@ -2,12 +2,13 @@ use field_type::FieldType;
 use objects::GqlObjectField;
 use proc_macro2::{Ident, Span};
 
-pub const TYPENAME_FIELD: &'static str = "__typename";
+pub const TYPENAME_FIELD: &str = "__typename";
 
 pub fn string_type() -> Ident {
     Ident::new("String", Span::call_site())
 }
 
+#[cfg(test)]
 pub fn float_type() -> Ident {
     Ident::new("Float", Span::call_site())
 }

graphql_query_derive/src/enums.rs

@@ -1,6 +1,6 @@
 use proc_macro2::{Ident, Span, TokenStream};
 
-pub const ENUMS_PREFIX: &'static str = "";
+pub const ENUMS_PREFIX: &str = "";
 
 #[derive(Debug, PartialEq)]
 pub struct GqlEnum {

graphql_query_derive/src/field_type.rs

@@ -27,8 +27,7 @@ impl FieldType {
                 let name = if context.schema.scalars.contains(&name_string)
                     || DEFAULT_SCALARS
                         .iter()
-                        .find(|elem| elem == &&name_string)
-                        .is_some()
+                        .any(|elem| elem == &name_string.as_str())
                 {
                     name.clone()
                 } else if context.schema.enums.contains_key(&name_string) {

graphql_query_derive/src/interfaces.rs

@@ -74,7 +74,7 @@ impl GqlInterface {
         );
 
         let attached_enum_name = Ident::new(&format!("{}On", name), Span::call_site());
-        let (attached_enum, last_object_field) = if union_variants.len() > 0 {
+        let (attached_enum, last_object_field) = if !union_variants.is_empty() {
             let attached_enum = quote! {
                 #[derive(Deserialize, Debug, Serialize)]
                 #[serde(tag = "__typename")]

graphql_query_derive/src/lib.rs

@@ -140,19 +140,15 @@ fn extract_attr(ast: &syn::DeriveInput, attr: &str) -> Result<String, failure::E
             let path = &attr.path;
             quote!(#path).to_string() == "GraphQLQuery"
         })
-        .ok_or(format_err!("The GraphQLQuery attribute is missing"))?;
+        .ok_or_else(|| format_err!("The GraphQLQuery attribute is missing"))?;
     if let syn::Meta::List(items) = &attribute
         .interpret_meta()
         .expect("Attribute is well formatted")
     {
         for item in items.nested.iter() {
             if let syn::NestedMeta::Meta(syn::Meta::NameValue(name_value)) = item {
-                let syn::MetaNameValue {
-                    ident,
-                    eq_token: _,
-                    lit,
-                } = name_value;
-                if ident == &attr {
+                let syn::MetaNameValue { ident, lit, .. } = name_value;
+                if ident == attr {
                     if let syn::Lit::Str(lit) = lit {
                         return Ok(lit.value());
                     }

graphql_query_derive/src/schema.rs

@@ -12,7 +12,7 @@ use selection::Selection;
 use std::collections::{BTreeMap, BTreeSet};
 use unions::GqlUnion;
 
-pub const DEFAULT_SCALARS: &[&'static str] = &["ID", "String", "Int", "Float", "Boolean"];
+pub const DEFAULT_SCALARS: &[&str] = &["ID", "String", "Int", "Float", "Boolean"];
 
 #[derive(Debug, PartialEq)]
 pub struct Schema {
@@ -147,8 +147,8 @@ impl Schema {
         let response_data_fields = context
             .query_root
             .as_ref()
-            .or(context.mutation_root.as_ref())
-            .or(context._subscription_root.as_ref())
+            .or_else(|| context.mutation_root.as_ref())
+            .or_else(|| context._subscription_root.as_ref())
             .expect("no selection defined");
 
         // TODO: do something smarter here
@@ -192,14 +192,21 @@ impl Schema {
         })
     }
 
-    pub fn ingest_interface_implementations(&mut self, impls: BTreeMap<String, Vec<String>>) {
-        impls.into_iter().for_each(|(iface_name, implementors)| {
-            let iface = self
-                .interfaces
-                .get_mut(&iface_name)
-                .expect(&format!("interface not found: {}", iface_name));
-            iface.implemented_by = implementors.into_iter().collect();
-        });
+    pub fn ingest_interface_implementations(
+        &mut self,
+        impls: BTreeMap<String, Vec<String>>,
+    ) -> Result<(), failure::Error> {
+        impls
+            .into_iter()
+            .map(|(iface_name, implementors)| {
+                let iface = self
+                    .interfaces
+                    .get_mut(&iface_name)
+                    .ok_or_else(|| format_err!("interface not found: {}", iface_name))?;
+                iface.implemented_by = implementors.into_iter().collect();
+                Ok(())
+            })
+            .collect()
     }
 }
 
@@ -215,7 +222,7 @@ impl ::std::convert::From<graphql_parser::schema::Document> for Schema {
             match definition {
                 schema::Definition::TypeDefinition(ty_definition) => match ty_definition {
                     schema::TypeDefinition::Object(obj) => {
-                        for implementing in obj.implements_interfaces.iter() {
+                        for implementing in &obj.implements_interfaces {
                             let name = &obj.name;
                             interface_implementations
                                 .entry(implementing.to_string())
@@ -269,7 +276,9 @@ impl ::std::convert::From<graphql_parser::schema::Document> for Schema {
             }
         }
 
-        schema.ingest_interface_implementations(interface_implementations);
+        schema
+            .ingest_interface_implementations(interface_implementations)
+            .expect("schema ingestion");
 
         schema
     }
@@ -372,7 +381,9 @@ impl ::std::convert::From<::introspection_response::IntrospectionResponse> for S
             }
         }
 
-        schema.ingest_interface_implementations(interface_implementations);
+        schema
+            .ingest_interface_implementations(interface_implementations)
+            .expect("schema ingestion");
 
         schema
     }

graphql_query_derive/src/selection.rs

@@ -51,7 +51,7 @@ impl<'a> ::std::convert::From<&'a SelectionSet> for Selection {
 
         let mut items = Vec::new();
 
-        for item in selection_set.items.iter() {
+        for item in &selection_set.items {
             let converted = match item {
                 Selection::Field(f) => SelectionItem::Field(SelectionField {
                     name: f.name.to_string(),

graphql_query_derive/src/shared.rs

@@ -5,7 +5,7 @@ use proc_macro2::{Ident, Span, TokenStream};
 use query::QueryContext;
 use selection::*;
 
-pub(crate) fn render_object_field(field_name: &str, field_type: TokenStream) -> TokenStream {
+pub(crate) fn render_object_field(field_name: &str, field_type: &TokenStream) -> TokenStream {
     if field_name == "type" {
         let name_ident = Ident::new(&format!("{}_", field_name), Span::call_site());
         return quote! {
@@ -65,13 +65,13 @@ pub fn response_fields_for_selection(
                 let ty = &schema_fields
                     .iter()
                     .find(|field| field.name.as_str() == name.as_str())
-                    .ok_or(format_err!("Could not find field: {}", name.as_str()))?
+                    .ok_or_else(|| format_err!("Could not find field: {}", name.as_str()))?
                     .type_;
                 let ty = ty.to_rust(
                     context,
                     &format!("{}{}", prefix.to_camel_case(), name.to_camel_case()),
                 );
-                Ok(render_object_field(name, ty))
+                Ok(render_object_field(name, &ty))
             }
             SelectionItem::FragmentSpread(fragment) => {
                 let field_name =

src/lib.rs

@@ -1,7 +1,6 @@
 extern crate serde;
 #[macro_use]
 extern crate serde_derive;
-#[allow(unused_imports)]
 #[macro_use]
 extern crate graphql_query_derive;