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

wip

Browse source
This commit is contained in:
Niko Matsakis 2024-07-17 06:14:43 -04:00
parent b552852f29
commit afd7bcfa78
4 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@ macro_rules! setup_interned_struct {
field_ids: [$($field_id:ident),*],
// Names for field setter methods (typically `set_foo`)
field_setter_ids: [$($field_setter_id:ident),*],
field_getter_ids: [$($field_getter_id:ident),*],
// Field types
field_tys: [$($field_ty:ty),*],
@ -35,6 +35,11 @@ macro_rules! setup_interned_struct {
// Number of fields
num_fields: $N:literal,
// Control customization: each path below either appears or doesn't.
customized: [
$($DebugTrait:path)?, // std::fmt::Debug
],
// Annoyingly macro-rules hygiene does not extend to items defined in the macro.
// We have the procedural macro generate names for those items that are
// not used elsewhere in the user's code.
@ -109,7 +114,7 @@ macro_rules! setup_interned_struct {
}
impl<$db_lt> $Struct<$db_lt> {
pub fn new<$Db>(db: &$db_lt $Db, $($field_id: $field_ty),*) -> Self
pub fn $new_fn<$Db>(db: &$db_lt $Db, $($field_id: $field_ty),*) -> Self
where
// FIXME(rust-lang/rust#65991): The `db` argument *should* have the type `dyn Database`
$Db: ?Sized + salsa::Database,
@ -120,7 +125,7 @@ macro_rules! setup_interned_struct {
}
$(
pub fn $field_id<$Db>(self, db: &'db $Db) -> $zalsa::maybe_cloned_ty!($field_option, 'db, $field_ty)
pub fn $field_getter_id<$Db>(self, db: &'db $Db) -> $zalsa::maybe_cloned_ty!($field_option, 'db, $field_ty)
where
// FIXME(rust-lang/rust#65991): The `db` argument *should* have the type `dyn Database`
$Db: ?Sized + $zalsa::Database,
@ -138,7 +143,7 @@ macro_rules! setup_interned_struct {
/// Default debug formatting for this struct (may be useful if you define your own `Debug` impl)
pub fn default_debug_fmt(this: Self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
$zalsa::with_attached_database(|db| {
let fields = $Configuration::ingredient(db).fields(*self);
let fields = $Configuration::ingredient(db).fields(this);
let mut f = f.debug_struct(stringify!($Struct));
$(
let f = f.field(stringify!($field_id), &fields.$field_index);
@ -146,7 +151,7 @@ macro_rules! setup_interned_struct {
f.finish()
}).unwrap_or_else(|| {
f.debug_tuple(stringify!($Struct))
.field(&self.0)
.field(&$zalsa::AsId::as_id(&this))
.finish()
})
}

3
components/salsa-macros/src/input.rs
View file

@ -76,6 +76,7 @@ impl Macro {
let attrs = &self.struct_item.attrs;
let vis = &self.struct_item.vis;
let struct_ident = &self.struct_item.ident;
let new_fn = salsa_struct.constructor_name();
let field_ids = salsa_struct.field_ids();
let field_indices = salsa_struct.field_indices();
let num_fields = salsa_struct.num_fields();
@ -99,7 +100,7 @@ impl Macro {
attrs: [#(#attrs),*],
vis: #vis,
Struct: #struct_ident,
new_fn: new, // FIXME
new_fn: #new_fn,
field_options: [#(#field_options),*],
field_ids: [#(#field_ids),*],
field_getter_ids: [#(#field_getter_ids),*],

4
components/salsa-macros/src/interned.rs
View file

@ -82,7 +82,7 @@ impl Macro {
let field_ids = salsa_struct.field_ids();
let field_indices = salsa_struct.field_indices();
let num_fields = salsa_struct.num_fields();
let field_setter_ids = salsa_struct.field_setter_ids();
let field_getter_ids = salsa_struct.field_getter_ids();
let field_options = salsa_struct.field_options();
let field_tys = salsa_struct.field_tys();
@ -105,7 +105,7 @@ impl Macro {
new_fn: #new_fn,
field_options: [#(#field_options),*],
field_ids: [#(#field_ids),*],
field_setter_ids: [#(#field_setter_ids),*],
field_getter_ids: [#(#field_getter_ids),*],
field_tys: [#(#field_tys),*],
field_indices: [#(#field_indices),*],
num_fields: #num_fields,

2
tests/override_new_get_set.rs
View file

@ -5,6 +5,8 @@
use std::fmt::Display;
use salsa::Setter;
#[salsa::db]
trait Db: salsa::Database {}