aboutsummaryrefslogtreecommitdiffstats
path: root/askama_shared/src
diff options
context:
space:
mode:
authorLibravatar Dirkjan Ochtman <dirkjan@ochtman.nl>2017-08-27 22:10:42 +0200
committerLibravatar Dirkjan Ochtman <dirkjan@ochtman.nl>2017-08-27 22:10:42 +0200
commit9f3b590206e3dfe33b7129b1c8ff010f60318cf2 (patch)
tree5411864d92ec220d9d4db8d9e40cda6df9b2b16f /askama_shared/src
parentaeac47cee0e14b9fa38c01082876667f0ec8d874 (diff)
downloadaskama-9f3b590206e3dfe33b7129b1c8ff010f60318cf2.tar.gz
askama-9f3b590206e3dfe33b7129b1c8ff010f60318cf2.tar.bz2
askama-9f3b590206e3dfe33b7129b1c8ff010f60318cf2.zip
Move most of the code into new askama_shared crate
This makes it possible to share code between askama and askama_derive.
Diffstat (limited to '')
-rw-r--r--askama_shared/src/filters/json.rs (renamed from askama/src/filters/json.rs)0
-rw-r--r--askama_shared/src/filters/mod.rs (renamed from askama/src/filters/mod.rs)0
-rw-r--r--askama_shared/src/generator.rs (renamed from askama_derive/src/generator.rs)0
-rw-r--r--askama_shared/src/lib.rs29
-rw-r--r--askama_shared/src/parser.rs (renamed from askama_derive/src/parser.rs)0
-rw-r--r--askama_shared/src/path.rs (renamed from askama_derive/src/path.rs)3
6 files changed, 30 insertions, 2 deletions
diff --git a/askama/src/filters/json.rs b/askama_shared/src/filters/json.rs
index 4443fb4..4443fb4 100644
--- a/askama/src/filters/json.rs
+++ b/askama_shared/src/filters/json.rs
diff --git a/askama/src/filters/mod.rs b/askama_shared/src/filters/mod.rs
index 73b311d..73b311d 100644
--- a/askama/src/filters/mod.rs
+++ b/askama_shared/src/filters/mod.rs
diff --git a/askama_derive/src/generator.rs b/askama_shared/src/generator.rs
index 82f3994..82f3994 100644
--- a/askama_derive/src/generator.rs
+++ b/askama_shared/src/generator.rs
diff --git a/askama_shared/src/lib.rs b/askama_shared/src/lib.rs
new file mode 100644
index 0000000..1ee19cf
--- /dev/null
+++ b/askama_shared/src/lib.rs
@@ -0,0 +1,29 @@
+#[macro_use]
+extern crate error_chain;
+#[macro_use]
+extern crate nom;
+extern crate quote;
+extern crate syn;
+
+#[cfg(feature = "serde-json")]
+extern crate serde;
+#[cfg(feature = "serde-json")]
+extern crate serde_json;
+
+pub use errors::Result;
+pub mod filters;
+pub mod path;
+pub use parser::parse;
+pub use generator::generate;
+
+mod generator;
+mod parser;
+
+mod errors {
+ error_chain! {
+ foreign_links {
+ Fmt(::std::fmt::Error);
+ Json(::serde_json::Error) #[cfg(feature = "serde-json")];
+ }
+ }
+}
diff --git a/askama_derive/src/parser.rs b/askama_shared/src/parser.rs
index 8732f0e..8732f0e 100644
--- a/askama_derive/src/parser.rs
+++ b/askama_shared/src/parser.rs
diff --git a/askama_derive/src/path.rs b/askama_shared/src/path.rs
index 3c04965..86bf6d7 100644
--- a/askama_derive/src/path.rs
+++ b/askama_shared/src/path.rs
@@ -43,8 +43,7 @@ pub fn find_template_from_path<'a>(path: &str, start_at: Option<&Path>) -> PathB
}
}
-// Duplicated in askama
-fn template_dir() -> PathBuf {
+pub fn template_dir() -> PathBuf {
let mut path = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
path.push("templates");
path