language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-27 18:26:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #19364 from Veykril/push-uonyorwwzpzx

Browse source 
fix: Fix missing `with_durability` calls
This commit is contained in:
Lukas Wirth 2025-03-15 15:09:18 +00:00 • committed by GitHub
commit db4ba3a991
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/base-db/src/lib.rs
View file

@ -86,7 +86,7 @@ impl Files {
let files = Arc::clone(&self.files); let files = Arc::clone(&self.files);
match files.entry(file_id) { match files.entry(file_id) {
Entry::Occupied(mut occupied) => { 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) => { Entry::Vacant(vacant) => {
let text = let text =
@ -116,7 +116,7 @@ impl Files {
let source_roots = Arc::clone(&self.source_roots); let source_roots = Arc::clone(&self.source_roots);
match source_roots.entry(source_root_id) { match source_roots.entry(source_root_id) {
Entry::Occupied(mut occupied) => { 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) => { Entry::Vacant(vacant) => {
let source_root = let source_root =
@ -145,7 +145,11 @@ impl Files {
// let db = self; // let db = self;
match file_source_roots.entry(id) { match file_source_roots.entry(id) {
Entry::Occupied(mut occupied) => { 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) => { Entry::Vacant(vacant) => {
let file_source_root = let file_source_root =

1
crates/hir-expand/src/db.rs
View file

@ -61,6 +61,7 @@ pub trait ExpandDatabase: RootQueryDb {
#[salsa::input] #[salsa::input]
fn proc_macros(&self) -> Arc<ProcMacros>; 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)] #[salsa::invoke_actual(crate::proc_macro::proc_macros_for_crate)]
fn proc_macros_for_crate(&self, krate: Crate) -> Option<Arc<CrateProcMacros>>; fn proc_macros_for_crate(&self, krate: Crate) -> Option<Arc<CrateProcMacros>>;