chore: fix more lint by clippy

y-crdt · Jul 10, 2024 · b84f08e · b84f08e
1 parent 1ab631e
commit b84f08e
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 30 deletions.
diff --git a/y-octo/src/doc/codec/any.rs b/y-octo/src/doc/codec/any.rs
@@ -1,4 +1,7 @@
-use std::{fmt, ops::RangeInclusive};
+use std::{
+    fmt::{self, Display},
+    ops::RangeInclusive,
+};
 
 use ordered_float::OrderedFloat;
 
@@ -515,21 +518,39 @@ impl serde::Serialize for Any {
     }
 }
 
-impl ToString for Any {
-    fn to_string(&self) -> String {
+impl Display for Any {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            Self::True => "true".to_string(),
-            Self::False => "false".to_string(),
-            Self::String(s) => s.clone(),
-            Self::Integer(i) => i.to_string(),
-            Self::Float32(f) => f.to_string(),
-            Self::Float64(f) => f.to_string(),
-            Self::BigInt64(i) => i.to_string(),
-            // TODO: stringify other types
-            _ => {
-                debug!("any to string {:?}", self);
-                String::default()
+            Self::True => write!(f, "true"),
+            Self::False => write!(f, "false"),
+            Self::String(s) => write!(f, "\"{}\"", s),
+            Self::Integer(i) => write!(f, "{}", i),
+            Self::Float32(v) => write!(f, "{}", v),
+            Self::Float64(v) => write!(f, "{}", v),
+            Self::BigInt64(v) => write!(f, "{}", v),
+            Self::Object(map) => {
+                write!(f, "{{")?;
+                for (i, (key, value)) in map.iter().enumerate() {
+                    if i > 0 {
+                        write!(f, ", ")?;
+                    }
+                    write!(f, "{}: {}", key, value)?;
+                }
+                write!(f, "}}")
+            }
+            Self::Array(vec) => {
+                write!(f, "[")?;
+                for (i, value) in vec.iter().enumerate() {
+                    if i > 0 {
+                        write!(f, ", ")?;
+                    }
+                    write!(f, "{}", value)?;
+                }
+                write!(f, "]")
             }
+            Self::Binary(buf) => write!(f, "{:?}", buf),
+            Self::Undefined => write!(f, "undefined"),
+            Self::Null => write!(f, "null"),
         }
     }
 }

diff --git a/y-octo/src/doc/types/text.rs b/y-octo/src/doc/types/text.rs
@@ -1,3 +1,5 @@
+use std::fmt::Display;
+
 use super::list::ListType;
 use crate::{impl_type, Content, JwstCodecResult};
 
@@ -27,19 +29,15 @@ impl Text {
     }
 }
 
-impl ToString for Text {
-    fn to_string(&self) -> String {
-        let mut ret = String::with_capacity(self.len() as usize);
-
-        self.iter_item().fold(&mut ret, |ret, item| {
+impl Display for Text {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.iter_item().try_for_each(|item| {
             if let Content::String(str) = &item.get().unwrap().content {
-                ret.push_str(str);
+                write!(f, "{}", str)
+            } else {
+                Ok(())
             }
-
-            ret
-        });
-
-        ret
+        })
     }
 }
 

diff --git a/y-octo/src/doc/types/value.rs b/y-octo/src/doc/types/value.rs
@@ -1,3 +1,5 @@
+use std::fmt::Display;
+
 use super::*;
 
 #[derive(Debug, PartialEq)]
@@ -123,12 +125,12 @@ impl From<Doc> for Value {
     }
 }
 
-impl ToString for Value {
-    fn to_string(&self) -> String {
+impl Display for Value {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Value::Any(any) => any.to_string(),
-            Value::Text(text) => text.to_string(),
-            _ => String::default(),
+            Value::Any(any) => write!(f, "{}", any),
+            Value::Text(text) => write!(f, "{}", text),
+            _ => write!(f, ""),
         }
     }
 }