Merge pull request #33 from k9withabone/limit-string-conversion

feat(service): add `Limit` string conversions

Cargo.toml

@@ -226,7 +226,7 @@ sort_commits = "oldest"
 
 [package]
 name = "compose_spec"
-version = "0.3.0-alpha.2"
+version = "0.3.0-alpha.3"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

src/service/limit.rs

@@ -2,8 +2,9 @@
 //! [`Service`](super::Service).
 
 use std::{
-    fmt::{self, Formatter},
+    fmt::{self, Display, Formatter},
     marker::PhantomData,
+    str::FromStr,
 };
 
 use serde::{
@@ -44,6 +45,27 @@ impl From<ByteValue> for Limit<ByteValue> {
     }
 }
 
+impl<T: Display> Display for Limit<T> {
+    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
+        match self {
+            Self::Value(value) => value.fmt(f),
+            Self::Unlimited => f.write_str("-1"),
+        }
+    }
+}
+
+impl<T: FromStr> FromStr for Limit<T> {
+    type Err = T::Err;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        if s == "-1" {
+            Ok(Self::Unlimited)
+        } else {
+            s.parse().map(Self::Value)
+        }
+    }
+}
+
 impl<T: Serialize> Serialize for Limit<T> {
     fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         match self {
@@ -88,10 +110,18 @@ impl<'de, T: Deserialize<'de>> de::Visitor<'de> for Visitor<T> {
     }
 
     fn visit_str<E: de::Error>(self, v: &str) -> Result<Self::Value, E> {
-        T::deserialize(v.into_deserializer()).map(Limit::Value)
+        if v == "-1" {
+            Ok(Limit::Unlimited)
+        } else {
+            T::deserialize(v.into_deserializer()).map(Limit::Value)
+        }
     }
 
     fn visit_string<E: de::Error>(self, v: String) -> Result<Self::Value, E> {
-        T::deserialize(v.into_deserializer()).map(Limit::Value)
+        if v == "-1" {
+            Ok(Limit::Unlimited)
+        } else {
+            T::deserialize(v.into_deserializer()).map(Limit::Value)
+        }
     }
 }