Skip to content

rustc_builtin_macros: rename bench parameter to avoid collisions with user-defined function names #148279

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

rustc_builtin_macros: rename bench parameter to avoid collisions with user-defined function names #148279

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c92aefc
rustc_builtin_macros: rename bench parameter to avoid collisions with…
IntegralPilot Oct 30, 2025
ebe155a
fix typo in comment
IntegralPilot Oct 30, 2025
7f382ac
nit: continue using from_str_and_span as requested
IntegralPilot Oct 31, 2025
595f084
inline param_name as requested
IntegralPilot Nov 5, 2025
50e1b4b
update comment as requested. also change outdated b references in oth…
IntegralPilot Nov 5, 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
14 changes: 7 additions & 7 deletions compiler/rustc_builtin_macros/src/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,30 +207,30 @@ pub(crate) fn expand_test_or_bench(
};

let test_fn = if is_bench {
// A simple ident for a lambda
let b = Ident::from_str_and_span("b", attr_sp);

// A collision-resistant ident for a lambda, using the user's function name within it to avoid collisions.
Copy link
Member

@hkBst hkBst Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is now repeating "collision", and should probably also link to the bug this solves.

Suggested change
// A collision-resistant ident for a lambda, using the user's function name within it to avoid collisions.
// try to avoid name collisions, see bug #148275

let bencher_param =
Ident::from_str_and_span(&format!("__bench_{}", fn_.ident.name), attr_sp);
cx.expr_call(
sp,
cx.expr_path(test_path("StaticBenchFn")),
thin_vec![
// #[coverage(off)]
// |b| self::test::assert_test_result(
// |__bench_fn_name| self::test::assert_test_result(
coverage_off(cx.lambda1(
sp,
cx.expr_call(
sp,
cx.expr_path(test_path("assert_test_result")),
thin_vec![
// super::$test_fn(b)
// super::$test_fn(__bench_fn_name)
cx.expr_call(
ret_ty_sp,
cx.expr_path(cx.path(sp, vec![fn_.ident])),
thin_vec![cx.expr_ident(sp, b)],
thin_vec![cx.expr_ident(sp, bencher_param)],
),
],
),
b,
bencher_param,
)), // )
],
)
Expand Down
Loading