mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-02-02 09:46:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #443 from Veykril/self-span

Browse source 
Preserve span of receiver for query trait functions
This commit is contained in:
Niko Matsakis 2024-03-11 09:58:15 +00:00 committed by GitHub
commit 4151b09d3c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
components/salsa-macros/src/query_group.rs
View file

@ -109,8 +109,8 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
// Extract keys. // Extract keys.
let mut iter = method.sig.inputs.iter(); let mut iter = method.sig.inputs.iter();
match iter.next() { let self_receiver = match iter.next() {
Some(FnArg::Receiver(sr)) if sr.mutability.is_none() => (), Some(FnArg::Receiver(sr)) if sr.mutability.is_none() => sr,
_ => { _ => {
return Error::new( return Error::new(
sig_span, sig_span,
@ -119,7 +119,7 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
.to_compile_error() .to_compile_error()
.into(); .into();
} }
} };
let mut keys: Vec<(Ident, Type)> = vec![]; let mut keys: Vec<(Ident, Type)> = vec![];
for (idx, arg) in iter.enumerate() { for (idx, arg) in iter.enumerate() {
match arg { match arg {
@ -176,6 +176,7 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
query_type: lookup_query_type, query_type: lookup_query_type,
query_name: format!("{}", lookup_fn_name), query_name: format!("{}", lookup_fn_name),
fn_name: lookup_fn_name, fn_name: lookup_fn_name,
receiver: self_receiver.clone(),
attrs: vec![], // FIXME -- some automatically generated docs on this method? attrs: vec![], // FIXME -- some automatically generated docs on this method?
storage: QueryStorage::InternedLookup { storage: QueryStorage::InternedLookup {
intern_query_type: query_type.clone(), intern_query_type: query_type.clone(),
@ -193,6 +194,7 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
query_type, query_type,
query_name, query_name,
fn_name: method.sig.ident, fn_name: method.sig.ident,
receiver: self_receiver.clone(),
attrs, attrs,
storage, storage,
keys, keys,
@ -218,10 +220,11 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
let fn_name = &query.fn_name; let fn_name = &query.fn_name;
let qt = &query.query_type; let qt = &query.query_type;
let attrs = &query.attrs; let attrs = &query.attrs;
let self_receiver = &query.receiver;
query_fn_declarations.extend(quote! { query_fn_declarations.extend(quote! {
#(#attrs)* #(#attrs)*
fn #fn_name(&self, #(#key_names: #keys),*) -> #value; fn #fn_name(#self_receiver, #(#key_names: #keys),*) -> #value;
}); });
// Special case: transparent queries don't create actual storage, // Special case: transparent queries don't create actual storage,
@ -277,7 +280,7 @@ pub(crate) fn query_group(args: TokenStream, input: TokenStream) -> TokenStream
specific durability instead of the default of specific durability instead of the default of
`Durability::LOW`. You can use `Durability::MAX` `Durability::LOW`. You can use `Durability::MAX`
to promise that its value will never change again. to promise that its value will never change again.
See `{fn_name}` for details. See `{fn_name}` for details.
*Note:* Setting values will trigger cancellation *Note:* Setting values will trigger cancellation
@ -720,6 +723,7 @@ fn filter_attrs(attrs: Vec<Attribute>) -> (Vec<Attribute>, Vec<SalsaAttr>) {
#[derive(Debug)] #[derive(Debug)]
struct Query { struct Query {
fn_name: Ident, fn_name: Ident,
receiver: syn::Receiver,
query_name: String, query_name: String,
attrs: Vec<syn::Attribute>, attrs: Vec<syn::Attribute>,
query_type: Ident, query_type: Ident,