zenithsiz/dynatos
1
0
Fork 0
mirror of https://github.com/Zenithsiz/dynatos.git synced 2026-02-07 20:51:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed dynatos_html::{html, html_file} not allowing arguments on their own.

Browse Source
This commit is contained in:
Filipe Rodrigues 2024-12-06 10:15:25 +00:00
parent 455858bf63
commit d1f59f4f81
Signed by: zenithsiz
SSH Key Fingerprint: SHA256:Mb5ppb3Sh7IarBO/sBTXLHbYEOz37hJAlslLQPPAPaU
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dynatos-html-macros/src/lib.rs
View File

@ -6,7 +6,6 @@
// Imports
use {
dynatos_html_parser::{XHtml, XHtmlNode},
itertools::Itertools,
proc_macro::TokenStream,
std::{
fs,
@ -227,17 +226,24 @@ impl Node {
});
};
let (cons, args) = args
.into_iter()
.partition_map::<Vec<_>, Vec<_>, _, _, _>(|arg| match arg {
TextArg::Cons(text) => itertools::Either::Left(text),
TextArg::Argument(arg) => itertools::Either::Right(arg),
});
// Otherwise, we'll format a string with dynamic text
let fmt = args
.iter()
.map(|arg| match arg {
TextArg::Cons(text) => text,
TextArg::Argument(_) => "{}",
})
.collect::<String>();
let fmt = cons.into_iter().join("{}");
let args = args
.into_iter()
.map(|arg| syn::parse_str::<syn::Expr>(arg).expect("Unable to parse argument expression"))
.filter_map(|arg| match arg {
TextArg::Cons(_) => None,
TextArg::Argument(arg) => {
let arg = syn::parse_str::<syn::Expr>(arg).expect("Unable to parse argument expression");
Some(arg)
},
})
.collect::<Vec<_>>();
Self {