Skip to content

Commit 4826c60

Browse files
hawkwhawkw
committed
also simplify the normal (non-log) macros
Signed-off-by: Eliza Weisman <[email protected]>
1 parent 56c4361 commit 4826c60

File tree

1 file changed

+44
-116
lines changed

1 file changed

+44
-116
lines changed

‎tracing/src/macros.rs

Lines changed: 44 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -2135,139 +2135,93 @@ macro_rules! valueset {
21352135
&[ $($val),* ]
21362136
};
21372137

2138-
// === recursive case (more tts), non-empty out set ===
2138+
// === recursive case (more tts) ===
21392139

21402140
// TODO(#1138): determine a new syntax for uninitialized span fields, and
21412141
// re-enable this.
2142-
// (@{ $($out:expr),+ }, $next:expr, $($k:ident).+ = _, $($rest:tt)*) => {
2143-
// $crate::valueset!(@ { $($out),+, (&$next, None) }, $next, $($rest)*)
2142+
// (@{ $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = _, $($rest:tt)*) => {
2143+
// $crate::valueset!(@ { $($out),*, (&$next, None) }, $next, $($rest)*)
21442144
// };
2145-
(@ { $($out:expr),+ }, $next:expr, $($k:ident).+ = ?$val:expr, $($rest:tt)*) => {
2145+
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = ?$val:expr, $($rest:tt)*) => {
21462146
$crate::valueset!(
2147-
@ { $($out),+, (&$next, Some(&debug(&$val) as &Value)) },
2147+
@ { $($out),*, (&$next, Some(&debug(&$val) as &Value)) },
21482148
$next,
21492149
$($rest)*
21502150
)
21512151
};
2152-
(@ { $($out:expr),+ }, $next:expr, $($k:ident).+ = %$val:expr, $($rest:tt)*) => {
2152+
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = %$val:expr, $($rest:tt)*) => {
21532153
$crate::valueset!(
2154-
@ { $($out),+, (&$next, Some(&display(&$val) as &Value)) },
2154+
@ { $($out),*, (&$next, Some(&display(&$val) as &Value)) },
21552155
$next,
21562156
$($rest)*
21572157
)
21582158
};
2159-
(@ { $($out:expr),+ }, $next:expr, $($k:ident).+ = $val:expr, $($rest:tt)*) => {
2159+
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = $val:expr, $($rest:tt)*) => {
21602160
$crate::valueset!(
2161-
@ { $($out),+, (&$next, Some(&$val as &Value)) },
2161+
@ { $($out),*, (&$next, Some(&$val as &Value)) },
21622162
$next,
21632163
$($rest)*
21642164
)
21652165
};
2166-
(@ { $($out:expr),+ }, $next:expr, $($k:ident).+, $($rest:tt)*) => {
2166+
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+, $($rest:tt)*) => {
21672167
$crate::valueset!(
2168-
@ { $($out),+, (&$next, Some(&$($k).+ as &Value)) },
2168+
@ { $($out),*, (&$next, Some(&$($k).+ as &Value)) },
21692169
$next,
21702170
$($rest)*
21712171
)
21722172
};
2173-
(@ { $($out:expr),+ }, $next:expr, ?$($k:ident).+, $($rest:tt)*) => {
2173+
(@ { $(,)* $($out:expr),* }, $next:expr, ?$($k:ident).+, $($rest:tt)*) => {
21742174
$crate::valueset!(
2175-
@ { $($out),+, (&$next, Some(&debug(&$($k).+) as &Value)) },
2175+
@ { $($out),*, (&$next, Some(&debug(&$($k).+) as &Value)) },
21762176
$next,
21772177
$($rest)*
21782178
)
21792179
};
2180-
(@ { $($out:expr),+ }, $next:expr, %$($k:ident).+, $($rest:tt)*) => {
2180+
(@ { $(,)* $($out:expr),* }, $next:expr, %$($k:ident).+, $($rest:tt)*) => {
21812181
$crate::valueset!(
2182-
@ { $($out),+, (&$next, Some(&display(&$($k).+) as &Value)) },
2182+
@ { $($out),*, (&$next, Some(&display(&$($k).+) as &Value)) },
21832183
$next,
21842184
$($rest)*
21852185
)
21862186
};
2187-
(@ { $($out:expr),+ }, $next:expr, $($k:ident).+ = ?$val:expr) => {
2187+
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = ?$val:expr) => {
21882188
$crate::valueset!(
2189-
@ { $($out),+, (&$next, Some(&debug(&$val) as &Value)) },
2189+
@ { $($out),*, (&$next, Some(&debug(&$val) as &Value)) },
21902190
$next,
21912191
)
21922192
};
2193-
(@ { $($out:expr),+ }, $next:expr, $($k:ident).+ = %$val:expr) => {
2193+
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = %$val:expr) => {
21942194
$crate::valueset!(
2195-
@ { $($out),+, (&$next, Some(&display(&$val) as &Value)) },
2195+
@ { $($out),*, (&$next, Some(&display(&$val) as &Value)) },
21962196
$next,
21972197
)
21982198
};
2199-
(@ { $($out:expr),+ }, $next:expr, $($k:ident).+ = $val:expr) => {
2199+
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = $val:expr) => {
22002200
$crate::valueset!(
2201-
@ { $($out),+, (&$next, Some(&$val as &Value)) },
2201+
@ { $($out),*, (&$next, Some(&$val as &Value)) },
22022202
$next,
22032203
)
22042204
};
2205-
(@ { $($out:expr),+ }, $next:expr, $($k:ident).+) => {
2205+
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+) => {
22062206
$crate::valueset!(
2207-
@ { $($out),+, (&$next, Some(&$($k).+ as &Value)) },
2207+
@ { $($out),*, (&$next, Some(&$($k).+ as &Value)) },
22082208
$next,
22092209
)
22102210
};
2211-
(@ { $($out:expr),+ }, $next:expr, ?$($k:ident).+) => {
2211+
(@ { $(,)* $($out:expr),* }, $next:expr, ?$($k:ident).+) => {
22122212
$crate::valueset!(
2213-
@ { $($out),+, (&$next, Some(&debug(&$($k).+) as &Value)) },
2213+
@ { $($out),*, (&$next, Some(&debug(&$($k).+) as &Value)) },
22142214
$next,
22152215
)
22162216
};
2217-
(@ { $($out:expr),+ }, $next:expr, %$($k:ident).+) => {
2217+
(@ { $(,)* $($out:expr),* }, $next:expr, %$($k:ident).+) => {
22182218
$crate::valueset!(
2219-
@ { $($out),+, (&$next, Some(&display(&$($k).+) as &Value)) },
2219+
@ { $($out),*, (&$next, Some(&display(&$($k).+) as &Value)) },
22202220
$next,
22212221
)
22222222
};
2223-
2224-
// == recursive case (more tts), empty out set ===
2225-
2226-
// TODO(#1138): determine a new syntax for uninitialized span fields, and
2227-
// re-enable this.
2228-
// (@ { }, $next:expr, $($k:ident).+ = _, $($rest:tt)* ) => {
2229-
// $crate::valueset!(@ { (&$next, None) }, $next, $($rest)* )
2230-
// };
2231-
(@ { }, $next:expr, $($k:ident).+ = ?$val:expr, $($rest:tt)* ) => {
2232-
$crate::valueset!(@ { (&$next, Some(&debug(&$val) as &Value)) }, $next, $($rest)* )
2233-
};
2234-
(@ { }, $next:expr, $($k:ident).+ = %$val:expr, $($rest:tt)*) => {
2235-
$crate::valueset!(@ { (&$next, Some(&display(&$val) as &Value)) }, $next, $($rest)*)
2236-
};
2237-
(@ { }, $next:expr, $($k:ident).+ = $val:expr, $($rest:tt)*) => {
2238-
$crate::valueset!(@ { (&$next, Some(&$val as &Value)) }, $next, $($rest)*)
2239-
};
2240-
(@ { }, $next:expr, $($k:ident).+, $($rest:tt)*) => {
2241-
$crate::valueset!(@ { (&$next, Some(&$($k).+ as &Value)) }, $next, $($rest)* )
2242-
};
2243-
(@ { }, $next:expr, ?$($k:ident).+, $($rest:tt)*) => {
2244-
$crate::valueset!(@ { (&$next, Some(&debug(&$($k).+) as &Value)) }, $next, $($rest)* )
2245-
};
2246-
(@ { }, $next:expr, %$($k:ident).+, $($rest:tt)*) => {
2247-
$crate::valueset!(@ { (&$next, Some(&display(&$($k).+) as &Value)) }, $next, $($rest)* )
2248-
};
2249-
// no trailing comma
2250-
(@ { }, $next:expr, $($k:ident).+ = ?$val:expr) => {
2251-
$crate::valueset!(@ { (&$next, Some(&debug(&$val) as &Value)) }, $next )
2252-
};
2253-
(@ { }, $next:expr, $($k:ident).+ = %$val:expr) => {
2254-
$crate::valueset!(@ { (&$next, Some(&display(&$val) as &Value)) }, $next)
2255-
};
2256-
(@ { }, $next:expr, $($k:ident).+ = $val:expr) => {
2257-
$crate::valueset!(@ { (&$next, Some(&$val as &Value)) }, $next)
2258-
};
2259-
(@ { }, $next:expr, $($k:ident).+) => {
2260-
$crate::valueset!(@ { (&$next, Some(&$($k).+ as &Value)) }, $next)
2261-
};
2262-
(@ { }, $next:expr, ?$($k:ident).+) => {
2263-
$crate::valueset!(@ { (&$next, Some(&debug(&$($k).+) as &Value)) }, $next)
2264-
};
2265-
(@ { }, $next:expr, %$($k:ident).+) => {
2266-
$crate::valueset!(@ { (&$next, Some(&display(&$($k).+) as &Value)) }, $next)
2267-
};
2268-
22692223
// Remainder is unparseable, but exists --- must be format args!
2270-
(@ { $($out:expr),* }, $next:expr, $($rest:tt)+) => {
2224+
(@ { $(,)* $($out:expr),* }, $next:expr, $($rest:tt)+) => {
22712225
$crate::valueset!(@ { $($out),*, (&$next, Some(&format_args!($($rest)+) as &Value)) }, $next, )
22722226
};
22732227

@@ -2299,59 +2253,33 @@ macro_rules! fieldset {
22992253
&[ $($out),* ]
23002254
};
23012255

2302-
// == empty out set, remaining tts ==
2303-
(@ { } $($k:ident).+ = ?$val:expr, $($rest:tt)*) => {
2304-
$crate::fieldset!(@ { $crate::__tracing_stringify!($($k).+) } $($rest)*)
2305-
};
2306-
(@ { } $($k:ident).+ = %$val:expr, $($rest:tt)*) => {
2307-
$crate::fieldset!(@ { $crate::__tracing_stringify!($($k).+) } $($rest)*)
2308-
};
2309-
(@ { } $($k:ident).+ = $val:expr, $($rest:tt)*) => {
2310-
$crate::fieldset!(@ { $crate::__tracing_stringify!($($k).+) } $($rest)*)
2311-
};
2312-
// TODO(#1138): determine a new syntax for uninitialized span fields, and
2313-
// re-enable this.
2314-
// (@ { } $($k:ident).+ = _, $($rest:tt)*) => {
2315-
// $crate::fieldset!(@ { $crate::__tracing_stringify!($($k).+) } $($rest)*)
2316-
// };
2317-
(@ { } ?$($k:ident).+, $($rest:tt)*) => {
2318-
$crate::fieldset!(@ { $crate::__tracing_stringify!($($k).+) } $($rest)*)
2319-
};
2320-
(@ { } %$($k:ident).+, $($rest:tt)*) => {
2321-
$crate::fieldset!(@ { $crate::__tracing_stringify!($($k).+) } $($rest)*)
2322-
};
2323-
(@ { } $($k:ident).+, $($rest:tt)*) => {
2324-
$crate::fieldset!(@ { $crate::__tracing_stringify!($($k).+) } $($rest)*)
2325-
};
2326-
2327-
2328-
// == non-empty out set, remaining tts ==
2329-
(@ { $($out:expr),+ } $($k:ident).+ = ?$val:expr, $($rest:tt)*) => {
2330-
$crate::fieldset!(@ { $($out),+,$crate::__tracing_stringify!($($k).+) } $($rest)*)
2256+
// == recursive cases (more tts) ==
2257+
(@ { $(,)* $($out:expr),* } $($k:ident).+ = ?$val:expr, $($rest:tt)*) => {
2258+
$crate::fieldset!(@ { $($out),*, $crate::__tracing_stringify!($($k).+) } $($rest)*)
23312259
};
2332-
(@ { $($out:expr),+ } $($k:ident).+ = %$val:expr, $($rest:tt)*) => {
2333-
$crate::fieldset!(@ { $($out),+, $crate::__tracing_stringify!($($k).+) } $($rest)*)
2260+
(@ { $(,)* $($out:expr),* } $($k:ident).+ = %$val:expr, $($rest:tt)*) => {
2261+
$crate::fieldset!(@ { $($out),*, $crate::__tracing_stringify!($($k).+) } $($rest)*)
23342262
};
2335-
(@ { $($out:expr),+ } $($k:ident).+ = $val:expr, $($rest:tt)*) => {
2336-
$crate::fieldset!(@ { $($out),+, $crate::__tracing_stringify!($($k).+) } $($rest)*)
2263+
(@ { $(,)* $($out:expr),* } $($k:ident).+ = $val:expr, $($rest:tt)*) => {
2264+
$crate::fieldset!(@ { $($out),*, $crate::__tracing_stringify!($($k).+) } $($rest)*)
23372265
};
23382266
// TODO(#1138): determine a new syntax for uninitialized span fields, and
23392267
// re-enable this.
2340-
// (@ { $($out:expr),+ } $($k:ident).+ = _, $($rest:tt)*) => {
2341-
// $crate::fieldset!(@ { $($out),+, $crate::__tracing_stringify!($($k).+) } $($rest)*)
2268+
// (@ { $($out:expr),* } $($k:ident).+ = _, $($rest:tt)*) => {
2269+
// $crate::fieldset!(@ { $($out),*, $crate::__tracing_stringify!($($k).+) } $($rest)*)
23422270
// };
2343-
(@ { $($out:expr),+ } ?$($k:ident).+, $($rest:tt)*) => {
2344-
$crate::fieldset!(@ { $($out),+, $crate::__tracing_stringify!($($k).+) } $($rest)*)
2271+
(@ { $(,)* $($out:expr),* } ?$($k:ident).+, $($rest:tt)*) => {
2272+
$crate::fieldset!(@ { $($out),*, $crate::__tracing_stringify!($($k).+) } $($rest)*)
23452273
};
2346-
(@ { $($out:expr),+ } %$($k:ident).+, $($rest:tt)*) => {
2347-
$crate::fieldset!(@ { $($out),+, $crate::__tracing_stringify!($($k).+) } $($rest)*)
2274+
(@ { $(,)* $($out:expr),* } %$($k:ident).+, $($rest:tt)*) => {
2275+
$crate::fieldset!(@ { $($out),*, $crate::__tracing_stringify!($($k).+) } $($rest)*)
23482276
};
2349-
(@ { $($out:expr),+ } $($k:ident).+, $($rest:tt)*) => {
2350-
$crate::fieldset!(@ { $($out),+, $crate::__tracing_stringify!($($k).+) } $($rest)*)
2277+
(@ { $(,)* $($out:expr),* } $($k:ident).+, $($rest:tt)*) => {
2278+
$crate::fieldset!(@ { $($out),*, $crate::__tracing_stringify!($($k).+) } $($rest)*)
23512279
};
23522280

23532281
// Remainder is unparseable, but exists --- must be format args!
2354-
(@ { $($out:expr),* } $($rest:tt)+) => {
2282+
(@ { $(,)* $($out:expr),* } $($rest:tt)+) => {
23552283
$crate::fieldset!(@ { $($out),*, "message" })
23562284
};
23572285

0 commit comments

Comments
 (0)