parser: import `parser::{Expr, Node}`

4 files changed, 8 insertions, 9 deletions

diff --git a/askama_derive/src/generator.rs b/askama_derive/src/generator.rs
index c736847..76b775b 100644
--- a/askama_derive/src/generator.rs
+++ b/askama_derive/src/generator.rs
@@ -3,11 +3,10 @@ use crate::heritage::{Context, Heritage};
 use crate::input::{Print, Source, TemplateInput};
 use crate::CompileError;
 
-use parser::expr::Expr;
 use parser::node::{
-    Call, Comment, CondTest, If, Include, Let, Lit, Loop, Match, Node, Target, Whitespace, Ws,
+    Call, Comment, CondTest, If, Include, Let, Lit, Loop, Match, Target, Whitespace, Ws,
 };
-use parser::Parsed;
+use parser::{Expr, Node, 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 4e12f35..ce85ac7 100644
--- a/askama_derive/src/heritage.rs
+++ b/askama_derive/src/heritage.rs
@@ -4,7 +4,8 @@ use std::path::{Path, PathBuf};
 use crate::config::Config;
 use crate::CompileError;
 
-use parser::node::{BlockDef, Macro, Match, Node};
+use parser::node::{BlockDef, Macro, Match};
+use parser::Node;
 
 pub(crate) struct Heritage<'a> {
     pub(crate) root: &'a Context<'a>,
diff --git a/askama_parser/src/node.rs b/askama_parser/src/node.rs
index 02b90b5..d902936 100644
--- a/askama_parser/src/node.rs
+++ b/askama_parser/src/node.rs
@@ -9,9 +9,9 @@ use nom::multi::{fold_many0, many0, many1, separated_list0, separated_list1};
 use nom::sequence::{delimited, pair, preceded, terminated, tuple};
 use nom::{error_position, IResult};
 
-use super::expr::Expr;
 use super::{
-    bool_lit, char_lit, identifier, is_ws, keyword, num_lit, path, skip_till, str_lit, ws, State,
+    bool_lit, char_lit, identifier, is_ws, keyword, num_lit, path, skip_till, str_lit, ws, Expr,
+    State,
 };
 
 #[derive(Debug, PartialEq)]
diff --git a/askama_parser/src/tests.rs b/askama_parser/src/tests.rs
index dde127b..9cafaf0 100644
--- a/askama_parser/src/tests.rs
+++ b/askama_parser/src/tests.rs
@@ -1,6 +1,5 @@
-use super::expr::Expr;
-use super::node::{Lit, Node, Whitespace, Ws};
-use super::{Ast, Syntax};
+use super::node::{Lit, Whitespace, Ws};
+use super::{Ast, Expr, Node, Syntax};
 
 fn check_ws_split(s: &str, res: &(&str, &str, &str)) {
     let Lit { lws, val, rws } = Lit::split_ws_parts(s);