fix

Author: dotansimha

src/ast/operation_visitor.rs

@@ -278,8 +278,7 @@ fn visit_input_value<'a, Visitor, UserContext>(
                 let input_type = context
                     .current_input_type_literal()
                     .and_then(|v| context.schema.type_by_name(v.inner_type()))
-                    .and_then(|v| v.input_field_by_name(sub_key))
-                    .and_then(|v| Some(&v.value_type));
+                    .and_then(|v| v.input_field_by_name(sub_key)).map(|v| &v.value_type);
 
                 context.with_input_type(input_type, |context| {
                     let param = &(sub_key.clone(), sub_value.clone());

src/validation/rules/fields_on_correct_type.rs

@@ -130,7 +130,7 @@ fn object_field_selection() {
           __typename
           name
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -147,7 +147,7 @@ fn aliased_object_field_selection() {
           tn : __typename
           otherName : name
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -164,7 +164,7 @@ fn interface_field_selection() {
           __typename
           name
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -180,7 +180,7 @@ fn aliased_interface_field_selection() {
         "fragment interfaceFieldSelection on Pet {
           otherName : name
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -196,7 +196,7 @@ fn lying_alias_selection() {
         "fragment lyingAliasSelection on Dog {
           name : nickname
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -212,7 +212,7 @@ fn ignores_fields_on_unknown_type() {
         "fragment unknownSelection on UnknownType {
           unknownField
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -232,7 +232,7 @@ fn reports_errors_when_type_is_known_again() {
             }
           }
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -256,7 +256,7 @@ fn field_not_defined_on_fragment() {
         "fragment fieldNotDefined on Dog {
           meowVolume
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -279,7 +279,7 @@ fn ignores_deeply_unknown_field() {
             deeper_unknown_field
           }
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -302,7 +302,7 @@ fn sub_field_not_defined() {
             unknown_field
           }
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -325,7 +325,7 @@ fn field_not_defined_on_inline_fragment() {
             meowVolume
           }
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -346,7 +346,7 @@ fn aliased_field_target_not_defined() {
         "fragment aliasedFieldTargetNotDefined on Dog {
           volume : mooVolume
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -367,7 +367,7 @@ fn aliased_lying_field_target_not_defined() {
         "fragment aliasedLyingFieldTargetNotDefined on Dog {
           barkVolume : kawVolume
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -388,7 +388,7 @@ fn not_defined_on_interface() {
         "fragment notDefinedOnInterface on Pet {
           tailLength
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -409,7 +409,7 @@ fn defined_on_implementors_but_not_on_interface() {
         "fragment definedOnImplementorsButNotInterface on Pet {
           nickname
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -430,7 +430,7 @@ fn direct_field_selection_on_union() {
         "fragment directFieldSelectionOnUnion on CatOrDog {
           directField
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -451,7 +451,7 @@ fn defined_on_implementors_queried_on_union() {
         "fragment definedOnImplementorsQueriedOnUnion on CatOrDog {
           name
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -472,7 +472,7 @@ fn meta_field_selection_on_union() {
         "fragment directFieldSelectionOnUnion on CatOrDog {
           __typename
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -494,7 +494,7 @@ fn valid_field_in_inline_fragment() {
             name
           }
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 
@@ -511,7 +511,7 @@ fn forbidden_typename_on_subscription_type() {
         "subscription {
           __typename 
         }",
-        &FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
+        FIELDS_ON_CORRECT_TYPE_TEST_SCHEMA,
         &mut plan,
     );
 

src/validation/rules/known_argument_names.rs

@@ -157,7 +157,7 @@ fn single_arg_is_known() {
         "fragment argOnRequiredArg on Dog {
           doesKnowCommand(dogCommand: SIT)
         }",
-        &TEST_SCHEMA,
+        TEST_SCHEMA,
         &mut plan,
     );
 
@@ -173,7 +173,7 @@ fn multple_args_are_known() {
         "fragment multipleArgs on ComplicatedArgs {
           multipleReqs(req1: 1, req2: 2)
         }",
-        &TEST_SCHEMA,
+        TEST_SCHEMA,
         &mut plan,
     );
 
@@ -189,7 +189,7 @@ fn ignores_args_of_unknown_fields() {
         "fragment argOnUnknownField on Dog {
           unknownField(unknownArg: SIT)
         }",
-        &TEST_SCHEMA,
+        TEST_SCHEMA,
         &mut plan,
     );
 
@@ -205,7 +205,7 @@ fn multiple_args_in_reverse_order_are_known() {
         "fragment multipleArgsReverseOrder on ComplicatedArgs {
           multipleReqs(req2: 2, req1: 1)
         }",
-        &TEST_SCHEMA,
+        TEST_SCHEMA,
         &mut plan,
     );
 
@@ -221,7 +221,7 @@ fn no_args_on_optional_arg() {
         "fragment noArgOnOptionalArg on Dog {
           isHouseTrained
         }",
-        &TEST_SCHEMA,
+        TEST_SCHEMA,
         &mut plan,
     );
 
@@ -246,7 +246,7 @@ fn args_are_known_deeply() {
             }
           }
         }",
-        &TEST_SCHEMA,
+        TEST_SCHEMA,
         &mut plan,
     );
 
@@ -262,7 +262,7 @@ fn directive_args_are_known() {
         "{
           dog @skip(if: true)
         }",
-        &TEST_SCHEMA,
+        TEST_SCHEMA,
         &mut plan,
     );
 
@@ -278,7 +278,7 @@ fn field_args_are_invalid() {
         "{
           dog @skip(unless: true)
         }",
-        &TEST_SCHEMA,
+        TEST_SCHEMA,
         &mut plan,
     );
 
@@ -299,7 +299,7 @@ fn directive_without_args_is_valid() {
         " {
           dog @onField
         }",
-        &TEST_SCHEMA,
+        TEST_SCHEMA,
         &mut plan,
     );
 
@@ -316,7 +316,7 @@ fn arg_passed_to_directive_without_arg_is_reported() {
         " {
           dog @onField(if: true)
         }",
-        &TEST_SCHEMA,
+        TEST_SCHEMA,
         &mut plan,
     );
 
@@ -338,7 +338,7 @@ fn misspelled_directive_args_are_reported() {
         "{
           dog @skip(iff: true)
         }",
-        &TEST_SCHEMA,
+        TEST_SCHEMA,
         &mut plan,
     );
 
@@ -359,7 +359,7 @@ fn invalid_arg_name() {
         "fragment invalidArgName on Dog {
           doesKnowCommand(unknown: true)
         }",
-        &TEST_SCHEMA,
+        TEST_SCHEMA,
         &mut plan,
     );
 
