avoid or delay str heap allocation for str-sourced deserializers

plabayo · Dec 30, 2024 · 1e2acae · 1e2acae
1 parent 620d182
commit 1e2acae
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/rama-net/src/address/authority.rs b/rama-net/src/address/authority.rs
@@ -209,8 +209,8 @@ impl<'de> serde::Deserialize<'de> for Authority {
     where
         D: serde::Deserializer<'de>,
     {
-        let s = String::deserialize(deserializer)?;
-        s.try_into().map_err(serde::de::Error::custom)
+        let s = <&'de str>::deserialize(deserializer)?;
+        s.parse().map_err(serde::de::Error::custom)
     }
 }
 

diff --git a/rama-net/src/address/domain.rs b/rama-net/src/address/domain.rs
@@ -305,8 +305,8 @@ impl<'de> serde::Deserialize<'de> for Domain {
     where
         D: serde::Deserializer<'de>,
     {
-        let s = String::deserialize(deserializer)?;
-        s.try_into().map_err(serde::de::Error::custom)
+        let s = <&'de str>::deserialize(deserializer)?;
+        s.parse().map_err(serde::de::Error::custom)
     }
 }
 

diff --git a/rama-net/src/address/host.rs b/rama-net/src/address/host.rs
@@ -314,8 +314,8 @@ impl<'de> serde::Deserialize<'de> for Host {
     where
         D: serde::Deserializer<'de>,
     {
-        let s = String::deserialize(deserializer)?;
-        s.try_into().map_err(serde::de::Error::custom)
+        let s = <&'de str>::deserialize(deserializer)?;
+        s.parse().map_err(serde::de::Error::custom)
     }
 }
 

diff --git a/rama-net/src/address/proxy.rs b/rama-net/src/address/proxy.rs
@@ -119,8 +119,8 @@ impl<'de> serde::Deserialize<'de> for ProxyAddress {
     where
         D: serde::Deserializer<'de>,
     {
-        let s = String::deserialize(deserializer)?;
-        s.try_into().map_err(serde::de::Error::custom)
+        let s = <&'de str>::deserialize(deserializer)?;
+        s.parse().map_err(serde::de::Error::custom)
     }
 }
 

diff --git a/rama-net/src/address/socket_address.rs b/rama-net/src/address/socket_address.rs
@@ -197,8 +197,8 @@ impl<'de> serde::Deserialize<'de> for SocketAddress {
     where
         D: serde::Deserializer<'de>,
     {
-        let s = String::deserialize(deserializer)?;
-        s.try_into().map_err(serde::de::Error::custom)
+        let s = <&'de str>::deserialize(deserializer)?;
+        s.parse().map_err(serde::de::Error::custom)
     }
 }
 

diff --git a/rama-net/src/forwarded/node.rs b/rama-net/src/forwarded/node.rs
@@ -374,8 +374,8 @@ impl<'de> serde::Deserialize<'de> for NodeId {
     where
         D: serde::Deserializer<'de>,
     {
-        let s = String::deserialize(deserializer)?;
-        s.try_into().map_err(serde::de::Error::custom)
+        let s = <&'de str>::deserialize(deserializer)?;
+        s.parse().map_err(serde::de::Error::custom)
     }
 }
 

diff --git a/rama-net/src/forwarded/obfuscated.rs b/rama-net/src/forwarded/obfuscated.rs
@@ -166,8 +166,8 @@ macro_rules! create_obf_type {
             where
                 D: serde::Deserializer<'de>,
             {
-                let s = String::deserialize(deserializer)?;
-                s.try_into().map_err(serde::de::Error::custom)
+                let s = <&'de str>::deserialize(deserializer)?;
+                s.parse().map_err(serde::de::Error::custom)
             }
         }
     };

diff --git a/rama-ua/src/info.rs b/rama-ua/src/info.rs
@@ -270,9 +270,9 @@ impl<'de> Deserialize<'de> for HttpAgent {
     where
         D: Deserializer<'de>,
     {
-        let s = String::deserialize(deserializer)?;
+        let s = <&'de str>::deserialize(deserializer)?;
         match_ignore_ascii_case_str! {
-            match (s.as_str()) {
+            match (s) {
                 "chrome" | "chromium" => Ok(HttpAgent::Chromium),
                 "Firefox" => Ok(HttpAgent::Firefox),
                 "Safari" => Ok(HttpAgent::Safari),
@@ -358,9 +358,9 @@ impl<'de> Deserialize<'de> for TlsAgent {
     where
         D: Deserializer<'de>,
     {
-        let s = String::deserialize(deserializer)?;
+        let s = <&'de str>::deserialize(deserializer)?;
         match_ignore_ascii_case_str! {
-            match (s.as_str()) {
+            match (s) {
                 "rustls" => Ok(TlsAgent::Rustls),
                 "boring" | "boringssl" => Ok(TlsAgent::Boringssl),
                 "nss" => Ok(TlsAgent::Nss),

diff --git a/rama-utils/src/str.rs b/rama-utils/src/str.rs
@@ -163,8 +163,8 @@ impl<'de> serde::Deserialize<'de> for NonEmptyString {
     where
         D: serde::Deserializer<'de>,
     {
-        let s = String::deserialize(deserializer)?;
-        s.try_into().map_err(serde::de::Error::custom)
+        let s = <&'de str>::deserialize(deserializer)?;
+        s.parse().map_err(serde::de::Error::custom)
     }
 }