Skip to content

tracing: revert "make valueset macro sanitary" #3425

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
hds merged 1 commit into from
Nov 27, 2025
Merged

tracing: revert "make valueset macro sanitary" #3425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions tracing/src/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2971,6 +2971,9 @@ macro_rules! valueset {
($fields:expr, $($kvs:tt)+) => {
{
#[allow(unused_imports)]
// This import statement CANNOT be removed as it will break existing use cases.
// See #831, #2332, #3424 for the last times we tried.
use $crate::field::{debug, display, Value};
$fields.value_set_all($crate::valueset!(
@ { },
$($kvs)+
Expand Down
56 changes: 41 additions & 15 deletions tracing/tests/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ fn span() {
span!(Level::DEBUG, "foo", bar.baz = %2);
span!(Level::DEBUG, "foo");
span!(Level::DEBUG, "bar",);
span!(
Level::DEBUG,
"bar",
foo = display("foo"),
quux = debug(::std::option::Option::Some(2))
);
}

#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
Expand All @@ -58,6 +64,11 @@ fn trace_span() {
trace_span!("foo", bar.baz = %2);
trace_span!("bar");
trace_span!("bar",);
trace_span!(
"bar",
foo = display("foo"),
quux = debug(::std::option::Option::Some(2))
);
}

#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
Expand All @@ -74,6 +85,11 @@ fn debug_span() {
debug_span!("foo", bar.baz = %2);
debug_span!("bar");
debug_span!("bar",);
debug_span!(
"bar",
foo = display("foo"),
quux = debug(::std::option::Option::Some(2))
);
}

#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
Expand All @@ -90,6 +106,11 @@ fn info_span() {
info_span!("foo", bar.baz = %2);
info_span!("bar");
info_span!("bar",);
info_span!(
"bar",
foo = display("foo"),
quux = debug(::std::option::Option::Some(2))
);
}

#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
Expand All @@ -106,6 +127,11 @@ fn warn_span() {
warn_span!("foo", bar.baz = %2);
warn_span!("bar");
warn_span!("bar",);
warn_span!(
"bar",
foo = display("foo"),
quux = debug(::std::option::Option::Some(2))
);
}

#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
Expand All @@ -122,6 +148,11 @@ fn error_span() {
error_span!("foo", bar.baz = %2);
error_span!("bar");
error_span!("bar",);
error_span!(
"bar",
foo = display("foo"),
quux = debug(::std::option::Option::Some(2))
);
}

#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
Expand Down Expand Up @@ -452,6 +483,11 @@ fn event() {
event!(Level::DEBUG, ?foo);
event!(Level::DEBUG, %foo);
event!(Level::DEBUG, foo);
event!(
Level::DEBUG,
foo = display("foo"),
quux = debug(::std::option::Option::Some(2))
);
}

#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
Expand Down Expand Up @@ -621,9 +657,7 @@ fn trace() {
trace!(target: "foo_events", %foo, true, "message");
trace!(name: "foo", target: "foo_events", ?foo, true, "message");
trace!(name: "foo", target: "foo_events", %foo, true, "message");
let debug = "debug";
let display = "display";
trace!("{debug:?} {display:?}");
trace!(foo = display("foo"), quux = debug(foo));
}

#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
Expand Down Expand Up @@ -691,9 +725,7 @@ fn debug() {
debug!(target: "foo_events", %foo, true, "message");
debug!(name: "foo", target: "foo_events", ?foo, true, "message");
debug!(name: "foo", target: "foo_events", %foo, true, "message");
let debug = "debug";
let display = "display";
debug!("{debug:?} {display:?}");
debug!(foo = display("foo"), quux = debug(foo));
}

#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
Expand Down Expand Up @@ -761,9 +793,7 @@ fn info() {
info!(target: "foo_events", %foo, true, "message");
info!(name: "foo", target: "foo_events", ?foo, true, "message");
info!(name: "foo", target: "foo_events", %foo, true, "message");
let debug = "debug";
let display = "display";
info!("{debug:?} {display:?}");
info!(foo = display("foo"), quux = debug(foo));
}

#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
Expand Down Expand Up @@ -831,9 +861,7 @@ fn warn() {
warn!(target: "foo_events", %foo, true, "message");
warn!(name: "foo", target: "foo_events", ?foo, true, "message");
warn!(name: "foo", target: "foo_events", %foo, true, "message");
let debug = "debug";
let display = "display";
warn!("{debug:?} {display:?}");
warn!(foo = display("foo"), quux = debug(foo));
}

#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
Expand Down Expand Up @@ -901,9 +929,7 @@ fn error() {
error!(target: "foo_events", %foo, true, "message");
error!(name: "foo", target: "foo_events", ?foo, true, "message");
error!(name: "foo", target: "foo_events", %foo, true, "message");
let debug = "debug";
let display = "display";
error!("{debug:?} {display:?}");
error!(foo = display("foo"), quux = debug(foo));
}

#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
Expand Down