Merge remote-tracking branch 'upstream/master' into dp-target-is-cow

* upstream/master: chore: fix tracing-macros::dbg (tokio-rs#1054)
dvdplm · Oct 19, 2020 · 7b0dfe5 · 7b0dfe5
2 parents c46c352 + 19af292
commit 7b0dfe5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/tracing-macros/Cargo.toml b/tracing-macros/Cargo.toml
@@ -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" }
diff --git a/tracing-macros/examples/factorial.rs b/tracing-macros/examples/factorial.rs
@@ -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)));
 }