Merge pull request #880 from Dirbaio/collapse-fns

Merge function calls emitted by the macro to save space.

Author: Urhengulas

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- [#880]: Merge function calls emitted by the macro to save space.
 - [#874]: `defmt`: Fix doc test
 - [#872]: `defmt`: Add `expect!` as alias for `unwrap!` for discoverability
 - [#871]: Set MSRV to Rust 1.76

defmt/src/export/mod.rs

@@ -209,11 +209,22 @@ pub fn display(val: &dyn core::fmt::Display) {
 }
 
 #[inline(never)]
-pub fn header(s: &Str) {
+pub unsafe fn acquire_and_header(s: &Str) {
+    acquire();
     istr(s);
     timestamp(make_formatter());
 }
 
+#[inline(never)]
+pub fn acquire_header_and_release(s: &Str) {
+    // safety: will be released a few lines further down
+    unsafe { acquire() };
+    istr(s);
+    timestamp(make_formatter());
+    // safety: acquire() was called a few lines above
+    unsafe { release() };
+}
+
 struct FmtWrite;
 
 impl core::fmt::Write for FmtWrite {

macros/src/function_like/log.rs

@@ -41,16 +41,25 @@ pub(crate) fn expand_parsed(level: Level, args: Args) -> TokenStream2 {
     let env_filter = EnvFilter::from_env_var();
 
     if let Some(filter_check) = env_filter.path_check(level) {
+        let content = if exprs.is_empty() {
+            quote!(
+                defmt::export::acquire_header_and_release(&#header);
+            )
+        } else {
+            quote!(
+                // safety: will be released a few lines further down
+                unsafe { defmt::export::acquire_and_header(&#header); };
+                #(#exprs;)*
+                // safety: acquire() was called a few lines above
+                unsafe { defmt::export::release() }
+            )
+        };
+
         quote!(
             match (#(&(#formatting_exprs)),*) {
                 (#(#patterns),*) => {
                     if #filter_check {
-                        // safety: will be released a few lines further down
-                        unsafe { defmt::export::acquire() };
-                        defmt::export::header(&#header);
-                        #(#exprs;)*
-                        // safety: acquire() was called a few lines above
-                        unsafe { defmt::export::release() }
+                        #content
                     }
                 }
             }

macros/src/function_like/println.rs

@@ -35,15 +35,23 @@ pub(crate) fn expand_parsed(args: Args) -> TokenStream2 {
     );
 
     let header = construct::interned_string(&format_string, "println", true, None);
+    let content = if exprs.is_empty() {
+        quote!(
+            defmt::export::acquire_header_and_release(&#header);
+        )
+    } else {
+        quote!(
+            // safety: will be released a few lines further down
+            unsafe { defmt::export::acquire_and_header(&#header); };
+            #(#exprs;)*
+            // safety: acquire() was called a few lines above
+            unsafe { defmt::export::release() }
+        )
+    };
     quote!({
         match (#(&(#formatting_exprs)),*) {
             (#(#patterns),*) => {
-                // safety: will be released a few lines further down
-                unsafe { defmt::export::acquire(); }
-                defmt::export::header(&#header);
-                #(#exprs;)*
-                // safety: acquire() was called a few lines above
-                unsafe { defmt::export::release() }
+                #content
             }
         }
     })