move DefDatabased::expand_proc_attr_macros out of the query group

Author: ada4a

crates/hir-def/src/db.rs

@@ -16,10 +16,6 @@ use crate::{
 
 #[query_group::query_group]
 pub trait DefDatabase: ExpandDatabase + SourceDatabase {
-    /// Whether to expand procedural macros during name resolution.
-    #[salsa::input]
-    fn expand_proc_attr_macros(&self) -> bool;
-
     /// Computes an [`ItemTree`] for the given file or macro expansion.
     #[salsa::invoke(file_item_tree)]
     #[salsa::transparent]
@@ -47,6 +43,13 @@ pub trait DefDatabase: ExpandDatabase + SourceDatabase {
     fn include_macro_invoc(&self, crate_id: Crate) -> Arc<[(MacroCallId, EditionedFileId)]>;
 }
 
+/// Whether to expand procedural macros during name resolution.
+#[salsa::input(singleton, debug)]
+pub struct ExpandProcAttrMacros {
+    #[returns(copy)]
+    pub enabled: bool,
+}
+
 // return: macro call id and include file id
 fn include_macro_invoc(
     db: &dyn DefDatabase,

crates/hir-def/src/nameres/collector.rs

@@ -34,7 +34,7 @@ use crate::{
     MacroRulesId, MacroRulesLoc, MacroRulesLocFlags, ModuleDefId, ModuleId, ProcMacroId,
     ProcMacroLoc, StaticLoc, StructLoc, TraitLoc, TypeAliasLoc, UnionLoc, UnresolvedMacro, UseId,
     UseLoc,
-    db::DefDatabase,
+    db::{DefDatabase, ExpandProcAttrMacros},
     item_scope::{GlobId, ImportId, ImportOrExternCrate, PerNsGlobImports},
     item_tree::{
         self, Attrs, AttrsOrCfg, FieldsShape, ImportAlias, ImportKind, ItemTree, ItemTreeAstId,
@@ -616,7 +616,7 @@ impl<'db> DefCollector<'db> {
         let (expander, kind) = match self.proc_macros.iter().find(|(n, _, _)| n == &def.name) {
             Some(_)
                 if kind == hir_expand::proc_macro::ProcMacroKind::Attr
-                    && !self.db.expand_proc_attr_macros() =>
+                    && !ExpandProcAttrMacros::get(self.db).enabled(self.db) =>
             {
                 (CustomProcMacroExpander::disabled_proc_attr(), kind)
             }

crates/hir-def/src/test_db.rs

@@ -15,7 +15,6 @@ use triomphe::Arc;
 
 use crate::{
     Lookup, ModuleDefId, ModuleId,
-    db::DefDatabase,
     expr_store::{Body, scope::ExprScopes},
     nameres::{DefMap, ModuleSource, block_def_map, crate_def_map},
     src::HasSource,
@@ -48,7 +47,8 @@ impl Default for TestDB {
             crates_map: Default::default(),
             nonce: Nonce::new(),
         };
-        this.set_expand_proc_attr_macros_with_durability(true, Durability::HIGH);
+        _ =
+            crate::db::ExpandProcAttrMacros::builder(true).durability(Durability::HIGH).new(&this);
         // This needs to be here otherwise `CrateGraphBuilder` panics.
         set_all_crates_with_durability(&mut this, std::iter::empty(), Durability::HIGH);
         _ = base_db::LibraryRoots::builder(Default::default())

crates/hir-ty/src/test_db.rs

@@ -7,7 +7,7 @@ use base_db::{
     SourceRootId, SourceRootInput, all_crates, relevant_crates, set_all_crates_with_durability,
 };
 
-use hir_def::{ModuleId, db::DefDatabase, nameres::crate_def_map};
+use hir_def::{ModuleId, nameres::crate_def_map};
 use hir_expand::EditionedFileId;
 use rustc_hash::FxHashMap;
 use salsa::Durability;
@@ -43,7 +43,9 @@ impl Default for TestDB {
             crates_map: Default::default(),
             nonce: Nonce::new(),
         };
-        this.set_expand_proc_attr_macros_with_durability(true, Durability::HIGH);
+        _ = hir_def::db::ExpandProcAttrMacros::builder(true)
+            .durability(Durability::HIGH)
+            .new(&this);
         // This needs to be here otherwise `CrateGraphBuilder` panics.
         set_all_crates_with_durability(&mut this, std::iter::empty(), Durability::HIGH);
         _ = base_db::LibraryRoots::builder(Default::default())

crates/hir/src/db.rs

@@ -3,6 +3,6 @@
 //! we didn't do that.
 //!
 //! But we need this for at least LRU caching at the query level.
-pub use hir_def::db::DefDatabase;
+pub use hir_def::db::{DefDatabase, ExpandProcAttrMacros};
 pub use hir_expand::db::ExpandDatabase;
 pub use hir_ty::db::HirDatabase;

crates/ide-db/src/lib.rs

@@ -55,7 +55,7 @@ pub mod syntax_helpers {
 }
 
 pub use hir::{ChangeWithProcMacros, EditionedFileId};
-use salsa::Durability;
+use salsa::{Durability, Setter};
 
 use std::{fmt, mem::ManuallyDrop};
 
@@ -65,7 +65,7 @@ use base_db::{
 };
 use hir::{
     FilePositionWrapper, FileRangeWrapper,
-    db::{DefDatabase, ExpandDatabase, HirDatabase},
+    db::{ExpandDatabase, HirDatabase},
 };
 use triomphe::Arc;
 
@@ -210,13 +210,16 @@ impl RootDatabase {
         _ = base_db::LocalRoots::builder(Default::default())
             .durability(Durability::MEDIUM)
             .new(&db);
-        db.set_expand_proc_attr_macros_with_durability(false, Durability::HIGH);
+        _ = hir::db::ExpandProcAttrMacros::builder(false).durability(Durability::HIGH).new(&db);
         db.update_base_query_lru_capacities(lru_capacity);
         db
     }
 
     pub fn enable_proc_attr_macros(&mut self) {
-        self.set_expand_proc_attr_macros_with_durability(true, Durability::HIGH);
+        hir::db::ExpandProcAttrMacros::get(self)
+            .set_enabled(self)
+            .with_durability(Durability::HIGH)
+            .to(true);
     }
 
     pub fn update_base_query_lru_capacities(&mut self, _lru_capacity: Option<u16>) {

crates/rust-analyzer/src/reload.rs

@@ -15,10 +15,13 @@
 // FIXME: This is a mess that needs some untangling work
 use std::{iter, mem, sync::atomic::AtomicUsize, time::Duration};
 
-use hir::{ChangeWithProcMacros, ProcMacrosBuilder, db::DefDatabase};
+use hir::{ChangeWithProcMacros, ProcMacrosBuilder};
 use ide_db::{
     FxHashMap,
-    base_db::{CrateGraphBuilder, ProcMacroLoadingError, ProcMacroPaths, salsa::Durability},
+    base_db::{
+        CrateGraphBuilder, ProcMacroLoadingError, ProcMacroPaths,
+        salsa::{Durability, Setter},
+    },
 };
 use itertools::Itertools;
 use load_cargo::{ProjectFolders, load_proc_macro};
@@ -109,13 +112,20 @@ impl GlobalState {
             self.reload_flycheck();
         }
 
-        if self.analysis_host.raw_database().expand_proc_attr_macros()
-            != self.config.expand_proc_attr_macros()
-        {
-            self.analysis_host.raw_database_mut().set_expand_proc_attr_macros_with_durability(
-                self.config.expand_proc_attr_macros(),
-                Durability::HIGH,
-            );
+        // TODO: `ide`'s Cargo.toml says that it should avoid depending on `hir-*` crates directly,
+        // and go through `hir` re-exports instead. `rust-analyzer` OTOH does seems to depend on `hir-*`
+        // after all. So, should I import `ExpandProcAttrMacros` through `hir` or `hir_def`?
+        // TODO: should I create `AnalysisHost::{update_,}expand_proc_attr_macros` to clean this up?
+        // TODO: we don't use `raw_db` mutably until we go into the `if` -- is it a problem that I
+        // still get it mutably in an eager manner? I did this to avoid needing two separate calls, to
+        // `raw_database` and `raw_database_mut`. Or maybe I should just inline `raw_db`?
+        let raw_db = self.analysis_host.raw_database_mut();
+        let expand_proc_macros = hir::db::ExpandProcAttrMacros::get(raw_db);
+        if expand_proc_macros.enabled(raw_db) != self.config.expand_proc_attr_macros() {
+            expand_proc_macros
+                .set_enabled(raw_db)
+                .with_durability(Durability::HIGH)
+                .to(self.config.expand_proc_attr_macros());
         }
 
         if self.config.cargo(None) != old_config.cargo(None) {