moved Branch, BranchPtr to branch.rs

y-crdt · Horusiath · Mar 9, 2024 · Feb 11, 2024 · Feb 15, 2024 · Feb 16, 2024
commit cd15621e88c1e45eb42a633930a8611047089c6b
diff --git a/yffi/src/lib.rs b/yffi/src/lib.rs
@@ -6,6 +6,7 @@ use std::ptr::{null, null_mut};
 use std::sync::atomic::{AtomicPtr, Ordering};
 use std::sync::Arc;
 use yrs::block::{ClientID, ItemContent, Prelim, Unused};
+use yrs::branch::BranchPtr;
 use yrs::encoding::read::Error;
 use yrs::types::array::ArrayEvent;
 use yrs::types::array::ArrayIter as NativeArrayIter;
@@ -16,9 +17,7 @@ use yrs::types::weak::{LinkSource, Unquote as NativeUnquote, WeakEvent, WeakRef}
 use yrs::types::xml::{Attributes as NativeAttributes, XmlNode};
 use yrs::types::xml::{TreeWalker as NativeTreeWalker, XmlFragment};
 use yrs::types::xml::{XmlEvent, XmlTextEvent};
-use yrs::types::{
-    Attrs, BranchPtr, Change, Delta, EntryChange, Event, PathSegment, TypeRef, Value,
-};
+use yrs::types::{Attrs, Change, Delta, EntryChange, Event, PathSegment, TypeRef, Value};
 use yrs::undo::EventKind;
 use yrs::updates::decoder::{Decode, DecoderV1};
 use yrs::updates::encoder::{Encode, Encoder, EncoderV1, EncoderV2};
@@ -118,7 +117,7 @@ pub type Doc = yrs::Doc;
 ///
 /// Using write methods of different shared types (eg. `ytext_insert` and `yarray_insert`) over
 /// the same branch may result in undefined behavior.
-pub type Branch = yrs::types::Branch;
+pub type Branch = yrs::branch::Branch;
 
 /// Subscription to any kind of observable events, like `ymap_observe`, `ydoc_observe_updates_v1` etc.
 /// This subscription can be destroyed by calling `yunobserve` function, which will cause to unsubscribe

diff --git a/yrs/src/block.rs b/yrs/src/block.rs
@@ -1,3 +1,4 @@
+use crate::branch::{Branch, BranchPtr};
 use crate::doc::{DocAddr, OffsetKind};
 use crate::encoding::read::Error;
 use crate::gc::GCCollector;
@@ -6,7 +7,7 @@ use crate::slice::{BlockSlice, GCSlice, ItemSlice};
 use crate::store::{Store, WeakStoreRef};
 use crate::transaction::TransactionMut;
 use crate::types::text::update_current_attributes;
-use crate::types::{Attrs, Branch, BranchPtr, TypePtr, TypeRef, Value};
+use crate::types::{Attrs, TypePtr, TypeRef, Value};
 use crate::undo::UndoStack;
 use crate::updates::decoder::{Decode, Decoder};
 use crate::updates::encoder::{Encode, Encoder};

diff --git a/yrs/src/block_iter.rs b/yrs/src/block_iter.rs
@@ -1,7 +1,8 @@
 use crate::block::{Item, ItemContent, ItemPtr, Prelim};
+use crate::branch::BranchPtr;
 use crate::moving::{Move, StickyIndex};
 use crate::transaction::{ReadTxn, TransactionMut};
-use crate::types::{BranchPtr, TypePtr, Value};
+use crate::types::{TypePtr, Value};
 use crate::{Assoc, ID};
 
 /// Struct used for iterating over the sequence of item's values with respect to a potential

diff --git a/yrs/src/block_store.rs b/yrs/src/block_store.rs
@@ -17,10 +17,6 @@ pub(crate) struct ClientBlockList {
 }
 
 impl ClientBlockList {
-    fn new() -> ClientBlockList {
-        ClientBlockList { list: Vec::new() }
-    }
-
     /// Creates a new instance of `ClientBlockList` with the specified capacity.
     ///
     /// This function initializes an internal vector with a capacity