Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

macros: fix the tracing-macros crate not compiling #1000

Merged
merged 1 commit into from
Sep 29, 2020
Merged

macros: fix the tracing-macros crate not compiling #1000

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 11 additions & 31 deletions tracing-macros/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#![cfg_attr(docsrs, deny(broken_intra_doc_links))]
#[doc(hidden)]
pub use tracing;

/// Alias of `dbg!` for avoiding conflicts with the `std::dbg!` macro.
#[macro_export]
Expand All @@ -10,10 +12,10 @@ macro_rules! trace_dbg {
$crate::dbg!(target: module_path!(), level: $level, $ex)
};
(target: $target:expr, $ex:expr) => {
$crate::dbg!(target: $target, level: tracing::Level::DEBUG, $ex)
$crate::dbg!(target: $target, level: $crate::tracing::Level::DEBUG, $ex)
};
($ex:expr) => {
$crate::dbg!(level: tracing::Level::DEBUG, $ex)
$crate::dbg!(level: $crate::tracing::Level::DEBUG, $ex)
};
}

Expand All @@ -25,42 +27,20 @@ macro_rules! trace_dbg {
#[macro_export]
macro_rules! dbg {
(target: $target:expr, level: $level:expr, $ex:expr) => {{
use tracing::callsite::Callsite;
use tracing::{
callsite,
field::{debug, Value},
Event, Id, Subscriber,
};
let callsite = tracing::callsite! {
name: concat!("event:trace_dbg(", stringify!($ex), ")"),
kind: tracing::metadata::Kind::EVENT,
target: $target,
level: $level,
fields: value,
};
let val = $ex;
if callsite.is_enabled() {
let meta = callsite.metadata();
let fields = meta.fields();
let key = meta
.fields()
.into_iter()
.next()
.expect("trace_dbg event must have one field");
Event::dispatch(
meta,
&fields.value_set(&[(&key, Some(&debug(&val) as &Value))]),
);
match $ex {
value => {
$crate::tracing::event!(target: $target, $level, ?value, stringify!($ex));
value
}
}
val
}};
(level: $level:expr, $ex:expr) => {
$crate::dbg!(target: module_path!(), level: $level, $ex)
};
(target: $target:expr, $ex:expr) => {
$crate::dbg!(target: $target, level: tracing::Level::DEBUG, $ex)
$crate::dbg!(target: $target, level: $crate::tracing::Level::DEBUG, $ex)
};
($ex:expr) => {
$crate::dbg!(level: tracing::Level::DEBUG, $ex)
$crate::dbg!(level: $crate::tracing::Level::DEBUG, $ex)
};
}