itsscb/tracing
1
0
Fork 0
mirror of https://github.com/tokio-rs/tracing.git synced 2025-10-03 15:54:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

tracing: use fully qualified names in macros for items exported from std prelude (#2621)

Browse Source 
Currently, in many places, macros do not use fully qualified names for
items exported from the prelude. This means that naming collisions
(`struct Some`) or the removal of the std library prelude will cause
compilation errors.

- Identify and use fully qualified names in macros were we previously
  assumed the Rust std prelude. We use `::core` rather than `::std`.
- Add
  [`no_implicit_prelude`](https://doc.rust-lang.org/reference/names/preludes.html#the-no_implicit_prelude-attribute)
  to `tracing/tests/macros.rs`. I'm unsure if this is giving us good
  coverage - can we improve on this approach? I'm not confident I've
  caught everything.
This commit is contained in:
Harry Barber 2023-07-11 20:39:10 +01:00 committed by Eliza Weisman
parent eb2ce04129
commit 111ad87d3d
7 changed files with 191 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tracing-core/src/field.rs
View File

@ -1086,7 +1086,7 @@ macro_rules! impl_valid_len {
( $( $len:tt ),+ ) => { ( $( $len:tt ),+ ) => {
$( $(
impl<'a> private::ValidLen<'a> for impl<'a> private::ValidLen<'a> for
[(&'a Field, Option<&'a (dyn Value + 'a)>); $len] {} [(&'a Field, ::core::option::Option<&'a (dyn Value + 'a)>); $len] {}
)+ )+
} }
} }

6
tracing-core/src/lib.rs
View File

@ -243,9 +243,9 @@ macro_rules! metadata {
$name, $name,
$target, $target,
$level, $level,
Some(file!()), ::core::option::Option::Some(file!()),
Some(line!()), ::core::option::Option::Some(line!()),
Some(module_path!()), ::core::option::Option::Some(module_path!()),
$crate::field::FieldSet::new($fields, $crate::identify_callsite!($callsite)), $crate::field::FieldSet::new($fields, $crate::identify_callsite!($callsite)),
$kind, $kind,
) )

6
tracing-log/src/lib.rs
View File

@ -307,9 +307,9 @@ macro_rules! log_cs {
"log event", "log event",
"log", "log",
$level, $level,
None, ::core::option::Option::None,
None, ::core::option::Option::None,
None, ::core::option::Option::None,
field::FieldSet::new(FIELD_NAMES, identify_callsite!(&$cs)), field::FieldSet::new(FIELD_NAMES, identify_callsite!(&$cs)),
Kind::EVENT, Kind::EVENT,
); );

2
tracing-subscriber/src/fmt/fmt_layer.rs
View File

