From 5b344b663a3d224134923eea0d67ebf44c069b07 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Sun, 31 Oct 2021 15:52:16 +0100
Subject: Reorganize modules

Instead of separating functionality into layout and library, everything lives in the library now. This way, related things live side by side and there are no duplicate file names in the two directories.
---
 src/eval/template.rs | 6 +++---
 src/eval/walk.rs     | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/eval')

diff --git a/src/eval/template.rs b/src/eval/template.rs
index 42c93b56..2622a1f0 100644
--- a/src/eval/template.rs
+++ b/src/eval/template.rs
@@ -8,9 +8,9 @@ use std::rc::Rc;
 use super::Str;
 use crate::diag::StrResult;
 use crate::geom::{Align, Dir, GenAxis, Length, Linear, Sides, Size};
-use crate::layout::{
-    BlockLevel, BlockNode, Decoration, InlineLevel, InlineNode, PadNode, PageNode,
-    ParChild, ParNode, Spacing, StackChild, StackNode,
+use crate::layout::{BlockLevel, BlockNode, InlineLevel, InlineNode, PageNode};
+use crate::library::{
+    Decoration, PadNode, ParChild, ParNode, Spacing, StackChild, StackNode,
 };
 use crate::style::Style;
 use crate::util::EcoString;
diff --git a/src/eval/walk.rs b/src/eval/walk.rs
index cd9809a2..06747e40 100644
--- a/src/eval/walk.rs
+++ b/src/eval/walk.rs
@@ -3,7 +3,8 @@ use std::rc::Rc;
 use super::{Eval, EvalContext, Str, Template, Value};
 use crate::diag::TypResult;
 use crate::geom::Align;
-use crate::layout::{BlockLevel, ParChild, ParNode, Spacing, StackChild, StackNode};
+use crate::layout::BlockLevel;
+use crate::library::{ParChild, ParNode, Spacing, StackChild, StackNode};
 use crate::syntax::*;
 use crate::util::BoolExt;
 
-- 
cgit v1.2.3