Make compact_str dependency optional, too

Author: fasterthanlime

Justfile

@@ -8,6 +8,6 @@ check:
     pushd zerodeps-example
     cargo check
     cargo check --features=merde
-    cargo tree --prefix none --no-dedupe | grep -v compact_str
-    cargo tree --prefix none --no-dedupe --features=merde | grep compact_str
+    cargo tree --prefix none --no-dedupe | grep -v merde-core
+    cargo tree --prefix none --no-dedupe --features=merde | grep merde-core
     popd

merde-core/Cargo.toml

@@ -11,4 +11,9 @@ keywords = ["merde", "serialization", "deserialization"]
 categories = ["encoding", "parser-implementations"]
 
 [dependencies]
-compact_str = "0.8.0"
+compact_str = { version = "0.8.0", optional = true }
+
+[features]
+default = []
+full = ["compact_str"]
+compact_str = ["dep:compact_str"]

merde-core/src/cowstr.rs

@@ -5,6 +5,7 @@ use std::{
     ops::Deref,
 };
 
+#[cfg(feature = "compact_str")]
 use compact_str::CompactString;
 
 use crate::IntoStatic;
@@ -17,7 +18,10 @@ use crate::IntoStatic;
 #[derive(Clone)]
 pub enum CowStr<'s> {
     Borrowed(&'s str),
+    #[cfg(feature = "compact_str")]
     Owned(CompactString),
+    #[cfg(not(feature = "compact_str"))]
+    Owned(String),
 }
 
 impl Deref for CowStr<'_> {
@@ -35,7 +39,8 @@ impl<'a> From<Cow<'a, str>> for CowStr<'a> {
     fn from(s: Cow<'a, str>) -> Self {
         match s {
             Cow::Borrowed(s) => CowStr::Borrowed(s),
-            Cow::Owned(s) => CowStr::Owned(CompactString::from(s)),
+            #[allow(clippy::useless_conversion)]
+            Cow::Owned(s) => CowStr::Owned(s.into()),
         }
     }
 }
@@ -48,13 +53,14 @@ impl<'s> From<&'s str> for CowStr<'s> {
 
 impl From<String> for CowStr<'_> {
     fn from(s: String) -> Self {
-        CowStr::Owned(CompactString::from(s))
+        #[allow(clippy::useless_conversion)]
+        CowStr::Owned(s.into())
     }
 }
 
 impl From<Box<str>> for CowStr<'_> {
     fn from(s: Box<str>) -> Self {
-        CowStr::Owned(CompactString::from(s))
+        CowStr::Owned(s.into())
     }
 }
 
@@ -68,6 +74,7 @@ impl From<CowStr<'_>> for String {
     fn from(s: CowStr<'_>) -> Self {
         match s {
             CowStr::Borrowed(s) => s.into(),
+            #[allow(clippy::useless_conversion)]
             CowStr::Owned(s) => s.into(),
         }
     }

merde-core/src/deserialize.rs

@@ -55,6 +55,7 @@ impl<'s> ValueDeserialize<'s> for Cow<'s, str> {
         match value {
             Some(Value::Str(s)) => match s {
                 CowStr::Borrowed(b) => Ok(Cow::Borrowed(b)),
+                #[allow(clippy::useless_conversion)]
                 CowStr::Owned(o) => Ok(Cow::Owned(o.into())),
             },
             Some(v) => Err(MerdeError::MismatchedType {

zerodeps-example/Cargo.lock

@@ -6,7 +6,8 @@ publish = false
 
 [dependencies]
 merde = { version = "4.0.0", path = "../merde", default-features = false }
+merde-core = { version = "4.0.0", path = "../merde-core", default-features = false }
 
 [features]
 default = []
-merde = ["merde/core"]
+merde = ["merde/core", "merde-core/compact_str"]