Renamed YjsSpanState to FugueSpanState

josephg · Nov 17, 2023 · c06c2f0 · c06c2f0
1 parent e0058bb
commit c06c2f0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/listmerge/merge.rs b/src/listmerge/merge.rs
@@ -1122,7 +1122,7 @@ mod test {
     use crate::dtrange::UNDERWATER_START;
     use crate::list::{ListCRDT, ListOpLog};
     use crate::listmerge::simple_oplog::SimpleOpLog;
-    use crate::listmerge::yjsspan::{deleted_n_state, DELETED_ONCE, YjsSpanState};
+    use crate::listmerge::yjsspan::{deleted_n_state, DELETED_ONCE, FugueSpanState};
     use crate::unicount::count_chars;
     use super::*;
 
@@ -1226,7 +1226,7 @@ mod test {
             .collect()
     }
 
-    fn items_state(tracker: &M2Tracker, filter_underwater: usize) -> Vec<(usize, YjsSpanState)> {
+    fn items_state(tracker: &M2Tracker, filter_underwater: usize) -> Vec<(usize, FugueSpanState)> {
         items(tracker, filter_underwater).iter().map(|i| (i.len(), i.state)).collect()
     }
 

diff --git a/src/listmerge/yjsspan.rs b/src/listmerge/yjsspan.rs
@@ -11,14 +11,14 @@ use crate::dtrange::{debug_time, DTRange, UNDERWATER_START};
 /// Note a u16 (or even a u8) should be fine in practice. Double deletes almost never happen in
 /// reality - unless someone is maliciously generating them.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Default)]
-pub struct YjsSpanState(u32);
+pub struct FugueSpanState(u32);
 
-pub const NOT_INSERTED_YET: YjsSpanState = YjsSpanState(0);
-pub const INSERTED: YjsSpanState = YjsSpanState(1);
-pub const DELETED_ONCE: YjsSpanState = YjsSpanState(2);
+pub const NOT_INSERTED_YET: FugueSpanState = FugueSpanState(0);
+pub const INSERTED: FugueSpanState = FugueSpanState(1);
+pub const DELETED_ONCE: FugueSpanState = FugueSpanState(2);
 
-pub(super) fn deleted_n_state(n: u32) -> YjsSpanState {
-    YjsSpanState(1 + n)
+pub(super) fn deleted_n_state(n: u32) -> FugueSpanState {
+    FugueSpanState(1 + n)
 }
 
 /// This is a span of sync9 / fugue items. (Those two algorithms generate identical merge
@@ -48,12 +48,12 @@ pub struct FugueSpan {
 
     /// Stores whether the item has been inserted, inserted and deleted, or not inserted yet at the
     /// current moment in time.
-    pub state: YjsSpanState,
+    pub state: FugueSpanState,
 
     pub ever_deleted: bool,
 }
 
-impl YjsSpanState {
+impl FugueSpanState {
     /// Note this doesn't (can't) set the ever_deleted flag. Use yjsspan.delete() instead.
     fn delete(&mut self) {
         if self.0 == NOT_INSERTED_YET.0 {