Merge pull request #606 from Veykril/veykril/push-wpzpkktutxso

Improve the span used for salsa struct constructors
salsa-rs · Oct 25, 2024 · b3b6286 · b3b6286
2 parents 254c749 + 56b7a23
commit b3b6286
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/components/salsa-macro-rules/src/setup_tracked_fn.rs b/components/salsa-macro-rules/src/setup_tracked_fn.rs
@@ -204,7 +204,7 @@ macro_rules! setup_tracked_fn {
                     aux: &dyn $zalsa::JarAux,
                     first_index: $zalsa::IngredientIndex,
                 ) -> Vec<Box<dyn $zalsa::Ingredient>> {
-                    let mut fn_ingredient = <$zalsa::function::IngredientImpl<$Configuration>>::new(
+                    let fn_ingredient = <$zalsa::function::IngredientImpl<$Configuration>>::new(
                         first_index,
                         aux,
                     );

diff --git a/components/salsa-macros/src/salsa_struct.rs b/components/salsa-macros/src/salsa_struct.rs
@@ -30,7 +30,6 @@ use crate::{
     options::{AllowedOptions, Options},
 };
 use proc_macro2::{Ident, Literal, Span, TokenStream};
-use syn::spanned::Spanned;
 
 pub(crate) struct SalsaStruct<'s, A: SalsaStructAllowedOptions> {
     struct_item: &'s syn::ItemStruct,
@@ -115,7 +114,7 @@ where
     pub(crate) fn constructor_name(&self) -> syn::Ident {
         match self.args.constructor_name.clone() {
             Some(name) => name,
-            None => Ident::new("new", self.struct_item.span()),
+            None => Ident::new("new", self.struct_item.ident.span()),
         }
     }