Fix clippy warnings

tomhoule · tomhoule · commit 4e088282d0fc · 2019-05-15T19:43:45.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
-This release sees the switch to the Rust 2018 edition and is only compatible with Rust 1.31.0 and later.
+This release sees the switch to the Rust 2018 edition - it is
+only compatible with Rust 1.31.0 and later.
 
 ## 0.7.1
 
diff --git a/graphql_client/src/lib.rs b/graphql_client/src/lib.rs
@@ -2,9 +2,9 @@
 //!
 //! The main interface to this library is the custom derive that generates modules from a GraphQL query and schema. See the docs for the [`GraphQLQuery`] trait for a full example.
 
-#![deny(warnings)]
 #![deny(missing_docs)]
 #![deny(rust_2018_idioms)]
+#![deny(warnings)]
 
 #[allow(unused_imports)]
 #[macro_use]
diff --git a/graphql_client_cli/src/generate.rs b/graphql_client_cli/src/generate.rs
@@ -64,7 +64,7 @@ pub(crate) fn generate_code(params: CliCodegenParams) -> Result<(), failure::Err
 
     let query_file_name: ::std::ffi::OsString = query_path
         .file_name()
-        .map(|s| s.to_owned())
+        .map(ToOwned::to_owned)
         .ok_or_else(|| format_err!("Failed to find a file name in the provided query path."))?;
 
     let dest_file_path: PathBuf = output_directory
