diff --git a/backend/Cargo.toml b/backend/Cargo.toml index a12333c3..907b201b 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -43,7 +43,6 @@ inefficient_to_string = "warn" linkedlist = "warn" lossy_float_literal = "warn" macro_use_imports = "warn" -match_on_vec_items = "warn" match_wildcard_for_single_variants = "warn" mem_forget = "warn" needless_borrow = "warn" diff --git a/backend/reconcile/src/operation_transformation/merge_context.rs b/backend/reconcile/src/operation_transformation/merge_context.rs index d45f08ad..5cf0972d 100644 --- a/backend/reconcile/src/operation_transformation/merge_context.rs +++ b/backend/reconcile/src/operation_transformation/merge_context.rs @@ -62,12 +62,11 @@ where self.shift -= *deleted_character_count as i64; self.last_operation = None; } - } else if let Operation::Insert { .. } = last_operation { - if threshold_index + self.shift - last_operation.len() as i64 + } else if let Operation::Insert { .. } = last_operation + && threshold_index + self.shift - last_operation.len() as i64 > last_operation.end_index() as i64 - { - self.last_operation = None; - } + { + self.last_operation = None; } } } diff --git a/backend/rust-toolchain.toml b/backend/rust-toolchain.toml index 8e466642..0d5c6104 100644 --- a/backend/rust-toolchain.toml +++ b/backend/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2025-03-14" +channel = "nightly-2025-06-06" targets = [ "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl" ] profile = "default"