Appease Clippy 1.86 (#964)

Author: SimonSapin

crates/apollo-compiler/src/introspection/mod.rs

@@ -111,7 +111,7 @@ pub fn partial_execute(
         });
     let mut errors = Vec::new();
     let path = None;
-    let data = match execute_selection_set(
+    let data = execute_selection_set(
         schema,
         document,
         variable_values,
@@ -121,9 +121,12 @@ pub fn partial_execute(
         root_operation_object_type_def,
         initial_value,
         &operation.selection_set.selections,
-    ) {
-        Ok(map) => Some(map),
-        Err(PropagateNull) => None,
-    };
+    )
+    // What `.ok()` below converts to `None` is a field error on a non-null field
+    // propagated all the way to the root, so that the response JSON should contain `"data": null`.
+    //
+    // No-op to witness the error type:
+    .inspect_err(|_: &PropagateNull| {})
+    .ok();
     Ok(ExecutionResponse { data, errors })
 }

crates/apollo-compiler/src/validation/mod.rs

@@ -291,7 +291,7 @@ impl DiagnosticData {
                     OutputType { .. } => "OutputType",
                     InputType { .. } => "InputType",
                     VariableInputType { .. } => "VariableInputType",
-                    QueryRootOperationType { .. } => "QueryRootOperationType",
+                    QueryRootOperationType => "QueryRootOperationType",
                     UnusedVariable { .. } => "UnusedVariable",
                     RootOperationObjectType { .. } => "RootOperationObjectType",
                     UnionMemberObjectType { .. } => "UnionMemberObjectType",
@@ -320,9 +320,7 @@ impl DiagnosticData {
             Details::ExecutableBuildError(error) => Some(match error {
                 ExecutableBuildError::UndefinedField { .. } => "UndefinedField",
                 ExecutableBuildError::TypeSystemDefinition { .. } => "TypeSystemDefinition",
-                ExecutableBuildError::AmbiguousAnonymousOperation { .. } => {
-                    "AmbiguousAnonymousOperation"
-                }
+                ExecutableBuildError::AmbiguousAnonymousOperation => "AmbiguousAnonymousOperation",
                 ExecutableBuildError::OperationNameCollision { .. } => "OperationNameCollision",
                 ExecutableBuildError::FragmentNameCollision { .. } => "FragmentNameCollision",
                 ExecutableBuildError::UndefinedRootOperation { .. } => "UndefinedRootOperation",
@@ -419,7 +417,7 @@ impl DiagnosticData {
                     VariableInputType { name, ty, .. } => Some(format!(
                         r#"Variable "${name}" cannot be non-input type "{ty}"."#
                     )),
-                    QueryRootOperationType { .. } => None,
+                    QueryRootOperationType => None,
                     UnusedVariable { name } => {
                         Some(format!(r#"Variable "${name}" is never used."#))
                     }
@@ -681,10 +679,10 @@ impl ToCliReport for DiagnosticData {
                     report.with_label_opt(self.location, format_args!("`{name}` redefined here"));
                     report.with_help("remove or rename one of the definitions, or use `extend`");
                 }
-                SchemaBuildError::BuiltInScalarTypeRedefinition { .. } => {
+                SchemaBuildError::BuiltInScalarTypeRedefinition => {
                     report.with_label_opt(self.location, "remove this scalar definition");
                 }
-                SchemaBuildError::OrphanSchemaExtension { .. } => {
+                SchemaBuildError::OrphanSchemaExtension => {
                     report.with_label_opt(self.location, "extension here")
                 }
                 SchemaBuildError::OrphanTypeExtension { .. } => {
@@ -761,7 +759,7 @@ impl ToCliReport for DiagnosticData {
                     self.location,
                     "remove this definition, or use `parse_mixed()`",
                 ),
-                ExecutableBuildError::AmbiguousAnonymousOperation { .. } => {
+                ExecutableBuildError::AmbiguousAnonymousOperation => {
                     report.with_label_opt(self.location, "provide a name for this definition");
                     report.with_help(
                         "GraphQL requires operations to be named if the document has more than one",