diff --git a/crates/typst-macros/src/elem.rs b/crates/typst-macros/src/elem.rs index d237ba72b..34c547375 100644 --- a/crates/typst-macros/src/elem.rs +++ b/crates/typst-macros/src/elem.rs @@ -837,13 +837,7 @@ fn create_native_elem_impl(element: &Elem) -> TokenStream { let field_dict = element.inherent_fields().clone().map(|field| { let name = &field.name; let field_ident = &field.ident; - - let field_call = if name.len() > 15 { - quote! { ::ecow::EcoString::from(#name).into() } - } else { - quote! { ::ecow::EcoString::inline(#name).into() } - }; - + let field_call = quote! { ::ecow::EcoString::from(#name).into() }; quote! { fields.insert( #field_call, @@ -860,13 +854,7 @@ fn create_native_elem_impl(element: &Elem) -> TokenStream { .map(|field| { let name = &field.name; let field_ident = &field.ident; - - let field_call = if name.len() > 15 { - quote! { ::ecow::EcoString::from(#name).into() } - } else { - quote! { ::ecow::EcoString::inline(#name).into() } - }; - + let field_call = quote! { ::ecow::EcoString::from(#name).into() }; if field.synthesized && field.default.is_some() { quote! { fields.insert( @@ -926,7 +914,7 @@ fn create_native_elem_impl(element: &Elem) -> TokenStream { quote! { if let Some(label) = self.label() { fields.insert( - ::ecow::EcoString::inline("label").into(), + "label".into(), #foundations::IntoValue::into_value(label) ); } diff --git a/crates/typst/src/foundations/content.rs b/crates/typst/src/foundations/content.rs index d8e7570d4..56813f23a 100644 --- a/crates/typst/src/foundations/content.rs +++ b/crates/typst/src/foundations/content.rs @@ -695,11 +695,8 @@ impl Serialize for Content { S: Serializer, { serializer.collect_map( - iter::once(( - Str::from(EcoString::inline("func")), - self.func().name().into_value(), - )) - .chain(self.fields()), + iter::once(("func".into(), self.func().name().into_value())) + .chain(self.fields()), ) } } @@ -736,7 +733,7 @@ impl PartialEq for SequenceElem { impl Repr for SequenceElem { fn repr(&self) -> EcoString { if self.children.is_empty() { - EcoString::inline("[]") + "[]".into() } else { eco_format!( "[{}]", diff --git a/crates/typst/src/text/space.rs b/crates/typst/src/text/space.rs index 02463e76a..f790ee61c 100644 --- a/crates/typst/src/text/space.rs +++ b/crates/typst/src/text/space.rs @@ -7,7 +7,7 @@ pub struct SpaceElem {} impl Repr for SpaceElem { fn repr(&self) -> EcoString { - EcoString::inline("[ ]") + "[ ]".into() } }