Skip to content

Commit 045b22e

Browse files
Turbo87Turbo87
authored
macros: Fix missing field prefixes (#2878)
## Motivation In the simple macro cases with e.g. only "name" or only "target" these prefixes exist, but for the more complicated cases like "name + target" the prefixes were not piped through and silently ignored. This led to the compiler complaining about `Value` not being implemented despite the usage of the `?` or `%` prefixes: <img width="1056" alt="Bildschirmfoto 2024-02-14 um 12 38 00" src="https://github.com/tokio-rs/tracing/assets/141300/f8b0b1af-fe66-41d8-9a08-2ecba2d67f9e"> ## Solution This change adds the missing prefixes to the `$($k)` tokens, like they already exist for the simple cases mentioned above.
1 parent baeba47 commit 045b22e

File tree

2 files changed

+115
-40
lines changed

2 files changed

+115
-40
lines changed

‎tracing/src/macros.rs

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,10 +1307,10 @@ macro_rules! trace {
13071307
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
13081308
);
13091309
(name: $name:expr, target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
1310-
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
1310+
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::TRACE, { ?$($k).+ $($field)+ })
13111311
);
13121312
(name: $name:expr, target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
1313-
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
1313+
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::TRACE, { %$($k).+ $($field)+ })
13141314
);
13151315
(name: $name:expr, target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
13161316
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::TRACE, {}, $($arg)+)
@@ -1324,10 +1324,10 @@ macro_rules! trace {
13241324
$crate::event!(name: $name, target: $target, $crate::Level::TRACE, { $($k).+ $($field)+ })
13251325
);
13261326
(name: $name:expr, target: $target:expr, ?$($k:ident).+ $($field:tt)+ ) => (
1327-
$crate::event!(name: $name, target: $target, $crate::Level::TRACE, { $($k).+ $($field)+ })
1327+
$crate::event!(name: $name, target: $target, $crate::Level::TRACE, { ?$($k).+ $($field)+ })
13281328
);
13291329
(name: $name:expr, target: $target:expr, %$($k:ident).+ $($field:tt)+ ) => (
1330-
$crate::event!(name: $name, target: $target, $crate::Level::TRACE, { $($k).+ $($field)+ })
1330+
$crate::event!(name: $name, target: $target, $crate::Level::TRACE, { %$($k).+ $($field)+ })
13311331
);
13321332
(name: $name:expr, target: $target:expr, $($arg:tt)+ ) => (
13331333
$crate::event!(name: $name, target: $target, $crate::Level::TRACE, {}, $($arg)+)
@@ -1341,10 +1341,10 @@ macro_rules! trace {
13411341
$crate::event!(target: $target, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
13421342
);
13431343
(target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
1344-
$crate::event!(target: $target, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
1344+
$crate::event!(target: $target, parent: $parent, $crate::Level::TRACE, { ?$($k).+ $($field)+ })
13451345
);
13461346
(target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
1347-
$crate::event!(target: $target, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
1347+
$crate::event!(target: $target, parent: $parent, $crate::Level::TRACE, { %$($k).+ $($field)+ })
13481348
);
13491349
(target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
13501350
$crate::event!(target: $target, parent: $parent, $crate::Level::TRACE, {}, $($arg)+)
@@ -1358,10 +1358,10 @@ macro_rules! trace {
13581358
$crate::event!(name: $name, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
13591359
);
13601360
(name: $name:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
1361-
$crate::event!(name: $name, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
1361+
$crate::event!(name: $name, parent: $parent, $crate::Level::TRACE, { ?$($k).+ $($field)+ })
13621362
);
13631363
(name: $name:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
1364-
$crate::event!(name: $name, parent: $parent, $crate::Level::TRACE, { $($k).+ $($field)+ })
1364+
$crate::event!(name: $name, parent: $parent, $crate::Level::TRACE, { %$($k).+ $($field)+ })
13651365
);
13661366
(name: $name:expr, parent: $parent:expr, $($arg:tt)+ ) => (
13671367
$crate::event!(name: $name, parent: $parent, $crate::Level::TRACE, {}, $($arg)+)
@@ -1584,10 +1584,10 @@ macro_rules! debug {
15841584
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
15851585
);
15861586
(name: $name:expr, target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
1587-
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
1587+
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::DEBUG, { ?$($k).+ $($field)+ })
15881588
);
15891589
(name: $name:expr, target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
1590-
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
1590+
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::DEBUG, { %$($k).+ $($field)+ })
15911591
);
15921592
(name: $name:expr, target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
15931593
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::DEBUG, {}, $($arg)+)
@@ -1601,10 +1601,10 @@ macro_rules! debug {
16011601
$crate::event!(name: $name, target: $target, $crate::Level::DEBUG, { $($k).+ $($field)+ })
16021602
);
16031603
(name: $name:expr, target: $target:expr, ?$($k:ident).+ $($field:tt)+ ) => (
1604-
$crate::event!(name: $name, target: $target, $crate::Level::DEBUG, { $($k).+ $($field)+ })
1604+
$crate::event!(name: $name, target: $target, $crate::Level::DEBUG, { ?$($k).+ $($field)+ })
16051605
);
16061606
(name: $name:expr, target: $target:expr, %$($k:ident).+ $($field:tt)+ ) => (
1607-
$crate::event!(name: $name, target: $target, $crate::Level::DEBUG, { $($k).+ $($field)+ })
1607+
$crate::event!(name: $name, target: $target, $crate::Level::DEBUG, { %$($k).+ $($field)+ })
16081608
);
16091609
(name: $name:expr, target: $target:expr, $($arg:tt)+ ) => (
16101610
$crate::event!(name: $name, target: $target, $crate::Level::DEBUG, {}, $($arg)+)
@@ -1618,10 +1618,10 @@ macro_rules! debug {
16181618
$crate::event!(target: $target, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
16191619
);
16201620
(target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
1621-
$crate::event!(target: $target, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
1621+
$crate::event!(target: $target, parent: $parent, $crate::Level::DEBUG, { ?$($k).+ $($field)+ })
16221622
);
16231623
(target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
1624-
$crate::event!(target: $target, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
1624+
$crate::event!(target: $target, parent: $parent, $crate::Level::DEBUG, { %$($k).+ $($field)+ })
16251625
);
16261626
(target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
16271627
$crate::event!(target: $target, parent: $parent, $crate::Level::DEBUG, {}, $($arg)+)
@@ -1635,10 +1635,10 @@ macro_rules! debug {
16351635
$crate::event!(name: $name, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
16361636
);
16371637
(name: $name:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
1638-
$crate::event!(name: $name, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
1638+
$crate::event!(name: $name, parent: $parent, $crate::Level::DEBUG, { ?$($k).+ $($field)+ })
16391639
);
16401640
(name: $name:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
1641-
$crate::event!(name: $name, parent: $parent, $crate::Level::DEBUG, { $($k).+ $($field)+ })
1641+
$crate::event!(name: $name, parent: $parent, $crate::Level::DEBUG, { %$($k).+ $($field)+ })
16421642
);
16431643
(name: $name:expr, parent: $parent:expr, $($arg:tt)+ ) => (
16441644
$crate::event!(name: $name, parent: $parent, $crate::Level::DEBUG, {}, $($arg)+)
@@ -1872,10 +1872,10 @@ macro_rules! info {
18721872
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
18731873
);
18741874
(name: $name:expr, target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
1875-
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
1875+
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::INFO, { ?$($k).+ $($field)+ })
18761876
);
18771877
(name: $name:expr, target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
1878-
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
1878+
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::INFO, { %$($k).+ $($field)+ })
18791879
);
18801880
(name: $name:expr, target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
18811881
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::INFO, {}, $($arg)+)
@@ -1889,10 +1889,10 @@ macro_rules! info {
18891889
$crate::event!(name: $name, target: $target, $crate::Level::INFO, { $($k).+ $($field)+ })
18901890
);
18911891
(name: $name:expr, target: $target:expr, ?$($k:ident).+ $($field:tt)+ ) => (
1892-
$crate::event!(name: $name, target: $target, $crate::Level::INFO, { $($k).+ $($field)+ })
1892+
$crate::event!(name: $name, target: $target, $crate::Level::INFO, { ?$($k).+ $($field)+ })
18931893
);
18941894
(name: $name:expr, target: $target:expr, %$($k:ident).+ $($field:tt)+ ) => (
1895-
$crate::event!(name: $name, target: $target, $crate::Level::INFO, { $($k).+ $($field)+ })
1895+
$crate::event!(name: $name, target: $target, $crate::Level::INFO, { %$($k).+ $($field)+ })
18961896
);
18971897
(name: $name:expr, target: $target:expr, $($arg:tt)+ ) => (
18981898
$crate::event!(name: $name, target: $target, $crate::Level::INFO, {}, $($arg)+)
@@ -1906,10 +1906,10 @@ macro_rules! info {
19061906
$crate::event!(target: $target, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
19071907
);
19081908
(target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
1909-
$crate::event!(target: $target, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
1909+
$crate::event!(target: $target, parent: $parent, $crate::Level::INFO, { ?$($k).+ $($field)+ })
19101910
);
19111911
(target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
1912-
$crate::event!(target: $target, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
1912+
$crate::event!(target: $target, parent: $parent, $crate::Level::INFO, { %$($k).+ $($field)+ })
19131913
);
19141914
(target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
19151915
$crate::event!(target: $target, parent: $parent, $crate::Level::INFO, {}, $($arg)+)
@@ -1923,10 +1923,10 @@ macro_rules! info {
19231923
$crate::event!(name: $name, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
19241924
);
19251925
(name: $name:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
1926-
$crate::event!(name: $name, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
1926+
$crate::event!(name: $name, parent: $parent, $crate::Level::INFO, { ?$($k).+ $($field)+ })
19271927
);
19281928
(name: $name:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
1929-
$crate::event!(name: $name, parent: $parent, $crate::Level::INFO, { $($k).+ $($field)+ })
1929+
$crate::event!(name: $name, parent: $parent, $crate::Level::INFO, { %$($k).+ $($field)+ })
19301930
);
19311931
(name: $name:expr, parent: $parent:expr, $($arg:tt)+ ) => (
19321932
$crate::event!(name: $name, parent: $parent, $crate::Level::INFO, {}, $($arg)+)
@@ -2153,10 +2153,10 @@ macro_rules! warn {
21532153
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
21542154
);
21552155
(name: $name:expr, target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
2156-
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
2156+
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::WARN, { ?$($k).+ $($field)+ })
21572157
);
21582158
(name: $name:expr, target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
2159-
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
2159+
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::WARN, { %$($k).+ $($field)+ })
21602160
);
21612161
(name: $name:expr, target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
21622162
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::WARN, {}, $($arg)+)
@@ -2170,10 +2170,10 @@ macro_rules! warn {
21702170
$crate::event!(name: $name, target: $target, $crate::Level::WARN, { $($k).+ $($field)+ })
21712171
);
21722172
(name: $name:expr, target: $target:expr, ?$($k:ident).+ $($field:tt)+ ) => (
2173-
$crate::event!(name: $name, target: $target, $crate::Level::WARN, { $($k).+ $($field)+ })
2173+
$crate::event!(name: $name, target: $target, $crate::Level::WARN, { ?$($k).+ $($field)+ })
21742174
);
21752175
(name: $name:expr, target: $target:expr, %$($k:ident).+ $($field:tt)+ ) => (
2176-
$crate::event!(name: $name, target: $target, $crate::Level::WARN, { $($k).+ $($field)+ })
2176+
$crate::event!(name: $name, target: $target, $crate::Level::WARN, { %$($k).+ $($field)+ })
21772177
);
21782178
(name: $name:expr, target: $target:expr, $($arg:tt)+ ) => (
21792179
$crate::event!(name: $name, target: $target, $crate::Level::WARN, {}, $($arg)+)
@@ -2187,10 +2187,10 @@ macro_rules! warn {
21872187
$crate::event!(target: $target, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
21882188
);
21892189
(target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
2190-
$crate::event!(target: $target, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
2190+
$crate::event!(target: $target, parent: $parent, $crate::Level::WARN, { ?$($k).+ $($field)+ })
21912191
);
21922192
(target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
2193-
$crate::event!(target: $target, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
2193+
$crate::event!(target: $target, parent: $parent, $crate::Level::WARN, { %$($k).+ $($field)+ })
21942194
);
21952195
(target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
21962196
$crate::event!(target: $target, parent: $parent, $crate::Level::WARN, {}, $($arg)+)
@@ -2204,10 +2204,10 @@ macro_rules! warn {
22042204
$crate::event!(name: $name, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
22052205
);
22062206
(name: $name:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
2207-
$crate::event!(name: $name, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
2207+
$crate::event!(name: $name, parent: $parent, $crate::Level::WARN, { ?$($k).+ $($field)+ })
22082208
);
22092209
(name: $name:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
2210-
$crate::event!(name: $name, parent: $parent, $crate::Level::WARN, { $($k).+ $($field)+ })
2210+
$crate::event!(name: $name, parent: $parent, $crate::Level::WARN, { %$($k).+ $($field)+ })
22112211
);
22122212
(name: $name:expr, parent: $parent:expr, $($arg:tt)+ ) => (
22132213
$crate::event!(name: $name, parent: $parent, $crate::Level::WARN, {}, $($arg)+)
@@ -2430,10 +2430,10 @@ macro_rules! error {
24302430
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
24312431
);
24322432
(name: $name:expr, target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
2433-
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
2433+
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::ERROR, { ?$($k).+ $($field)+ })
24342434
);
24352435
(name: $name:expr, target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
2436-
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
2436+
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::ERROR, { %$($k).+ $($field)+ })
24372437
);
24382438
(name: $name:expr, target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
24392439
$crate::event!(name: $name, target: $target, parent: $parent, $crate::Level::ERROR, {}, $($arg)+)
@@ -2447,10 +2447,10 @@ macro_rules! error {
24472447
$crate::event!(name: $name, target: $target, $crate::Level::ERROR, { $($k).+ $($field)+ })
24482448
);
24492449
(name: $name:expr, target: $target:expr, ?$($k:ident).+ $($field:tt)+ ) => (
2450-
$crate::event!(name: $name, target: $target, $crate::Level::ERROR, { $($k).+ $($field)+ })
2450+
$crate::event!(name: $name, target: $target, $crate::Level::ERROR, { ?$($k).+ $($field)+ })
24512451
);
24522452
(name: $name:expr, target: $target:expr, %$($k:ident).+ $($field:tt)+ ) => (
2453-
$crate::event!(name: $name, target: $target, $crate::Level::ERROR, { $($k).+ $($field)+ })
2453+
$crate::event!(name: $name, target: $target, $crate::Level::ERROR, { %$($k).+ $($field)+ })
24542454
);
24552455
(name: $name:expr, target: $target:expr, $($arg:tt)+ ) => (
24562456
$crate::event!(name: $name, target: $target, $crate::Level::ERROR, {}, $($arg)+)
@@ -2464,10 +2464,10 @@ macro_rules! error {
24642464
$crate::event!(target: $target, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
24652465
);
24662466
(target: $target:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
2467-
$crate::event!(target: $target, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
2467+
$crate::event!(target: $target, parent: $parent, $crate::Level::ERROR, { ?$($k).+ $($field)+ })
24682468
);
24692469
(target: $target:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
2470-
$crate::event!(target: $target, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
2470+
$crate::event!(target: $target, parent: $parent, $crate::Level::ERROR, { %$($k).+ $($field)+ })
24712471
);
24722472
(target: $target:expr, parent: $parent:expr, $($arg:tt)+ ) => (
24732473
$crate::event!(target: $target, parent: $parent, $crate::Level::ERROR, {}, $($arg)+)
@@ -2481,10 +2481,10 @@ macro_rules! error {
24812481
$crate::event!(name: $name, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
24822482
);
24832483
(name: $name:expr, parent: $parent:expr, ?$($k:ident).+ $($field:tt)+ ) => (
2484-
$crate::event!(name: $name, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
2484+
$crate::event!(name: $name, parent: $parent, $crate::Level::ERROR, { ?$($k).+ $($field)+ })
24852485
);
24862486
(name: $name:expr, parent: $parent:expr, %$($k:ident).+ $($field:tt)+ ) => (
2487-
$crate::event!(name: $name, parent: $parent, $crate::Level::ERROR, { $($k).+ $($field)+ })
2487+
$crate::event!(name: $name, parent: $parent, $crate::Level::ERROR, { %$($k).+ $($field)+ })
24882488
);
24892489
(name: $name:expr, parent: $parent:expr, $($arg:tt)+ ) => (
24902490
$crate::event!(name: $name, parent: $parent, $crate::Level::ERROR, {}, $($arg)+)

0 commit comments

Comments
 (0)