mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-08-04 19:08:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'salsa-rs:master' into master

Browse source
This commit is contained in:
puuuuh 2025-07-06 09:21:28 +03:00 • committed by GitHub
commit 973152c4cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/salsa-macro-rules/src/setup_interned_struct.rs
View file

@ -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<fn() -> &$interior_lt ()>
);
#[allow(clippy::all)]

2
components/salsa-macro-rules/src/setup_tracked_fn.rs
View file

@ -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<fn() -> &$db_lt ()>,
);
static $INTERN_CACHE: $zalsa::IngredientCache<$zalsa::interned::IngredientImpl<$Configuration>> =

2
components/salsa-macro-rules/src/setup_tracked_struct.rs
View file

@ -118,7 +118,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<fn() -> &$db_lt ()>
);
#[allow(clippy::all)]

2
components/salsa-macros/src/options.rs
View file

@ -527,7 +527,7 @@ impl<A: AllowedOptions> quote::ToTokens for Options<A> {
tokens.extend(quote::quote! { revisions = #revisions, });
}
if let Some(heap_size_fn) = heap_size_fn {
tokens.extend(quote::quote! { heap_size_fn = #heap_size_fn, });
tokens.extend(quote::quote! { heap_size = #heap_size_fn, });
}
if let Some(self_ty) = self_ty {
tokens.extend(quote::quote! { self_ty = #self_ty, });