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

Merge branch 'master' into dhruv/recreate-panic

Browse source
This commit is contained in:
Niko Matsakis 2024-09-22 07:37:00 -04:00 • committed by GitHub
commit acc34396c6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 365 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/function/execute.rs
View file

@ -1,8 +1,7 @@
use std::sync::Arc;
use crate::{
runtime::StampedValue, zalsa::ZalsaDatabase, zalsa_local::ActiveQueryGuard, Cycle, Database,
Event, EventKind,
zalsa::ZalsaDatabase, zalsa_local::ActiveQueryGuard, Cycle, Database, Event, EventKind,
};
use super::{memo::Memo, Configuration, IngredientImpl};
@ -25,7 +24,7 @@ where
db: &'db C::DbView,
active_query: ActiveQueryGuard<'_>,
opt_old_memo: Option<Arc<Memo<C::Output<'_>>>>,
) -> StampedValue<&'db C::Output<'db>> {
) -> &'db Memo<C::Output<'db>> {
let zalsa = db.zalsa();
let revision_now = zalsa.current_revision();
let database_key_index = active_query.database_key_index;
@ -86,11 +85,6 @@ where
tracing::debug!("{database_key_index:?}: read_upgrade: result.revisions = {revisions:#?}");
let stamp_template = revisions.stamp_template();
let value = self
.insert_memo(zalsa, id, Memo::new(Some(value), revision_now, revisions))
.unwrap();
stamp_template.stamp(value)
self.insert_memo(zalsa, id, Memo::new(Some(value), revision_now, revisions))
}
}