From 36b3067c19c8743032a44f888ee48702b88d135b Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Sat, 10 Jul 2021 13:07:39 +0200
Subject: =?UTF-8?q?Eco=20string=20=F0=9F=8C=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/library/elements.rs | 2 +-
 src/library/layout.rs   | 2 +-
 src/library/mod.rs      | 1 +
 src/library/text.rs     | 4 ++--
 src/library/utility.rs  | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/library')

diff --git a/src/library/elements.rs b/src/library/elements.rs
index c57504fb..e669369a 100644
--- a/src/library/elements.rs
+++ b/src/library/elements.rs
@@ -9,7 +9,7 @@ use crate::layout::{
 
 /// `image`: An image.
 pub fn image(ctx: &mut EvalContext, args: &mut FuncArgs) -> Value {
-    let path = args.expect::<Spanned<String>>(ctx, "path to image file");
+    let path = args.expect::<Spanned<EcoString>>(ctx, "path to image file");
     let width = args.named(ctx, "width");
     let height = args.named(ctx, "height");
 
diff --git a/src/library/layout.rs b/src/library/layout.rs
index 4903077b..28ee27e1 100644
--- a/src/library/layout.rs
+++ b/src/library/layout.rs
@@ -5,7 +5,7 @@ use crate::paper::{Paper, PaperClass};
 /// `page`: Configure pages.
 pub fn page(ctx: &mut EvalContext, args: &mut FuncArgs) -> Value {
     let span = args.span;
-    let paper = args.eat::<Spanned<String>>(ctx).and_then(|name| {
+    let paper = args.eat::<Spanned<EcoString>>(ctx).and_then(|name| {
         Paper::from_name(&name.v).or_else(|| {
             ctx.diag(error!(name.span, "invalid paper name"));
             None
diff --git a/src/library/mod.rs b/src/library/mod.rs
index abc9ff5f..7c3e0a71 100644
--- a/src/library/mod.rs
+++ b/src/library/mod.rs
@@ -17,6 +17,7 @@ use std::fmt::{self, Display, Formatter};
 use std::rc::Rc;
 
 use crate::color::{Color, RgbaColor};
+use crate::eco::EcoString;
 use crate::eval::{EvalContext, FuncArgs, Scope, TemplateValue, Value};
 use crate::exec::{Exec, FontFamily};
 use crate::font::{FontStyle, FontWeight, VerticalFontMetric};
diff --git a/src/library/text.rs b/src/library/text.rs
index e1fff9f3..a0ffc56c 100644
--- a/src/library/text.rs
+++ b/src/library/text.rs
@@ -99,7 +99,7 @@ castable! {
     Value::Array(values) => Self(values
         .into_iter()
         .filter_map(|v| v.cast().ok())
-        .map(|string: String| string.to_lowercase())
+        .map(|string: EcoString| string.to_lowercase())
         .collect()
     ),
 }
@@ -185,7 +185,7 @@ pub fn par(ctx: &mut EvalContext, args: &mut FuncArgs) -> Value {
 
 /// `lang`: Configure the language.
 pub fn lang(ctx: &mut EvalContext, args: &mut FuncArgs) -> Value {
-    let iso = args.eat::<String>(ctx).map(|s| lang_dir(&s));
+    let iso = args.eat::<EcoString>(ctx).map(|s| lang_dir(&s));
     let dir = match args.named::<Spanned<Dir>>(ctx, "dir") {
         Some(dir) if dir.v.axis() == SpecAxis::Horizontal => Some(dir.v),
         Some(dir) => {
diff --git a/src/library/utility.rs b/src/library/utility.rs
index 272183aa..c1f20cc6 100644
--- a/src/library/utility.rs
+++ b/src/library/utility.rs
@@ -39,7 +39,7 @@ pub fn len(ctx: &mut EvalContext, args: &mut FuncArgs) -> Value {
 /// `rgb`: Create an RGB(A) color.
 pub fn rgb(ctx: &mut EvalContext, args: &mut FuncArgs) -> Value {
     Value::Color(Color::Rgba(
-        if let Some(string) = args.eat::<Spanned<String>>(ctx) {
+        if let Some(string) = args.eat::<Spanned<EcoString>>(ctx) {
             match RgbaColor::from_str(&string.v) {
                 Ok(color) => color,
                 Err(_) => {
-- 
cgit v1.2.3