summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
Diffstat (limited to 'src/library')
-rw-r--r--src/library/elements.rs2
-rw-r--r--src/library/layout.rs2
-rw-r--r--src/library/mod.rs1
-rw-r--r--src/library/text.rs4
-rw-r--r--src/library/utility.rs2
5 files changed, 6 insertions, 5 deletions
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(_) => {