mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-01-12 08:30:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

re-use the database-key instead of recreating it

Browse source
This commit is contained in:
Niko Matsakis 2019-08-15 06:39:17 -04:00
parent 4cae741768
commit 969a9c2fc8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/derived/slot.rs
View file

@ -171,7 +171,8 @@ where
}
};
let mut panic_guard = PanicGuard::new(self.database_key(db), self, old_memo, runtime);
let database_key = self.database_key(db);
let mut panic_guard = PanicGuard::new(&database_key, self, old_memo, runtime);
// If we have an old-value, it *may* now be stale, since there
// has been a new revision since the last time we checked. So,
@ -184,7 +185,7 @@ where
db.salsa_event(|| Event {
runtime_id: runtime.id(),
kind: EventKind::DidValidateMemoizedValue {
database_key: self.database_key(db),
database_key: database_key.clone(),
},
});
@ -196,7 +197,6 @@ where
// Query was not previously executed, or value is potentially
// stale, or value is absent. Let's execute!
let database_key = self.database_key(db);
let mut result = runtime.execute_query_implementation(db, &database_key, || {
info!("{:?}: executing query", self);
@ -526,7 +526,7 @@ where
Q: QueryFunction<DB>,
MP: MemoizationPolicy<DB, Q>,
{
database_key: DB::DatabaseKey,
database_key: &'me DB::DatabaseKey,
slot: &'me Slot<DB, Q, MP>,
memo: Option<Memo<DB, Q>>,
runtime: &'me Runtime<DB>,
@ -539,7 +539,7 @@ where
MP: MemoizationPolicy<DB, Q>,
{
fn new(
database_key: DB::DatabaseKey,
database_key: &'me DB::DatabaseKey,
slot: &'me Slot<DB, Q, MP>,
memo: Option<Memo<DB, Q>>,
runtime: &'me Runtime<DB>,