Merge pull request #731 from Veykril/veykril/push-nzkwqzxxkxou

Remove some dynamically dispatched `Database::event` calls

Author: Veykril

src/function/diff_outputs.rs

@@ -1,7 +1,7 @@
 use super::{memo::Memo, Configuration, IngredientImpl};
 use crate::{
     hash::FxHashSet, key::OutputDependencyIndex, zalsa::Zalsa, zalsa_local::QueryRevisions,
-    AsDynDatabase as _, DatabaseKeyIndex, Event, EventKind,
+    AsDynDatabase as _, Database, DatabaseKeyIndex, Event, EventKind,
 };
 
 impl<C> IngredientImpl<C>
@@ -49,15 +49,13 @@ where
         key: DatabaseKeyIndex,
         output: OutputDependencyIndex,
     ) {
-        let db = db.as_dyn_database();
-
         db.salsa_event(&|| {
             Event::new(EventKind::WillDiscardStaleOutput {
                 execute_key: key,
                 output_key: output,
             })
         });
 
-        output.remove_stale_output(zalsa, db, key);
+        output.remove_stale_output(zalsa, db.as_dyn_database(), key);
     }
 }

src/function/maybe_changed_after.rs

@@ -149,14 +149,13 @@ where
         );
         if last_changed <= verified_at {
             // No input of the suitable durability has changed since last verified.
-            let db = db.as_dyn_database();
             memo.mark_as_verified(
                 db,
                 revision_now,
                 database_key_index,
                 memo.revisions.accumulated_inputs.load(),
             );
-            memo.mark_outputs_as_verified(zalsa, db, database_key_index);
+            memo.mark_outputs_as_verified(zalsa, db.as_dyn_database(), database_key_index);
             return true;
         }
 
@@ -264,12 +263,7 @@ where
             }
         };
 
-        old_memo.mark_as_verified(
-            db.as_dyn_database(),
-            zalsa.current_revision(),
-            database_key_index,
-            inputs,
-        );
+        old_memo.mark_as_verified(db, zalsa.current_revision(), database_key_index, inputs);
         true
     }
 }

src/function/memo.rs

@@ -157,9 +157,9 @@ impl<V> Memo<V> {
 
     /// Mark memo as having been verified in the `revision_now`, which should
     /// be the current revision.
-    pub(super) fn mark_as_verified(
+    pub(super) fn mark_as_verified<Db: ?Sized + crate::Database>(
         &self,
-        db: &dyn crate::Database,
+        db: &Db,
         revision_now: Revision,
         database_key_index: DatabaseKeyIndex,
         accumulated: InputAccumulatedValues,

src/function/specify.rs

@@ -127,7 +127,7 @@ where
 
         let database_key_index = self.database_key_index(key);
         memo.mark_as_verified(
-            db.as_dyn_database(),
+            db,
             zalsa.current_revision(),
             database_key_index,
             InputAccumulatedValues::Empty,