changes

Author: Emilgardis

src/generate/device.rs

@@ -2,9 +2,9 @@ use crate::svd::Device;
 use proc_macro2::{Ident, Span, TokenStream};
 use quote::{quote, ToTokens};
 
-use tracing::debug;
 use std::fs::File;
 use std::io::Write;
+use tracing::debug;
 
 use crate::util::{self, Config, ToSanitizedUpperCase};
 use crate::Target;
@@ -194,7 +194,6 @@ pub fn render(d: &Device, config: &Config, device_x: &mut String) -> Result<Toke
             continue;
         }
 
-        debug!("Rendering peripheral {}", p.name);
         match peripheral::render(p, &d.peripherals, &d.default_register_properties, config) {
             Ok(periph) => out.extend(periph),
             Err(e) => {

src/generate/peripheral.rs

@@ -7,10 +7,10 @@ use crate::svd::{
     RegisterProperties,
 };
 
-use tracing::{debug, trace, warn};
 use proc_macro2::{Ident, Punct, Spacing, Span, TokenStream};
 use quote::{quote, ToTokens};
 use syn::{parse_str, Token};
+use tracing::{debug, trace, warn};
 
 use crate::util::{
     self, handle_cluster_error, handle_reg_error, Config, FullName, ToSanitizedSnakeCase,
@@ -27,6 +27,8 @@ pub fn render(
     defaults: &RegisterProperties,
     config: &Config,
 ) -> Result<TokenStream> {
+    debug!("Rendering peripheral {}", p_original.name);
+
     let mut out = TokenStream::new();
 
     let p_derivedfrom = p_original
@@ -177,17 +179,24 @@ pub fn render(
     let mut mod_items = TokenStream::new();
     mod_items.extend(register_or_cluster_block(&ercs, &defaults, None, config)?);
 
-    debug!("Pushing cluster information into output");
+    if !clusters.is_empty() {
+        debug!("Pushing cluster information into output");
+    }
     // Push all cluster related information into the peripheral module
     for c in &clusters {
-        trace!("Pushing cluster: {}", c.name);
-        mod_items.extend(render_cluster_block(c, &defaults, p, all_peripherals, config)?);
+        mod_items.extend(render_cluster_block(
+            c,
+            &defaults,
+            p,
+            all_peripherals,
+            config,
+        )?);
+    }
+    if !registers.is_empty() {
+        debug!("Pushing register information into output");
     }
-
-    debug!("Pushing register information into output");
     // Push all register related information into the peripheral module
     for reg in registers {
-        trace!("Pushing register: {}", reg.name);
         match register::render(reg, registers, p, all_peripherals, &defaults, config) {
             Ok(rendered_reg) => mod_items.extend(rendered_reg),
             Err(e) => {
@@ -581,7 +590,6 @@ fn register_or_cluster_block(
 
 /// Expand a list of parsed `Register`s or `Cluster`s, and render them to
 /// `RegisterBlockField`s containing `Field`s.
-#[tracing::instrument(skip_all, fields(module = name))]
 fn expand(
     ercs: &[RegisterCluster],
     defs: &RegisterProperties,
@@ -596,7 +604,6 @@ fn expand(
             RegisterCluster::Register(register) => {
                 match expand_register(register, defs, name, config) {
                     Ok(expanded_reg) => {
-                        trace!("Expanding register: {}", register.name);
                         ercs_expanded.extend(expanded_reg);
                     }
                     Err(e) => {
@@ -608,7 +615,6 @@ fn expand(
             RegisterCluster::Cluster(cluster) => {
                 match expand_cluster(cluster, defs, name, config) {
                     Ok(expanded_cluster) => {
-                        trace!("Expanding cluster: {}", cluster.name);
                         ercs_expanded.extend(expanded_cluster);
                     }
                     Err(e) => {
@@ -684,13 +690,15 @@ fn cluster_info_size_in_bits(
 }
 
 /// Render a given cluster (and any children) into `RegisterBlockField`s
-#[tracing::instrument(skip_all, fields(cluster.name = cluster.name(), module = name))]
+#[tracing::instrument(skip_all, fields(cluster.name = %cluster.name, module = name))]
 fn expand_cluster(
     cluster: &Cluster,
     defs: &RegisterProperties,
     name: Option<&str>,
     config: &Config,
 ) -> Result<Vec<RegisterBlockField>> {
+    trace!("Expanding cluster: {}", cluster.name);
+
     let mut cluster_expanded = vec![];
 
     let defs = cluster.default_register_properties.derive_from(defs);
@@ -747,13 +755,14 @@ fn expand_cluster(
 
 /// If svd register arrays can't be converted to rust arrays (non sequential addresses, non
 /// numeral indexes, or not containing all elements from 0 to size) they will be expanded
-#[tracing::instrument(skip_all, fields(register.name = %register.name, module = name))]
+#[tracing::instrument(skip_all, fields(register.name = %register.name))]
 fn expand_register(
     register: &Register,
     defs: &RegisterProperties,
     name: Option<&str>,
     config: &Config,
 ) -> Result<Vec<RegisterBlockField>> {
+    trace!("Expanding register: {}", register.name);
     let mut register_expanded = vec![];
 
     let register_size = register
@@ -810,14 +819,16 @@ fn expand_register(
 }
 
 /// Render a Cluster Block into `TokenStream`
-#[tracing::instrument(skip_all, fields(peripheral.name = %p.name, cluster.name = %c.name()))]
+#[tracing::instrument(skip_all, fields(peripheral.name = %p.name, cluster.name = %c.name))]
 fn render_cluster_block(
     c: &Cluster,
     defaults: &RegisterProperties,
     p: &Peripheral,
     all_peripherals: &[Peripheral],
     config: &Config,
 ) -> Result<TokenStream> {
+    debug!("Rendering cluster: {}", c.name);
+
     let mut mod_items = TokenStream::new();
 
     // name_sc needs to take into account array type.
@@ -857,7 +868,13 @@ fn render_cluster_block(
     // Generate the sub-cluster blocks.
     let clusters = util::only_clusters(&c.children);
     for c in &clusters {
-        mod_items.extend(render_cluster_block(c, &defaults, p, all_peripherals, config)?);
+        mod_items.extend(render_cluster_block(
+            c,
+            &defaults,
+            p,
+            all_peripherals,
+            config,
+        )?);
     }
 
     Ok(quote! {

src/generate/register.rs

@@ -4,9 +4,9 @@ use crate::svd::{
 };
 use cast::u64;
 use core::u64;
-use tracing::warn;
 use proc_macro2::{Ident, Punct, Spacing, Span, TokenStream};
 use quote::{quote, ToTokens};
+use tracing::{debug, warn};
 
 use crate::util::{self, Config, ToSanitizedSnakeCase, ToSanitizedUpperCase, U32Ext};
 use anyhow::{anyhow, Result};
@@ -20,6 +20,7 @@ pub fn render(
     defs: &RegisterProperties,
     config: &Config,
 ) -> Result<TokenStream> {
+    debug!("Rendering register: {}", register.name);
     let access = util::access_of(register);
     let name = util::name_of(register, config.ignore_groups);
     let span = Span::call_site();

src/main.rs

@@ -92,7 +92,7 @@ fn run() -> Result<()> {
                         "Choose which messages to log (overrides {})",
                         tracing_subscriber::EnvFilter::DEFAULT_ENV
                     ))
-                    .takes_value(true)
+                    .takes_value(true),
             )
             .version(concat!(
                 env!("CARGO_PKG_VERSION"),
@@ -206,8 +206,9 @@ fn setup_logging<'a>(getter: &'a impl clap_conf::Getter<'a, String>) {
 
     tracing_subscriber::fmt()
         .without_time()
-        .with_target(true)
+        .with_target(false)
         .with_env_filter(filter)
+        .compact()
         .with_ansi(true)
         .init();
 }