Merge pull request #7 from Keats/reorg

Move query parser in its own mod

Author: tailhook

src/format.rs

@@ -1,6 +1,7 @@
 //! Formatting graphql
 use std::default::Default;
 
+
 #[derive(Debug, PartialEq)]
 pub(crate) struct Formatter<'a> {
     buf: String,

src/lib.rs

@@ -46,15 +46,11 @@ extern crate combine;
 #[cfg(test)] #[macro_use] extern crate pretty_assertions;
 
 
+mod format;
 mod position;
 mod tokenizer;
 mod helpers;
-mod query_grammar;
-mod query_error;
-mod query_format;
+mod query;
 
-pub mod format;
-pub mod query;
-
-pub use query_grammar::parse_query;
+pub use query::{parse_query, QueryParseError};
 pub use position::Pos;

src/query.rs renamed to src/query/ast.rs

@@ -7,8 +7,6 @@
 //!
 use std::collections::BTreeMap;
 
-pub use query_error::QueryParseError as ParseError;
-
 use position::Pos;
 
 /// An alias for string, used where graphql expects a name

src/query_error.rs renamed to src/query/error.rs

@@ -1,6 +1,9 @@
 use std::fmt;
-use format::{Displayable, Formatter, Style};
-use query::*;
+
+use ::format::{Displayable, Formatter, Style};
+
+use query::ast::*;
+
 
 impl Document {
     /// Format a document according to style

src/query_format.rs renamed to src/query/format.rs

@@ -1,14 +1,12 @@
-use tokenizer::TokenStream;
-
 use combine::{parser, ParseResult, Parser};
 use combine::easy::Error;
 use combine::error::StreamError;
 use combine::combinator::{many, many1, eof, optional, position};
 
-use query_error::{QueryParseError};
-use tokenizer::{Kind as T, Token};
+use tokenizer::{Kind as T, Token, TokenStream};
 use helpers::{punct, ident, kind, name};
-use query::*;
+use query::error::{QueryParseError};
+use query::ast::*;
 
 pub fn directives<'a>(input: &mut TokenStream<'a>)
     -> ParseResult<Vec<Directive>, TokenStream<'a>>
@@ -385,7 +383,7 @@ pub fn parse_query(s: &str) -> Result<Document, QueryParseError> {
 #[cfg(test)]
 mod test {
     use position::Pos;
-    use query::*;
+    use query::grammar::*;
     use super::parse_query;
 
     fn ast(s: &str) -> Document {

src/query_grammar.rs renamed to src/query/grammar.rs

@@ -0,0 +1,8 @@
+mod ast;
+mod error;
+mod format;
+mod grammar;
+
+
+pub use self::grammar::parse_query;
+pub use self::error::QueryParseError;

src/query/mod.rs

@@ -4,6 +4,7 @@ use combine::{StreamOnce, Positioned};
 use combine::error::{StreamError};
 use combine::stream::{Resetable};
 use combine::easy::{Error, Errors};
+
 use position::Pos;