Skip to content

Commit

Permalink
rename callsite in new macro cases from #2699
Browse files Browse the repository at this point in the history
  • Loading branch information
@hawkw
hawkw committed Sep 5, 2023
1 parent cb5b499 commit 5d65b45
Showing 1 changed file with 32 additions and 32 deletions.
64 changes: 32 additions & 32 deletions tracing/src/macros.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ macro_rules! event {
// Name / target / parent.
(name: $name:expr, target: $target:expr, parent: $parent:expr, $lvl:expr, { $($fields:tt)* } )=> ({
use $crate::__macro_support::Callsite as _;
static CALLSITE: $crate::__macro_support::MacroCallsite = $crate::callsite2! {
static __CALLSITE: $crate::__macro_support::MacroCallsite = $crate::callsite2! {
name: $name,
kind: $crate::metadata::Kind::EVENT,
target: $target,
Expand All @@ -596,29 +596,29 @@ macro_rules! event {
};

let enabled = $crate::level_enabled!($lvl) && {
let interest = CALLSITE.interest();
!interest.is_never() && CALLSITE.is_enabled(interest)
let interest = __CALLSITE.interest();
!interest.is_never() && __CALLSITE.is_enabled(interest)
};
if enabled {
(|value_set: $crate::field::ValueSet| {
$crate::__tracing_log!(
$lvl,
CALLSITE,
__CALLSITE,
&value_set
);
let meta = CALLSITE.metadata();
let meta = __CALLSITE.metadata();
// event with explicit parent
$crate::Event::child_of(
$parent,
meta,
&value_set
);
})($crate::valueset!(CALLSITE.metadata().fields(), $($fields)*));
})($crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*));
} else {
$crate::__tracing_log!(
$lvl,
CALLSITE,
&$crate::valueset!(CALLSITE.metadata().fields(), $($fields)*)
__CALLSITE,
&$crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*)
);
}
});
Expand All @@ -641,36 +641,36 @@ macro_rules! event {
// Name / target.
(name: $name:expr, target: $target:expr, $lvl:expr, { $($fields:tt)* } )=> ({
use $crate::__macro_support::Callsite as _;
static CALLSITE: $crate::__macro_support::MacroCallsite = $crate::callsite2! {
static __CALLSITE: $crate::__macro_support::MacroCallsite = $crate::callsite2! {
name: $name,
kind: $crate::metadata::Kind::EVENT,
target: $target,
level: $lvl,
fields: $($fields)*
};
let enabled = $crate::level_enabled!($lvl) && {
let interest = CALLSITE.interest();
!interest.is_never() && CALLSITE.is_enabled(interest)
let interest = __CALLSITE.interest();
!interest.is_never() && __CALLSITE.is_enabled(interest)
};
if enabled {
(|value_set: $crate::field::ValueSet| {
let meta = CALLSITE.metadata();
let meta = __CALLSITE.metadata();
// event with contextual parent
$crate::Event::dispatch(
meta,
&value_set
);
$crate::__tracing_log!(
$lvl,
CALLSITE,
__CALLSITE,
&value_set
);
})($crate::valueset!(CALLSITE.metadata().fields(), $($fields)*));
})($crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*));
} else {
$crate::__tracing_log!(
$lvl,
CALLSITE,
&$crate::valueset!(CALLSITE.metadata().fields(), $($fields)*)
__CALLSITE,
&$crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*)
);
}
});
Expand Down Expand Up @@ -750,7 +750,7 @@ macro_rules! event {
// Name / parent.
(name: $name:expr, parent: $parent:expr, $lvl:expr, { $($fields:tt)* } )=> ({
use $crate::__macro_support::Callsite as _;
static CALLSITE: $crate::__macro_support::MacroCallsite = $crate::callsite2! {
static __CALLSITE: $crate::__macro_support::MacroCallsite = $crate::callsite2! {
name: $name,
kind: $crate::metadata::Kind::EVENT,
target: module_path!(),
Expand All @@ -759,29 +759,29 @@ macro_rules! event {
};

let enabled = $crate::level_enabled!($lvl) && {
let interest = CALLSITE.interest();
!interest.is_never() && CALLSITE.is_enabled(interest)
let interest = __CALLSITE.interest();
!interest.is_never() && __CALLSITE.is_enabled(interest)
};
if enabled {
(|value_set: $crate::field::ValueSet| {
$crate::__tracing_log!(
$lvl,
CALLSITE,
__CALLSITE,
&value_set
);
let meta = CALLSITE.metadata();
let meta = __CALLSITE.metadata();
// event with explicit parent
$crate::Event::child_of(
$parent,
meta,
&value_set
);
})($crate::valueset!(CALLSITE.metadata().fields(), $($fields)*));
})($crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*));
} else {
$crate::__tracing_log!(
$lvl,
CALLSITE,
&$crate::valueset!(CALLSITE.metadata().fields(), $($fields)*)
__CALLSITE,
&$crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*)
);
}
});
Expand All @@ -803,36 +803,36 @@ macro_rules! event {
// Name.
(name: $name:expr, $lvl:expr, { $($fields:tt)* } )=> ({
use $crate::__macro_support::Callsite as _;
static CALLSITE: $crate::__macro_support::MacroCallsite = $crate::callsite2! {
static __CALLSITE: $crate::__macro_support::MacroCallsite = $crate::callsite2! {
name: $name,
kind: $crate::metadata::Kind::EVENT,
target: module_path!(),
level: $lvl,
fields: $($fields)*
};
let enabled = $crate::level_enabled!($lvl) && {
let interest = CALLSITE.interest();
!interest.is_never() && CALLSITE.is_enabled(interest)
let interest = __CALLSITE.interest();
!interest.is_never() && __CALLSITE.is_enabled(interest)
};
if enabled {
(|value_set: $crate::field::ValueSet| {
let meta = CALLSITE.metadata();
let meta = __CALLSITE.metadata();
// event with contextual parent
$crate::Event::dispatch(
meta,
&value_set
);
$crate::__tracing_log!(
$lvl,
CALLSITE,
__CALLSITE,
&value_set
);
})($crate::valueset!(CALLSITE.metadata().fields(), $($fields)*));
})($crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*));
} else {
$crate::__tracing_log!(
$lvl,
CALLSITE,
&$crate::valueset!(CALLSITE.metadata().fields(), $($fields)*)
__CALLSITE,
&$crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*)
);
}
});
Expand Down

0 comments on commit 5d65b45

Please sign in to comment.