Skip to content

Commit ffad660

Browse files
Xiami2012hawkw
authored andcommitted
tracing: add dyn keyword for trait objects in valueset! expansion (#2308)
## Motivation `bare_trait_objects` lint will become a hard error in Rust 2021. While tracing is still using Rust 2018, `bare_trait_objects` is a warning in the MSRV and `dyn` keyword is recommended. ## Solution Replace all `&Value` with `&dyn Value` in macro expansions.
1 parent e42e322 commit ffad660

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

tracing/src/macros.rs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2193,127 +2193,127 @@ macro_rules! valueset {
21932193
// };
21942194
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = ?$val:expr, $($rest:tt)*) => {
21952195
$crate::valueset!(
2196-
@ { $($out),*, (&$next, Some(&debug(&$val) as &Value)) },
2196+
@ { $($out),*, (&$next, Some(&debug(&$val) as &dyn Value)) },
21972197
$next,
21982198
$($rest)*
21992199
)
22002200
};
22012201
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = %$val:expr, $($rest:tt)*) => {
22022202
$crate::valueset!(
2203-
@ { $($out),*, (&$next, Some(&display(&$val) as &Value)) },
2203+
@ { $($out),*, (&$next, Some(&display(&$val) as &dyn Value)) },
22042204
$next,
22052205
$($rest)*
22062206
)
22072207
};
22082208
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = $val:expr, $($rest:tt)*) => {
22092209
$crate::valueset!(
2210-
@ { $($out),*, (&$next, Some(&$val as &Value)) },
2210+
@ { $($out),*, (&$next, Some(&$val as &dyn Value)) },
22112211
$next,
22122212
$($rest)*
22132213
)
22142214
};
22152215
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+, $($rest:tt)*) => {
22162216
$crate::valueset!(
2217-
@ { $($out),*, (&$next, Some(&$($k).+ as &Value)) },
2217+
@ { $($out),*, (&$next, Some(&$($k).+ as &dyn Value)) },
22182218
$next,
22192219
$($rest)*
22202220
)
22212221
};
22222222
(@ { $(,)* $($out:expr),* }, $next:expr, ?$($k:ident).+, $($rest:tt)*) => {
22232223
$crate::valueset!(
2224-
@ { $($out),*, (&$next, Some(&debug(&$($k).+) as &Value)) },
2224+
@ { $($out),*, (&$next, Some(&debug(&$($k).+) as &dyn Value)) },
22252225
$next,
22262226
$($rest)*
22272227
)
22282228
};
22292229
(@ { $(,)* $($out:expr),* }, $next:expr, %$($k:ident).+, $($rest:tt)*) => {
22302230
$crate::valueset!(
2231-
@ { $($out),*, (&$next, Some(&display(&$($k).+) as &Value)) },
2231+
@ { $($out),*, (&$next, Some(&display(&$($k).+) as &dyn Value)) },
22322232
$next,
22332233
$($rest)*
22342234
)
22352235
};
22362236
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = ?$val:expr) => {
22372237
$crate::valueset!(
2238-
@ { $($out),*, (&$next, Some(&debug(&$val) as &Value)) },
2238+
@ { $($out),*, (&$next, Some(&debug(&$val) as &dyn Value)) },
22392239
$next,
22402240
)
22412241
};
22422242
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = %$val:expr) => {
22432243
$crate::valueset!(
2244-
@ { $($out),*, (&$next, Some(&display(&$val) as &Value)) },
2244+
@ { $($out),*, (&$next, Some(&display(&$val) as &dyn Value)) },
22452245
$next,
22462246
)
22472247
};
22482248
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = $val:expr) => {
22492249
$crate::valueset!(
2250-
@ { $($out),*, (&$next, Some(&$val as &Value)) },
2250+
@ { $($out),*, (&$next, Some(&$val as &dyn Value)) },
22512251
$next,
22522252
)
22532253
};
22542254
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+) => {
22552255
$crate::valueset!(
2256-
@ { $($out),*, (&$next, Some(&$($k).+ as &Value)) },
2256+
@ { $($out),*, (&$next, Some(&$($k).+ as &dyn Value)) },
22572257
$next,
22582258
)
22592259
};
22602260
(@ { $(,)* $($out:expr),* }, $next:expr, ?$($k:ident).+) => {
22612261
$crate::valueset!(
2262-
@ { $($out),*, (&$next, Some(&debug(&$($k).+) as &Value)) },
2262+
@ { $($out),*, (&$next, Some(&debug(&$($k).+) as &dyn Value)) },
22632263
$next,
22642264
)
22652265
};
22662266
(@ { $(,)* $($out:expr),* }, $next:expr, %$($k:ident).+) => {
22672267
$crate::valueset!(
2268-
@ { $($out),*, (&$next, Some(&display(&$($k).+) as &Value)) },
2268+
@ { $($out),*, (&$next, Some(&display(&$($k).+) as &dyn Value)) },
22692269
$next,
22702270
)
22712271
};
22722272

22732273
// Handle literal names
22742274
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = ?$val:expr, $($rest:tt)*) => {
22752275
$crate::valueset!(
2276-
@ { $($out),*, (&$next, Some(&debug(&$val) as &Value)) },
2276+
@ { $($out),*, (&$next, Some(&debug(&$val) as &dyn Value)) },
22772277
$next,
22782278
$($rest)*
22792279
)
22802280
};
22812281
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = %$val:expr, $($rest:tt)*) => {
22822282
$crate::valueset!(
2283-
@ { $($out),*, (&$next, Some(&display(&$val) as &Value)) },
2283+
@ { $($out),*, (&$next, Some(&display(&$val) as &dyn Value)) },
22842284
$next,
22852285
$($rest)*
22862286
)
22872287
};
22882288
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = $val:expr, $($rest:tt)*) => {
22892289
$crate::valueset!(
2290-
@ { $($out),*, (&$next, Some(&$val as &Value)) },
2290+
@ { $($out),*, (&$next, Some(&$val as &dyn Value)) },
22912291
$next,
22922292
$($rest)*
22932293
)
22942294
};
22952295
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = ?$val:expr) => {
22962296
$crate::valueset!(
2297-
@ { $($out),*, (&$next, Some(&debug(&$val) as &Value)) },
2297+
@ { $($out),*, (&$next, Some(&debug(&$val) as &dyn Value)) },
22982298
$next,
22992299
)
23002300
};
23012301
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = %$val:expr) => {
23022302
$crate::valueset!(
2303-
@ { $($out),*, (&$next, Some(&display(&$val) as &Value)) },
2303+
@ { $($out),*, (&$next, Some(&display(&$val) as &dyn Value)) },
23042304
$next,
23052305
)
23062306
};
23072307
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = $val:expr) => {
23082308
$crate::valueset!(
2309-
@ { $($out),*, (&$next, Some(&$val as &Value)) },
2309+
@ { $($out),*, (&$next, Some(&$val as &dyn Value)) },
23102310
$next,
23112311
)
23122312
};
23132313

23142314
// Remainder is unparseable, but exists --- must be format args!
23152315
(@ { $(,)* $($out:expr),* }, $next:expr, $($rest:tt)+) => {
2316-
$crate::valueset!(@ { (&$next, Some(&format_args!($($rest)+) as &Value)), $($out),* }, $next, )
2316+
$crate::valueset!(@ { (&$next, Some(&format_args!($($rest)+) as &dyn Value)), $($out),* }, $next, )
23172317
};
23182318

23192319
// === entry ===

0 commit comments

Comments
 (0)