use tracing

Author: Emilgardis

Cargo.toml

@@ -38,9 +38,10 @@ path = "src/main.rs"
 cast = "0.3"
 clap = "2.33"
 clap_conf = "0.1.5"
-env_logger = "0.9"
 inflections = "1.1"
-log = { version = "~0.4", features = ["std"] }
+tracing = { version = "0.1", default-features = false, features = ["std"] }
+tracing-subscriber = { version = "0.3", default-features = false, features = ["std", "ansi", "fmt", "env-filter", "tracing-log"] }
+
 quote = "1.0"
 proc-macro2 = "1.0"
 anyhow = "1.0"

src/generate/device.rs

@@ -2,7 +2,7 @@ use crate::svd::Device;
 use proc_macro2::{Ident, Span, TokenStream};
 use quote::{quote, ToTokens};
 
-use log::debug;
+use tracing::debug;
 use std::fs::File;
 use std::io::Write;
 

src/generate/peripheral.rs

@@ -6,7 +6,8 @@ use crate::svd::{
     Cluster, ClusterInfo, DeriveFrom, DimElement, Peripheral, Register, RegisterCluster,
     RegisterProperties,
 };
-use log::{debug, trace, warn};
+
+use tracing::{debug, trace, warn};
 use proc_macro2::{Ident, Punct, Spacing, Span, TokenStream};
 use quote::{quote, ToTokens};
 use syn::{parse_str, Token};

src/generate/register.rs

@@ -4,7 +4,7 @@ use crate::svd::{
 };
 use cast::u64;
 use core::u64;
-use log::warn;
+use tracing::warn;
 use proc_macro2::{Ident, Punct, Spacing, Span, TokenStream};
 use quote::{quote, ToTokens};
 

src/main.rs

@@ -1,8 +1,8 @@
 #![recursion_limit = "128"]
 
-use log::{error, info};
 use std::path::PathBuf;
 use svd_parser::svd;
+use tracing::{error, info};
 
 mod generate;
 mod util;
@@ -90,10 +90,9 @@ fn run() -> Result<()> {
                     .short("l")
                     .help(&format!(
                         "Choose which messages to log (overrides {})",
-                        env_logger::DEFAULT_FILTER_ENV
+                        tracing_subscriber::EnvFilter::DEFAULT_ENV
                     ))
                     .takes_value(true)
-                    .possible_values(&["off", "error", "warn", "info", "debug", "trace"]),
             )
             .version(concat!(
                 env!("CARGO_PKG_VERSION"),
@@ -193,29 +192,24 @@ fn run() -> Result<()> {
 }
 
 fn setup_logging<'a>(getter: &'a impl clap_conf::Getter<'a, String>) {
-    // * Log at info by default.
+    // * Log at `info` by default.
     // * Allow users the option of setting complex logging filters using
-    //   env_logger's `RUST_LOG` environment variable.
-    // * Override both of those if the logging level is set via the `--log`
-    //   command line argument.
-    let env = env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info");
-    let mut builder = env_logger::Builder::from_env(env);
-    builder.format_timestamp(None);
-
-    let log_lvl_from_env = std::env::var_os(env_logger::DEFAULT_FILTER_ENV).is_some();
-
-    if log_lvl_from_env {
-        log::set_max_level(log::LevelFilter::Trace);
-    } else {
-        let level = match getter.grab().arg("log_level").conf("log_level").done() {
-            Some(lvl) => lvl.parse().unwrap(),
-            None => log::LevelFilter::Info,
-        };
-        log::set_max_level(level);
-        builder.filter_level(level);
-    }
+    //   the `RUST_LOG` environment variable.
+    // * Override both of those if the logging level is set via
+    //   the `log_level` config setting.
+
+    let filter = match getter.grab().arg("log_level").conf("log_level").done() {
+        Some(lvl) => tracing_subscriber::EnvFilter::from(lvl),
+        None => tracing_subscriber::EnvFilter::from_default_env()
+            .add_directive(tracing::Level::INFO.into()),
+    };
 
-    builder.init();
+    tracing_subscriber::fmt()
+        .without_time()
+        .with_target(true)
+        .with_env_filter(filter)
+        .with_ansi(true)
+        .init();
 }
 
 fn main() {