Deduplicate via type alias

Author: Veykril

Diff for: src/function.rs

@@ -160,17 +160,17 @@ where
     /// only cleared with `&mut self`.
     unsafe fn extend_memo_lifetime<'this>(
         &'this self,
-        memo: &memo::Memo<C::Lru, C::Output<'this>>,
-    ) -> &'this memo::Memo<C::Lru, C::Output<'this>> {
+        memo: &memo::MemoConfigured<'this, C>,
+    ) -> &'this memo::MemoConfigured<'this, C> {
         std::mem::transmute(memo)
     }
 
     fn insert_memo<'db>(
         &'db self,
         zalsa: &'db Zalsa,
         id: Id,
-        memo: memo::Memo<C::Lru, C::Output<'db>>,
-    ) -> &'db memo::Memo<C::Lru, C::Output<'db>> {
+        memo: memo::MemoConfigured<'db, C>,
+    ) -> &'db memo::MemoConfigured<'db, C> {
         let memo = Arc::new(memo);
         let db_memo = unsafe {
             // Unsafety conditions: memo must be in the map (it's not yet, but it will be by the time this

Diff for: src/function/backdate.rs

@@ -1,6 +1,6 @@
-use crate::zalsa_local::QueryRevisions;
+use crate::{function::memo::MemoConfigured, zalsa_local::QueryRevisions};
 
-use super::{memo::Memo, Configuration, IngredientImpl, LruChoice};
+use super::{Configuration, IngredientImpl, LruChoice};
 
 impl<C> IngredientImpl<C>
 where
@@ -11,7 +11,7 @@ where
     /// on an old memo when a new memo has been produced to check whether there have been changed.
     pub(super) fn backdate_if_appropriate(
         &self,
-        old_memo: &Memo<C::Lru, C::Output<'_>>,
+        old_memo: &MemoConfigured<'_, C>,
         revisions: &mut QueryRevisions,
         value: &C::Output<'_>,
     ) {

Diff for: src/function/diff_outputs.rs

@@ -1,7 +1,7 @@
-use super::{memo::Memo, Configuration, IngredientImpl};
+use super::{Configuration, IngredientImpl};
 use crate::{
-    hash::FxHashSet, key::OutputDependencyIndex, zalsa_local::QueryRevisions, AsDynDatabase as _,
-    DatabaseKeyIndex, Event, EventKind,
+    function::memo::MemoConfigured, hash::FxHashSet, key::OutputDependencyIndex,
+    zalsa_local::QueryRevisions, AsDynDatabase as _, DatabaseKeyIndex, Event, EventKind,
 };
 
 impl<C> IngredientImpl<C>
@@ -17,7 +17,7 @@ where
         &self,
         db: &C::DbView,
         key: DatabaseKeyIndex,
-        old_memo: &Memo<C::Lru, C::Output<'_>>,
+        old_memo: &MemoConfigured<'_, C>,
         revisions: &mut QueryRevisions,
     ) {
         // Iterate over the outputs of the `old_memo` and put them into a hashset

Diff for: src/function/execute.rs

@@ -1,7 +1,8 @@
 use std::sync::Arc;
 
 use crate::{
-    zalsa::ZalsaDatabase, zalsa_local::ActiveQueryGuard, Cycle, Database, Event, EventKind,
+    function::memo::MemoConfigured, zalsa::ZalsaDatabase, zalsa_local::ActiveQueryGuard, Cycle,
+    Database, Event, EventKind,
 };
 
 use super::{memo::Memo, Configuration, IngredientImpl, LruChoice};
@@ -23,8 +24,8 @@ where
         &'db self,
         db: &'db C::DbView,
         active_query: ActiveQueryGuard<'_>,
-        opt_old_memo: Option<Arc<Memo<C::Lru, C::Output<'_>>>>,
-    ) -> &'db Memo<C::Lru, C::Output<'db>> {
+        opt_old_memo: Option<Arc<MemoConfigured<'_, C>>>,
+    ) -> &'db MemoConfigured<'db, C> {
         let zalsa = db.zalsa();
         let revision_now = zalsa.current_revision();
         let database_key_index = active_query.database_key_index;

Diff for: src/function/fetch.rs

@@ -1,7 +1,8 @@
-use super::{memo::Memo, Configuration, IngredientImpl};
+use super::{Configuration, IngredientImpl};
 use crate::{
     accumulator::accumulated_map::InputAccumulatedValues, function::lru::LruChoice as _,
-    runtime::StampedValue, zalsa::ZalsaDatabase, AsDynDatabase as _, Id,
+    function::memo::MemoConfigured, runtime::StampedValue, zalsa::ZalsaDatabase,
+    AsDynDatabase as _, Id,
 };
 
 impl<C> IngredientImpl<C>
@@ -41,7 +42,7 @@ where
         &'db self,
         db: &'db C::DbView,
         id: Id,
-    ) -> &'db Memo<C::Lru, C::Output<'db>> {
+    ) -> &'db MemoConfigured<'db, C> {
         loop {
             if let Some(memo) = self.fetch_hot(db, id).or_else(|| self.fetch_cold(db, id)) {
                 return memo;
@@ -54,7 +55,7 @@ where
         &'db self,
         db: &'db C::DbView,
         id: Id,
-    ) -> Option<&'db Memo<C::Lru, C::Output<'db>>> {
+    ) -> Option<&'db MemoConfigured<'db, C>> {
         let zalsa = db.zalsa();
         let memo_guard = self.get_memo_from_table_for(zalsa, id);
         if let Some(memo) = &memo_guard {
@@ -73,7 +74,7 @@ where
         &'db self,
         db: &'db C::DbView,
         id: Id,
-    ) -> Option<&'db Memo<C::Lru, C::Output<'db>>> {
+    ) -> Option<&'db MemoConfigured<'db, C>> {
         let (zalsa, zalsa_local) = db.zalsas();
         let database_key_index = self.database_key_index(id);
 

Diff for: src/function/maybe_changed_after.rs

@@ -1,13 +1,14 @@
 use crate::{
     accumulator::accumulated_map::InputAccumulatedValues,
+    function::memo::MemoConfigured,
     ingredient::MaybeChangedAfter,
     key::DatabaseKeyIndex,
     zalsa::{Zalsa, ZalsaDatabase},
     zalsa_local::{ActiveQueryGuard, QueryEdge, QueryOrigin},
     AsDynDatabase as _, Id, Revision,
 };
 
-use super::{memo::Memo, Configuration, IngredientImpl, LruChoice};
+use super::{Configuration, IngredientImpl, LruChoice};
 
 impl<C> IngredientImpl<C>
 where
@@ -117,7 +118,7 @@ where
         db: &C::DbView,
         zalsa: &Zalsa,
         database_key_index: DatabaseKeyIndex,
-        memo: &Memo<C::Lru, C::Output<'_>>,
+        memo: &MemoConfigured<'_, C>,
     ) -> bool {
         let verified_at = memo.verified_at.load();
         let revision_now = zalsa.current_revision();
@@ -159,7 +160,7 @@ where
     pub(super) fn deep_verify_memo(
         &self,
         db: &C::DbView,
-        old_memo: &Memo<C::Lru, C::Output<'_>>,
+        old_memo: &MemoConfigured<'_, C>,
         active_query: &ActiveQueryGuard<'_>,
     ) -> bool {
         let zalsa = db.zalsa();

Diff for: src/function/memo.rs

@@ -67,7 +67,7 @@ impl<C: Configuration> IngredientImpl<C> {
     /// or has values assigned as output of another query, this has no effect.
     pub(super) fn evict_value_from_memo_for(&self, table: &mut MemoTable) {
         C::Lru::if_enabled(|| {
-            table.map_memo::<Memo<C::Lru, C::Output<'_>>>(self.memo_ingredient_index, |memo| {
+            table.map_memo::<MemoConfigured<'_, C>>(self.memo_ingredient_index, |memo| {
                 match &memo.revisions.origin {
                     QueryOrigin::Assigned(_)
                     | QueryOrigin::DerivedUntracked(_)
@@ -110,6 +110,10 @@ impl<C: Configuration> IngredientImpl<C> {
     }
 }
 
+#[allow(type_alias_bounds)]
+pub(super) type MemoConfigured<'db, C: Configuration<Lru: LruChoice>> =
+    Memo<C::Lru, C::Output<'db>>;
+
 pub(super) struct Memo<L: LruChoice, V: Send + Sync> {
     /// The result of the query, if we decide to memoize it.
     pub(super) value: L::LruCtor<V>,