From baf67f3344c2ebac392578d9de8bea41a5d6f697 Mon Sep 17 00:00:00 2001 From: Olexiy Buyanskyy Date: Fri, 23 Oct 2020 11:10:00 +0300 Subject: [PATCH] Fixed redundant_closure_for_method_calls https://rust-lang.github.io/rust-clippy/master/index.html#redundant_closure_for_method_calls --- src/http/multipart.rs | 3 ++- src/lib.rs | 2 +- src/model/directive.rs | 4 +++- src/model/enum_value.rs | 4 ++-- src/model/field.rs | 4 ++-- src/model/input_value.rs | 4 +++- src/model/type.rs | 16 ++++++++++------ src/validation/rules/fields_on_correct_type.rs | 2 +- src/validation/rules/no_undefined_variables.rs | 2 +- src/validation/rules/no_unused_fragments.rs | 4 ++-- src/validation/rules/no_unused_variables.rs | 2 +- .../rules/variables_in_allowed_position.rs | 2 +- src/validation/utils.rs | 2 +- 13 files changed, 30 insertions(+), 21 deletions(-) diff --git a/src/http/multipart.rs b/src/http/multipart.rs index 22d34a0d..7b7945fc 100644 --- a/src/http/multipart.rs +++ b/src/http/multipart.rs @@ -85,7 +85,8 @@ pub(super) async fn receive_batch_multipart( _ => { if let Some(name) = field.name().map(ToString::to_string) { if let Some(filename) = field.file_name().map(ToString::to_string) { - let content_type = field.content_type().map(|mime| mime.to_string()); + let content_type = + field.content_type().map(std::string::ToString::to_string); let mut file = tempfile::tempfile().map_err(ParseRequestError::Io)?; while let Some(chunk) = field.chunk().await.unwrap() { file.write(&chunk).map_err(ParseRequestError::Io)?; diff --git a/src/lib.rs b/src/lib.rs index 66dde065..bba6a00e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -124,7 +124,7 @@ #![allow(clippy::must_use_candidate)] #![allow(clippy::missing_errors_doc)] #![allow(clippy::needless_pass_by_value)] -#![allow(clippy::redundant_closure_for_method_calls)] +#![deny(clippy::redundant_closure_for_method_calls)] #![allow(clippy::option_if_let_else)] #![allow(clippy::match_same_arms)] #![allow(clippy::filter_map)] diff --git a/src/model/directive.rs b/src/model/directive.rs index 84114201..ee9a64f3 100644 --- a/src/model/directive.rs +++ b/src/model/directive.rs @@ -79,7 +79,9 @@ impl<'a> __Directive<'a> { } async fn description(&self) -> Option { - self.directive.description.map(|s| s.to_string()) + self.directive + .description + .map(std::string::ToString::to_string) } async fn locations(&self) -> &Vec<__DirectiveLocation> { diff --git a/src/model/enum_value.rs b/src/model/enum_value.rs index 0af35fad..dffee67f 100644 --- a/src/model/enum_value.rs +++ b/src/model/enum_value.rs @@ -13,7 +13,7 @@ impl<'a> __EnumValue<'a> { } async fn description(&self) -> Option { - self.value.description.map(|s| s.to_string()) + self.value.description.map(std::string::ToString::to_string) } async fn is_deprecated(&self) -> bool { @@ -21,6 +21,6 @@ impl<'a> __EnumValue<'a> { } async fn deprecation_reason(&self) -> Option { - self.value.deprecation.map(|s| s.to_string()) + self.value.deprecation.map(std::string::ToString::to_string) } } diff --git a/src/model/field.rs b/src/model/field.rs index 717bf63d..d39d4897 100644 --- a/src/model/field.rs +++ b/src/model/field.rs @@ -14,7 +14,7 @@ impl<'a> __Field<'a> { } async fn description(&self) -> Option { - self.field.description.map(|s| s.to_string()) + self.field.description.map(std::string::ToString::to_string) } async fn args(&self) -> Vec<__InputValue<'a>> { @@ -38,6 +38,6 @@ impl<'a> __Field<'a> { } async fn deprecation_reason(&self) -> Option { - self.field.deprecation.map(|s| s.to_string()) + self.field.deprecation.map(std::string::ToString::to_string) } } diff --git a/src/model/input_value.rs b/src/model/input_value.rs index 2d9ebc44..5e257e0d 100644 --- a/src/model/input_value.rs +++ b/src/model/input_value.rs @@ -14,7 +14,9 @@ impl<'a> __InputValue<'a> { } async fn description(&self) -> Option { - self.input_value.description.map(|s| s.to_string()) + self.input_value + .description + .map(std::string::ToString::to_string) } #[graphql(name = "type")] diff --git a/src/model/type.rs b/src/model/type.rs index a78830fc..77d46a82 100644 --- a/src/model/type.rs +++ b/src/model/type.rs @@ -70,18 +70,22 @@ impl<'a> __Type<'a> { match &self.detail { TypeDetail::Named(ty) => match ty { registry::MetaType::Scalar { description, .. } => { - description.map(|s| s.to_string()) + description.map(std::string::ToString::to_string) } registry::MetaType::Object { description, .. } => { - description.map(|s| s.to_string()) + description.map(std::string::ToString::to_string) } registry::MetaType::Interface { description, .. } => { - description.map(|s| s.to_string()) + description.map(std::string::ToString::to_string) + } + registry::MetaType::Union { description, .. } => { + description.map(std::string::ToString::to_string) + } + registry::MetaType::Enum { description, .. } => { + description.map(std::string::ToString::to_string) } - registry::MetaType::Union { description, .. } => description.map(|s| s.to_string()), - registry::MetaType::Enum { description, .. } => description.map(|s| s.to_string()), registry::MetaType::InputObject { description, .. } => { - description.map(|s| s.to_string()) + description.map(std::string::ToString::to_string) } }, TypeDetail::NonNull(_) => None, diff --git a/src/validation/rules/fields_on_correct_type.rs b/src/validation/rules/fields_on_correct_type.rs index 3496a6e4..542b749a 100644 --- a/src/validation/rules/fields_on_correct_type.rs +++ b/src/validation/rules/fields_on_correct_type.rs @@ -40,7 +40,7 @@ impl<'a> Visitor<'a> for FieldsOnCorrectType { .iter() .map(|fields| fields.keys()) .flatten() - .map(|s| s.as_str()), + .map(std::string::String::as_str), &field.node.name.node, ) .unwrap_or_default() diff --git a/src/validation/rules/no_undefined_variables.rs b/src/validation/rules/no_undefined_variables.rs index fdd43813..5993bc61 100644 --- a/src/validation/rules/no_undefined_variables.rs +++ b/src/validation/rules/no_undefined_variables.rs @@ -80,7 +80,7 @@ impl<'a> Visitor<'a> for NoUndefinedVariables<'a> { name: Option<&'a Name>, operation_definition: &'a Positioned, ) { - let name = name.map(|name| name.as_str()); + let name = name.map(async_graphql_value::Name::as_str); self.current_scope = Some(Scope::Operation(name)); self.defined_variables .insert(name, (operation_definition.pos, HashSet::new())); diff --git a/src/validation/rules/no_unused_fragments.rs b/src/validation/rules/no_unused_fragments.rs index d685d9b0..da3dd117 100644 --- a/src/validation/rules/no_unused_fragments.rs +++ b/src/validation/rules/no_unused_fragments.rs @@ -38,7 +38,7 @@ impl<'a> Visitor<'a> for NoUnusedFragments<'a> { for (name, _) in doc.operations.iter() { self.find_reachable_fragments( - &Scope::Operation(name.map(|name| name.as_str())), + &Scope::Operation(name.map(Name::as_str)), &mut reachable, ); } @@ -59,7 +59,7 @@ impl<'a> Visitor<'a> for NoUnusedFragments<'a> { name: Option<&'a Name>, _operation_definition: &'a Positioned, ) { - self.current_scope = Some(Scope::Operation(name.map(|name| name.as_str()))); + self.current_scope = Some(Scope::Operation(name.map(Name::as_str))); } fn enter_fragment_definition( diff --git a/src/validation/rules/no_unused_variables.rs b/src/validation/rules/no_unused_variables.rs index c973e23b..10019b73 100644 --- a/src/validation/rules/no_unused_variables.rs +++ b/src/validation/rules/no_unused_variables.rs @@ -80,7 +80,7 @@ impl<'a> Visitor<'a> for NoUnusedVariables<'a> { name: Option<&'a Name>, _operation_definition: &'a Positioned, ) { - let op_name = name.map(|name| name.as_str()); + let op_name = name.map(Name::as_str); self.current_scope = Some(Scope::Operation(op_name)); self.defined_variables.insert(op_name, HashSet::new()); } diff --git a/src/validation/rules/variables_in_allowed_position.rs b/src/validation/rules/variables_in_allowed_position.rs index 1e6a0904..19945dde 100644 --- a/src/validation/rules/variables_in_allowed_position.rs +++ b/src/validation/rules/variables_in_allowed_position.rs @@ -76,7 +76,7 @@ impl<'a> Visitor<'a> for VariableInAllowedPosition<'a> { name: Option<&'a Name>, _operation_definition: &'a Positioned, ) { - self.current_scope = Some(Scope::Operation(name.map(|name| name.as_str()))); + self.current_scope = Some(Scope::Operation(name.map(Name::as_str))); } fn enter_fragment_definition( diff --git a/src/validation/utils.rs b/src/validation/utils.rs index 14bfd42b..a3b72e8f 100644 --- a/src/validation/utils.rs +++ b/src/validation/utils.rs @@ -124,7 +124,7 @@ pub fn is_valid_input_value( ConstValue::Object(values) => { let mut input_names = values .keys() - .map(|name| name.as_ref()) + .map(std::convert::AsRef::as_ref) .collect::>(); for field in input_fields.values() {