From b42ecbd6a67d6af42f06c52c290d88e176cee0ea Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Sun, 17 Oct 2021 17:35:15 +0200
Subject: Simplify decorations

---
 src/library/text.rs | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

(limited to 'src/library')

diff --git a/src/library/text.rs b/src/library/text.rs
index 3c7055d3..8c5b2547 100644
--- a/src/library/text.rs
+++ b/src/library/text.rs
@@ -181,30 +181,27 @@ fn line_impl(args: &mut Args, kind: LineKind) -> TypResult<Value> {
     let thickness = args.named::<Linear>("thickness")?.or_else(|| args.eat());
     let offset = args.named("offset")?;
     let extent = args.named("extent")?.unwrap_or_default();
-
-    let mut body: Template = args.expect("body")?;
-    body.decorate(Decoration::Line(LineDecoration {
-        kind,
-        stroke: stroke.map(Paint::Color),
-        thickness,
-        offset,
-        extent,
-    }));
-
-    Ok(Value::Template(body))
+    let body: Template = args.expect("body")?;
+
+    Ok(Value::Template(body.decorate(Decoration::Line(
+        LineDecoration {
+            kind,
+            stroke: stroke.map(Paint::Color),
+            thickness,
+            offset,
+            extent,
+        },
+    ))))
 }
 
 /// `link`: Typeset text as a link.
 pub fn link(_: &mut EvalContext, args: &mut Args) -> TypResult<Value> {
     let url = args.expect::<Str>("url")?;
-
-    let mut body = args.eat().unwrap_or_else(|| {
+    let body = args.eat().unwrap_or_else(|| {
         let mut template = Template::new();
         template.text(&url);
         template
     });
 
-    body.decorate(Decoration::Link(url.into()));
-
-    Ok(Value::Template(body))
+    Ok(Value::Template(body.decorate(Decoration::Link(url.into()))))
 }
-- 
cgit v1.2.3