@ -775,7 +775,7 @@ macro_rules! with_event_from_span {
#[allow(unused)] #[allow(unused)]
let mut iter = fs.iter(); let mut iter = fs.iter();
let v = [$( let v = [$(
(&iter.next().unwrap(), Some(&$value as &dyn field::Value)), (&iter.next().unwrap(), ::core::option::Option::Some(&$value as &dyn field::Value)),
)*]; )*];
let vs = fs.value_set(&v); let vs = fs.value_set(&v);
let $event = Event::new_child_of($id, meta, &vs); let $event = Event::new_child_of($id, meta, &vs);

2
tracing-subscriber/src/macros.rs
View File

@ -4,7 +4,7 @@ macro_rules! try_lock {
try_lock!($lock, else return) try_lock!($lock, else return)
}; };
($lock:expr, else $els:expr) => { ($lock:expr, else $els:expr) => {
if let Ok(l) = $lock { if let ::core::result::Result::Ok(l) = $lock {
l l
} else if std::thread::panicking() { } else if std::thread::panicking() {
$els $els

40
tracing/src/macros.rs
View File

@ -2193,79 +2193,79 @@ macro_rules! valueset {
// }; // };
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = ?$val:expr, $($rest:tt)*) => { (@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = ?$val:expr, $($rest:tt)*) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&debug(&$val) as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&debug(&$val) as &dyn Value)) },
$next, $next,
$($rest)* $($rest)*
) )
}; };
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = %$val:expr, $($rest:tt)*) => { (@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = %$val:expr, $($rest:tt)*) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&display(&$val) as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&display(&$val) as &dyn Value)) },
$next, $next,
$($rest)* $($rest)*
) )
}; };
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = $val:expr, $($rest:tt)*) => { (@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = $val:expr, $($rest:tt)*) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&$val as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&$val as &dyn Value)) },
$next, $next,
$($rest)* $($rest)*
) )
}; };
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+, $($rest:tt)*) => { (@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+, $($rest:tt)*) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&$($k).+ as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&$($k).+ as &dyn Value)) },
$next, $next,
$($rest)* $($rest)*
) )
}; };
(@ { $(,)* $($out:expr),* }, $next:expr, ?$($k:ident).+, $($rest:tt)*) => { (@ { $(,)* $($out:expr),* }, $next:expr, ?$($k:ident).+, $($rest:tt)*) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&debug(&$($k).+) as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&debug(&$($k).+) as &dyn Value)) },
$next, $next,
$($rest)* $($rest)*
) )
}; };
(@ { $(,)* $($out:expr),* }, $next:expr, %$($k:ident).+, $($rest:tt)*) => { (@ { $(,)* $($out:expr),* }, $next:expr, %$($k:ident).+, $($rest:tt)*) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&display(&$($k).+) as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&display(&$($k).+) as &dyn Value)) },
$next, $next,
$($rest)* $($rest)*
) )
}; };
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = ?$val:expr) => { (@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = ?$val:expr) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&debug(&$val) as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&debug(&$val) as &dyn Value)) },
$next, $next,
) )
}; };
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = %$val:expr) => { (@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = %$val:expr) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&display(&$val) as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&display(&$val) as &dyn Value)) },
$next, $next,
) )
}; };
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = $val:expr) => { (@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = $val:expr) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&$val as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&$val as &dyn Value)) },
$next, $next,
) )
}; };
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+) => { (@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&$($k).+ as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&$($k).+ as &dyn Value)) },
$next, $next,
) )
}; };
(@ { $(,)* $($out:expr),* }, $next:expr, ?$($k:ident).+) => { (@ { $(,)* $($out:expr),* }, $next:expr, ?$($k:ident).+) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&debug(&$($k).+) as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&debug(&$($k).+) as &dyn Value)) },
$next, $next,
) )
}; };
(@ { $(,)* $($out:expr),* }, $next:expr, %$($k:ident).+) => { (@ { $(,)* $($out:expr),* }, $next:expr, %$($k:ident).+) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&display(&$($k).+) as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&display(&$($k).+) as &dyn Value)) },
$next, $next,
) )
}; };
@ -2273,47 +2273,47 @@ macro_rules! valueset {
// Handle literal names // Handle literal names
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = ?$val:expr, $($rest:tt)*) => { (@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = ?$val:expr, $($rest:tt)*) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&debug(&$val) as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&debug(&$val) as &dyn Value)) },
$next, $next,
$($rest)* $($rest)*
) )
}; };
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = %$val:expr, $($rest:tt)*) => { (@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = %$val:expr, $($rest:tt)*) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&display(&$val) as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&display(&$val) as &dyn Value)) },
$next, $next,
$($rest)* $($rest)*
) )
}; };
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = $val:expr, $($rest:tt)*) => { (@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = $val:expr, $($rest:tt)*) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&$val as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&$val as &dyn Value)) },
$next, $next,
$($rest)* $($rest)*
) )
}; };
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = ?$val:expr) => { (@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = ?$val:expr) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&debug(&$val) as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&debug(&$val) as &dyn Value)) },
$next, $next,
) )
}; };
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = %$val:expr) => { (@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = %$val:expr) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&display(&$val) as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&display(&$val) as &dyn Value)) },
$next, $next,
) )
}; };
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = $val:expr) => { (@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = $val:expr) => {
$crate::valueset!( $crate::valueset!(
@ { $($out),*, (&$next, Some(&$val as &dyn Value)) }, @ { $($out),*, (&$next, ::core::option::Option::Some(&$val as &dyn Value)) },
$next, $next,
) )
}; };
// Remainder is unparsable, but exists --- must be format args! // Remainder is unparsable, but exists --- must be format args!
(@ { $(,)* $($out:expr),* }, $next:expr, $($rest:tt)+) => { (@ { $(,)* $($out:expr),* }, $next:expr, $($rest:tt)+) => {
$crate::valueset!(@ { (&$next, Some(&format_args!($($rest)+) as &dyn Value)), $($out),* }, $next, ) $crate::valueset!(@ { (&$next, ::core::option::Option::Some(&format_args!($($rest)+) as &dyn Value)), $($out),* }, $next, )
}; };
// === entry === // === entry ===
@ -2324,7 +2324,7 @@ macro_rules! valueset {
let mut iter = $fields.iter(); let mut iter = $fields.iter();
$fields.value_set($crate::valueset!( $fields.value_set($crate::valueset!(
@ { }, @ { },
iter.next().expect("FieldSet corrupted (this is a bug)"), ::core::iter::Iterator::next(&mut iter).expect("FieldSet corrupted (this is a bug)"),
$($kvs)+ $($kvs)+
)) ))
} }

