From d28d66bf1390037f38abfe9cfcf9cd1ee4eb6f74 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Fri, 4 Jul 2025 22:47:07 +0200 Subject: [PATCH] fix: Fix phantom data usage in salsa structs affecting auto traits (#932) --- components/salsa-macro-rules/src/setup_interned_struct.rs | 2 +- components/salsa-macro-rules/src/setup_tracked_fn.rs | 2 +- components/salsa-macro-rules/src/setup_tracked_struct.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/salsa-macro-rules/src/setup_interned_struct.rs b/components/salsa-macro-rules/src/setup_interned_struct.rs index 19343622..103f4d21 100644 --- a/components/salsa-macro-rules/src/setup_interned_struct.rs +++ b/components/salsa-macro-rules/src/setup_interned_struct.rs @@ -81,7 +81,7 @@ macro_rules! setup_interned_struct { #[derive(Copy, Clone, PartialEq, Eq, Hash)] $vis struct $Struct< $($db_lt_arg)? >( $Id, - std::marker::PhantomData < & $interior_lt salsa::plumbing::interned::Value <$StructWithStatic> > + std::marker::PhantomData &$interior_lt ()> ); #[allow(clippy::all)] diff --git a/components/salsa-macro-rules/src/setup_tracked_fn.rs b/components/salsa-macro-rules/src/setup_tracked_fn.rs index c424c466..850b3e58 100644 --- a/components/salsa-macro-rules/src/setup_tracked_fn.rs +++ b/components/salsa-macro-rules/src/setup_tracked_fn.rs @@ -99,7 +99,7 @@ macro_rules! setup_tracked_fn { #[derive(Copy, Clone)] struct $InternedData<$db_lt>( salsa::Id, - std::marker::PhantomData<&$db_lt $zalsa::interned::Value<$Configuration>>, + std::marker::PhantomData &$db_lt ()>, ); static $INTERN_CACHE: $zalsa::IngredientCache<$zalsa::interned::IngredientImpl<$Configuration>> = diff --git a/components/salsa-macro-rules/src/setup_tracked_struct.rs b/components/salsa-macro-rules/src/setup_tracked_struct.rs index ab3512ad..8b54fdd2 100644 --- a/components/salsa-macro-rules/src/setup_tracked_struct.rs +++ b/components/salsa-macro-rules/src/setup_tracked_struct.rs @@ -104,7 +104,7 @@ macro_rules! setup_tracked_struct { #[derive(Copy, Clone, PartialEq, Eq, Hash)] $vis struct $Struct<$db_lt>( salsa::Id, - std::marker::PhantomData < & $db_lt salsa::plumbing::tracked_struct::Value < $Struct<'static> > > + std::marker::PhantomData &$db_lt ()> ); #[allow(clippy::all)]