Merge pull request #646 from Veykril/veykril/push-vulksuymvxot

Remove panicking paths from `maybe_changed_after`

Author: Veykril

src/accumulator.rs

@@ -101,12 +101,7 @@ impl<A: Accumulator> Ingredient for IngredientImpl<A> {
         self.index
     }
 
-    fn maybe_changed_after(
-        &self,
-        _db: &dyn Database,
-        _input: Option<Id>,
-        _revision: Revision,
-    ) -> bool {
+    fn maybe_changed_after(&self, _db: &dyn Database, _input: Id, _revision: Revision) -> bool {
         panic!("nothing should ever depend on an accumulator directly")
     }
 

src/function.rs

@@ -189,15 +189,9 @@ where
         self.index
     }
 
-    fn maybe_changed_after(
-        &self,
-        db: &dyn Database,
-        input: Option<Id>,
-        revision: Revision,
-    ) -> bool {
-        let key = input.unwrap();
+    fn maybe_changed_after(&self, db: &dyn Database, input: Id, revision: Revision) -> bool {
         let db = db.as_view::<C::DbView>();
-        self.maybe_changed_after(db, key, revision)
+        self.maybe_changed_after(db, input, revision)
     }
 
     fn cycle_recovery_strategy(&self) -> CycleRecoveryStrategy {

src/ingredient.rs

@@ -59,7 +59,7 @@ pub trait Ingredient: Any + std::fmt::Debug + Send + Sync {
     fn maybe_changed_after<'db>(
         &'db self,
         db: &'db dyn Database,
-        input: Option<Id>,
+        input: Id,
         revision: Revision,
     ) -> bool;
 

src/input.rs

@@ -214,12 +214,7 @@ impl<C: Configuration> Ingredient for IngredientImpl<C> {
         self.ingredient_index
     }
 
-    fn maybe_changed_after(
-        &self,
-        _db: &dyn Database,
-        _input: Option<Id>,
-        _revision: Revision,
-    ) -> bool {
+    fn maybe_changed_after(&self, _db: &dyn Database, _input: Id, _revision: Revision) -> bool {
         // Input ingredients are just a counter, they store no data, they are immortal.
         // Their *fields* are stored in function ingredients elsewhere.
         false

src/input/input_field.rs

@@ -49,14 +49,8 @@ where
         CycleRecoveryStrategy::Panic
     }
 
-    fn maybe_changed_after(
-        &self,
-        db: &dyn Database,
-        input: Option<Id>,
-        revision: Revision,
-    ) -> bool {
+    fn maybe_changed_after(&self, db: &dyn Database, input: Id, revision: Revision) -> bool {
         let zalsa = db.zalsa();
-        let input = input.unwrap();
         let value = <IngredientImpl<C>>::data(zalsa, input);
         value.stamps[self.field_index].changed_at > revision
     }

src/interned.rs

@@ -220,12 +220,7 @@ where
         self.ingredient_index
     }
 
-    fn maybe_changed_after(
-        &self,
-        _db: &dyn Database,
-        _input: Option<Id>,
-        revision: Revision,
-    ) -> bool {
+    fn maybe_changed_after(&self, _db: &dyn Database, _input: Id, revision: Revision) -> bool {
         revision < self.reset_at
     }
 

src/key.rs

@@ -87,9 +87,14 @@ impl InputDependencyIndex {
         db: &dyn Database,
         last_verified_at: crate::Revision,
     ) -> bool {
-        db.zalsa()
-            .lookup_ingredient(self.ingredient_index)
-            .maybe_changed_after(db, self.key_index, last_verified_at)
+        match self.key_index {
+            Some(key_index) => db
+                .zalsa()
+                .lookup_ingredient(self.ingredient_index)
+                .maybe_changed_after(db, key_index, last_verified_at),
+            // Data in tables themselves remain valid until the table as a whole is reset.
+            None => false,
+        }
     }
 
     pub fn set_key_index(&mut self, key_index: Id) {

src/tracked_struct.rs

@@ -577,12 +577,7 @@ where
         self.ingredient_index
     }
 
-    fn maybe_changed_after(
-        &self,
-        _db: &dyn Database,
-        _input: Option<Id>,
-        _revision: Revision,
-    ) -> bool {
+    fn maybe_changed_after(&self, _db: &dyn Database, _input: Id, _revision: Revision) -> bool {
         false
     }
 

src/tracked_struct/tracked_field.rs

@@ -51,12 +51,11 @@ where
     fn maybe_changed_after<'db>(
         &'db self,
         db: &'db dyn Database,
-        input: Option<Id>,
+        input: Id,
         revision: crate::Revision,
     ) -> bool {
         let zalsa = db.zalsa();
-        let id = input.unwrap();
-        let data = <super::IngredientImpl<C>>::data(zalsa.table(), id);
+        let data = <super::IngredientImpl<C>>::data(zalsa.table(), input);
         let field_changed_at = data.revisions[self.field_index];
         field_changed_at > revision
     }

src/zalsa.rs

@@ -329,7 +329,7 @@ impl JarAux for JarAuxImpl<'_> {
             memo_ingredients
         } else {
             memo_ingredients.resize_with(idx + 1, Vec::new);
-            memo_ingredients.get_mut(idx).unwrap()
+            &mut memo_ingredients[idx]
         };
         let mi = MemoIngredientIndex(u32::try_from(memo_ingredients.len()).unwrap());
         memo_ingredients.push(ingredient_index);