320
tracing/tests/macros.rs
View File

@ -1,4 +1,8 @@
#![deny(warnings)] #![deny(warnings)]
// We call all macros in this module with `no_implicit_prelude` to ensure they do not depend on the standard prelude.
#![no_implicit_prelude]
extern crate tracing;
use tracing::{ use tracing::{
callsite, debug, debug_span, enabled, error, error_span, event, event_enabled, info, info_span, callsite, debug, debug_span, enabled, error, error_span, event, event_enabled, info, info_span,
span, span_enabled, trace, trace_span, warn, warn_span, Level, span, span_enabled, trace, trace_span, warn, warn_span, Level,
@ -111,80 +115,80 @@ fn error_span() {
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
#[test] #[test]
fn span_root() { fn span_root() {
span!(target: "foo_events", parent: None, Level::TRACE, "foo", bar.baz = 2, quux = 3); span!(target: "foo_events", parent: ::core::option::Option::None, Level::TRACE, "foo", bar.baz = 2, quux = 3);
span!(target: "foo_events", parent: None, Level::TRACE, "foo", bar.baz = 2, quux = 3); span!(target: "foo_events", parent: ::core::option::Option::None, Level::TRACE, "foo", bar.baz = 2, quux = 3);
span!(target: "foo_events", parent: None, Level::TRACE, "foo", bar.baz = 2, quux = 4,); span!(target: "foo_events", parent: ::core::option::Option::None, Level::TRACE, "foo", bar.baz = 2, quux = 4,);
span!(target: "foo_events", parent: None, Level::TRACE, "foo"); span!(target: "foo_events", parent: ::core::option::Option::None, Level::TRACE, "foo");
span!(target: "foo_events", parent: None, Level::TRACE, "bar",); span!(target: "foo_events", parent: ::core::option::Option::None, Level::TRACE, "bar",);
span!(parent: None, Level::DEBUG, "foo", bar.baz = 2, quux = 3); span!(parent: ::core::option::Option::None, Level::DEBUG, "foo", bar.baz = 2, quux = 3);
span!(parent: None, Level::DEBUG, "foo", bar.baz = 2, quux = 4,); span!(parent: ::core::option::Option::None, Level::DEBUG, "foo", bar.baz = 2, quux = 4,);
span!(parent: None, Level::DEBUG, "foo"); span!(parent: ::core::option::Option::None, Level::DEBUG, "foo");
span!(parent: None, Level::DEBUG, "bar",); span!(parent: ::core::option::Option::None, Level::DEBUG, "bar",);
} }
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
#[test] #[test]
fn trace_span_root() { fn trace_span_root() {
trace_span!(target: "foo_events", parent: None, "foo", bar.baz = 2, quux = 3); trace_span!(target: "foo_events", parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 3);
trace_span!(target: "foo_events", parent: None, "foo", bar.baz = 2, quux = 4,); trace_span!(target: "foo_events", parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 4,);
trace_span!(target: "foo_events", parent: None, "foo"); trace_span!(target: "foo_events", parent: ::core::option::Option::None, "foo");
trace_span!(target: "foo_events", parent: None, "bar",); trace_span!(target: "foo_events", parent: ::core::option::Option::None, "bar",);
trace_span!(parent: None, "foo", bar.baz = 2, quux = 3); trace_span!(parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 3);
trace_span!(parent: None, "foo", bar.baz = 2, quux = 4,); trace_span!(parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 4,);
trace_span!(parent: None, "foo"); trace_span!(parent: ::core::option::Option::None, "foo");
trace_span!(parent: None, "bar",); trace_span!(parent: ::core::option::Option::None, "bar",);
} }
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
#[test] #[test]
fn debug_span_root() { fn debug_span_root() {
debug_span!(target: "foo_events", parent: None, "foo", bar.baz = 2, quux = 3); debug_span!(target: "foo_events", parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 3);
debug_span!(target: "foo_events", parent: None, "foo", bar.baz = 2, quux = 4,); debug_span!(target: "foo_events", parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 4,);
debug_span!(target: "foo_events", parent: None, "foo"); debug_span!(target: "foo_events", parent: ::core::option::Option::None, "foo");
debug_span!(target: "foo_events", parent: None, "bar",); debug_span!(target: "foo_events", parent: ::core::option::Option::None, "bar",);
debug_span!(parent: None, "foo", bar.baz = 2, quux = 3); debug_span!(parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 3);
debug_span!(parent: None, "foo", bar.baz = 2, quux = 4,); debug_span!(parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 4,);
debug_span!(parent: None, "foo"); debug_span!(parent: ::core::option::Option::None, "foo");
debug_span!(parent: None, "bar",); debug_span!(parent: ::core::option::Option::None, "bar",);
} }
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
#[test] #[test]
fn info_span_root() { fn info_span_root() {
info_span!(target: "foo_events", parent: None, "foo", bar.baz = 2, quux = 3); info_span!(target: "foo_events", parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 3);
info_span!(target: "foo_events", parent: None, "foo", bar.baz = 2, quux = 4,); info_span!(target: "foo_events", parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 4,);
info_span!(target: "foo_events", parent: None, "foo"); info_span!(target: "foo_events", parent: ::core::option::Option::None, "foo");
info_span!(target: "foo_events", parent: None, "bar",); info_span!(target: "foo_events", parent: ::core::option::Option::None, "bar",);
info_span!(parent: None, "foo", bar.baz = 2, quux = 3); info_span!(parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 3);
info_span!(parent: None, "foo", bar.baz = 2, quux = 4,); info_span!(parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 4,);
info_span!(parent: None, "foo"); info_span!(parent: ::core::option::Option::None, "foo");
info_span!(parent: None, "bar",); info_span!(parent: ::core::option::Option::None, "bar",);
} }
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
#[test] #[test]
fn warn_span_root() { fn warn_span_root() {
warn_span!(target: "foo_events", parent: None, "foo", bar.baz = 2, quux = 3); warn_span!(target: "foo_events", parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 3);
warn_span!(target: "foo_events", parent: None, "foo", bar.baz = 2, quux = 4,); warn_span!(target: "foo_events", parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 4,);
warn_span!(target: "foo_events", parent: None, "foo"); warn_span!(target: "foo_events", parent: ::core::option::Option::None, "foo");
warn_span!(target: "foo_events", parent: None, "bar",); warn_span!(target: "foo_events", parent: ::core::option::Option::None, "bar",);
warn_span!(parent: None, "foo", bar.baz = 2, quux = 3); warn_span!(parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 3);
warn_span!(parent: None, "foo", bar.baz = 2, quux = 4,); warn_span!(parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 4,);
warn_span!(parent: None, "foo"); warn_span!(parent: ::core::option::Option::None, "foo");
warn_span!(parent: None, "bar",); warn_span!(parent: ::core::option::Option::None, "bar",);
} }
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
#[test] #[test]
fn error_span_root() { fn error_span_root() {
error_span!(target: "foo_events", parent: None, "foo", bar.baz = 2, quux = 3); error_span!(target: "foo_events", parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 3);
error_span!(target: "foo_events", parent: None, "foo", bar.baz = 2, quux = 4,); error_span!(target: "foo_events", parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 4,);
error_span!(target: "foo_events", parent: None, "foo"); error_span!(target: "foo_events", parent: ::core::option::Option::None, "foo");
error_span!(target: "foo_events", parent: None, "bar",); error_span!(target: "foo_events", parent: ::core::option::Option::None, "bar",);
error_span!(parent: None, "foo", bar.baz = 2, quux = 3); error_span!(parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 3);
error_span!(parent: None, "foo", bar.baz = 2, quux = 4,); error_span!(parent: ::core::option::Option::None, "foo", bar.baz = 2, quux = 4,);
error_span!(parent: None, "foo"); error_span!(parent: ::core::option::Option::None, "foo");
error_span!(parent: None, "bar",); error_span!(parent: ::core::option::Option::None, "bar",);
} }
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
@ -605,144 +609,144 @@ fn error() {
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
#[test] #[test]
fn event_root() { fn event_root() {
event!(parent: None, Level::DEBUG, foo = ?3, bar.baz = %2, quux = false); event!(parent: ::core::option::Option::None, Level::DEBUG, foo = ?3, bar.baz = %2, quux = false);
event!( event!(
parent: None, parent: ::core::option::Option::None,
Level::DEBUG, Level::DEBUG,
foo = 3, foo = 3,
bar.baz = 2, bar.baz = 2,
quux = false quux = false
); );
event!(parent: None, Level::DEBUG, foo = 3, bar.baz = 3,); event!(parent: ::core::option::Option::None, Level::DEBUG, foo = 3, bar.baz = 3,);
event!(parent: None, Level::DEBUG, "foo"); event!(parent: ::core::option::Option::None, Level::DEBUG, "foo");
event!(parent: None, Level::DEBUG, "foo: {}", 3); event!(parent: ::core::option::Option::None, Level::DEBUG, "foo: {}", 3);
event!(parent: None, Level::DEBUG, { foo = 3, bar.baz = 80 }, "quux"); event!(parent: ::core::option::Option::None, Level::DEBUG, { foo = 3, bar.baz = 80 }, "quux");
event!(parent: None, Level::DEBUG, { foo = 2, bar.baz = 79 }, "quux {:?}", true); event!(parent: ::core::option::Option::None, Level::DEBUG, { foo = 2, bar.baz = 79 }, "quux {:?}", true);
event!(parent: None, Level::DEBUG, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false); event!(parent: ::core::option::Option::None, Level::DEBUG, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false);
event!(parent: None, Level::DEBUG, { foo = ?2, bar.baz = %78 }, "quux"); event!(parent: ::core::option::Option::None, Level::DEBUG, { foo = ?2, bar.baz = %78 }, "quux");
event!(target: "foo_events", parent: None, Level::DEBUG, foo = 3, bar.baz = 2, quux = false); event!(target: "foo_events", parent: ::core::option::Option::None, Level::DEBUG, foo = 3, bar.baz = 2, quux = false);
event!(target: "foo_events", parent: None, Level::DEBUG, foo = 3, bar.baz = 3,); event!(target: "foo_events", parent: ::core::option::Option::None, Level::DEBUG, foo = 3, bar.baz = 3,);
event!(target: "foo_events", parent: None, Level::DEBUG, "foo"); event!(target: "foo_events", parent: ::core::option::Option::None, Level::DEBUG, "foo");
event!(target: "foo_events", parent: None, Level::DEBUG, "foo: {}", 3); event!(target: "foo_events", parent: ::core::option::Option::None, Level::DEBUG, "foo: {}", 3);
event!(target: "foo_events", parent: None, Level::DEBUG, { foo = 3, bar.baz = 80 }, "quux"); event!(target: "foo_events", parent: ::core::option::Option::None, Level::DEBUG, { foo = 3, bar.baz = 80 }, "quux");
event!(target: "foo_events", parent: None, Level::DEBUG, { foo = 2, bar.baz = 79 }, "quux {:?}", true); event!(target: "foo_events", parent: ::core::option::Option::None, Level::DEBUG, { foo = 2, bar.baz = 79 }, "quux {:?}", true);
event!(target: "foo_events", parent: None, Level::DEBUG, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false); event!(target: "foo_events", parent: ::core::option::Option::None, Level::DEBUG, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false);
event!(target: "foo_events", parent: None, Level::DEBUG, { foo = 2, bar.baz = 78, }, "quux"); event!(target: "foo_events", parent: ::core::option::Option::None, Level::DEBUG, { foo = 2, bar.baz = 78, }, "quux");
} }
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
#[test] #[test]
fn trace_root() { fn trace_root() {
trace!(parent: None, foo = ?3, bar.baz = %2, quux = false); trace!(parent: ::core::option::Option::None, foo = ?3, bar.baz = %2, quux = false);
trace!(parent: None, foo = 3, bar.baz = 2, quux = false); trace!(parent: ::core::option::Option::None, foo = 3, bar.baz = 2, quux = false);
trace!(parent: None, foo = 3, bar.baz = 3,); trace!(parent: ::core::option::Option::None, foo = 3, bar.baz = 3,);
trace!(parent: None, "foo"); trace!(parent: ::core::option::Option::None, "foo");
trace!(parent: None, "foo: {}", 3); trace!(parent: ::core::option::Option::None, "foo: {}", 3);
trace!(parent: None, { foo = 3, bar.baz = 80 }, "quux"); trace!(parent: ::core::option::Option::None, { foo = 3, bar.baz = 80 }, "quux");
trace!(parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}", true); trace!(parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}", true);
trace!(parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false); trace!(parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false);
trace!(parent: None, { foo = 2, bar.baz = 78 }, "quux"); trace!(parent: ::core::option::Option::None, { foo = 2, bar.baz = 78 }, "quux");
trace!(parent: None, { foo = ?2, bar.baz = %78 }, "quux"); trace!(parent: ::core::option::Option::None, { foo = ?2, bar.baz = %78 }, "quux");
trace!(target: "foo_events", parent: None, foo = 3, bar.baz = 2, quux = false); trace!(target: "foo_events", parent: ::core::option::Option::None, foo = 3, bar.baz = 2, quux = false);
trace!(target: "foo_events", parent: None, foo = 3, bar.baz = 3,); trace!(target: "foo_events", parent: ::core::option::Option::None, foo = 3, bar.baz = 3,);
trace!(target: "foo_events", parent: None, "foo"); trace!(target: "foo_events", parent: ::core::option::Option::None, "foo");
trace!(target: "foo_events", parent: None, "foo: {}", 3); trace!(target: "foo_events", parent: ::core::option::Option::None, "foo: {}", 3);
trace!(target: "foo_events", parent: None, { foo = 3, bar.baz = 80 }, "quux"); trace!(target: "foo_events", parent: ::core::option::Option::None, { foo = 3, bar.baz = 80 }, "quux");
trace!(target: "foo_events", parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}", true); trace!(target: "foo_events", parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}", true);
trace!(target: "foo_events", parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false); trace!(target: "foo_events", parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false);
trace!(target: "foo_events", parent: None, { foo = 2, bar.baz = 78, }, "quux"); trace!(target: "foo_events", parent: ::core::option::Option::None, { foo = 2, bar.baz = 78, }, "quux");
} }
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
#[test] #[test]
fn debug_root() { fn debug_root() {
debug!(parent: None, foo = ?3, bar.baz = %2, quux = false); debug!(parent: ::core::option::Option::None, foo = ?3, bar.baz = %2, quux = false);
debug!(parent: None, foo = 3, bar.baz = 2, quux = false); debug!(parent: ::core::option::Option::None, foo = 3, bar.baz = 2, quux = false);
debug!(parent: None, foo = 3, bar.baz = 3,); debug!(parent: ::core::option::Option::None, foo = 3, bar.baz = 3,);
debug!(parent: None, "foo"); debug!(parent: ::core::option::Option::None, "foo");
debug!(parent: None, "foo: {}", 3); debug!(parent: ::core::option::Option::None, "foo: {}", 3);
debug!(parent: None, { foo = 3, bar.baz = 80 }, "quux"); debug!(parent: ::core::option::Option::None, { foo = 3, bar.baz = 80 }, "quux");
debug!(parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}", true); debug!(parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}", true);
debug!(parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false); debug!(parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false);
debug!(parent: None, { foo = 2, bar.baz = 78 }, "quux"); debug!(parent: ::core::option::Option::None, { foo = 2, bar.baz = 78 }, "quux");
debug!(parent: None, { foo = ?2, bar.baz = %78 }, "quux"); debug!(parent: ::core::option::Option::None, { foo = ?2, bar.baz = %78 }, "quux");
debug!(target: "foo_events", parent: None, foo = 3, bar.baz = 2, quux = false); debug!(target: "foo_events", parent: ::core::option::Option::None, foo = 3, bar.baz = 2, quux = false);
debug!(target: "foo_events", parent: None, foo = 3, bar.baz = 3,); debug!(target: "foo_events", parent: ::core::option::Option::None, foo = 3, bar.baz = 3,);
debug!(target: "foo_events", parent: None, "foo"); debug!(target: "foo_events", parent: ::core::option::Option::None, "foo");
debug!(target: "foo_events", parent: None, "foo: {}", 3); debug!(target: "foo_events", parent: ::core::option::Option::None, "foo: {}", 3);
debug!(target: "foo_events", parent: None, { foo = 3, bar.baz = 80 }, "quux"); debug!(target: "foo_events", parent: ::core::option::Option::None, { foo = 3, bar.baz = 80 }, "quux");
debug!(target: "foo_events", parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}", true); debug!(target: "foo_events", parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}", true);
debug!(target: "foo_events", parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false); debug!(target: "foo_events", parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false);
debug!(target: "foo_events", parent: None, { foo = 2, bar.baz = 78, }, "quux"); debug!(target: "foo_events", parent: ::core::option::Option::None, { foo = 2, bar.baz = 78, }, "quux");
} }
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
#[test] #[test]
fn info_root() { fn info_root() {
info!(parent: None, foo = ?3, bar.baz = %2, quux = false); info!(parent: ::core::option::Option::None, foo = ?3, bar.baz = %2, quux = false);
info!(parent: None, foo = 3, bar.baz = 2, quux = false); info!(parent: ::core::option::Option::None, foo = 3, bar.baz = 2, quux = false);
info!(parent: None, foo = 3, bar.baz = 3,); info!(parent: ::core::option::Option::None, foo = 3, bar.baz = 3,);
info!(parent: None, "foo"); info!(parent: ::core::option::Option::None, "foo");
info!(parent: None, "foo: {}", 3); info!(parent: ::core::option::Option::None, "foo: {}", 3);
info!(parent: None, { foo = 3, bar.baz = 80 }, "quux"); info!(parent: ::core::option::Option::None, { foo = 3, bar.baz = 80 }, "quux");
info!(parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}", true); info!(parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}", true);
info!(parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false); info!(parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false);
info!(parent: None, { foo = 2, bar.baz = 78 }, "quux"); info!(parent: ::core::option::Option::None, { foo = 2, bar.baz = 78 }, "quux");
info!(parent: None, { foo = ?2, bar.baz = %78 }, "quux"); info!(parent: ::core::option::Option::None, { foo = ?2, bar.baz = %78 }, "quux");
info!(target: "foo_events", parent: None, foo = 3, bar.baz = 2, quux = false); info!(target: "foo_events", parent: ::core::option::Option::None, foo = 3, bar.baz = 2, quux = false);
info!(target: "foo_events", parent: None, foo = 3, bar.baz = 3,); info!(target: "foo_events", parent: ::core::option::Option::None, foo = 3, bar.baz = 3,);
info!(target: "foo_events", parent: None, "foo"); info!(target: "foo_events", parent: ::core::option::Option::None, "foo");
info!(target: "foo_events", parent: None, "foo: {}", 3); info!(target: "foo_events", parent: ::core::option::Option::None, "foo: {}", 3);
info!(target: "foo_events", parent: None, { foo = 3, bar.baz = 80 }, "quux"); info!(target: "foo_events", parent: ::core::option::Option::None, { foo = 3, bar.baz = 80 }, "quux");
info!(target: "foo_events", parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}", true); info!(target: "foo_events", parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}", true);
info!(target: "foo_events", parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false); info!(target: "foo_events", parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false);
info!(target: "foo_events", parent: None, { foo = 2, bar.baz = 78, }, "quux"); info!(target: "foo_events", parent: ::core::option::Option::None, { foo = 2, bar.baz = 78, }, "quux");
} }
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
#[test] #[test]
fn warn_root() { fn warn_root() {
warn!(parent: None, foo = ?3, bar.baz = %2, quux = false); warn!(parent: ::core::option::Option::None, foo = ?3, bar.baz = %2, quux = false);
warn!(parent: None, foo = 3, bar.baz = 2, quux = false); warn!(parent: ::core::option::Option::None, foo = 3, bar.baz = 2, quux = false);
warn!(parent: None, foo = 3, bar.baz = 3,); warn!(parent: ::core::option::Option::None, foo = 3, bar.baz = 3,);
warn!(parent: None, "foo"); warn!(parent: ::core::option::Option::None, "foo");
warn!(parent: None, "foo: {}", 3); warn!(parent: ::core::option::Option::None, "foo: {}", 3);
warn!(parent: None, { foo = 3, bar.baz = 80 }, "quux"); warn!(parent: ::core::option::Option::None, { foo = 3, bar.baz = 80 }, "quux");
warn!(parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}", true); warn!(parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}", true);
warn!(parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false); warn!(parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false);
warn!(parent: None, { foo = 2, bar.baz = 78 }, "quux"); warn!(parent: ::core::option::Option::None, { foo = 2, bar.baz = 78 }, "quux");
warn!(parent: None, { foo = ?2, bar.baz = %78 }, "quux"); warn!(parent: ::core::option::Option::None, { foo = ?2, bar.baz = %78 }, "quux");
warn!(target: "foo_events", parent: None, foo = 3, bar.baz = 2, quux = false); warn!(target: "foo_events", parent: ::core::option::Option::None, foo = 3, bar.baz = 2, quux = false);
warn!(target: "foo_events", parent: None, foo = 3, bar.baz = 3,); warn!(target: "foo_events", parent: ::core::option::Option::None, foo = 3, bar.baz = 3,);
warn!(target: "foo_events", parent: None, "foo"); warn!(target: "foo_events", parent: ::core::option::Option::None, "foo");
warn!(target: "foo_events", parent: None, "foo: {}", 3); warn!(target: "foo_events", parent: ::core::option::Option::None, "foo: {}", 3);
warn!(target: "foo_events", parent: None, { foo = 3, bar.baz = 80 }, "quux"); warn!(target: "foo_events", parent: ::core::option::Option::None, { foo = 3, bar.baz = 80 }, "quux");
warn!(target: "foo_events", parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}", true); warn!(target: "foo_events", parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}", true);
warn!(target: "foo_events", parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false); warn!(target: "foo_events", parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false);
warn!(target: "foo_events", parent: None, { foo = 2, bar.baz = 78, }, "quux"); warn!(target: "foo_events", parent: ::core::option::Option::None, { foo = 2, bar.baz = 78, }, "quux");
} }
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
#[test] #[test]
fn error_root() { fn error_root() {
error!(parent: None, foo = ?3, bar.baz = %2, quux = false); error!(parent: ::core::option::Option::None, foo = ?3, bar.baz = %2, quux = false);
error!(parent: None, foo = 3, bar.baz = 2, quux = false); error!(parent: ::core::option::Option::None, foo = 3, bar.baz = 2, quux = false);
error!(parent: None, foo = 3, bar.baz = 3,); error!(parent: ::core::option::Option::None, foo = 3, bar.baz = 3,);
error!(parent: None, "foo"); error!(parent: ::core::option::Option::None, "foo");
error!(parent: None, "foo: {}", 3); error!(parent: ::core::option::Option::None, "foo: {}", 3);
error!(parent: None, { foo = 3, bar.baz = 80 }, "quux"); error!(parent: ::core::option::Option::None, { foo = 3, bar.baz = 80 }, "quux");
error!(parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}", true); error!(parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}", true);
error!(parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false); error!(parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false);
error!(parent: None, { foo = 2, bar.baz = 78 }, "quux"); error!(parent: ::core::option::Option::None, { foo = 2, bar.baz = 78 }, "quux");
error!(parent: None, { foo = ?2, bar.baz = %78 }, "quux"); error!(parent: ::core::option::Option::None, { foo = ?2, bar.baz = %78 }, "quux");
error!(target: "foo_events", parent: None, foo = 3, bar.baz = 2, quux = false); error!(target: "foo_events", parent: ::core::option::Option::None, foo = 3, bar.baz = 2, quux = false);
error!(target: "foo_events", parent: None, foo = 3, bar.baz = 3,); error!(target: "foo_events", parent: ::core::option::Option::None, foo = 3, bar.baz = 3,);
error!(target: "foo_events", parent: None, "foo"); error!(target: "foo_events", parent: ::core::option::Option::None, "foo");
error!(target: "foo_events", parent: None, "foo: {}", 3); error!(target: "foo_events", parent: ::core::option::Option::None, "foo: {}", 3);
error!(target: "foo_events", parent: None, { foo = 3, bar.baz = 80 }, "quux"); error!(target: "foo_events", parent: ::core::option::Option::None, { foo = 3, bar.baz = 80 }, "quux");
error!(target: "foo_events", parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}", true); error!(target: "foo_events", parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}", true);
error!(target: "foo_events", parent: None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false); error!(target: "foo_events", parent: ::core::option::Option::None, { foo = 2, bar.baz = 79 }, "quux {:?}, {quux}", true, quux = false);
error!(target: "foo_events", parent: None, { foo = 2, bar.baz = 78, }, "quux"); error!(target: "foo_events", parent: ::core::option::Option::None, { foo = 2, bar.baz = 78, }, "quux");
} }
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
@ -913,7 +917,7 @@ fn field_shorthand_only() {
#[test] #[test]
fn borrow_val_events() { fn borrow_val_events() {
// Reproduces https://github.com/tokio-rs/tracing/issues/954 // Reproduces https://github.com/tokio-rs/tracing/issues/954
let mut foo = (String::new(), String::new()); let mut foo = (::std::string::String::new(), ::std::string::String::new());
let zero = &mut foo.0; let zero = &mut foo.0;
trace!(one = ?foo.1); trace!(one = ?foo.1);
debug!(one = ?foo.1); debug!(one = ?foo.1);
@ -927,7 +931,7 @@ fn borrow_val_events() {
#[test] #[test]
fn borrow_val_spans() { fn borrow_val_spans() {
// Reproduces https://github.com/tokio-rs/tracing/issues/954 // Reproduces https://github.com/tokio-rs/tracing/issues/954
let mut foo = (String::new(), String::new()); let mut foo = (::std::string::String::new(), ::std::string::String::new());
let zero = &mut foo.0; let zero = &mut foo.0;
let _span = trace_span!("span", one = ?foo.1); let _span = trace_span!("span", one = ?foo.1);
let _span = debug_span!("span", one = ?foo.1); let _span = debug_span!("span", one = ?foo.1);