From 5c534fb42881b508175dd25129f62e604bdae403 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Tue, 26 Oct 2021 17:11:08 +0200
Subject: Simplify node construction

---
 src/eval/template.rs | 17 +++++++++--------
 src/eval/walk.rs     |  6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'src/eval')

diff --git a/src/eval/template.rs b/src/eval/template.rs
index b1559b8f..42c93b56 100644
--- a/src/eval/template.rs
+++ b/src/eval/template.rs
@@ -1,5 +1,6 @@
 use std::convert::TryFrom;
 use std::fmt::{self, Debug, Formatter};
+use std::hash::Hash;
 use std::mem;
 use std::ops::{Add, AddAssign};
 use std::rc::Rc;
@@ -8,8 +9,8 @@ use super::Str;
 use crate::diag::StrResult;
 use crate::geom::{Align, Dir, GenAxis, Length, Linear, Sides, Size};
 use crate::layout::{
-    BlockNode, Decoration, InlineNode, PadNode, PageNode, ParChild, ParNode, Spacing,
-    StackChild, StackNode,
+    BlockLevel, BlockNode, Decoration, InlineLevel, InlineNode, PadNode, PageNode,
+    ParChild, ParNode, Spacing, StackChild, StackNode,
 };
 use crate::style::Style;
 use crate::util::EcoString;
@@ -57,9 +58,9 @@ impl Template {
     pub fn from_inline<F, T>(f: F) -> Self
     where
         F: Fn(&Style) -> T + 'static,
-        T: Into<InlineNode>,
+        T: InlineLevel + Hash + 'static,
     {
-        let node = TemplateNode::Inline(Rc::new(move |s| f(s).into()));
+        let node = TemplateNode::Inline(Rc::new(move |s| f(s).pack()));
         Self(Rc::new(vec![node]))
     }
 
@@ -67,9 +68,9 @@ impl Template {
     pub fn from_block<F, T>(f: F) -> Self
     where
         F: Fn(&Style) -> T + 'static,
-        T: Into<BlockNode>,
+        T: BlockLevel + Hash + 'static,
     {
-        let node = TemplateNode::Block(Rc::new(move |s| f(s).into()));
+        let node = TemplateNode::Block(Rc::new(move |s| f(s).pack()));
         Self(Rc::new(vec![node]))
     }
 
@@ -396,7 +397,7 @@ impl PageBuilder {
         let Self { size, padding, hard } = self;
         (!child.children.is_empty() || (keep && hard)).then(|| PageNode {
             size,
-            child: PadNode { padding, child: child.into() }.into(),
+            child: PadNode { padding, child: child.pack() }.pack(),
         })
     }
 }
@@ -502,7 +503,7 @@ impl ParBuilder {
     fn build(self) -> Option<StackChild> {
         let Self { align, dir, leading, children, .. } = self;
         (!children.is_empty())
-            .then(|| StackChild::Node(ParNode { dir, leading, children }.into(), align))
+            .then(|| StackChild::Node(ParNode { dir, leading, children }.pack(), align))
     }
 }
 
diff --git a/src/eval/walk.rs b/src/eval/walk.rs
index 9dd7cd2e..cd9809a2 100644
--- a/src/eval/walk.rs
+++ b/src/eval/walk.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 use super::{Eval, EvalContext, Str, Template, Value};
 use crate::diag::TypResult;
 use crate::geom::Align;
-use crate::layout::{ParChild, ParNode, Spacing, StackChild, StackNode};
+use crate::layout::{BlockLevel, ParChild, ParNode, Spacing, StackChild, StackNode};
 use crate::syntax::*;
 use crate::util::BoolExt;
 
@@ -118,9 +118,9 @@ fn walk_item(ctx: &mut EvalContext, label: Str, body: Template) {
         StackNode {
             dir: style.dir,
             children: vec![
-                StackChild::Node(label.into(), Align::Start),
+                StackChild::Node(label.pack(), Align::Start),
                 StackChild::Spacing(Spacing::Linear((style.text.size / 2.0).into())),
-                StackChild::Node(body.to_stack(&style).into(), Align::Start),
+                StackChild::Node(body.to_stack(&style).pack(), Align::Start),
             ],
         }
     });
-- 
cgit v1.2.3