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

Remove duplicate information from interned::Slot

Browse source
This commit is contained in:
Lukas Wirth 2024-07-19 17:52:49 +02:00
parent 8e3133f118
commit 7fcac48023
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
crates/salsa/src/interned.rs
View file

@ -121,8 +121,8 @@ impl InternValueTrivial for String {}
#[derive(Debug)] #[derive(Debug)]
struct Slot<V> { struct Slot<V> {
/// DatabaseKeyIndex for this slot. /// key index for this slot.
database_key_index: DatabaseKeyIndex, key_index: u32,
/// Value that was interned. /// Value that was interned.
value: V, value: V,
@ -199,13 +199,8 @@ where
}; };
let create_slot = |index: InternId| { let create_slot = |index: InternId| {
let database_key_index = DatabaseKeyIndex {
group_index: self.group_index,
query_index: Q::QUERY_INDEX,
key_index: index.as_u32(),
};
Arc::new(Slot { Arc::new(Slot {
database_key_index, key_index: index.as_u32(),
value: insert(Q::Value::from_intern_id(index)), value: insert(Q::Value::from_intern_id(index)),
interned_at: revision_now, interned_at: revision_now,
}) })
@ -242,7 +237,11 @@ where
}; };
let changed_at = slot.interned_at; let changed_at = slot.interned_at;
db.salsa_runtime().report_query_read_and_unwind_if_cycle_resulted( db.salsa_runtime().report_query_read_and_unwind_if_cycle_resulted(
slot.database_key_index, DatabaseKeyIndex {
group_index: self.group_index,
query_index: Q::QUERY_INDEX,
key_index: slot.key_index,
},
INTERN_DURABILITY, INTERN_DURABILITY,
changed_at, changed_at,
); );
@ -294,7 +293,11 @@ where
}; };
let changed_at = slot.interned_at; let changed_at = slot.interned_at;
db.salsa_runtime().report_query_read_and_unwind_if_cycle_resulted( db.salsa_runtime().report_query_read_and_unwind_if_cycle_resulted(
slot.database_key_index, DatabaseKeyIndex {
group_index: self.group_index,
query_index: Q::QUERY_INDEX,
key_index: slot.key_index,
},
INTERN_DURABILITY, INTERN_DURABILITY,
changed_at, changed_at,
); );
@ -414,7 +417,11 @@ where
let value = slot.value.clone(); let value = slot.value.clone();
let interned_at = slot.interned_at; let interned_at = slot.interned_at;
db.salsa_runtime().report_query_read_and_unwind_if_cycle_resulted( db.salsa_runtime().report_query_read_and_unwind_if_cycle_resulted(
slot.database_key_index, DatabaseKeyIndex {
group_index: interned_storage.group_index,
query_index: Q::QUERY_INDEX,
key_index: slot.key_index,
},
INTERN_DURABILITY, INTERN_DURABILITY,
interned_at, interned_at,
); );