Move parser and generator code into askama crate

4 files changed, 4 insertions, 8 deletions

diff --git a/askama_derive/src/generator.rs b/askama/src/generator.rs
index 0e80265..0e80265 100644
--- a/askama_derive/src/generator.rs
+++ b/askama/src/generator.rs
diff --git a/askama_derive/src/parser.rs b/askama/src/parser.rs
index cd93971..cd93971 100644
--- a/askama_derive/src/parser.rs
+++ b/askama/src/parser.rs
diff --git a/askama_derive/Cargo.toml b/askama_derive/Cargo.toml
index e9bfa66..400cbd3 100644
--- a/askama_derive/Cargo.toml
+++ b/askama_derive/Cargo.toml
@@ -7,5 +7,5 @@ authors = ["Dirkjan Ochtman <dirkjan@ochtman.nl>"]
 proc-macro = true
 
 [dependencies]
+askama = { path = "../askama" }
 syn = "0.10"
-nom = "2.0"
diff --git a/askama_derive/src/lib.rs b/askama_derive/src/lib.rs
index 3b8fe55..8613ead 100644
--- a/askama_derive/src/lib.rs
+++ b/askama_derive/src/lib.rs
@@ -1,13 +1,9 @@
 #![feature(proc_macro, proc_macro_lib)]
 
-#[macro_use]
-extern crate nom;
+extern crate askama;
 extern crate proc_macro;
 extern crate syn;
 
-mod generator;
-mod parser;
-
 use proc_macro::TokenStream;
 use std::fs::File;
 use std::io::Read;
@@ -65,6 +61,6 @@ pub fn derive_template(input: TokenStream) -> TokenStream {
     let name = &ast.ident;
     let path = get_path_from_attrs(&ast.attrs);
     let src = get_template_source(&path);
-    let tokens = parser::parse(&src);
-    generator::generate(name.as_ref(), &tokens).parse().unwrap()
+    let tokens = askama::parser::parse(&src);
+    askama::generator::generate(name.as_ref(), &tokens).parse().unwrap()
 }