mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-01-23 05:07:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge #307

Browse source 
307: quick fix for components w/ optional jar r=nikomatsakis a=nikomatsakis

We need tests!

Co-authored-by: Niko Matsakis <niko@alum.mit.edu>
This commit is contained in:
bors[bot] 2022-08-02 04:32:17 +00:00 committed by GitHub
commit 6bd6f6ee0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/salsa-entity-macros/src/component.rs
View file

@ -111,7 +111,7 @@ fn fn_configuration(args: &Args, item_fn: &syn::ItemFn) -> syn::Result<Configura
}
fn ingredients_for_impl(args: &Args, struct_ty: &syn::Type) -> syn::ItemImpl {
let jar_ty = &args.jar_ty;
let jar_ty = args.jar_ty();
parse_quote! {
impl salsa::storage::IngredientsFor for #struct_ty {
type Ingredients = Self;
@ -202,7 +202,7 @@ fn ref_getter_fn(
item_fn: &syn::ItemFn,
struct_ty: &syn::Type,
) -> syn::Result<syn::ItemFn> {
let jar_ty = &args.jar_ty;
let jar_ty = args.jar_ty();
let mut ref_getter_fn = item_fn.clone();
ref_getter_fn.sig.ident = syn::Ident::new("get", item_fn.sig.ident.span());
ref_getter_fn = make_fn_return_ref(ref_getter_fn)?;
@ -226,7 +226,7 @@ fn setter_fn(
) -> syn::Result<syn::ImplItemMethod> {
// The setter has *always* the same signature as the original:
// but it takes a value arg and has no return type.
let jar_ty = &args.jar_ty;
let jar_ty = args.jar_ty();
let (db_var, arg_names) = fn_args(item_fn)?;
let mut setter_sig = item_fn.sig.clone();
let value_ty = configuration::value_ty(&item_fn.sig);
@ -321,7 +321,7 @@ fn accumulated_fn(
item_fn: &syn::ItemFn,
struct_ty: &syn::Type,
) -> syn::Result<syn::ItemFn> {
let jar_ty = &args.jar_ty;
let jar_ty = args.jar_ty();
let mut accumulated_fn = item_fn.clone();
accumulated_fn.sig.ident = syn::Ident::new("accumulated", item_fn.sig.ident.span());