diff --git a/graphql_client_cli/src/introspect_schema.rs b/graphql_client_cli/src/introspect_schema.rs
@@ -77,7 +77,7 @@ impl FromStr for Header {
 
     fn from_str(input: &str) -> Result<Self, Self::Err> {
         // error: colon required for name/value pair
-        if !input.contains(":") {
+        if !input.contains(':') {
             return Err(format_err!(
                 "Invalid header input. A colon is required to separate the name and value. [{}]",
                 input
@@ -90,7 +90,7 @@ impl FromStr for Header {
         let value = name_value[1].trim();
 
         // error: field name must be
-        if name.len() == 0 {
+        if name.is_empty() {
             return Err(format_err!(
                 "Invalid header input. Field name is required before colon. [{}]",
                 input
diff --git a/graphql_client_codegen/src/codegen.rs b/graphql_client_codegen/src/codegen.rs
@@ -18,7 +18,7 @@ pub(crate) fn select_operation<'query>(
     operations
         .iter()
         .find(|op| op.name == struct_name)
-        .map(|i| i.to_owned())
+        .map(ToOwned::to_owned)
 }
 
 pub(crate) fn all_operations(query: &query::Document) -> Vec<Operation<'_>> {
diff --git a/graphql_client_codegen/src/lib.rs b/graphql_client_codegen/src/lib.rs
@@ -1,5 +1,6 @@
 #![recursion_limit = "512"]
 #![deny(missing_docs)]
+#![deny(rust_2018_idioms)]
 #![deny(warnings)]
 
 //! Crate for internal use by other graphql-client crates, for code generation.
@@ -167,7 +168,7 @@ fn derive_operation_not_found_error(
 ) -> failure::Error {
     use graphql_parser::query::*;
 
-    let operation_name = ident.map(|i| i.to_string());
+    let operation_name = ident.map(ToString::to_string);
     let struct_ident = operation_name.as_ref().map(String::as_str).unwrap_or("");
 
     let available_operations = query
diff --git a/graphql_client_codegen/src/objects.rs b/graphql_client_codegen/src/objects.rs
@@ -68,7 +68,7 @@ impl<'schema> GqlObject<'schema> {
     }
 
     pub fn from_graphql_parser_object(obj: &'schema schema::ObjectType) -> Self {
-        let description = obj.description.as_ref().map(|s| s.as_str());
+        let description = obj.description.as_ref().map(String::as_str);
         let mut item = GqlObject::new(&obj.name, description);
         item.fields.extend(obj.fields.iter().map(|f| {
             let deprecation = parse_deprecation_info(&f);
diff --git a/graphql_client_codegen/src/query.rs b/graphql_client_codegen/src/query.rs
@@ -91,13 +91,13 @@ impl<'query, 'schema> QueryContext<'query, 'schema> {
         self.variables_derives.extend(
             attribute_value
                 .split(',')
-                .map(|s| s.trim())
+                .map(str::trim)
                 .map(|s| Ident::new(s, Span::call_site())),
         );
         self.response_derives.extend(
             attribute_value
                 .split(',')
-                .map(|s| s.trim())
+                .map(str::trim)
                 .map(|s| Ident::new(s, Span::call_site())),
         );
         Ok(())
diff --git a/graphql_client_codegen/src/schema.rs b/graphql_client_codegen/src/schema.rs
@@ -159,7 +159,7 @@ impl<'schema> ::std::convert::From<&'schema graphql_parser::schema::Document> fo
                     }
                     schema::TypeDefinition::Union(union) => {
                         let variants: BTreeSet<&str> =
-                            union.types.iter().map(|s| s.as_str()).collect();
+                            union.types.iter().map(String::as_str).collect();
                         schema.unions.insert(
                             &union.name,
                             GqlUnion {
@@ -173,12 +173,12 @@ impl<'schema> ::std::convert::From<&'schema graphql_parser::schema::Document> fo
                     schema::TypeDefinition::Interface(interface) => {
                         let mut iface = GqlInterface::new(
                             &interface.name,
-                            interface.description.as_ref().map(|d| d.as_str()),
+                            interface.description.as_ref().map(String::as_str),
                         );
                         iface
                             .fields
                             .extend(interface.fields.iter().map(|f| GqlObjectField {
-                                description: f.description.as_ref().map(|s| s.as_str()),
+                                description: f.description.as_ref().map(String::as_str),
                                 name: f.name.as_str(),
                                 type_: FieldType::from(&f.field_type),
                                 deprecation: DeprecationStatus::Current,
@@ -192,9 +192,9 @@ impl<'schema> ::std::convert::From<&'schema graphql_parser::schema::Document> fo
                 schema::Definition::DirectiveDefinition(_) => (),
                 schema::Definition::TypeExtension(_extension) => (),
                 schema::Definition::SchemaDefinition(definition) => {
-                    schema.query_type = definition.query.as_ref().map(|s| s.as_str());
-                    schema.mutation_type = definition.mutation.as_ref().map(|s| s.as_str());
-                    schema.subscription_type = definition.subscription.as_ref().map(|s| s.as_str());
+                    schema.query_type = definition.query.as_ref().map(String::as_str);
+                    schema.mutation_type = definition.mutation.as_ref().map(String::as_str);
+                    schema.subscription_type = definition.subscription.as_ref().map(String::as_str);
                 }
             }
         }
@@ -224,17 +224,17 @@ impl<'schema> ::std::convert::From<&'schema crate::introspection_response::Intro
             .query_type
             .as_ref()
             .and_then(|ty| ty.name.as_ref())
-            .map(|s| s.as_str());
+            .map(String::as_str);
         schema.mutation_type = root
             .mutation_type
             .as_ref()
             .and_then(|ty| ty.name.as_ref())
-            .map(|s| s.as_str());
+            .map(String::as_str);
         schema.subscription_type = root
             .subscription_type
             .as_ref()
             .and_then(|ty| ty.name.as_ref())
-            .map(|s| s.as_str());
+            .map(String::as_str);
 
         // Holds which objects implement which interfaces so we can populate GqlInterface#implemented_by later.
         // It maps interface names to a vec of implementation names.
@@ -320,7 +320,7 @@ impl<'schema> ::std::convert::From<&'schema crate::introspection_response::Intro
                         .map(Vec::as_slice)
                         .unwrap_or_else(|| &[])
                         .iter()
-                        .filter_map(|t| t.as_ref())
+                        .filter_map(Option::as_ref)
                         .map(|t| &t.type_ref.name)
                     {
                         interface_implementations
@@ -340,7 +340,7 @@ impl<'schema> ::std::convert::From<&'schema crate::introspection_response::Intro
                 }
                 Some(__TypeKind::INTERFACE) => {
                     let mut iface =
-                        GqlInterface::new(name, ty.description.as_ref().map(|t| t.as_str()));
+                        GqlInterface::new(name, ty.description.as_ref().map(String::as_str));
                     iface.fields.extend(
                         ty.fields
                             .as_ref()
diff --git a/graphql_query_derive/src/lib.rs b/graphql_query_derive/src/lib.rs
@@ -36,7 +36,7 @@ fn graphql_query_derive_inner(
     let options = build_graphql_client_derive_options(&ast, query_path.to_path_buf())?;
     Ok(
         generate_module_token_stream(query_path, &schema_path, options)
-            .map(|module| module.into())
+            .map(Into::into)
             .context("Code generation failed.")?,
     )
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ pub(crate) fn select_operation<'query>(`
`18`	`18`	`operations`
`19`	`19`	`.iter()`
`20`	`20`	`.find(\|op\| op.name == struct_name)`
`21`		`- .map(\|i\| i.to_owned())`
	`21`	`+ .map(ToOwned::to_owned)`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`pub(crate) fn all_operations(query: &query::Document) -> Vec<Operation<'_>> {`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ impl<'schema> GqlObject<'schema> {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`pub fn from_graphql_parser_object(obj: &'schema schema::ObjectType) -> Self {`
`71`		`- let description = obj.description.as_ref().map(\|s\| s.as_str());`
	`71`	`+ let description = obj.description.as_ref().map(String::as_str);`
`72`	`72`	`let mut item = GqlObject::new(&obj.name, description);`
`73`	`73`	`item.fields.extend(obj.fields.iter().map(\|f\| {`
`74`	`74`	`let deprecation = parse_deprecation_info(&f);`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ fn graphql_query_derive_inner(`
`36`	`36`	`let options = build_graphql_client_derive_options(&ast, query_path.to_path_buf())?;`
`37`	`37`	`Ok(`
`38`	`38`	`generate_module_token_stream(query_path, &schema_path, options)`
`39`		`- .map(\|module\| module.into())`
	`39`	`+ .map(Into::into)`
`40`	`40`	`.context("Code generation failed.")?,`
`41`	`41`	`)`
`42`	`42`	`}`