diff options
Diffstat (limited to 'askama_derive')
-rw-r--r-- | askama_derive/src/config.rs | 4 | ||||
-rw-r--r-- | askama_derive/src/generator.rs | 8 | ||||
-rw-r--r-- | askama_derive/src/heritage.rs | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/askama_derive/src/config.rs b/askama_derive/src/config.rs index 6533fdc..a4eec28 100644 --- a/askama_derive/src/config.rs +++ b/askama_derive/src/config.rs @@ -6,7 +6,9 @@ use std::{env, fs}; use serde::Deserialize; use crate::CompileError; -use parser::{Syntax, Whitespace}; + +use parser::node::Whitespace; +use parser::Syntax; #[derive(Debug)] pub(crate) struct Config<'a> { diff --git a/askama_derive/src/generator.rs b/askama_derive/src/generator.rs index f33829d..6e04a1a 100644 --- a/askama_derive/src/generator.rs +++ b/askama_derive/src/generator.rs @@ -2,10 +2,12 @@ use crate::config::{get_template_source, read_config_file, Config, WhitespaceHan use crate::heritage::{Context, Heritage}; use crate::input::{Print, Source, TemplateInput}; use crate::CompileError; -use parser::{ - Call, CondTest, Expr, If, Include, Let, Lit, Loop, Match, Node, Parsed, Target, Whitespace, Ws, -}; +use parser::expr::Expr; +use parser::node::{ + Call, CondTest, If, Include, Let, Lit, Loop, Match, Node, Target, Whitespace, Ws, +}; +use parser::Parsed; use proc_macro::TokenStream; use quote::{quote, ToTokens}; use syn::punctuated::Punctuated; diff --git a/askama_derive/src/heritage.rs b/askama_derive/src/heritage.rs index f09b83e..d34ef33 100644 --- a/askama_derive/src/heritage.rs +++ b/askama_derive/src/heritage.rs @@ -3,7 +3,8 @@ use std::path::{Path, PathBuf}; use crate::config::Config; use crate::CompileError; -use parser::{BlockDef, Loop, Macro, Match, Node}; + +use parser::node::{BlockDef, Loop, Macro, Match, Node}; pub(crate) struct Heritage<'a> { pub(crate) root: &'a Context<'a>, |