From 545d223badc61d1f40d6539efc1a4b68b523adba Mon Sep 17 00:00:00 2001
From: "cmd[bot]" <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 6 Mar 2025 10:34:33 +0000
Subject: [PATCH] Update from seemantaggarwal running command 'fmt'
---
.../client/tracing/proc-macro/src/lib.rs | 74 +++++++++----------
.../client/tracing/proc-macro/src/utils.rs | 20 +++--
substrate/client/tracing/src/logging/mod.rs | 1 -
3 files changed, 46 insertions(+), 49 deletions(-)
diff --git a/substrate/client/tracing/proc-macro/src/lib.rs b/substrate/client/tracing/proc-macro/src/lib.rs
index dacb0f37769..9108b4f202c 100644
--- a/substrate/client/tracing/proc-macro/src/lib.rs
+++ b/substrate/client/tracing/proc-macro/src/lib.rs
@@ -104,45 +104,45 @@ mod utils;
#[proc_macro_attribute]
pub fn prefix_logs_with(arg: TokenStream, item: TokenStream) -> TokenStream {
- // Ensure an argument was provided.
- if arg.is_empty() {
- return Error::new(
- proc_macro2::Span::call_site(),
- "missing argument: prefix. Example: prefix_logs_with(\"Relaychain\")",
- )
- .to_compile_error()
- .into();
- }
+ // Ensure an argument was provided.
+ if arg.is_empty() {
+ return Error::new(
+ proc_macro2::Span::call_site(),
+ "missing argument: prefix. Example: prefix_logs_with(\"Relaychain\")",
+ )
+ .to_compile_error()
+ .into();
+ }
- let prefix_expr = syn::parse_macro_input!(arg as Expr);
- let item_fn = syn::parse_macro_input!(item as ItemFn);
+ let prefix_expr = syn::parse_macro_input!(arg as Expr);
+ let item_fn = syn::parse_macro_input!(item as ItemFn);
- // Resolve the proper sc_tracing path.
- let resolved_crate = match utils::resolve_sc_tracing() {
- Ok(path) => path,
- Err(err) => return err.to_compile_error().into(),
- };
+ // Resolve the proper sc_tracing path.
+ let resolved_crate = match utils::resolve_sc_tracing() {
+ Ok(path) => path,
+ Err(err) => return err.to_compile_error().into(),
+ };
- let syn::ItemFn { attrs, vis, sig, block } = item_fn;
+ let syn::ItemFn { attrs, vis, sig, block } = item_fn;
- // Generate different output based on whether the function is async.
- let output = if sig.asyncness.is_some() {
- // Async branch: wrap the block in a closure that returns an async block.
- quote! {
- #(#attrs)*
- #vis #sig {
- #resolved_crate::logging::apply_prefix_async(#prefix_expr, || async { #block }).await
- }
- }
- } else {
- // Sync branch: call the synchronous logging helper.
- quote! {
- #(#attrs)*
- #vis #sig {
- #resolved_crate::logging::apply_prefix_sync(#prefix_expr, || { #block })
- }
- }
- };
+ // Generate different output based on whether the function is async.
+ let output = if sig.asyncness.is_some() {
+ // Async branch: wrap the block in a closure that returns an async block.
+ quote! {
+ #(#attrs)*
+ #vis #sig {
+ #resolved_crate::logging::apply_prefix_async(#prefix_expr, || async { #block }).await
+ }
+ }
+ } else {
+ // Sync branch: call the synchronous logging helper.
+ quote! {
+ #(#attrs)*
+ #vis #sig {
+ #resolved_crate::logging::apply_prefix_sync(#prefix_expr, || { #block })
+ }
+ }
+ };
- output.into()
-}
\ No newline at end of file
+ output.into()
+}
diff --git a/substrate/client/tracing/proc-macro/src/utils.rs b/substrate/client/tracing/proc-macro/src/utils.rs
index c99ee80472c..d875dff21ba 100644
--- a/substrate/client/tracing/proc-macro/src/utils.rs
+++ b/substrate/client/tracing/proc-macro/src/utils.rs
@@ -6,15 +6,13 @@ use syn::{Path, Result};
/// - If `polkadot-sdk` is in scope, returns a Path corresponding to `polkadot_sdk::sc_tracing`
/// - Otherwise, falls back to `sc_tracing`
pub fn resolve_sc_tracing() -> Result<Path> {
- match crate_name("polkadot-sdk") {
- Ok(FoundCrate::Itself) => syn::parse_str("polkadot_sdk::sc_tracing"),
- Ok(FoundCrate::Name(sdk_name)) => syn::parse_str(&format!("{}::sc_tracing", sdk_name)),
- Err(_) => {
- match crate_name("sc-tracing") {
- Ok(FoundCrate::Itself) => syn::parse_str("sc_tracing"),
- Ok(FoundCrate::Name(name)) => syn::parse_str(&name),
- Err(e) => Err(syn::Error::new(Span::call_site(), e)),
- }
- }
- }
+ match crate_name("polkadot-sdk") {
+ Ok(FoundCrate::Itself) => syn::parse_str("polkadot_sdk::sc_tracing"),
+ Ok(FoundCrate::Name(sdk_name)) => syn::parse_str(&format!("{}::sc_tracing", sdk_name)),
+ Err(_) => match crate_name("sc-tracing") {
+ Ok(FoundCrate::Itself) => syn::parse_str("sc_tracing"),
+ Ok(FoundCrate::Name(name)) => syn::parse_str(&name),
+ Err(e) => Err(syn::Error::new(Span::call_site(), e)),
+ },
+ }
}
diff --git a/substrate/client/tracing/src/logging/mod.rs b/substrate/client/tracing/src/logging/mod.rs
index fd5edfccc18..98547ccf523 100644
--- a/substrate/client/tracing/src/logging/mod.rs
+++ b/substrate/client/tracing/src/logging/mod.rs
@@ -96,7 +96,6 @@ where
f().await
}
-
/// Convert a `Option<LevelFilter>` to a [`log::LevelFilter`].
///
/// `None` is interpreted as `Info`.
--
GitLab