@@ -381,7 +381,7 @@ fn misspelled_arg_name_is_reported() {
         "fragment invalidArgName on Dog {
           doesKnowCommand(DogCommand: true)
         }",
-        &TEST_SCHEMA,
+        TEST_SCHEMA,
         &mut plan,
     );
 
@@ -402,7 +402,7 @@ fn unknown_args_amongst_known_args() {
         "fragment oneGoodArgOneInvalidArg on Dog {
           doesKnowCommand(whoKnows: 1, dogCommand: SIT, unknown: true)
         }",
-        &TEST_SCHEMA,
+        TEST_SCHEMA,
         &mut plan,
     );
 
@@ -435,7 +435,7 @@ fn unknown_args_deeply() {
             }
           }
         }",
-        &TEST_SCHEMA,
+        TEST_SCHEMA,
         &mut plan,
     );
 

src/validation/rules/known_fragment_names.rs

@@ -32,7 +32,7 @@ impl<'a> OperationVisitor<'a, ValidationErrorContext> for KnownFragmentNames {
     ) {
         if visitor_context
             .known_fragments
-            .get(fragment_spread.fragment_name.as_str()) == None { user_context.report_error(ValidationError {
+            .get(fragment_spread.fragment_name.as_str()).is_none() { user_context.report_error(ValidationError {
             error_code: self.error_code(),
             locations: vec![fragment_spread.position],
             message: format!("Unknown fragment \"{}\".", fragment_spread.fragment_name),

src/validation/rules/known_type_names.rs

@@ -69,14 +69,12 @@ impl<'a> OperationVisitor<'a, ValidationErrorContext> for KnownTypeNames {
     ) {
         let base_type = variable_definition.var_type.inner_type();
 
-        if let None = visitor_context.schema.type_by_name(base_type) {
-            if !base_type.starts_with("__") {
-                user_context.report_error(ValidationError {
-                    error_code: self.error_code(),
-                    locations: vec![variable_definition.position],
-                    message: format!("Unknown type \"{}\".", base_type),
-                });
-            }
+        if visitor_context.schema.type_by_name(base_type).is_none() && !base_type.starts_with("__") {
+            user_context.report_error(ValidationError {
+                error_code: self.error_code(),
+                locations: vec![variable_definition.position],
+                message: format!("Unknown type \"{}\".", base_type),
+            });
         }
     }
 }
@@ -119,7 +117,7 @@ fn known_type_names_are_valid() {
         fragment PetFields on Pet {
           name
         }",
-        &TEST_SCHEMA,
+        TEST_SCHEMA,
         &mut plan,
     );
 
@@ -143,7 +141,7 @@ fn unknown_type_names_are_invalid() {
         fragment PetFields on Peat {
           name
         }",
-        &TEST_SCHEMA,
+        TEST_SCHEMA,
         &mut plan,
     );
 

src/validation/rules/overlapping_fields_can_be_merged.rs

@@ -794,9 +794,8 @@ impl<'a> OverlappingFieldsCanBeMerged<'a> {
                         .push(AstAndDef(parent_type, field, field_def));
                 }
                 Selection::FragmentSpread(fragment_spread) => {
-                    if fragment_names
-                        .iter()
-                        .find(|n| (*n).eq(&fragment_spread.fragment_name)).is_none()
+                    if !fragment_names
+                        .iter().any(|n| (*n).eq(&fragment_spread.fragment_name))
                     {
                         fragment_names.push(&fragment_spread.fragment_name);
                     }