From 3391d2c0ec7ddbc012aab3b8855cf8ff52c6e612 Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Sun, 24 Nov 2024 22:33:24 +0000 Subject: [PATCH] Lint --- backend/reconcile/src/diffs/raw_operation.rs | 6 +++--- .../reconcile/src/operation_transformation/edited_text.rs | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/backend/reconcile/src/diffs/raw_operation.rs b/backend/reconcile/src/diffs/raw_operation.rs index f03b2b2f..ce59436e 100644 --- a/backend/reconcile/src/diffs/raw_operation.rs +++ b/backend/reconcile/src/diffs/raw_operation.rs @@ -37,13 +37,13 @@ where pub fn extend(self, other: RawOperation) -> Option> { match (self, other) { (RawOperation::Insert(tokens1), RawOperation::Insert(tokens2)) => Some( - RawOperation::Insert(tokens1.into_iter().chain(tokens2.into_iter()).collect()), + RawOperation::Insert(tokens1.into_iter().chain(tokens2).collect()), ), (RawOperation::Delete(tokens1), RawOperation::Delete(tokens2)) => Some( - RawOperation::Delete(tokens1.into_iter().chain(tokens2.into_iter()).collect()), + RawOperation::Delete(tokens1.into_iter().chain(tokens2).collect()), ), (RawOperation::Equal(tokens1), RawOperation::Equal(tokens2)) => Some( - RawOperation::Equal(tokens1.into_iter().chain(tokens2.into_iter()).collect()), + RawOperation::Equal(tokens1.into_iter().chain(tokens2).collect()), ), _ => None, } diff --git a/backend/reconcile/src/operation_transformation/edited_text.rs b/backend/reconcile/src/operation_transformation/edited_text.rs index c16fc03d..45c0e037 100644 --- a/backend/reconcile/src/operation_transformation/edited_text.rs +++ b/backend/reconcile/src/operation_transformation/edited_text.rs @@ -10,7 +10,6 @@ use crate::{diffs::myers::diff, utils::merge_iters::MergeSorted}; use ropey::Rope; use std::hash::Hash; use std::iter; -use std::path::Iter; #[cfg(feature = "serde")] use serde::{Deserialize, Serialize}; @@ -59,7 +58,7 @@ impl<'a> EditedText<'a> { Self::new( original, // Self::cook_operations(diff), - Self::cook_operations(Self::elongate_operations(diff.into_iter())).collect(), + Self::cook_operations(Self::elongate_operations(diff)).collect(), ) }