Unnamed repository; edit this file 'description' to name the repository.
| -rw-r--r-- | crates/base-db/src/lib.rs | 10 | ||||
| -rw-r--r-- | crates/hir-expand/src/db.rs | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/crates/base-db/src/lib.rs b/crates/base-db/src/lib.rs index 0f29abbb54..b733c4d241 100644 --- a/crates/base-db/src/lib.rs +++ b/crates/base-db/src/lib.rs @@ -86,7 +86,7 @@ impl Files { let files = Arc::clone(&self.files); match files.entry(file_id) { Entry::Occupied(mut occupied) => { - occupied.get_mut().set_text(db).to(Arc::from(text)); + occupied.get_mut().set_text(db).with_durability(durability).to(Arc::from(text)); } Entry::Vacant(vacant) => { let text = @@ -116,7 +116,7 @@ impl Files { let source_roots = Arc::clone(&self.source_roots); match source_roots.entry(source_root_id) { Entry::Occupied(mut occupied) => { - occupied.get_mut().set_source_root(db).to(source_root); + occupied.get_mut().set_source_root(db).with_durability(durability).to(source_root); } Entry::Vacant(vacant) => { let source_root = @@ -145,7 +145,11 @@ impl Files { // let db = self; match file_source_roots.entry(id) { Entry::Occupied(mut occupied) => { - occupied.get_mut().set_source_root_id(db).to(source_root_id); + occupied + .get_mut() + .set_source_root_id(db) + .with_durability(durability) + .to(source_root_id); } Entry::Vacant(vacant) => { let file_source_root = diff --git a/crates/hir-expand/src/db.rs b/crates/hir-expand/src/db.rs index 112327f11e..7e7858d15b 100644 --- a/crates/hir-expand/src/db.rs +++ b/crates/hir-expand/src/db.rs @@ -61,6 +61,7 @@ pub trait ExpandDatabase: RootQueryDb { #[salsa::input] fn proc_macros(&self) -> Arc<ProcMacros>; + /// Incrementality query to prevent queries from directly depending on `ExpandDatabase::proc_macros`. #[salsa::invoke_actual(crate::proc_macro::proc_macros_for_crate)] fn proc_macros_for_crate(&self, krate: Crate) -> Option<Arc<CrateProcMacros>>; |