Switch to const generics for nodes

2 files changed, 7 insertions, 7 deletions

diff --git a/src/eval/mod.rs b/src/eval/mod.rs
index 5a67555c..9ad23538 100644
--- a/src/eval/mod.rs
+++ b/src/eval/mod.rs
@@ -41,7 +41,7 @@ use crate::diag::{At, Error, StrResult, Trace, Tracepoint, TypResult};
 use crate::geom::{Angle, Fractional, Length, Relative};
 use crate::image::ImageStore;
 use crate::layout::Layout;
-use crate::library::{self};
+use crate::library::{self, ORDERED, UNORDERED};
 use crate::loading::Loader;
 use crate::source::{SourceId, SourceStore};
 use crate::syntax::ast::*;
@@ -272,9 +272,9 @@ impl Eval for ListNode {
     type Output = Template;
 
     fn eval(&self, ctx: &mut EvalContext) -> TypResult<Self::Output> {
-        Ok(Template::show(library::ListNode {
+        Ok(Template::show(library::ListNode::<UNORDERED> {
+            number: None,
             child: self.body().eval(ctx)?.pack(),
-            label: library::Unordered,
         }))
     }
 }
@@ -283,9 +283,9 @@ impl Eval for EnumNode {
     type Output = Template;
 
     fn eval(&self, ctx: &mut EvalContext) -> TypResult<Self::Output> {
-        Ok(Template::show(library::ListNode {
+        Ok(Template::show(library::ListNode::<ORDERED> {
+            number: self.number(),
             child: self.body().eval(ctx)?.pack(),
-            label: library::Ordered(self.number()),
         }))
     }
 }
diff --git a/src/eval/template.rs b/src/eval/template.rs
index 84888b95..f953287d 100644
--- a/src/eval/template.rs
+++ b/src/eval/template.rs
@@ -14,7 +14,7 @@ use crate::layout::{Layout, LayoutNode};
 use crate::library::prelude::*;
 use crate::library::{
     DecoNode, FlowChild, FlowNode, PageNode, ParChild, ParNode, PlaceNode, SpacingKind,
-    TextNode, Underline,
+    TextNode, UNDERLINE,
 };
 use crate::util::EcoString;
 use crate::Context;
@@ -145,7 +145,7 @@ impl Template {
 
     /// Underline this template.
     pub fn underlined(self) -> Self {
-        Self::show(DecoNode { kind: Underline, body: self })
+        Self::show(DecoNode::<UNDERLINE>(self))
     }
 
     /// Create a new sequence template.