Skip to content

fix: prefix macro calls with ::core to avoid clashing with local macros #3024

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
merged 3 commits into from
Jul 24, 2024
Merged

fix: prefix macro calls with ::core to avoid clashing with local macros #3024

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1ab24e
fix: prefix macro calls with ::core to avoid clashing with local macros
joshka Jun 30, 2024
5960e0a
fix: use __macro_support:: instead of ::core:: in macros
joshka Jul 2, 2024
b4c1a68
Merge branch 'master' into jm/fix-macro-disambiguation
davidbarsky Jul 23, 2024
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
6 changes: 3 additions & 3 deletions tracing-core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,9 @@ macro_rules! metadata {
$name,
$target,
$level,
::core::option::Option::Some(file!()),
::core::option::Option::Some(line!()),
::core::option::Option::Some(module_path!()),
::core::option::Option::Some(::core::file!()),
::core::option::Option::Some(::core::line!()),
::core::option::Option::Some(::core::module_path!()),
$crate::field::FieldSet::new($fields, $crate::identify_callsite!($callsite)),
$kind,
)
Expand Down
18 changes: 9 additions & 9 deletions tracing/src/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,11 +693,11 @@ macro_rules! event {
(target: $target:expr, parent: $parent:expr, $lvl:expr, { $($fields:tt)* } )=> ({
use $crate::__macro_support::Callsite as _;
static __CALLSITE: $crate::__macro_support::MacroCallsite = $crate::callsite2! {
name: concat!(
name: ::core::concat!(
"event ",
file!(),
::core::file!(),
":",
line!()
::core::line!()
),
kind: $crate::metadata::Kind::EVENT,
target: $target,
Expand Down Expand Up @@ -854,11 +854,11 @@ macro_rules! event {
(target: $target:expr, $lvl:expr, { $($fields:tt)* } )=> ({
use $crate::__macro_support::Callsite as _;
static __CALLSITE: $crate::__macro_support::MacroCallsite = $crate::callsite2! {
name: concat!(
name: ::core::concat!(
"event ",
file!(),
::core::file!(),
":",
line!()
::core::line!()
),
kind: $crate::metadata::Kind::EVENT,
target: $target,
Expand Down Expand Up @@ -1184,11 +1184,11 @@ macro_rules! enabled {
if $crate::level_enabled!($lvl) {
use $crate::__macro_support::Callsite as _;
static __CALLSITE: $crate::__macro_support::MacroCallsite = $crate::callsite2! {
name: concat!(
name: ::core::concat!(
"enabled ",
file!(),
::core::file!(),
":",
line!()
::core::line!()
),
kind: $kind.hint(),
target: $target,
Expand Down