Skip to content

Commit 3b6c69c

Browse files
committed
Move executor to its own library
1 parent 2be6f74 commit 3b6c69c

File tree

12 files changed

+14
-14
lines changed

12 files changed

+14
-14
lines changed
File renamed without changes.

src/lib.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ mod value;
183183
mod types;
184184
mod schema;
185185
pub mod validation;
186+
mod executor;
186187
mod integrations;
187188

188189
#[cfg(all(test, not(feature="expose-test-schema")))] mod tests;
@@ -193,13 +194,15 @@ use std::collections::HashMap;
193194
use rustc_serialize::json::{ToJson, Json};
194195

195196
use parser::{parse_document_source, ParseError, Spanning, SourcePosition};
196-
use types::execute_validated_query;
197197
use validation::{RuleError, ValidatorContext, visit_all_rules};
198198

199199
pub use ast::{ToInputValue, FromInputValue, InputValue, Type, Selection};
200200
pub use value::Value;
201201
pub use types::base::{Arguments, GraphQLType, TypeKind};
202-
pub use types::schema::{Executor, Registry, ExecutionResult, ExecutionError, FieldResult};
202+
pub use executor::{
203+
Executor, Registry, ExecutionResult, ExecutionError, FieldResult,
204+
execute_validated_query,
205+
};
203206
pub use types::scalars::ID;
204207
pub use schema::model::RootNode;
205208

src/schema/model.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::marker::PhantomData;
33
use std::fmt;
44

55
use types::base::{GraphQLType};
6-
use types::schema::Registry;
6+
use executor::Registry;
77
use ast::Type;
88
use schema::meta::{MetaType, ObjectMeta, PlaceholderMeta, UnionMeta, InterfaceMeta, Argument};
99

src/schema/schema.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rustc_serialize::json::ToJson;
22

33
use types::base::{GraphQLType, Arguments, TypeKind};
4-
use types::schema::{Executor, Registry, FieldResult, ExecutionResult};
4+
use executor::{Executor, Registry, FieldResult, ExecutionResult};
55

66
use schema::meta::{MetaType, ObjectMeta, EnumMeta, InputObjectMeta, UnionMeta, InterfaceMeta,
77
Field, Argument, EnumValue};

src/tests/schema.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use types::schema::FieldResult;
1+
use executor::FieldResult;
22
use tests::model::{Character, Human, Droid, Database, Episode};
33

44
graphql_enum!(Episode {

src/types/base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use ast::{InputValue, Selection, Directive, FromInputValue};
44
use value::Value;
55

66
use schema::meta::{Argument, MetaType};
7-
use types::schema::{Executor, Registry, ExecutionResult};
7+
use executor::{Executor, Registry, ExecutionResult};
88
use parser::Spanning;
99

1010
/// GraphQL type kind

src/types/containers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use ast::{InputValue, ToInputValue, FromInputValue, Selection};
22
use value::Value;
33
use schema::meta::MetaType;
44

5-
use types::schema::{Executor, Registry};
5+
use executor::{Executor, Registry};
66
use types::base::{GraphQLType};
77

88
impl<T, CtxT> GraphQLType<CtxT> for Option<T> where T: GraphQLType<CtxT> {

src/types/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
pub mod base;
2-
pub mod schema;
32
pub mod scalars;
43
pub mod pointers;
54
pub mod containers;
65
pub mod utilities;
7-
8-
pub use self::schema::execute_validated_query;

src/types/pointers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use ast::{Selection, InputValue, ToInputValue, FromInputValue};
22
use value::Value;
33

44
use schema::meta::MetaType;
5-
use types::schema::{Executor, Registry, ExecutionResult};
5+
use executor::{Executor, Registry, ExecutionResult};
66
use types::base::{Arguments, GraphQLType};
77

88
impl<T, CtxT> GraphQLType<CtxT> for Box<T> where T: GraphQLType<CtxT> {

src/types/scalars.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use value::Value;
33

44
use schema::meta::MetaType;
55

6-
use types::schema::{Executor, Registry};
6+
use executor::{Executor, Registry};
77
use types::base::GraphQLType;
88

99
/// An ID as defined by the GraphQL specification

0 commit comments

Comments
 (0)