mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-08-09 21:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP checkpoint

Browse source
This commit is contained in:
Niko Matsakis 2024-07-12 07:51:28 -04:00
parent 15106ff8ea
commit 73b8134345
12 changed files with 132 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/function/execute.rs
View file

@ -25,8 +25,8 @@ where
&'db self,
db: &'db C::DbView,
active_query: ActiveQueryGuard<'_>,
opt_old_memo: Option<Arc<Memo<C::Value<'_>>>>,
) -> StampedValue<&C::Value<'db>> {
opt_old_memo: Option<Arc<Memo<C::Output<'_>>>>,
) -> StampedValue<&C::Output<'db>> {
let runtime = db.runtime();
let revision_now = runtime.current_revision();
let database_key_index = active_query.database_key_index;
@ -44,7 +44,7 @@ where
// stale, or value is absent. Let's execute!
let database_key_index = active_query.database_key_index;
let key = database_key_index.key_index;
let value = match Cycle::catch(|| C::execute(db, key)) {
let value = match Cycle::catch(|| C::execute(db, C::id_to_input(db, key))) {
Ok(v) => v,
Err(cycle) => {
log::debug!(