expose getters and setters on ExpandProcAttrMacros instead of the struct directly

Author: ada4a

crates/hir-def/src/db.rs

@@ -4,6 +4,7 @@ use hir_expand::{
     EditionedFileId, HirFileId, InFile, Lookup, MacroCallId, MacroDefId, MacroDefKind,
     db::ExpandDatabase,
 };
+use salsa::{Durability, Setter};
 use triomphe::Arc;
 
 use crate::{
@@ -45,9 +46,25 @@ pub trait DefDatabase: ExpandDatabase + SourceDatabase {
 
 /// Whether to expand procedural macros during name resolution.
 #[salsa::input(singleton, debug)]
-pub struct ExpandProcAttrMacros {
+struct ExpandProcAttrMacros {
     #[returns(copy)]
-    pub enabled: bool,
+    enabled: bool,
+}
+
+pub fn get_expand_proc_attr_macros(db: &dyn DefDatabase) -> bool {
+    ExpandProcAttrMacros::get(db).enabled(db)
+}
+
+pub fn set_expand_proc_attr_macros_with_durability(
+    db: &mut dyn salsa::Database,
+    enabled: bool,
+    durability: Durability,
+) {
+    ExpandProcAttrMacros::try_get(db)
+        .unwrap_or_else(|| ExpandProcAttrMacros::new(db, Default::default()))
+        .set_enabled(db)
+        .with_durability(durability)
+        .to(enabled);
 }
 
 // return: macro call id and include file id

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, ExpandProcAttrMacros},
+    db::DefDatabase,
     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
-                    && !ExpandProcAttrMacros::get(self.db).enabled(self.db) =>
+                    && !crate::db::get_expand_proc_attr_macros(self.db) =>
             {
                 (CustomProcMacroExpander::disabled_proc_attr(), kind)
             }

crates/hir-def/src/test_db.rs

@@ -47,7 +47,7 @@ impl Default for TestDB {
             crates_map: Default::default(),
             nonce: Nonce::new(),
         };
-        _ = crate::db::ExpandProcAttrMacros::builder(true).durability(Durability::HIGH).new(&this);
+        crate::db::set_expand_proc_attr_macros_with_durability(&mut this, true, Durability::HIGH);
         // 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

@@ -43,9 +43,7 @@ impl Default for TestDB {
             crates_map: Default::default(),
             nonce: Nonce::new(),
         };
-        _ = hir_def::db::ExpandProcAttrMacros::builder(true)
-            .durability(Durability::HIGH)
-            .new(&this);
+        hir_def::db::set_expand_proc_attr_macros_with_durability(&mut this, true, Durability::HIGH);
         // 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,8 @@
 //! we didn't do that.
 //!
 //! But we need this for at least LRU caching at the query level.
-pub use hir_def::db::{DefDatabase, ExpandProcAttrMacros};
+pub use hir_def::db::{
+    DefDatabase, get_expand_proc_attr_macros, set_expand_proc_attr_macros_with_durability,
+};
 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, Setter};
+use salsa::Durability;
 
 use std::{fmt, mem::ManuallyDrop};
 
@@ -210,16 +210,13 @@ impl RootDatabase {
         _ = base_db::LocalRoots::builder(Default::default())
             .durability(Durability::MEDIUM)
             .new(&db);
-        _ = hir::db::ExpandProcAttrMacros::builder(false).durability(Durability::HIGH).new(&db);
+        hir::db::set_expand_proc_attr_macros_with_durability(&mut db, false, Durability::HIGH);
         db.update_base_query_lru_capacities(lru_capacity);
         db
     }
 
     pub fn enable_proc_attr_macros(&mut self) {
-        hir::db::ExpandProcAttrMacros::get(self)
-            .set_enabled(self)
-            .with_durability(Durability::HIGH)
-            .to(true);
+        hir::db::set_expand_proc_attr_macros_with_durability(self, true, Durability::HIGH);
     }
 
     pub fn update_base_query_lru_capacities(&mut self, _lru_capacity: Option<u16>) {

crates/rust-analyzer/src/reload.rs

@@ -18,10 +18,7 @@ use std::{iter, mem, sync::atomic::AtomicUsize, time::Duration};
 use hir::{ChangeWithProcMacros, ProcMacrosBuilder};
 use ide_db::{
     FxHashMap,
-    base_db::{
-        CrateGraphBuilder, ProcMacroLoadingError, ProcMacroPaths,
-        salsa::{Durability, Setter},
-    },
+    base_db::{CrateGraphBuilder, ProcMacroLoadingError, ProcMacroPaths, salsa::Durability},
 };
 use itertools::Itertools;
 use load_cargo::{ProjectFolders, load_proc_macro};
@@ -112,20 +109,16 @@ impl GlobalState {
             self.reload_flycheck();
         }
 
-        // 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 hir::db::get_expand_proc_attr_macros(raw_db) != self.config.expand_proc_attr_macros() {
+            hir::db::set_expand_proc_attr_macros_with_durability(
+                raw_db,
+                self.config.expand_proc_attr_macros(),
+                Durability::HIGH,
+            );
         }
 
         if self.config.cargo(None) != old_config.cargo(None) {