Skip to content

Commit

Permalink
Fix tracing-macros::dbg
Browse files Browse the repository at this point in the history
…and the `factorial` example.
  • Loading branch information
dvdplm committed Oct 19, 2020
1 parent a8cc977 commit 0ba8541
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
5 changes: 2 additions & 3 deletions tracing-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@ keywords = ["logging", "tracing"]
license = "MIT"

[dependencies]
tracing = "0.1.18"
tracing = "0.1.20"

[dev-dependencies]
tracing-log = "0.1"
env_logger = "0.7"
tracing-subscriber = "0.2"

[badges]
maintenance = { status = "experimental" }
4 changes: 1 addition & 3 deletions tracing-macros/examples/factorial.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ fn factorial(n: u32) -> u32 {
}

fn main() {
env_logger::Builder::new().parse_filters("trace").init();
#[allow(deprecated)]
let subscriber = tracing_log::TraceLogger::new();
let subscriber = tracing_subscriber::fmt().finish();

tracing::subscriber::with_default(subscriber, || dbg!(factorial(4)));
}
5 changes: 3 additions & 2 deletions tracing-macros/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ macro_rules! dbg {
use tracing::{
callsite,
field::{debug, Value},
subscriber::Interest,
Event, Id, Subscriber,
};
let callsite = tracing::callsite! {
Expand All @@ -39,7 +40,7 @@ macro_rules! dbg {
fields: value,
};
let val = $ex;
if callsite.is_enabled() {
if callsite.is_enabled(Interest::always()) {
let meta = callsite.metadata();
let fields = meta.fields();
let key = meta
Expand All @@ -49,7 +50,7 @@ macro_rules! dbg {
.expect("trace_dbg event must have one field");
Event::dispatch(
meta,
&fields.value_set(&[(&key, Some(&debug(&val) as &Value))]),
&fields.value_set(&[(&key, Some(&debug(&val) as &dyn Value))]),
);
}
val
Expand Down

0 comments on commit 0ba8541

Please sign in to comment.