graphql: Remove QueryResponse alias

Author: leoyvens

graphql/src/execution/execution.rs

@@ -1,4 +1,5 @@
 use super::cache::QueryCache;
+use crossbeam::atomic::AtomicCell;
 use graph::prelude::CheapClone;
 use graphql_parser::query as q;
 use graphql_parser::schema as s;
@@ -8,11 +9,10 @@ use stable_hash::crypto::SetHasher;
 use stable_hash::prelude::*;
 use stable_hash::utils::stable_hash;
 use std::collections::{BTreeMap, HashMap, HashSet, VecDeque};
+use std::fmt;
 use std::iter;
 use std::sync::RwLock;
 use std::time::Instant;
-use std::fmt;
-use crossbeam::atomic::AtomicCell;
 
 use graph::prelude::*;
 
@@ -26,8 +26,6 @@ use crate::values::coercion;
 
 type QueryHash = <SetHasher as StableHasher>::Out;
 
-pub(crate) type QueryResponse = Result<BTreeMap<String, q::Value>, Vec<QueryExecutionError>>;
-
 #[derive(Debug)]
 struct CacheByBlock {
     block: EthereumBlockPointer,
@@ -199,7 +197,7 @@ impl fmt::Display for CacheStatus {
             CacheStatus::Hit => f.write_str("hit"),
             CacheStatus::Shared => f.write_str("shared"),
             CacheStatus::Insert => f.write_str("insert"),
-            CacheStatus::Miss => f.write_str("miss")
+            CacheStatus::Miss => f.write_str("miss"),
         }
     }
 }
@@ -271,7 +269,7 @@ pub fn execute_root_selection_set_uncached(
     ctx: &ExecutionContext<impl Resolver>,
     selection_set: &q::SelectionSet,
     root_type: &s::ObjectType,
-) -> QueryResponse {
+) -> Result<BTreeMap<String, q::Value>, Vec<QueryExecutionError>> {
     // Split the top-level fields into introspection fields and
     // regular data fields
     let mut data_set = q::SelectionSet {
@@ -442,7 +440,7 @@ fn execute_selection_set_to_map<'a>(
     selection_sets: impl Iterator<Item = &'a q::SelectionSet>,
     object_type: &s::ObjectType,
     prefetched_value: Option<q::Value>,
-) -> QueryResponse {
+) -> Result<BTreeMap<String, q::Value>, Vec<QueryExecutionError>> {
     let mut prefetched_object = match prefetched_value {
         Some(q::Value::Object(object)) => Some(object),
         Some(_) => unreachable!(),

graphql/src/query/mod.rs

@@ -62,7 +62,7 @@ where
         query: query.clone(),
         deadline: options.deadline,
         max_first: options.max_first,
-        cache_status: Default::default()
+        cache_status: Default::default(),
     };
 
     if !query.is_query() {

graphql/src/subscription/mod.rs

@@ -81,7 +81,7 @@ where
         query: query.clone(),
         deadline: None,
         max_first: options.max_first,
-        cache_status: Default::default()
+        cache_status: Default::default(),
     };
 
     if !query.is_subscription() {
@@ -198,7 +198,7 @@ async fn execute_subscription_event(
         query,
         deadline: timeout.map(|t| Instant::now() + t),
         max_first,
-        cache_status: Default::default()
+        cache_status: Default::default(),
     };
 
     // We have established that this exists earlier in the subscription execution