From 6c301aa9806c6040f0c1c54c894776c895472fb2 Mon Sep 17 00:00:00 2001 From: Zixuan Chen Date: Sat, 17 May 2025 05:18:49 +0800 Subject: [PATCH] refactor: rm redundant config --- crates/loro-internal/src/diff_calc.rs | 2 -- crates/loro-internal/src/event.rs | 1 - crates/loro-internal/src/state.rs | 7 ------- crates/loro-internal/src/txn.rs | 1 - 4 files changed, 11 deletions(-) diff --git a/crates/loro-internal/src/diff_calc.rs b/crates/loro-internal/src/diff_calc.rs index e0183f7e1..a4111dc79 100644 --- a/crates/loro-internal/src/diff_calc.rs +++ b/crates/loro-internal/src/diff_calc.rs @@ -298,7 +298,6 @@ impl DiffCalculator { InternalContainerDiff { idx: container_idx, bring_back, - is_container_deleted: false, diff: diff.into(), diff_mode, }, @@ -326,7 +325,6 @@ impl DiffCalculator { InternalContainerDiff { idx, bring_back: true, - is_container_deleted: false, diff: DiffVariant::None, diff_mode: DiffMode::Checkout, }, diff --git a/crates/loro-internal/src/event.rs b/crates/loro-internal/src/event.rs index b6a2d25de..19638c87a 100644 --- a/crates/loro-internal/src/event.rs +++ b/crates/loro-internal/src/event.rs @@ -96,7 +96,6 @@ pub(crate) struct InternalContainerDiff { pub(crate) idx: ContainerIdx, /// Indicates whether this event was generated by a container that has been resurrected during a checkout operation. pub(crate) bring_back: bool, - pub(crate) is_container_deleted: bool, pub(crate) diff: DiffVariant, /// This mode decides how should we apply the diff. pub(crate) diff_mode: DiffMode, diff --git a/crates/loro-internal/src/state.rs b/crates/loro-internal/src/state.rs index 959a89ef2..3641f4d5f 100644 --- a/crates/loro-internal/src/state.rs +++ b/crates/loro-internal/src/state.rs @@ -584,7 +584,6 @@ impl DocState { diffs.push(InternalContainerDiff { idx: new, bring_back: true, - is_container_deleted: false, diff: external_diff.into(), diff_mode: DiffMode::Checkout, }); @@ -688,7 +687,6 @@ impl DocState { diffs.push(InternalContainerDiff { idx: new, bring_back: true, - is_container_deleted: false, diff: external_diff.into(), diff_mode: DiffMode::Checkout, }); @@ -861,7 +859,6 @@ impl DocState { .map(|(&idx, state)| InternalContainerDiff { idx, bring_back: false, - is_container_deleted: false, diff: state .get_state_mut( idx, @@ -1248,10 +1245,6 @@ impl DocState { for diff in diffs { #[allow(clippy::unnecessary_to_owned)] for container_diff in diff.diff.into_owned() { - if container_diff.is_container_deleted { - // omit event form deleted container - continue; - } let Some((last_container_diff, _)) = containers.get_mut(&container_diff.idx) else { if let Some(path) = self.get_path(container_diff.idx) { containers.insert(container_diff.idx, (container_diff.diff, path)); diff --git a/crates/loro-internal/src/txn.rs b/crates/loro-internal/src/txn.rs index 085b8a2ea..34d060f77 100644 --- a/crates/loro-internal/src/txn.rs +++ b/crates/loro-internal/src/txn.rs @@ -480,7 +480,6 @@ impl Transaction { .map(|x| InternalContainerDiff { idx: x.idx, bring_back: false, - is_container_deleted: false, diff: (x.diff.into()), diff_mode: crate::diff_calc::DiffMode::Linear, })