Move executor to its own library

src/lib.rs

@@ -183,6 +183,7 @@ mod value;
 mod types;
 mod schema;
 pub mod validation;
+mod executor;
 mod integrations;
 
 #[cfg(all(test, not(feature="expose-test-schema")))] mod tests;
@@ -193,13 +194,15 @@ use std::collections::HashMap;
 use rustc_serialize::json::{ToJson, Json};
 
 use parser::{parse_document_source, ParseError, Spanning, SourcePosition};
-use types::execute_validated_query;
 use validation::{RuleError, ValidatorContext, visit_all_rules};
 
 pub use ast::{ToInputValue, FromInputValue, InputValue, Type, Selection};
 pub use value::Value;
 pub use types::base::{Arguments, GraphQLType, TypeKind};
-pub use types::schema::{Executor, Registry, ExecutionResult, ExecutionError, FieldResult};
+pub use executor::{
+    Executor, Registry, ExecutionResult, ExecutionError, FieldResult,
+    execute_validated_query,
+};
 pub use types::scalars::ID;
 pub use schema::model::RootNode;
 

src/schema/model.rs

@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 use std::fmt;
 
 use types::base::{GraphQLType};
-use types::schema::Registry;
+use executor::Registry;
 use ast::Type;
 use schema::meta::{MetaType, ObjectMeta, PlaceholderMeta, UnionMeta, InterfaceMeta, Argument};
 

src/schema/schema.rs

@@ -1,7 +1,7 @@
 use rustc_serialize::json::ToJson;
 
 use types::base::{GraphQLType, Arguments, TypeKind};
-use types::schema::{Executor, Registry, FieldResult, ExecutionResult};
+use executor::{Executor, Registry, FieldResult, ExecutionResult};
 
 use schema::meta::{MetaType, ObjectMeta, EnumMeta, InputObjectMeta, UnionMeta, InterfaceMeta,
                    Field, Argument, EnumValue};

src/tests/schema.rs

@@ -1,4 +1,4 @@
-use types::schema::FieldResult;
+use executor::FieldResult;
 use tests::model::{Character, Human, Droid, Database, Episode};
 
 graphql_enum!(Episode {

src/types/base.rs

@@ -4,7 +4,7 @@ use ast::{InputValue, Selection, Directive, FromInputValue};
 use value::Value;
 
 use schema::meta::{Argument, MetaType};
-use types::schema::{Executor, Registry, ExecutionResult};
+use executor::{Executor, Registry, ExecutionResult};
 use parser::Spanning;
 
 /// GraphQL type kind

src/types/containers.rs

@@ -2,7 +2,7 @@ use ast::{InputValue, ToInputValue, FromInputValue, Selection};
 use value::Value;
 use schema::meta::MetaType;
 
-use types::schema::{Executor, Registry};
+use executor::{Executor, Registry};
 use types::base::{GraphQLType};
 
 impl<T, CtxT> GraphQLType<CtxT> for Option<T> where T: GraphQLType<CtxT> {

src/types/mod.rs

@@ -1,8 +1,5 @@
 pub mod base;
-pub mod schema;
 pub mod scalars;
 pub mod pointers;
 pub mod containers;
 pub mod utilities;
-
-pub use self::schema::execute_validated_query;

src/types/pointers.rs

@@ -2,7 +2,7 @@ use ast::{Selection, InputValue, ToInputValue, FromInputValue};
 use value::Value;
 
 use schema::meta::MetaType;
-use types::schema::{Executor, Registry, ExecutionResult};
+use executor::{Executor, Registry, ExecutionResult};
 use types::base::{Arguments, GraphQLType};
 
 impl<T, CtxT> GraphQLType<CtxT> for Box<T> where T: GraphQLType<CtxT> {

src/types/scalars.rs

@@ -3,7 +3,7 @@ use value::Value;
 
 use schema::meta::MetaType;
 
-use types::schema::{Executor, Registry};
+use executor::{Executor, Registry};
 use types::base::GraphQLType;
 
 /// An ID as defined by the GraphQL specification

src/validation/rules/overlapping_fields_can_be_merged.rs

@@ -642,7 +642,7 @@ mod tests {
     use super::ConflictReasonMessage::*;
 
     use types::base::GraphQLType;
-    use types::schema::Registry;
+    use executor::Registry;
     use types::scalars::ID;
     use schema::meta::MetaType;
 

src/validation/test_harness.rs

@@ -1,7 +1,7 @@
 use parser::parse_document_source;
 use ast::{FromInputValue, InputValue};
 use types::base::GraphQLType;
-use types::schema::Registry;
+use executor::Registry;
 use types::scalars::ID;
 use schema::model::{DirectiveType, DirectiveLocation, RootNode};
 use schema::meta::{EnumValue, MetaType};