NationTech/yaserde
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use custom target for derive-generated log calls

Browse Source
This commit is contained in:
David Stangl 2021-07-24 12:06:31 +02:00
parent 57dce9057e
commit f845c0dfd1
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yaserde/Cargo.toml
View File

@ -17,7 +17,7 @@ xml-rs = "0.8.3"
log = "0.4" log = "0.4"
[dev-dependencies] [dev-dependencies]
env_logger = "0.8.2" env_logger = "0.9.0"
yaserde_derive = { version = "0.7.1", path = "../yaserde_derive" } yaserde_derive = { version = "0.7.1", path = "../yaserde_derive" }
[badges] [badges]

14
yaserde/src/lib.rs
View File

@ -217,6 +217,20 @@ serialize_type!(i64);
serialize_type!(f32); serialize_type!(f32);
serialize_type!(f64); serialize_type!(f64);
/// Used in code generated by yaserde_derive for logging
#[macro_export]
#[doc(hidden)]
macro_rules! __derive_debug {
($($arg:tt)+) => { ::yaserde::log::debug!(target: "yaserde_derive", $($arg)+) };
}
/// Used in code generated by yaserde_derive for logging
#[macro_export]
#[doc(hidden)]
macro_rules! __derive_trace {
($($arg:tt)+) => { ::yaserde::log::trace!(target: "yaserde_derive", $($arg)+) };
}
#[test] #[test]
fn default_visitor() { fn default_visitor() {
struct Test; struct Test;

6
yaserde_derive/src/de/expand_enum.rs
View File

@ -39,7 +39,7 @@ pub fn parse(
}; };
let start_depth = reader.depth(); let start_depth = reader.depth();
::yaserde::log::debug!("Enum {} @ {}: start to parse {:?}", stringify!(#name), start_depth, named_element); ::yaserde::__derive_debug!("Enum {} @ {}: start to parse {:?}", stringify!(#name), start_depth, named_element);
#namespaces_matching #namespaces_matching
@ -48,7 +48,7 @@ pub fn parse(
loop { loop {
let event = reader.peek()?.to_owned(); let event = reader.peek()?.to_owned();
::yaserde::log::trace!("Enum {} @ {}: matching {:?}", stringify!(#name), start_depth, event); ::yaserde::__derive_trace!("Enum {} @ {}: matching {:?}", stringify!(#name), start_depth, event);
match event { match event {
::yaserde::xml::reader::XmlEvent::StartElement { ref name, ref attributes, .. } => { ::yaserde::xml::reader::XmlEvent::StartElement { ref name, ref attributes, .. } => {
match name.local_name.as_str() { match name.local_name.as_str() {
@ -89,7 +89,7 @@ pub fn parse(
} }
} }
::yaserde::log::debug!("Enum {} @ {}: success", stringify!(#name), start_depth); ::yaserde::__derive_debug!("Enum {} @ {}: success", stringify!(#name), start_depth);
match enum_value { match enum_value {
::std::option::Option::Some(value) => ::std::result::Result::Ok(value), ::std::option::Option::Some(value) => ::std::result::Result::Ok(value),
::std::option::Option::None => { ::std::option::Option::None => {

6
yaserde_derive/src/de/expand_struct.rs
View File

@ -352,7 +352,7 @@ pub fn parse(
(::std::string::String::from(#root), ::std::option::Option::None) (::std::string::String::from(#root), ::std::option::Option::None)
}; };
let start_depth = reader.depth(); let start_depth = reader.depth();
::yaserde::log::debug!("Struct {} @ {}: start to parse {:?}", stringify!(#name), start_depth, ::yaserde::__derive_debug!("Struct {} @ {}: start to parse {:?}", stringify!(#name), start_depth,
named_element); named_element);
if reader.depth() == 0 { if reader.depth() == 0 {
@ -367,7 +367,7 @@ pub fn parse(
loop { loop {
let event = reader.peek()?.to_owned(); let event = reader.peek()?.to_owned();
::yaserde::log::trace!( ::yaserde::__derive_trace!(
"Struct {} @ {}: matching {:?}", "Struct {} @ {}: matching {:?}",
stringify!(#name), start_depth, event, stringify!(#name), start_depth, event,
); );
@ -425,7 +425,7 @@ pub fn parse(
#visit_unused #visit_unused
::yaserde::log::debug!("Struct {} @ {}: success", stringify!(#name), start_depth); ::yaserde::__derive_debug!("Struct {} @ {}: success", stringify!(#name), start_depth);
::std::result::Result::Ok(#name{#struct_builder}) ::std::result::Result::Ok(#name{#struct_builder})
} }
} }