Refactoring

Co-Authored-By: Martin <mhaug@live.de>

3 files changed, 6 insertions, 4 deletions

diff --git a/src/eval/capture.rs b/src/eval/capture.rs
index b71e1ac1..e46103c8 100644
--- a/src/eval/capture.rs
+++ b/src/eval/capture.rs
@@ -1,7 +1,8 @@
 use std::rc::Rc;
 
 use super::{Scope, Scopes, Value};
-use crate::syntax::{ClosureParam, Expr, Imports, RedRef};
+use crate::syntax::ast::{ClosureParam, Expr, Imports};
+use crate::syntax::RedRef;
 
 /// A visitor that captures variable slots.
 pub struct CapturesVisitor<'a> {
diff --git a/src/eval/mod.rs b/src/eval/mod.rs
index ba266ea5..809209f4 100644
--- a/src/eval/mod.rs
+++ b/src/eval/mod.rs
@@ -36,7 +36,8 @@ use crate::geom::{Angle, Fractional, Length, Relative};
 use crate::image::ImageStore;
 use crate::loading::Loader;
 use crate::source::{SourceId, SourceStore};
-use crate::syntax::*;
+use crate::syntax::ast::*;
+use crate::syntax::{Span, Spanned};
 use crate::util::RefMutExt;
 use crate::Context;
 
@@ -238,7 +239,7 @@ impl Eval for DictExpr {
 
     fn eval(&self, ctx: &mut EvalContext) -> TypResult<Self::Output> {
         self.items()
-            .map(|x| Ok(((&x.name().string).into(), x.expr().eval(ctx)?)))
+            .map(|x| Ok((x.name().string.into(), x.expr().eval(ctx)?)))
             .collect()
     }
 }
diff --git a/src/eval/walk.rs b/src/eval/walk.rs
index e4f8ac7b..ff73f9f9 100644
--- a/src/eval/walk.rs
+++ b/src/eval/walk.rs
@@ -5,7 +5,7 @@ use crate::diag::TypResult;
 use crate::geom::Spec;
 use crate::layout::BlockLevel;
 use crate::library::{GridNode, ParChild, ParNode, TrackSizing};
-use crate::syntax::*;
+use crate::syntax::ast::*;
 use crate::util::BoolExt;
 
 /// Walk markup, filling the currently built template.