caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-07-27 22:37:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added deduplication of keys in macro

Browse Source
This commit is contained in:
Dherse 2025-07-14 14:55:15 +02:00
parent 0fb01fccc3
commit 02495899ec
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crates/typst-macros/src/time.rs
View File

@ -1,3 +1,5 @@
use std::collections::HashSet;
use proc_macro2::TokenStream; use proc_macro2::TokenStream;
use quote::{format_ident, quote, ToTokens}; use quote::{format_ident, quote, ToTokens};
use syn::parse::{Parse, ParseStream}; use syn::parse::{Parse, ParseStream};
@ -17,12 +19,12 @@ pub struct Meta {
pub span: Option<syn::Expr>, pub span: Option<syn::Expr>,
pub callsite: Option<syn::Expr>, pub callsite: Option<syn::Expr>,
pub func: Option<syn::Expr>, pub func: Option<syn::Expr>,
pub extras: Vec<(String, Mode, syn::Expr)>, pub extras: Vec<(syn::Ident, Mode, syn::Expr)>,
} }
impl Parse for Meta { impl Parse for Meta {
fn parse(input: ParseStream) -> Result<Self> { fn parse(input: ParseStream) -> Result<Self> {
Ok(Self { let out = Self {
name: parse_string::<kw::name>(input)?, name: parse_string::<kw::name>(input)?,
span: parse_key_value::<kw::span, syn::Expr>(input)?, span: parse_key_value::<kw::span, syn::Expr>(input)?,
callsite: parse_key_value::<kw::callsite, syn::Expr>(input)?, callsite: parse_key_value::<kw::callsite, syn::Expr>(input)?,
@ -39,11 +41,26 @@ impl Parse for Meta {
let value = input.parse()?; let value = input.parse()?;
eat_comma(input); eat_comma(input);
pairs.push((key.to_string(), mode, value)); pairs.push((key, mode, value));
} }
pairs pairs
}, },
}) };
let mut keys = HashSet::new();
keys.insert("name".to_string());
keys.insert("span".to_string());
keys.insert("callsite".to_string());
keys.insert("func".to_string());
// Check that the keys are unique.
for (key, _, _) in &out.extras {
if !keys.insert(key.to_string()) {
bail!(key, "Duplicate key in #[time(..)]: `{}`", key);
}
}
Ok(out)
} }
} }
@ -98,6 +115,7 @@ fn create(meta: Meta, mut item: syn::ItemFn) -> Result<TokenStream> {
Mode::Serialize => (format_ident!("with_arg"), None), Mode::Serialize => (format_ident!("with_arg"), None),
}; };
let key = key.to_string();
extras.push(quote! { .#method(#key, (#value) #transform) }); extras.push(quote! { .#method(#key, (#value) #transform) });
if matches!(mode, Mode::Serialize) { if matches!(mode, Mode::Serialize) {
let error_msg = format!("failed to serialize {key}"); let error_msg = format!("failed to serialize {key}");