diff --git a/yaserde/Cargo.toml b/yaserde/Cargo.toml index ff26f21..3f10030 100644 --- a/yaserde/Cargo.toml +++ b/yaserde/Cargo.toml @@ -17,7 +17,7 @@ xml-rs = "0.8.3" log = "0.4" [dev-dependencies] -env_logger = "0.8.2" +env_logger = "0.9.0" yaserde_derive = { version = "0.7.1", path = "../yaserde_derive" } [badges] diff --git a/yaserde/src/lib.rs b/yaserde/src/lib.rs index 3cc92c3..12e3ddd 100644 --- a/yaserde/src/lib.rs +++ b/yaserde/src/lib.rs @@ -217,6 +217,20 @@ serialize_type!(i64); serialize_type!(f32); 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] fn default_visitor() { struct Test; diff --git a/yaserde_derive/src/de/expand_enum.rs b/yaserde_derive/src/de/expand_enum.rs index fe32b51..832202c 100644 --- a/yaserde_derive/src/de/expand_enum.rs +++ b/yaserde_derive/src/de/expand_enum.rs @@ -39,7 +39,7 @@ pub fn parse( }; 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 @@ -48,7 +48,7 @@ pub fn parse( loop { 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 { ::yaserde::xml::reader::XmlEvent::StartElement { ref name, ref attributes, .. } => { 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 { ::std::option::Option::Some(value) => ::std::result::Result::Ok(value), ::std::option::Option::None => { diff --git a/yaserde_derive/src/de/expand_struct.rs b/yaserde_derive/src/de/expand_struct.rs index cf805e2..8be3f5e 100644 --- a/yaserde_derive/src/de/expand_struct.rs +++ b/yaserde_derive/src/de/expand_struct.rs @@ -352,7 +352,7 @@ pub fn parse( (::std::string::String::from(#root), ::std::option::Option::None) }; 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); if reader.depth() == 0 { @@ -367,7 +367,7 @@ pub fn parse( loop { let event = reader.peek()?.to_owned(); - ::yaserde::log::trace!( + ::yaserde::__derive_trace!( "Struct {} @ {}: matching {:?}", stringify!(#name), start_depth, event, ); @@ -425,7 +425,7 @@ pub fn parse( #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}) } }