robin/tf-log-parser
1
0
Fork 0
mirror of https://codeberg.org/icewind/tf-log-parser.git synced 2026-06-03 18:24:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix serialize

Browse source
This commit is contained in:
Robin Appelman 2021-08-28 19:10:52 +02:00
commit a4653ab04b
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/module/mod.rs
View file

@ -87,6 +87,16 @@ impl<Head: EventHandler, Tail: EventHandler> EventHandler for HandlerStack<Head,
} }
} }
macro_rules! replace_expr {
($_t:tt $sub:expr) => {
$sub
};
}
macro_rules! count_tts {
($($tts:tt)*) => {0usize $(+ replace_expr!($tts 1usize))*};
}
#[macro_export] #[macro_export]
macro_rules! handler { macro_rules! handler {
($name:ident {$($child:ident: $ty:path),*}) => { ($name:ident {$($child:ident: $ty:path),*}) => {
@ -109,7 +119,7 @@ macro_rules! handler {
S: serde::Serializer, S: serde::Serializer,
{ {
use serde::ser::SerializeStruct; use serde::ser::SerializeStruct;
let mut state = serializer.serialize_struct(concat!(stringify!($name), "output"), 0)?; let mut state = serializer.serialize_struct(concat!(stringify!($name), "output"), count_tts!($($child)*))?;
$( $(
if self.$child != <<$ty as $crate::EventHandler>::GlobalOutput>::default() { if self.$child != <<$ty as $crate::EventHandler>::GlobalOutput>::default() {
state.serialize_field(stringify!($child), &self.$child)?; state.serialize_field(stringify!($child), &self.$child)?;
@ -141,7 +151,7 @@ macro_rules! handler {
S: serde::Serializer, S: serde::Serializer,
{ {
use serde::ser::SerializeStruct; use serde::ser::SerializeStruct;
let mut state = serializer.serialize_struct(concat!(stringify!($name), "output"), 0)?; let mut state = serializer.serialize_struct(concat!(stringify!($name), "output"), count_tts!($($child)*))?;
$( $(
if self.$child != <<$ty as $crate::EventHandler>::PerSubjectOutput>::default() { if self.$child != <<$ty as $crate::EventHandler>::PerSubjectOutput>::default() {
state.serialize_field(stringify!($child), &self.$child)?; state.serialize_field(stringify!($child), &self.$child)?;