chore: specify edition in expr fragments in macros, remove lint excep…

…tion
open-telemetry · Mar 10, 2025 · ea416a0 · ea416a0
1 parent 4c7f451
commit ea416a0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -88,7 +88,6 @@ opentelemetry-stdout = { path = "opentelemetry-stdout" }
 [workspace.lints.rust]
 rust_2024_compatibility = { level = "warn", priority = -1 }
 # No need to enable those, because it either not needed or results in ugly syntax
-edition_2024_expr_fragment_specifier = "allow"
 tail_expr_drop_order = "allow"
 
 [workspace.lints.clippy]

diff --git a/opentelemetry/src/common.rs b/opentelemetry/src/common.rs
@@ -197,7 +197,7 @@ fn display_array_str<T: fmt::Display>(slice: &[T], fmt: &mut fmt::Formatter<'_>)
 }
 
 macro_rules! into_array {
-    ($(($t:ty, $val:expr),)+) => {
+    ($(($t:ty, $val:expr_2021),)+) => {
         $(
             impl From<$t> for Array {
                 fn from(t: $t) -> Self {
@@ -332,7 +332,7 @@ impl Value {
 macro_rules! from_values {
    (
         $(
-            ($t:ty, $val:expr);
+            ($t:ty, $val:expr_2021);
         )+
     ) => {
         $(

diff --git a/opentelemetry/src/global/internal_logging.rs b/opentelemetry/src/global/internal_logging.rs
@@ -20,7 +20,7 @@
 // See issue: https://github.com/tokio-rs/tracing/issues/2774
 #[macro_export]
 macro_rules! otel_info {
-    (name: $name:expr $(,)?) => {
+    (name: $name:expr_2021 $(,)?) => {
         #[cfg(feature = "internal-logs")]
         {
             tracing::info!( name: $name, target: env!("CARGO_PKG_NAME"), name = $name, "");
@@ -30,7 +30,7 @@ macro_rules! otel_info {
             let _ = $name; // Compiler will optimize this out as it's unused.
         }
     };
-    (name: $name:expr, $($key:ident = $value:expr),+ $(,)?) => {
+    (name: $name:expr_2021, $($key:ident = $value:expr_2021),+ $(,)?) => {
         #[cfg(feature = "internal-logs")]
         {
             tracing::info!(name: $name, target: env!("CARGO_PKG_NAME"), name = $name, $($key = $value),+, "");
@@ -55,7 +55,7 @@ macro_rules! otel_info {
 /// ```
 #[macro_export]
 macro_rules! otel_warn {
-    (name: $name:expr $(,)?) => {
+    (name: $name:expr_2021 $(,)?) => {
         #[cfg(feature = "internal-logs")]
         {
             tracing::warn!(name: $name, target: env!("CARGO_PKG_NAME"), name = $name, "");
@@ -65,7 +65,7 @@ macro_rules! otel_warn {
             let _ = $name; // Compiler will optimize this out as it's unused.
         }
     };
-    (name: $name:expr, $($key:ident = $value:expr),+ $(,)?) => {
+    (name: $name:expr_2021, $($key:ident = $value:expr_2021),+ $(,)?) => {
         #[cfg(feature = "internal-logs")]
         {
             tracing::warn!(name: $name,
@@ -97,7 +97,7 @@ macro_rules! otel_warn {
 /// ```
 #[macro_export]
 macro_rules! otel_debug {
-    (name: $name:expr $(,)?) => {
+    (name: $name:expr_2021 $(,)?) => {
         #[cfg(feature = "internal-logs")]
         {
             tracing::debug!(name: $name, target: env!("CARGO_PKG_NAME"), name = $name, "");
@@ -107,7 +107,7 @@ macro_rules! otel_debug {
             let _ = $name; // Compiler will optimize this out as it's unused.
         }
     };
-    (name: $name:expr, $($key:ident = $value:expr),+ $(,)?) => {
+    (name: $name:expr_2021, $($key:ident = $value:expr_2021),+ $(,)?) => {
         #[cfg(feature = "internal-logs")]
         {
             tracing::debug!(name: $name, target: env!("CARGO_PKG_NAME"), name = $name, $($key = $value),+, "");
@@ -132,7 +132,7 @@ macro_rules! otel_debug {
 /// ```
 #[macro_export]
 macro_rules! otel_error {
-    (name: $name:expr $(,)?) => {
+    (name: $name:expr_2021 $(,)?) => {
         #[cfg(feature = "internal-logs")]
         {
             tracing::error!(name: $name, target: env!("CARGO_PKG_NAME"), name = $name, "");
@@ -142,7 +142,7 @@ macro_rules! otel_error {
             let _ = $name; // Compiler will optimize this out as it's unused.
         }
     };
-    (name: $name:expr, $($key:ident = $value:expr),+ $(,)?) => {
+    (name: $name:expr_2021, $($key:ident = $value:expr_2021),+ $(,)?) => {
         #[cfg(feature = "internal-logs")]
         {
             tracing::error!(name: $name,