diff options
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/layout/page.rs | 2 | ||||
| -rw-r--r-- | src/library/math/mod.rs | 2 | ||||
| -rw-r--r-- | src/library/text/link.rs | 4 | ||||
| -rw-r--r-- | src/library/text/raw.rs | 4 | ||||
| -rw-r--r-- | src/library/utility/string.rs | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/library/layout/page.rs b/src/library/layout/page.rs index 0a7c7579..afcc4855 100644 --- a/src/library/layout/page.rs +++ b/src/library/layout/page.rs @@ -198,7 +198,7 @@ impl Cast<Spanned<Value>> for Marginal { fn cast(value: Spanned<Value>) -> StrResult<Self> { match value.v { Value::None => Ok(Self::None), - Value::Str(v) => Ok(Self::Content(Content::Text(v))), + Value::Str(v) => Ok(Self::Content(Content::Text(v.into()))), Value::Content(v) => Ok(Self::Content(v)), Value::Func(v) => Ok(Self::Func(v, value.span)), v => Err(format!( diff --git a/src/library/math/mod.rs b/src/library/math/mod.rs index 1eed89b1..81593c4f 100644 --- a/src/library/math/mod.rs +++ b/src/library/math/mod.rs @@ -43,7 +43,7 @@ impl Show for MathNode { fn encode(&self, _: StyleChain) -> Dict { dict! { - "formula" => Value::Str(self.formula.v.clone()), + "formula" => Value::Str(self.formula.v.clone().into()), "display" => Value::Bool(self.display) } } diff --git a/src/library/text/link.rs b/src/library/text/link.rs index 740426a3..c4898eb0 100644 --- a/src/library/text/link.rs +++ b/src/library/text/link.rs @@ -33,7 +33,7 @@ impl LinkNode { castable! { Destination, Expected: "string or dictionary with `page`, `x`, and `y` keys", - Value::Str(string) => Self::Url(string), + Value::Str(string) => Self::Url(string.into()), Value::Dict(dict) => { let page = dict.get("page")?.clone().cast()?; let x: RawLength = dict.get("x")?.clone().cast()?; @@ -54,7 +54,7 @@ impl Show for LinkNode { fn encode(&self, _: StyleChain) -> Dict { dict! { "url" => match &self.dest { - Destination::Url(url) => Value::Str(url.clone()), + Destination::Url(url) => Value::Str(url.clone().into()), Destination::Internal(loc) => Value::Dict(loc.encode()), }, "body" => match &self.body { diff --git a/src/library/text/raw.rs b/src/library/text/raw.rs index 8db4cf3e..e64636f8 100644 --- a/src/library/text/raw.rs +++ b/src/library/text/raw.rs @@ -50,10 +50,10 @@ impl Show for RawNode { fn encode(&self, styles: StyleChain) -> Dict { dict! { - "text" => Value::Str(self.text.clone()), + "text" => Value::Str(self.text.clone().into()), "block" => Value::Bool(self.block), "lang" => match styles.get(Self::LANG) { - Some(lang) => Value::Str(lang.clone()), + Some(lang) => Value::Str(lang.clone().into()), None => Value::None, }, } diff --git a/src/library/utility/string.rs b/src/library/utility/string.rs index 4739dbf4..972b44d7 100644 --- a/src/library/utility/string.rs +++ b/src/library/utility/string.rs @@ -10,8 +10,8 @@ pub fn repr(_: &mut Machine, args: &mut Args) -> TypResult<Value> { pub fn str(_: &mut Machine, args: &mut Args) -> TypResult<Value> { let Spanned { v, span } = args.expect("value")?; Ok(Value::Str(match v { - Value::Int(v) => format_eco!("{}", v), - Value::Float(v) => format_eco!("{}", v), + Value::Int(v) => format_str!("{}", v), + Value::Float(v) => format_str!("{}", v), Value::Str(v) => v, v => bail!(span, "cannot convert {} to string", v.type_name()), })) @@ -46,7 +46,7 @@ pub fn symbol(_: &mut Machine, args: &mut Args) -> TypResult<Value> { fn numbered(numbering: Numbering, args: &mut Args) -> TypResult<Value> { let n = args.expect::<usize>("non-negative integer")?; - Ok(Value::Str(numbering.apply(n))) + Ok(Value::Str(numbering.apply(n).into())) } /// Allows to convert a number into letters, roman numerals and symbols. |
