Skip to content

Commit a77be16

Browse files
Xiami2012Xiami2012
authored
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 5c35eb0 commit a77be16

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
@@ -2196,127 +2196,127 @@ macro_rules! valueset {
21962196
// };
21972197
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = ?$val:expr, $($rest:tt)*) => {
21982198
$crate::valueset!(
2199-
@ { $($out),*, (&$next, Some(&debug(&$val) as &Value)) },
2199+
@ { $($out),*, (&$next, Some(&debug(&$val) as &dyn Value)) },
22002200
$next,
22012201
$($rest)*
22022202
)
22032203
};
22042204
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = %$val:expr, $($rest:tt)*) => {
22052205
$crate::valueset!(
2206-
@ { $($out),*, (&$next, Some(&display(&$val) as &Value)) },
2206+
@ { $($out),*, (&$next, Some(&display(&$val) as &dyn Value)) },
22072207
$next,
22082208
$($rest)*
22092209
)
22102210
};
22112211
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = $val:expr, $($rest:tt)*) => {
22122212
$crate::valueset!(
2213-
@ { $($out),*, (&$next, Some(&$val as &Value)) },
2213+
@ { $($out),*, (&$next, Some(&$val as &dyn Value)) },
22142214
$next,
22152215
$($rest)*
22162216
)
22172217
};
22182218
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+, $($rest:tt)*) => {
22192219
$crate::valueset!(
2220-
@ { $($out),*, (&$next, Some(&$($k).+ as &Value)) },
2220+
@ { $($out),*, (&$next, Some(&$($k).+ as &dyn Value)) },
22212221
$next,
22222222
$($rest)*
22232223
)
22242224
};
22252225
(@ { $(,)* $($out:expr),* }, $next:expr, ?$($k:ident).+, $($rest:tt)*) => {
22262226
$crate::valueset!(
2227-
@ { $($out),*, (&$next, Some(&debug(&$($k).+) as &Value)) },
2227+
@ { $($out),*, (&$next, Some(&debug(&$($k).+) as &dyn Value)) },
22282228
$next,
22292229
$($rest)*
22302230
)
22312231
};
22322232
(@ { $(,)* $($out:expr),* }, $next:expr, %$($k:ident).+, $($rest:tt)*) => {
22332233
$crate::valueset!(
2234-
@ { $($out),*, (&$next, Some(&display(&$($k).+) as &Value)) },
2234+
@ { $($out),*, (&$next, Some(&display(&$($k).+) as &dyn Value)) },
22352235
$next,
22362236
$($rest)*
22372237
)
22382238
};
22392239
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = ?$val:expr) => {
22402240
$crate::valueset!(
2241-
@ { $($out),*, (&$next, Some(&debug(&$val) as &Value)) },
2241+
@ { $($out),*, (&$next, Some(&debug(&$val) as &dyn Value)) },
22422242
$next,
22432243
)
22442244
};
22452245
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = %$val:expr) => {
22462246
$crate::valueset!(
2247-
@ { $($out),*, (&$next, Some(&display(&$val) as &Value)) },
2247+
@ { $($out),*, (&$next, Some(&display(&$val) as &dyn Value)) },
22482248
$next,
22492249
)
22502250
};
22512251
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+ = $val:expr) => {
22522252
$crate::valueset!(
2253-
@ { $($out),*, (&$next, Some(&$val as &Value)) },
2253+
@ { $($out),*, (&$next, Some(&$val as &dyn Value)) },
22542254
$next,
22552255
)
22562256
};
22572257
(@ { $(,)* $($out:expr),* }, $next:expr, $($k:ident).+) => {
22582258
$crate::valueset!(
2259-
@ { $($out),*, (&$next, Some(&$($k).+ as &Value)) },
2259+
@ { $($out),*, (&$next, Some(&$($k).+ as &dyn Value)) },
22602260
$next,
22612261
)
22622262
};
22632263
(@ { $(,)* $($out:expr),* }, $next:expr, ?$($k:ident).+) => {
22642264
$crate::valueset!(
2265-
@ { $($out),*, (&$next, Some(&debug(&$($k).+) as &Value)) },
2265+
@ { $($out),*, (&$next, Some(&debug(&$($k).+) as &dyn Value)) },
22662266
$next,
22672267
)
22682268
};
22692269
(@ { $(,)* $($out:expr),* }, $next:expr, %$($k:ident).+) => {
22702270
$crate::valueset!(
2271-
@ { $($out),*, (&$next, Some(&display(&$($k).+) as &Value)) },
2271+
@ { $($out),*, (&$next, Some(&display(&$($k).+) as &dyn Value)) },
22722272
$next,
22732273
)
22742274
};
22752275

22762276
// Handle literal names
22772277
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = ?$val:expr, $($rest:tt)*) => {
22782278
$crate::valueset!(
2279-
@ { $($out),*, (&$next, Some(&debug(&$val) as &Value)) },
2279+
@ { $($out),*, (&$next, Some(&debug(&$val) as &dyn Value)) },
22802280
$next,
22812281
$($rest)*
22822282
)
22832283
};
22842284
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = %$val:expr, $($rest:tt)*) => {
22852285
$crate::valueset!(
2286-
@ { $($out),*, (&$next, Some(&display(&$val) as &Value)) },
2286+
@ { $($out),*, (&$next, Some(&display(&$val) as &dyn Value)) },
22872287
$next,
22882288
$($rest)*
22892289
)
22902290
};
22912291
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = $val:expr, $($rest:tt)*) => {
22922292
$crate::valueset!(
2293-
@ { $($out),*, (&$next, Some(&$val as &Value)) },
2293+
@ { $($out),*, (&$next, Some(&$val as &dyn Value)) },
22942294
$next,
22952295
$($rest)*
22962296
)
22972297
};
22982298
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = ?$val:expr) => {
22992299
$crate::valueset!(
2300-
@ { $($out),*, (&$next, Some(&debug(&$val) as &Value)) },
2300+
@ { $($out),*, (&$next, Some(&debug(&$val) as &dyn Value)) },
23012301
$next,
23022302
)
23032303
};
23042304
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = %$val:expr) => {
23052305
$crate::valueset!(
2306-
@ { $($out),*, (&$next, Some(&display(&$val) as &Value)) },
2306+
@ { $($out),*, (&$next, Some(&display(&$val) as &dyn Value)) },
23072307
$next,
23082308
)
23092309
};
23102310
(@ { $(,)* $($out:expr),* }, $next:expr, $k:literal = $val:expr) => {
23112311
$crate::valueset!(
2312-
@ { $($out),*, (&$next, Some(&$val as &Value)) },
2312+
@ { $($out),*, (&$next, Some(&$val as &dyn Value)) },
23132313
$next,
23142314
)
23152315
};
23162316

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

23222322
// === entry ===

0 commit comments

Comments
 (0)