jake/libpso
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

use Formatter::debug_struct for packet debug impl
All checks were successful
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
jake 2022-08-02 21:31:29 -06:00
parent 3cf9cf5392
commit 2996b176a7
1 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
psopacket/src/lib.rs
View File

@ -205,18 +205,19 @@ fn generate_psopacket_impl(pkt_cmd: u16, name: syn::Ident, attrs: &Vec<AttrType>
} }
fn generate_debug_impl(name: syn::Ident, attrs: &Vec<AttrType>) -> proc_macro2::TokenStream { fn generate_debug_impl(name: syn::Ident, attrs: &Vec<AttrType>) -> proc_macro2::TokenStream {
let mut dbg_write = Vec::new(); let dbg_write = attrs
for attr in attrs { .iter()
let element = match attr { .map(|attr| {
match attr {
AttrType::Value(ty, name, meta) => { AttrType::Value(ty, name, meta) => {
let ident_str = name.to_string(); let ident_str = name.to_string();
let type_str = ty.path.segments[0].ident.to_string(); let type_str = ty.path.segments[0].ident.to_string();
match meta { match meta {
AttrMeta::NoDebug => quote! { AttrMeta::NoDebug => quote! {
write!(f, " {} {}: [...]\n", #ident_str, #type_str)?; .field(&format!("{} [{}]", #ident_str, #type_str), &format_args!("[...]"))
}, },
_ => quote! { _ => quote! {
write!(f, " {} {}: {:?}\n", #ident_str, #type_str, self.#name)?; .field(&format!("{} [{}]", #ident_str, #type_str), &self.#name)
} }
} }
}, },
@ -225,35 +226,38 @@ fn generate_debug_impl(name: syn::Ident, attrs: &Vec<AttrType>) -> proc_macro2::
let type_str = ty.path.segments[0].ident.to_string(); let type_str = ty.path.segments[0].ident.to_string();
match meta { match meta {
AttrMeta::Utf8 => quote! { AttrMeta::Utf8 => quote! {
.field(&format!("{} [utf8; {}]", #ident_str, #len),
match std::str::from_utf8(&self.#name) { match std::str::from_utf8(&self.#name) {
Ok(v) => write!(f, " {} [utf8; {}]: {:?}\n", #ident_str, #len, v)?, Ok(ref s) => s,
Err(_) => write!(f, " {} [{}; {}]: {:?}\n", #ident_str, #type_str, #len, self.#name.to_vec())?, Err(_) => &self.#name
}; })
}, },
AttrMeta::Utf16 => quote! { AttrMeta::Utf16 => quote! {
match String::from_utf16(&self.#name) { .field(&format!("{} [utf16; {}]", #ident_str, #len),
Ok(v) => write!(f, " {} [utf16; {}]: {:?}\n", #ident_str, #len, v)?, match std::str::from_utf16(&self.#name) {
Err(_) => write!(f, " {} [{}; {}]: {:?}\n", #ident_str, #type_str, #len, self.#name.to_vec())?, Ok(ref s) => s,
}; Err(_) => &self.#name
})
}, },
AttrMeta::NoDebug => quote! { AttrMeta::NoDebug => quote! {
write!(f, " {} [{}; {}]: [...]\n", #ident_str, #type_str, #len)?; .field(&format!("{} [{}; {}]", #ident_str, #type_str, #len), &format_args!("[...]"))
}, },
_ => quote! { _ => quote! {
write!(f, " {} [{}; {}]: {:?}\n", #ident_str, #type_str, #len, self.#name.to_vec())?; .field(&format!("{} [{}; {}]", #ident_str, #type_str, #len), &format_args!("{:?}", &self.#name))
},
} }
} }
};
dbg_write.push(element);
} }
}
})
.collect::<Vec<_>>();
let name_str = name.to_string(); let name_str = name.to_string();
quote! { quote! {
impl std::fmt::Debug for #name { impl std::fmt::Debug for #name {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "{} {{\n", #name_str)?; f.debug_struct(#name_str)
#(#dbg_write)* #(#dbg_write)*
write!(f, "}}") .finish()
} }
} }
} }