Rename MaybeChangeAfterCycleHeads

Author: MichaReiser

src/accumulator.rs

@@ -7,7 +7,7 @@ use std::panic::UnwindSafe;
 
 use accumulated::{Accumulated, AnyAccumulated};
 
-use crate::function::{MaybeChangeAfterCycleHeads, VerifyResult};
+use crate::function::{VerifyCycleHeads, VerifyResult};
 use crate::ingredient::{Ingredient, Jar};
 use crate::plumbing::ZalsaLocal;
 use crate::sync::Arc;
@@ -105,7 +105,7 @@ impl<A: Accumulator> Ingredient for IngredientImpl<A> {
         _db: crate::database::RawDatabase<'_>,
         _input: Id,
         _revision: Revision,
-        _cycle_heads: &mut MaybeChangeAfterCycleHeads,
+        _cycle_heads: &mut VerifyCycleHeads,
     ) -> VerifyResult {
         panic!("nothing should ever depend on an accumulator directly")
     }

src/function.rs

@@ -1,4 +1,4 @@
-pub(crate) use maybe_changed_after::{MaybeChangeAfterCycleHeads, VerifyResult};
+pub(crate) use maybe_changed_after::{VerifyCycleHeads, VerifyResult};
 use std::any::Any;
 use std::fmt;
 use std::ptr::NonNull;
@@ -265,7 +265,7 @@ where
         db: RawDatabase<'_>,
         input: Id,
         revision: Revision,
-        cycle_heads: &mut MaybeChangeAfterCycleHeads,
+        cycle_heads: &mut VerifyCycleHeads,
     ) -> VerifyResult {
         // SAFETY: The `db` belongs to the ingredient as per caller invariant
         let db = unsafe { self.view_caster().downcast_unchecked(db) };

src/function/fetch.rs

@@ -1,5 +1,5 @@
 use crate::cycle::{CycleHeads, CycleRecoveryStrategy, IterationCount};
-use crate::function::maybe_changed_after::MaybeChangeAfterCycleHeads;
+use crate::function::maybe_changed_after::VerifyCycleHeads;
 use crate::function::memo::Memo;
 use crate::function::sync::ClaimResult;
 use crate::function::{Configuration, IngredientImpl};
@@ -182,7 +182,7 @@ where
                     return unsafe { Some(self.extend_memo_lifetime(old_memo)) };
                 }
 
