Prevent 'Storage' types from being modified without a log

Author: Markus Westerlind

src/snapshot_vec.rs

@@ -98,6 +98,10 @@ where
     }
 }
 
+#[allow(type_alias_bounds)]
+pub type SnapshotVecStorage<D: SnapshotVecDelegate> =
+    SnapshotVec<D, Vec<<D as SnapshotVecDelegate>::Value>, ()>;
+
 pub struct SnapshotVec<
     D: SnapshotVecDelegate,
     V: VecLike<D> = Vec<<D as SnapshotVecDelegate>::Value>,
@@ -153,9 +157,13 @@ impl<D: SnapshotVecDelegate, V: VecLike<D> + Default, L: Default> SnapshotVec<D,
 }
 
 impl<D: SnapshotVecDelegate, V: VecLike<D>, L> SnapshotVec<D, V, L> {
-    pub fn with_log(values: V, undo_log: L) -> Self {
+    pub fn with_log<'a, L2>(&'a mut self, undo_log: L2) -> SnapshotVec<D, &'a mut V, L2>
+    where
+        L2: UndoLogs<UndoLog<D>>,
+        &'a mut V: VecLike<D>,
+    {
         SnapshotVec {
-            values,
+            values: &mut self.values,
             undo_log,
             _marker: PhantomData,
         }

src/unify/mod.rs

@@ -179,12 +179,12 @@ pub struct VarValue<K: UnifyKey> {
 ///   - This implies that ordinary operations are quite a bit slower though.
 ///   - Requires the `persistent` feature be selected in your Cargo.toml file.
 #[derive(Clone, Debug, Default)]
-pub struct UnificationTable<S: UnificationStoreBase> {
+pub struct UnificationTable<S> {
     /// Indicates the current value of each key.
     values: S,
 }
 
-pub type UnificationStorage<K> = Vec<VarValue<K>>;
+pub type UnificationTableStorage<K> = UnificationTable<InPlace<K, Vec<VarValue<K>>, ()>>;
 
 /// A unification table that uses an "in-place" vector.
 #[allow(type_alias_bounds)]
@@ -245,12 +245,18 @@ impl<K, V, L> UnificationTable<InPlace<K, V, L>>
 where
     K: UnifyKey,
     V: sv::VecLike<Delegate<K>>,
-    L: UndoLogs<sv::UndoLog<Delegate<K>>>,
 {
-    pub fn with_log(values: V, undo_log: L) -> Self {
-        Self {
+    pub fn with_log<'a, L2>(
+        &'a mut self,
+        undo_log: L2,
+    ) -> UnificationTable<InPlace<K, &'a mut V, L2>>
+    where
+        L2: UndoLogs<sv::UndoLog<Delegate<K>>>,
+        &'a mut V: sv::VecLike<Delegate<K>>,
+    {
+        UnificationTable {
             values: InPlace {
-                values: sv::SnapshotVec::with_log(values, undo_log),
+                values: self.values.values.with_log(undo_log),
             },
         }
     }