diff --git a/Cargo.toml b/Cargo.toml index 2ff8573004..510ab8d634 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -85,5 +85,12 @@ opentelemetry = { path = "opentelemetry" } opentelemetry_sdk = { path = "opentelemetry-sdk" } 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" +if_let_rescope = "allow" +tail_expr_drop_order = "allow" + [workspace.lints.clippy] all = { level = "warn", priority = 1 } diff --git a/opentelemetry-appender-tracing/src/layer.rs b/opentelemetry-appender-tracing/src/layer.rs index cc48eb22cc..12aa347af6 100644 --- a/opentelemetry-appender-tracing/src/layer.rs +++ b/opentelemetry-appender-tracing/src/layer.rs @@ -245,6 +245,7 @@ mod tests { .any(|(k, v)| k == key && v == value) } + #[allow(impl_trait_overcaptures)] // can only be fixed with Rust 1.82+ fn create_tracing_subscriber( _exporter: InMemoryLogExporter, logger_provider: &SdkLoggerProvider, diff --git a/opentelemetry-sdk/src/trace/id_generator/mod.rs b/opentelemetry-sdk/src/trace/id_generator/mod.rs index 716d510d91..c753de152c 100644 --- a/opentelemetry-sdk/src/trace/id_generator/mod.rs +++ b/opentelemetry-sdk/src/trace/id_generator/mod.rs @@ -22,11 +22,11 @@ pub struct RandomIdGenerator { impl IdGenerator for RandomIdGenerator { fn new_trace_id(&self) -> TraceId { - CURRENT_RNG.with(|rng| TraceId::from(rng.borrow_mut().gen::())) + CURRENT_RNG.with(|rng| TraceId::from(rng.borrow_mut().random::())) } fn new_span_id(&self) -> SpanId { - CURRENT_RNG.with(|rng| SpanId::from(rng.borrow_mut().gen::())) + CURRENT_RNG.with(|rng| SpanId::from(rng.borrow_mut().random::())) } } diff --git a/stress/src/throughput.rs b/stress/src/throughput.rs index 131762fab7..9e074abe8b 100644 --- a/stress/src/throughput.rs +++ b/stress/src/throughput.rs @@ -155,7 +155,7 @@ impl<'a> UnsafeSlice<'a> { #[inline(always)] unsafe fn increment(&self, i: usize) { let value = self.slice[i].get(); - (*value).count += 1; + unsafe { (*value).count += 1 }; } #[inline(always)]