Skip to content

Remove whitespaces added by macros due to token re-parsing #9354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karolk91 merged 5 commits into from
Jul 30, 2025
Merged

Remove whitespaces added by macros due to token re-parsing #9354

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01812cc
Remove whitespaces added by macros due to token re-parsing
karolk91 Jul 28, 2025
9f366f5
Update from github-actions[bot] running command 'prdoc --audience run…
github-actions[bot] Jul 28, 2025
02419e0
Update pr_9354.prdoc
karolk91 Jul 28, 2025
d6263c2
Merge branch 'master' into kk-fix-spaces-in-macros
karolk91 Jul 28, 2025
96657d0
Merge branch 'master' into kk-fix-spaces-in-macros
karolk91 Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Remove whitespaces added by macros due to token re-parsing
  • Loading branch information
@karolk91
karolk91 committed Jul 28, 2025
commit 01812ccfc62b970768e88312c72ecae96eba19ec
20 changes: 10 additions & 10 deletions substrate/frame/benchmarking/src/v1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1818,8 +1818,8 @@ pub fn show_benchmark_debug_info(
#[macro_export]
macro_rules! add_benchmark {
( $params:ident, $batches:ident, $name:path, $location:ty ) => {
let name_string = stringify!($name).as_bytes();
let instance_string = stringify!($location).as_bytes();
let pallet_string = stringify!($name).replace(" ", "").into_bytes();
let instance_string = stringify!($location).replace(" ", "").into_bytes();
let (config, whitelist) = $params;
let $crate::BenchmarkConfig {
pallet,
Expand All @@ -1829,7 +1829,7 @@ macro_rules! add_benchmark {
verify,
internal_repeats,
} = config;
if &pallet[..] == &name_string[..] && &instance[..] == &instance_string[..] {
if &pallet[..] == &pallet_string[..] && &instance[..] == &instance_string[..] {
let benchmark_result = <$location as $crate::Benchmarking>::run_benchmark(
&benchmark[..],
&selected_components[..],
Expand All @@ -1852,7 +1852,7 @@ macro_rules! add_benchmark {
},
Err($crate::BenchmarkError::Stop(e)) => {
$crate::show_benchmark_debug_info(
instance_string,
&instance_string,
benchmark,
selected_components,
verify,
Expand Down Expand Up @@ -1883,8 +1883,8 @@ macro_rules! add_benchmark {

if let Some(final_results) = final_results {
$batches.push($crate::BenchmarkBatch {
pallet: name_string.to_vec(),
instance: instance_string.to_vec(),
pallet: pallet_string,
instance: instance_string,
benchmark: benchmark.clone(),
results: final_results,
});
Expand Down Expand Up @@ -1915,12 +1915,12 @@ macro_rules! add_benchmark {
#[macro_export]
macro_rules! list_benchmark {
( $list:ident, $extra:ident, $name:path, $location:ty ) => {
let pallet_string = stringify!($name).as_bytes();
let instance_string = stringify!($location).as_bytes();
let pallet_string = stringify!($name).replace(" ", "").into_bytes();
let instance_string = stringify!($location).replace(" ", "").into_bytes();
let benchmarks = <$location as $crate::Benchmarking>::benchmarks($extra);
let pallet_benchmarks = $crate::BenchmarkList {
pallet: pallet_string.to_vec(),
instance: instance_string.to_vec(),
pallet: pallet_string,
instance: instance_string,
benchmarks: benchmarks.to_vec(),
};
$list.push(pallet_benchmarks)
Expand Down
Loading