andras/reconcile
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Fix lints

Browse source
This commit is contained in:
Andras Schmelczer 2025-10-26 21:29:52 +00:00
parent 3da0673af6
commit 450eaaff05
5 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/operation_transformation/edited_text.rs
View file

@ -381,7 +381,6 @@ where
mod tests {
use insta::assert_debug_snapshot;
use pretty_assertions::assert_eq;
use serde_yaml;
use super::*;

18
src/operation_transformation/transport.rs
View file

@ -3,8 +3,8 @@ use std::fmt::Debug;
#[cfg(feature = "serde")]
use serde::{
Deserialize, Serialize,
de::{self, Deserializer, SeqAccess, Visitor},
ser::{SerializeSeq, Serializer},
de::{self, Deserializer, Visitor},
ser::Serializer,
};
use crate::{CursorPosition, Tokenizer, operation_transformation::Operation};
@ -126,7 +126,9 @@ impl Serialize for SimpleOperation {
match self {
SimpleOperation::Equal { length } => serializer.serialize_u64(*length as u64),
SimpleOperation::Insert { text } => serializer.serialize_str(text),
SimpleOperation::Delete { length } => serializer.serialize_i64(-(*length as i64)),
SimpleOperation::Delete { length } => {
serializer.serialize_i64(-(i64::try_from(*length).unwrap_or(i64::MAX)))
}
}
}
}
@ -137,12 +139,14 @@ impl<'de> Deserialize<'de> for SimpleOperation {
where
D: Deserializer<'de>,
{
use std::fmt;
struct OperationVisitor;
impl<'de> Visitor<'de> for OperationVisitor {
impl Visitor<'_> for OperationVisitor {
type Value = SimpleOperation;
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
formatter.write_str("an integer between -2^64 and 2^63 or a string")
}
@ -151,7 +155,7 @@ impl<'de> Deserialize<'de> for SimpleOperation {
E: de::Error,
{
Ok(SimpleOperation::Equal {
length: value as usize,
length: usize::try_from(value).unwrap_or(usize::MAX),
})
}
@ -160,7 +164,7 @@ impl<'de> Deserialize<'de> for SimpleOperation {
E: de::Error,
{
Ok(SimpleOperation::Delete {
length: (-value) as usize,
length: usize::try_from(-value).unwrap_or(usize::MAX),
})
}