Skip to content

Commit fe550d7

Browse files
conradludgateconradludgate
committed
replace valueset with valueset_all
1 parent 9978c36 commit fe550d7

File tree

2 files changed

+46
-46
lines changed

2 files changed

+46
-46
lines changed

‎tracing/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ become an error in the next edition.
266266
type errors in `#[instrument]`ed `async fn`s ([#2270])
267267
- **attributes**: Updated `syn` dependency to fix compilation with `-Z
268268
minimal-versions` ([#2246])
269-
- `bare_trait_objects` warning in `valueset!` macro expansion ([#2308])
269+
- `bare_trait_objects` warning in `valueset_all!` macro expansion ([#2308])
270270

271271
### Added
272272

‎tracing/src/macros.rs‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ macro_rules! span {
4141
$crate::Span::child_of(
4242
$parent,
4343
meta,
44-
&$crate::valueset!(meta.fields(), $($fields)*),
44+
&$crate::valueset_all!(meta.fields(), $($fields)*),
4545
)
4646
} else {
4747
let span = $crate::__macro_support::__disabled_span(__CALLSITE.metadata());
4848
$crate::if_log_enabled! { $lvl, {
49-
span.record_all(&$crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*));
49+
span.record_all(&$crate::valueset_all!(__CALLSITE.metadata().fields(), $($fields)*));
5050
}};
5151
span
5252
}
@@ -71,12 +71,12 @@ macro_rules! span {
7171
// span with contextual parent
7272
$crate::Span::new(
7373
meta,
74-
&$crate::valueset!(meta.fields(), $($fields)*),
74+
&$crate::valueset_all!(meta.fields(), $($fields)*),
7575
)
7676
} else {
7777
let span = $crate::__macro_support::__disabled_span(__CALLSITE.metadata());
7878
$crate::if_log_enabled! { $lvl, {
79-
span.record_all(&$crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*));
79+
span.record_all(&$crate::valueset_all!(__CALLSITE.metadata().fields(), $($fields)*));
8080
}};
8181
span
8282
}
@@ -152,7 +152,7 @@ macro_rules! span {
152152
macro_rules! record_all {
153153
($span:expr, $($fields:tt)*) => {
154154
if let Some(meta) = $span.metadata() {
155-
$span.record_all(&$crate::valueset!(
155+
$span.record_all(&$crate::valueset_all!(
156156
meta.fields(),
157157
$($fields)*
158158
));
@@ -642,12 +642,12 @@ macro_rules! event {
642642
meta,
643643
&value_set
644644
);
645-
})($crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*));
645+
})($crate::valueset_all!(__CALLSITE.metadata().fields(), $($fields)*));
646646
} else {
647647
$crate::__tracing_log!(
648648
$lvl,
649649
__CALLSITE,
650-
&$crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*)
650+
&$crate::valueset_all!(__CALLSITE.metadata().fields(), $($fields)*)
651651
);
652652
}
653653
});
@@ -694,12 +694,12 @@ macro_rules! event {
694694
__CALLSITE,
695695
&value_set
696696
);
697-
})($crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*));
697+
})($crate::valueset_all!(__CALLSITE.metadata().fields(), $($fields)*));
698698
} else {
699699
$crate::__tracing_log!(
700700
$lvl,
701701
__CALLSITE,
702-
&$crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*)
702+
&$crate::valueset_all!(__CALLSITE.metadata().fields(), $($fields)*)
703703
);
704704
}
705705
});
@@ -752,12 +752,12 @@ macro_rules! event {
752752
meta,
753753
&value_set
754754
);
755-
})($crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*));
755+
})($crate::valueset_all!(__CALLSITE.metadata().fields(), $($fields)*));
756756
} else {
757757
$crate::__tracing_log!(
758758
$lvl,
759759
__CALLSITE,
760-
&$crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*)
760+
&$crate::valueset_all!(__CALLSITE.metadata().fields(), $($fields)*)
761761
);
762762
}
763763
});
@@ -805,12 +805,12 @@ macro_rules! event {
805805
meta,
806806
&value_set
807807
);
808-
})($crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*));
808+
})($crate::valueset_all!(__CALLSITE.metadata().fields(), $($fields)*));
809809
} else {
810810
$crate::__tracing_log!(
811811
$lvl,
812812
__CALLSITE,
813-
&$crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*)
813+
&$crate::valueset_all!(__CALLSITE.metadata().fields(), $($fields)*)
814814
);
815815
}
816816
});
@@ -856,12 +856,12 @@ macro_rules! event {
856856
__CALLSITE,
857857
&value_set
858858
);
859-
})($crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*));
859+
})($crate::valueset_all!(__CALLSITE.metadata().fields(), $($fields)*));
860860
} else {
861861
$crate::__tracing_log!(
862862
$lvl,
863863
__CALLSITE,
864-
&$crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*)
864+
&$crate::valueset_all!(__CALLSITE.metadata().fields(), $($fields)*)
865865
);
866866
}
867867
});
@@ -911,12 +911,12 @@ macro_rules! event {
911911
__CALLSITE,
912912
&value_set
913913
);
914-
})($crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*));
914+
})($crate::valueset_all!(__CALLSITE.metadata().fields(), $($fields)*));
915915
} else {
916916
$crate::__tracing_log!(
917917
$lvl,
918918
__CALLSITE,
919-
&$crate::valueset!(__CALLSITE.metadata().fields(), $($fields)*)
919+
&$crate::valueset_all!(__CALLSITE.metadata().fields(), $($fields)*)
920920
);
921921
}
922922
});
@@ -2811,7 +2811,7 @@ macro_rules! level_enabled {
28112811

28122812
#[doc(hidden)]
28132813
#[macro_export]
2814-
macro_rules! valueset {
2814+
macro_rules! valueset_all {
28152815

28162816
// === base case ===
28172817
(@ { $(,)* $($val:expr),* $(,)* } $(,)*) => {
@@ -2823,148 +2823,148 @@ macro_rules! valueset {
28232823
// TODO(#1138): determine a new syntax for uninitialized span fields, and
28242824
// re-enable this.
28252825
// (@{ $(,)* $($out:expr),* }, $($k:ident).+ = _, $($rest:tt)*) => {
2826-
// $crate::valueset!(@ { $($out),*, (None) }, $($rest)*)
2826+
// $crate::valueset_all!(@ { $($out),*, (None) }, $($rest)*)
28272827
// };
28282828
(@ { $(,)* $($out:expr),* }, $($k:ident).+ = ?$val:expr, $($rest:tt)*) => {
2829-
$crate::valueset!(
2829+
$crate::valueset_all!(
28302830
@ { $($out),*, ($crate::__macro_support::Option::Some(&$crate::field::debug(&$val) as &dyn $crate::field::Value)) },
28312831
$($rest)*
28322832
)
28332833
};
28342834
(@ { $(,)* $($out:expr),* }, $($k:ident).+ = %$val:expr, $($rest:tt)*) => {
2835-
$crate::valueset!(
2835+
$crate::valueset_all!(
28362836
@ { $($out),*, ($crate::__macro_support::Option::Some(&$crate::field::display(&$val) as &dyn $crate::field::Value)) },
28372837
$($rest)*
28382838
)
28392839
};
28402840
(@ { $(,)* $($out:expr),* }, $($k:ident).+ = $val:expr, $($rest:tt)*) => {
2841-
$crate::valueset!(
2841+
$crate::valueset_all!(
28422842
@ { $($out),*, ($crate::__macro_support::Option::Some(&$val as &dyn $crate::field::Value)) },
28432843
$($rest)*
28442844
)
28452845
};
28462846
(@ { $(,)* $($out:expr),* }, $($k:ident).+, $($rest:tt)*) => {
2847-
$crate::valueset!(
2847+
$crate::valueset_all!(
28482848
@ { $($out),*, ($crate::__macro_support::Option::Some(&$($k).+ as &dyn $crate::field::Value)) },
28492849
$($rest)*
28502850
)
28512851
};
28522852
(@ { $(,)* $($out:expr),* }, ?$($k:ident).+, $($rest:tt)*) => {
2853-
$crate::valueset!(
2853+
$crate::valueset_all!(
28542854
@ { $($out),*, ($crate::__macro_support::Option::Some(&$crate::field::debug(&$($k).+) as &dyn $crate::field::Value)) },
28552855
$($rest)*
28562856
)
28572857
};
28582858
(@ { $(,)* $($out:expr),* }, %$($k:ident).+, $($rest:tt)*) => {
2859-
$crate::valueset!(
2859+
$crate::valueset_all!(
28602860
@ { $($out),*, ($crate::__macro_support::Option::Some(&$crate::field::display(&$($k).+) as &dyn $crate::field::Value)) },
28612861
$($rest)*
28622862
)
28632863
};
28642864
(@ { $(,)* $($out:expr),* }, $($k:ident).+ = ?$val:expr) => {
2865-
$crate::valueset!(
2865+
$crate::valueset_all!(
28662866
@ { $($out),*, ($crate::__macro_support::Option::Some(&$crate::field::debug(&$val) as &dyn $crate::field::Value)) },
28672867
)
28682868
};
28692869
(@ { $(,)* $($out:expr),* }, $($k:ident).+ = %$val:expr) => {
2870-
$crate::valueset!(
2870+
$crate::valueset_all!(
28712871
@ { $($out),*, ($crate::__macro_support::Option::Some(&$crate::field::display(&$val) as &dyn $crate::field::Value)) },
28722872
)
28732873
};
28742874
(@ { $(,)* $($out:expr),* }, $($k:ident).+ = $val:expr) => {
2875-
$crate::valueset!(
2875+
$crate::valueset_all!(
28762876
@ { $($out),*, ($crate::__macro_support::Option::Some(&$val as &dyn $crate::field::Value)) },
28772877
)
28782878
};
28792879
(@ { $(,)* $($out:expr),* }, $($k:ident).+) => {
2880-
$crate::valueset!(
2880+
$crate::valueset_all!(
28812881
@ { $($out),*, ($crate::__macro_support::Option::Some(&$($k).+ as &dyn $crate::field::Value)) },
28822882
)
28832883
};
28842884
(@ { $(,)* $($out:expr),* }, ?$($k:ident).+) => {
2885-
$crate::valueset!(
2885+
$crate::valueset_all!(
28862886
@ { $($out),*, ($crate::__macro_support::Option::Some(&$crate::field::debug(&$($k).+) as &dyn $crate::field::Value)) },
28872887
)
28882888
};
28892889
(@ { $(,)* $($out:expr),* }, %$($k:ident).+) => {
2890-
$crate::valueset!(
2890+
$crate::valueset_all!(
28912891
@ { $($out),*, ($crate::__macro_support::Option::Some(&$crate::field::display(&$($k).+) as &dyn $crate::field::Value)) },
28922892
)
28932893
};
28942894

28952895
// Handle literal names
28962896
(@ { $(,)* $($out:expr),* }, $k:literal = ?$val:expr, $($rest:tt)*) => {
2897-
$crate::valueset!(
2897+
$crate::valueset_all!(
28982898
@ { $($out),*, ($crate::__macro_support::Option::Some(&$crate::field::debug(&$val) as &dyn $crate::field::Value)) },
28992899
$($rest)*
29002900
)
29012901
};
29022902
(@ { $(,)* $($out:expr),* }, $k:literal = %$val:expr, $($rest:tt)*) => {
2903-
$crate::valueset!(
2903+
$crate::valueset_all!(
29042904
@ { $($out),*, ($crate::__macro_support::Option::Some(&$crate::field::display(&$val) as &dyn $crate::field::Value)) },
29052905
$($rest)*
29062906
)
29072907
};
29082908
(@ { $(,)* $($out:expr),* }, $k:literal = $val:expr, $($rest:tt)*) => {
2909-
$crate::valueset!(
2909+
$crate::valueset_all!(
29102910
@ { $($out),*, ($crate::__macro_support::Option::Some(&$val as &dyn $crate::field::Value)) },
29112911
$($rest)*
29122912
)
29132913
};
29142914
(@ { $(,)* $($out:expr),* }, $k:literal = ?$val:expr) => {
2915-
$crate::valueset!(
2915+
$crate::valueset_all!(
29162916
@ { $($out),*, ($crate::__macro_support::Option::Some(&$crate::field::debug(&$val) as &dyn $crate::field::Value)) },
29172917
)
29182918
};
29192919
(@ { $(,)* $($out:expr),* }, $k:literal = %$val:expr) => {
2920-
$crate::valueset!(
2920+
$crate::valueset_all!(
29212921
@ { $($out),*, ($crate::__macro_support::Option::Some(&$crate::field::display(&$val) as &dyn $crate::field::Value)) },
29222922
)
29232923
};
29242924
(@ { $(,)* $($out:expr),* }, $k:literal = $val:expr) => {
2925-
$crate::valueset!(
2925+
$crate::valueset_all!(
29262926
@ { $($out),*, ($crate::__macro_support::Option::Some(&$val as &dyn $crate::field::Value)) },
29272927
)
29282928
};
29292929

29302930
// Handle constant names
29312931
(@ { $(,)* $($out:expr),* }, { $k:expr } = ?$val:expr, $($rest:tt)*) => {
2932-
$crate::valueset!(
2932+
$crate::valueset_all!(
29332933
@ { $($out),*, (Some(&$crate::field::debug(&$val) as &dyn $crate::field::Value)) },
29342934
$($rest)*
29352935
)
29362936
};
29372937
(@ { $(,)* $($out:expr),* }, { $k:expr } = %$val:expr, $($rest:tt)*) => {
2938-
$crate::valueset!(
2938+
$crate::valueset_all!(
29392939
@ { $($out),*, (Some(&$crate::field::display(&$val) as &dyn $crate::field::Value)) },
29402940
$($rest)*
29412941
)
29422942
};
29432943
(@ { $(,)* $($out:expr),* }, { $k:expr } = $val:expr, $($rest:tt)*) => {
2944-
$crate::valueset!(
2944+
$crate::valueset_all!(
29452945
@ { $($out),*, (Some(&$val as &dyn $crate::field::Value)) },
29462946
$($rest)*
29472947
)
29482948
};
29492949
(@ { $(,)* $($out:expr),* }, { $k:expr } = ?$val:expr) => {
2950-
$crate::valueset!(
2950+
$crate::valueset_all!(
29512951
@ { $($out),*, (Some(&$crate::field::debug(&$val) as &dyn $crate::field::Value)) },
29522952
)
29532953
};
29542954
(@ { $(,)* $($out:expr),* }, { $k:expr } = %$val:expr) => {
2955-
$crate::valueset!(
2955+
$crate::valueset_all!(
29562956
@ { $($out),*, (Some(&$crate::field::display(&$val) as &dyn $crate::field::Value)) },
29572957
)
29582958
};
29592959
(@ { $(,)* $($out:expr),* }, { $k:expr } = $val:expr) => {
2960-
$crate::valueset!(
2960+
$crate::valueset_all!(
29612961
@ { $($out),*, (Some(&$val as &dyn $crate::field::Value)) },
29622962
)
29632963
};
29642964

29652965
// Remainder is unparsable, but exists --- must be format args!
29662966
(@ { $(,)* $($out:expr),* }, $($rest:tt)+) => {
2967-
$crate::valueset!(@ { ($crate::__macro_support::Option::Some(&$crate::__macro_support::format_args!($($rest)+) as &dyn $crate::field::Value)), $($out),* },)
2967+
$crate::valueset_all!(@ { ($crate::__macro_support::Option::Some(&$crate::__macro_support::format_args!($($rest)+) as &dyn $crate::field::Value)), $($out),* },)
29682968
};
29692969

29702970
// === entry ===
@@ -2974,7 +2974,7 @@ macro_rules! valueset {
29742974
// This import statement CANNOT be removed as it will break existing use cases.
29752975
// See #831, #2332, #3424 for the last times we tried.
29762976
use $crate::field::{debug, display, Value};
2977-
$fields.value_set_all($crate::valueset!(
2977+
$fields.value_set_all($crate::valueset_all!(
29782978
@ { },
29792979
$($kvs)+
29802980
))

0 commit comments

Comments
 (0)