add lifetime to BuiltinDeriveMacroId

Author: ada4a

crates/hir-def/src/builtin_derive.rs

@@ -111,7 +111,7 @@ impl BuiltinDeriveImplMethod {
     pub fn trait_method(
         self,
         db: &dyn SourceDatabase,
-        impl_: BuiltinDeriveImplId,
+        impl_: BuiltinDeriveImplId<'_>,
     ) -> Option<FunctionId> {
         let loc = impl_.loc(db);
         let lang_items = crate::lang_item::lang_items(db, loc.krate(db));

crates/hir-def/src/dyn_map.rs

@@ -86,11 +86,11 @@ pub mod keys {
         pub const ATTR_MACRO_CALL<ast::Item, MacroCallId>;
         pub const DERIVE_MACRO_CALL<
             ast::Meta,
-            (
+            for<'db> (
                 AttrId,
                 /* derive() */ MacroCallId,
                 /* actual derive macros */
-                Box<[Option<Either<MacroCallId, BuiltinDeriveImplId>>]>,
+                Box<[Option<Either<MacroCallId, BuiltinDeriveImplId<'db>>>]>,
             ),
         >;
     }
@@ -210,35 +210,3 @@ where
         unsafe { std::mem::transmute::<&mut DynMap<'db>, &mut KeyMap<'db, Key<K, V>>>(self) }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use test_fixture::WithFixture;
-
-    use syntax::{
-        AstPtr,
-        ast::{self, make},
-    };
-
-    use crate::{ModuleIdLt, test_db::TestDB};
-
-    use super::{DynMap, Key, ValueTrait};
-
-    const MODULE: Key<ast::Module, dyn for<'db> ValueTrait<'db, Output = ModuleIdLt<'db>>> =
-        Key::new();
-
-    #[test]
-    fn lifetime_key_returns_database_bound_id() {
-        let (db, file_id) = TestDB::with_single_file("");
-        let module = make::mod_(make::name("foo"), None);
-        let module = AstPtr::new(&module);
-        let module_id = db.module_for_file(file_id.file_id(&db));
-        let module_id = unsafe { module_id.to_db(&db) };
-        let mut map = DynMap::default();
-
-        map[MODULE].insert(module, module_id);
-
-        let stored = map[MODULE].get(&module).unwrap();
-        assert_eq!(*stored, module_id);
-    }
-}

crates/hir-def/src/expr_store.rs

@@ -587,7 +587,7 @@ impl ExpressionStore {
     pub fn blocks<'a>(
         &'a self,
         db: &'a dyn SourceDatabase,
-    ) -> impl Iterator<Item = (BlockId, &'a DefMap)> {
+    ) -> impl Iterator<Item = (BlockId, &'a DefMap<'a>)> {
         self.expr_only
             .as_ref()
             .map(|it| &*it.block_scopes)

crates/hir-def/src/expr_store/expander.rs

@@ -33,7 +33,7 @@ impl<'db> Expander<'db> {
     pub(super) fn new(
         db: &'db dyn SourceDatabase,
         current_file_id: HirFileId,
-        def_map: &DefMap,
+        def_map: &DefMap<'_>,
     ) -> Expander<'db> {
         let recursion_limit = def_map.recursion_limit();
         let recursion_limit = if cfg!(test) {

crates/hir-def/src/expr_store/lower.rs

@@ -451,7 +451,7 @@ pub struct ExprCollector<'db> {
     db: &'db dyn SourceDatabase,
     cfg_options: &'db CfgOptions,
     expander: Expander<'db>,
-    def_map: &'db DefMap,
+    def_map: &'db DefMap<'db>,
     local_def_map: &'db LocalDefMap,
     module: ModuleId,
     lowering_mode: LoweringMode,

crates/hir-def/src/find_path.rs

@@ -124,7 +124,7 @@ struct FindPathCtx<'db> {
     from: ModuleIdLt<'db>,
     from_crate: Crate,
     crate_root: ModuleIdLt<'db>,
-    from_def_map: &'db DefMap,
+    from_def_map: &'db DefMap<'db>,
     fuel: Cell<usize>,
 }
 
@@ -271,7 +271,7 @@ fn find_path_for_module<'db>(
 
 fn find_in_scope<'db>(
     db: &'db dyn SourceDatabase,
-    def_map: &DefMap,
+    def_map: &DefMap<'db>,
     from: ModuleIdLt<'db>,
     item: ItemInNs,
     ignore_local_imports: bool,
@@ -286,11 +286,11 @@ fn find_in_scope<'db>(
 
 /// Returns single-segment path (i.e. without any prefix) if `item` is found in prelude and its
 /// name doesn't clash in current scope.
-fn find_in_prelude(
-    db: &dyn SourceDatabase,
-    local_def_map: &DefMap,
+fn find_in_prelude<'db>(
+    db: &'db dyn SourceDatabase,
+    local_def_map: &DefMap<'db>,
     item: ItemInNs,
-    from: ModuleIdLt<'_>,
+    from: ModuleIdLt<'db>,
 ) -> Option<Choice> {
     let (prelude_module, _) = local_def_map.prelude()?;
     let prelude_def_map = prelude_module.def_map(db);
@@ -321,7 +321,7 @@ fn find_in_prelude(
 
 fn is_kw_kind_relative_to_from(
     db: &dyn SourceDatabase,
-    def_map: &DefMap,
+    def_map: &DefMap<'_>,
     item: ModuleIdLt<'_>,
     from: ModuleIdLt<'_>,
 ) -> Option<PathKind> {

crates/hir-def/src/item_scope.rs

@@ -10,6 +10,7 @@ use indexmap::map::Entry;
 use itertools::Itertools;
 use la_arena::Idx;
 use rustc_hash::{FxHashMap, FxHashSet};
+use salsa::SalsaValue;
 use smallvec::SmallVec;
 use span::Edition;
 use stdx::{format_to, impl_from};
@@ -121,8 +122,8 @@ impl PerNsGlobImports {
     }
 }
 
-#[derive(Debug, Default, PartialEq, Eq)]
-pub struct ItemScope {
+#[derive(Debug, Default, PartialEq, Eq, SalsaValue)]
+pub struct ItemScope<'db> {
     /// Defs visible in this scope. This includes `declarations`, but also
     /// imports. The imports belong to this module and can be resolved by using them on
     /// the `use_imports_*` fields.
@@ -136,7 +137,7 @@ pub struct ItemScope {
     declarations: ThinVec<ModuleDefId>,
 
     impls: ThinVec<(ImplId, /* trait impl */ bool)>,
-    builtin_derive_impls: ThinVec<BuiltinDeriveImplId>,
+    builtin_derive_impls: ThinVec<BuiltinDeriveImplId<'db>>,
     extern_blocks: ThinVec<ExternBlockId>,
     unnamed_consts: ThinVec<ConstId>,
     /// Traits imported via `use Trait as _;`.
@@ -168,15 +169,15 @@ pub struct ItemScope {
     macro_invocations: FxHashMap<AstId<ast::MacroCall>, MacroCallId>,
     /// The derive macro invocations in this scope, keyed by the owner item over the actual derive attributes
     /// paired with the derive macro invocations for the specific attribute.
-    derive_macros: FxHashMap<AstId<ast::Adt>, SmallVec<[DeriveMacroInvocation; 1]>>,
+    derive_macros: FxHashMap<AstId<ast::Adt>, SmallVec<[DeriveMacroInvocation<'db>; 1]>>,
 }
 
-#[derive(Debug, PartialEq, Eq)]
-struct DeriveMacroInvocation {
+#[derive(Debug, PartialEq, Eq, SalsaValue)]
+struct DeriveMacroInvocation<'db> {
     attr_id: AttrId,
     /// The `#[derive]` call
     attr_call_id: MacroCallId,
-    derive_call_ids: SmallVec<[Option<Either<MacroCallId, BuiltinDeriveImplId>>; 4]>,
+    derive_call_ids: SmallVec<[Option<Either<MacroCallId, BuiltinDeriveImplId<'db>>>; 4]>,
 }
 
 pub(crate) static BUILTIN_SCOPE: LazyLock<FxIndexMap<Name, PerNs>> = LazyLock::new(|| {
@@ -197,7 +198,7 @@ pub(crate) enum BuiltinShadowMode {
 
 /// Legacy macros can only be accessed through special methods like `get_legacy_macros`.
 /// Other methods will only resolve values, types and module scoped macros only.
-impl ItemScope {
+impl<'db> ItemScope<'db> {
     pub fn entries(&self) -> impl Iterator<Item = (&Name, PerNs)> {
         // FIXME: shadowing
         self.types
@@ -234,7 +235,7 @@ impl ItemScope {
             .dedup()
     }
 
-    pub fn fully_resolve_import(&self, db: &dyn SourceDatabase, mut import: ImportId) -> PerNs {
+    pub fn fully_resolve_import(&self, db: &'db dyn SourceDatabase, mut import: ImportId) -> PerNs {
         let mut res = PerNs::none();
 
         let mut scope = self;
@@ -313,7 +314,7 @@ impl ItemScope {
         self.impls.iter().filter(|&&(_, is_trait_impl)| !is_trait_impl).map(|&(id, _)| id)
     }
 
-    pub fn builtin_derive_impls(&self) -> impl ExactSizeIterator<Item = BuiltinDeriveImplId> {
+    pub fn builtin_derive_impls(&self) -> impl ExactSizeIterator<Item = BuiltinDeriveImplId<'db>> {
         self.builtin_derive_impls.iter().copied()
     }
 
@@ -452,7 +453,7 @@ impl ItemScope {
     }
 }
 
-impl ItemScope {
+impl<'db> ItemScope<'db> {
     pub(crate) fn declare(&mut self, def: ModuleDefId) {
         self.declarations.push(def)
     }
@@ -473,7 +474,7 @@ impl ItemScope {
         self.impls.push((imp, is_trait_impl));
     }
 
-    pub(crate) fn define_builtin_derive_impl(&mut self, imp: BuiltinDeriveImplId) {
+    pub(crate) fn define_builtin_derive_impl(&mut self, imp: BuiltinDeriveImplId<'db>) {
         self.builtin_derive_impls.push(imp);
     }
 
@@ -508,7 +509,7 @@ impl ItemScope {
     pub(crate) fn set_derive_macro_invoc(
         &mut self,
         adt: AstId<ast::Adt>,
-        call: Either<MacroCallId, BuiltinDeriveImplId>,
+        call: Either<MacroCallId, BuiltinDeriveImplId<'db>>,
         id: AttrId,
         idx: usize,
     ) {
@@ -528,7 +529,7 @@ impl ItemScope {
         adt: AstId<ast::Adt>,
         attr_id: AttrId,
         attr_call_id: MacroCallId,
-        mut derive_call_ids: SmallVec<[Option<Either<MacroCallId, BuiltinDeriveImplId>>; 4]>,
+        mut derive_call_ids: SmallVec<[Option<Either<MacroCallId, BuiltinDeriveImplId<'db>>>; 4]>,
     ) {
         derive_call_ids.shrink_to_fit();
         self.derive_macros.entry(adt).or_default().push(DeriveMacroInvocation {
@@ -544,7 +545,11 @@ impl ItemScope {
         Item = (
             AstId<ast::Adt>,
             impl Iterator<
-                Item = (AttrId, MacroCallId, &[Option<Either<MacroCallId, BuiltinDeriveImplId>>]),
+                Item = (
+                    AttrId,
+                    MacroCallId,
+                    &[Option<Either<MacroCallId, BuiltinDeriveImplId<'db>>>],
+                ),
             >,
         ),
     > + '_ {
@@ -863,7 +868,7 @@ impl ItemScope {
 }
 
 // These methods are a temporary measure only meant to be used by `DefCollector::push_res_and_update_glob_vis()`.
-impl ItemScope {
+impl<'db> ItemScope<'db> {
     pub(crate) fn update_visibility_types(&mut self, name: &Name, vis: Visibility) {
         let res =
             self.types.get_mut(name).expect("tried to update visibility of non-existent type");

crates/hir-def/src/lang_item.rs

@@ -151,7 +151,7 @@ impl LangItems {
 
 fn resolve_core_trait(
     db: &dyn SourceDatabase,
-    core_def_map: &DefMap,
+    core_def_map: &DefMap<'_>,
     modules: &[Symbol],
     name: Symbol,
 ) -> Option<TraitId> {
@@ -176,7 +176,7 @@ fn resolve_core_trait(
 
 fn resolve_core_macro(
     db: &dyn SourceDatabase,
-    core_def_map: &DefMap,
+    core_def_map: &DefMap<'_>,
     modules: &[Symbol],
     name: Symbol,
 ) -> Option<MacroId> {
@@ -397,7 +397,7 @@ macro_rules! language_item_table {
                 }
             }
 
-            fn fill_non_lang_core_items(&mut self, db: &dyn SourceDatabase, core_def_map: &DefMap) {
+            fn fill_non_lang_core_items(&mut self, db: &dyn SourceDatabase, core_def_map: &DefMap<'_>) {
                 $( self.$non_lang_trait = resolve_core_trait(db, core_def_map, &[ $(sym::$non_lang_trait_module),* ], sym::$non_lang_trait); )*
                 $( self.$non_lang_macro_field = resolve_core_macro(db, core_def_map, &[ $(sym::$non_lang_macro_module),* ], sym::$non_lang_macro); )*
             }

crates/hir-def/src/lib.rs

@@ -354,7 +354,7 @@ pub struct BuiltinDeriveImplLoc {
     pub derive_index: u32,
 }
 
-#[salsa::interned(debug, unsafe(no_lifetime), revisions = usize::MAX)]
+#[salsa::interned(debug, revisions = usize::MAX)]
 #[derive(PartialOrd, Ord)]
 pub struct BuiltinDeriveImplId {
     #[returns(ref)]
@@ -564,7 +564,7 @@ impl<'db> ModuleIdLt<'db> {
         unsafe { std::mem::transmute(self) }
     }
 
-    pub fn def_map(self, db: &'db dyn SourceDatabase) -> &'db DefMap {
+    pub fn def_map(self, db: &'db dyn SourceDatabase) -> &'db DefMap<'db> {
         match self.block(db) {
             Some(block) => block_def_map(db, block),
             None => crate_def_map(db, self.krate(db)),
@@ -574,7 +574,7 @@ impl<'db> ModuleIdLt<'db> {
     pub(crate) fn local_def_map(
         self,
         db: &'db dyn SourceDatabase,
-    ) -> (&'db DefMap, &'db LocalDefMap) {
+    ) -> (&'db DefMap<'db>, &'db LocalDefMap) {
         match self.block(db) {
             Some(block) => (block_def_map(db, block), self.only_local_def_map(db)),
             None => {
@@ -588,7 +588,7 @@ impl<'db> ModuleIdLt<'db> {
         crate_local_def_map(db, self.krate(db)).local(db)
     }
 
-    pub fn crate_def_map(self, db: &'db dyn SourceDatabase) -> &'db DefMap {
+    pub fn crate_def_map(self, db: &'db dyn SourceDatabase) -> &'db DefMap<'db> {
         crate_def_map(db, self.krate(db))
     }
 
@@ -742,7 +742,9 @@ pub enum AdtId {
 impl_from!(StructId, UnionId, EnumId for AdtId);
 
 /// A macro
-#[derive(Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::Supertype)]
+#[derive(
+    Debug, PartialOrd, Ord, Clone, Copy, PartialEq, Eq, Hash, salsa::Supertype, salsa::SalsaValue,
+)]
 pub enum MacroId {
     Macro2Id(Macro2Id),
     MacroRulesId(MacroRulesId),
@@ -1241,7 +1243,7 @@ impl HasModule for BuiltinDeriveImplLoc {
     }
 }
 
-impl HasModule for BuiltinDeriveImplId {
+impl HasModule for BuiltinDeriveImplId<'_> {
     #[inline]
     fn module(&self, db: &dyn SourceDatabase) -> ModuleId {
         self.loc(db).module(db)

crates/hir-def/src/macro_expansion_tests/mod.rs

@@ -260,7 +260,7 @@ pub fn identity_when_valid(_attr: TokenStream, item: TokenStream) -> TokenStream
 
 fn resolve_macro_call_id(
     db: &dyn SourceDatabase,
-    def_map: &DefMap,
+    def_map: &DefMap<'_>,
     ast_id: AstId<ast::MacroCall>,
     ast_ptr: InFile<AstPtr<ast::MacroCall>>,
 ) -> Option<MacroCallId> {