-                let mut cycle_heads = MaybeChangeAfterCycleHeads::default();
+                let mut cycle_heads = VerifyCycleHeads::default();
                 let verify_result = self.deep_verify_memo(
                     db,
                     zalsa,

src/function/maybe_changed_after.rs

@@ -72,7 +72,7 @@ where
         db: &'db C::DbView,
         id: Id,
         revision: Revision,
-        cycle_heads: &mut MaybeChangeAfterCycleHeads,
+        cycle_heads: &mut VerifyCycleHeads,
     ) -> VerifyResult {
         let (zalsa, zalsa_local) = db.zalsas();
         let memo_ingredient_index = self.memo_ingredient_index(zalsa, id);
@@ -131,7 +131,7 @@ where
         key_index: Id,
         revision: Revision,
         memo_ingredient_index: MemoIngredientIndex,
-        cycle_heads: &mut MaybeChangeAfterCycleHeads,
+        cycle_heads: &mut VerifyCycleHeads,
     ) -> Option<VerifyResult> {
         let database_key_index = self.database_key_index(key_index);
 
@@ -243,7 +243,7 @@ where
         &'db self,
         db: &'db C::DbView,
         database_key_index: DatabaseKeyIndex,
-        cycle_heads: &mut MaybeChangeAfterCycleHeads,
+        cycle_heads: &mut VerifyCycleHeads,
     ) -> VerifyResult {
         match C::CYCLE_STRATEGY {
             // SAFETY: We do not access the query stack reentrantly.
@@ -498,7 +498,7 @@ where
         zalsa: &Zalsa,
         old_memo: &Memo<'_, C>,
         database_key_index: DatabaseKeyIndex,
-        cycle_heads: &mut MaybeChangeAfterCycleHeads,
+        cycle_heads: &mut VerifyCycleHeads,
         can_shallow_update: ShallowUpdate,
     ) -> VerifyResult {
         crate::tracing::debug!(
@@ -533,7 +533,7 @@ where
 
                             // The `MaybeChangeAfterCycleHeads` is used as an out parameter and it's
                             // the caller's responsibility to pass an empty `heads`, which is what we do here.
-                            let mut inner_cycle_heads = MaybeChangeAfterCycleHeads {
+                            let mut inner_cycle_heads = VerifyCycleHeads {
                                 heads: std::mem::take(&mut child_cycle_heads),
                                 has_outer_cycles: cycle_heads.has_any(),
                             };
@@ -691,15 +691,15 @@ impl ShallowUpdate {
 ///
 /// [`maybe_changed_after`]: crate::ingredient::Ingredient::maybe_changed_after
 #[derive(Debug, Default)]
-pub struct MaybeChangeAfterCycleHeads {
+pub struct VerifyCycleHeads {
     heads: Vec<DatabaseKeyIndex>,
 
     /// Whether the outer query (e.g. the parent query running `maybe_changed_after`) has encountered
     /// any cycles to this point.
     has_outer_cycles: bool,
 }
 
-impl MaybeChangeAfterCycleHeads {
+impl VerifyCycleHeads {
     #[inline]
     fn contains(&self, key: DatabaseKeyIndex) -> bool {
         self.heads.contains(&key)

src/ingredient.rs

@@ -5,7 +5,7 @@ use crate::cycle::{
     empty_cycle_heads, CycleHeads, CycleRecoveryStrategy, IterationCount, ProvisionalStatus,
 };
 use crate::database::RawDatabase;
-use crate::function::{MaybeChangeAfterCycleHeads, VerifyResult};
+use crate::function::{VerifyCycleHeads, VerifyResult};
 use crate::runtime::Running;
 use crate::sync::Arc;
 use crate::table::memo::MemoTableTypes;
@@ -51,7 +51,7 @@ pub trait Ingredient: Any + std::fmt::Debug + Send + Sync {
         db: crate::database::RawDatabase<'_>,
         input: Id,
         revision: Revision,
-        cycle_heads: &mut MaybeChangeAfterCycleHeads,
+        cycle_heads: &mut VerifyCycleHeads,
     ) -> VerifyResult;
 
     /// Returns information about the current provisional status of `input`.

src/input.rs

@@ -8,7 +8,7 @@ pub mod singleton;
 
 use input_field::FieldIngredientImpl;
 
-use crate::function::{MaybeChangeAfterCycleHeads, VerifyResult};
+use crate::function::{VerifyCycleHeads, VerifyResult};
 use crate::id::{AsId, FromId, FromIdWithDb};
 use crate::ingredient::Ingredient;
 use crate::input::singleton::{Singleton, SingletonChoice};
@@ -230,7 +230,7 @@ impl<C: Configuration> Ingredient for IngredientImpl<C> {
         _db: crate::database::RawDatabase<'_>,
         _input: Id,
         _revision: Revision,
-        _cycle_heads: &mut MaybeChangeAfterCycleHeads,
+        _cycle_heads: &mut VerifyCycleHeads,
     ) -> VerifyResult {
         // Input ingredients are just a counter, they store no data, they are immortal.
         // Their *fields* are stored in function ingredients elsewhere.

src/input/input_field.rs

@@ -1,7 +1,7 @@
 use std::fmt;
 use std::marker::PhantomData;
 
-use crate::function::{MaybeChangeAfterCycleHeads, VerifyResult};
+use crate::function::{VerifyCycleHeads, VerifyResult};
 use crate::ingredient::Ingredient;
 use crate::input::{Configuration, IngredientImpl, Value};
 use crate::sync::Arc;
@@ -55,7 +55,7 @@ where
         _db: crate::database::RawDatabase<'_>,
         input: Id,
         revision: Revision,
-        _cycle_heads: &mut MaybeChangeAfterCycleHeads,
+        _cycle_heads: &mut VerifyCycleHeads,
     ) -> VerifyResult {
         let value = <IngredientImpl<C>>::data(zalsa, input);
         VerifyResult::changed_if(value.revisions[self.field_index] > revision)

src/interned.rs

@@ -11,7 +11,7 @@ use intrusive_collections::{intrusive_adapter, LinkedList, LinkedListLink, Unsaf
 use rustc_hash::FxBuildHasher;
 
 use crate::durability::Durability;
-use crate::function::{MaybeChangeAfterCycleHeads, VerifyResult};
+use crate::function::{VerifyCycleHeads, VerifyResult};
 use crate::id::{AsId, FromId};
 use crate::ingredient::Ingredient;
 use crate::plumbing::{Jar, ZalsaLocal};
@@ -803,7 +803,7 @@ where
         _db: crate::database::RawDatabase<'_>,
         input: Id,
         _revision: Revision,
-        _cycle_heads: &mut MaybeChangeAfterCycleHeads,
+        _cycle_heads: &mut VerifyCycleHeads,
     ) -> VerifyResult {
         // Record the current revision as active.
         let current_revision = zalsa.current_revision();

src/key.rs

@@ -1,6 +1,6 @@
 use core::fmt;
 
-use crate::function::{MaybeChangeAfterCycleHeads, VerifyResult};
+use crate::function::{VerifyCycleHeads, VerifyResult};
 use crate::zalsa::{IngredientIndex, Zalsa};
 use crate::Id;
 
@@ -38,7 +38,7 @@ impl DatabaseKeyIndex {
         db: crate::database::RawDatabase<'_>,
         zalsa: &Zalsa,
         last_verified_at: crate::Revision,
-        cycle_heads: &mut MaybeChangeAfterCycleHeads,
+        cycle_heads: &mut VerifyCycleHeads,
     ) -> VerifyResult {
         // SAFETY: The `db` belongs to the ingredient
         unsafe {

src/tracked_struct.rs

@@ -10,7 +10,7 @@ use crossbeam_queue::SegQueue;
 use thin_vec::ThinVec;
 use tracked_field::FieldIngredientImpl;
 
-use crate::function::{MaybeChangeAfterCycleHeads, VerifyResult};
+use crate::function::{VerifyCycleHeads, VerifyResult};
 use crate::id::{AsId, FromId};
 use crate::ingredient::{Ingredient, Jar};
 use crate::key::DatabaseKeyIndex;
@@ -821,7 +821,7 @@ where
         _db: crate::database::RawDatabase<'_>,
         _input: Id,
         _revision: Revision,
-        _cycle_heads: &mut MaybeChangeAfterCycleHeads,
+        _cycle_heads: &mut VerifyCycleHeads,
     ) -> VerifyResult {
         // Any change to a tracked struct results in a new ID generation.
         VerifyResult::unchanged()