Avoid using owned String in deserializers (#11764)

## Summary

This is the pattern I see in a variety of crates, and I believe this is
preferred if you don't _need_ an owned `String`, since you can avoid the
allocation. This could be pretty impactful for us?
This commit is contained in:
Charlie Marsh 2025-02-25 06:28:16 -08:00 committed by GitHub
parent 275db0668d
commit c37af945b3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 350 additions and 104 deletions

View file

@ -48,8 +48,25 @@ impl<'de> Deserialize<'de> for ExtraName {
where
D: Deserializer<'de>,
{
let s = String::deserialize(deserializer)?;
Self::from_str(&s).map_err(serde::de::Error::custom)
struct Visitor;
impl serde::de::Visitor<'_> for Visitor {
type Value = ExtraName;
fn expecting(&self, f: &mut Formatter) -> fmt::Result {
f.write_str("a string")
}
fn visit_str<E: serde::de::Error>(self, v: &str) -> Result<Self::Value, E> {
ExtraName::from_str(v).map_err(serde::de::Error::custom)
}
fn visit_string<E: serde::de::Error>(self, v: String) -> Result<Self::Value, E> {
ExtraName::from_owned(v).map_err(serde::de::Error::custom)
}
}
deserializer.deserialize_str(Visitor)
}
}

View file

@ -1,5 +1,3 @@
use std::fmt;
use std::fmt::{Display, Formatter};
use std::str::FromStr;
use std::sync::LazyLock;
@ -41,8 +39,25 @@ impl<'de> Deserialize<'de> for GroupName {
where
D: Deserializer<'de>,
{
let s = String::deserialize(deserializer)?;
Self::from_str(&s).map_err(serde::de::Error::custom)
struct Visitor;
impl serde::de::Visitor<'_> for Visitor {
type Value = GroupName;
fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
f.write_str("a string")
}
fn visit_str<E: serde::de::Error>(self, v: &str) -> Result<Self::Value, E> {
GroupName::from_str(v).map_err(serde::de::Error::custom)
}
fn visit_string<E: serde::de::Error>(self, v: String) -> Result<Self::Value, E> {
GroupName::from_owned(v).map_err(serde::de::Error::custom)
}
}
deserializer.deserialize_str(Visitor)
}
}
@ -55,8 +70,8 @@ impl Serialize for GroupName {
}
}
impl Display for GroupName {
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
impl std::fmt::Display for GroupName {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
self.0.fmt(f)
}
}

View file

@ -91,8 +91,25 @@ impl<'de> Deserialize<'de> for PackageName {
where
D: Deserializer<'de>,
{
let s = String::deserialize(deserializer)?;
Self::from_str(&s).map_err(serde::de::Error::custom)
struct Visitor;
impl serde::de::Visitor<'_> for Visitor {
type Value = PackageName;
fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
f.write_str("a string")
}
fn visit_str<E: serde::de::Error>(self, v: &str) -> Result<Self::Value, E> {
PackageName::from_str(v).map_err(serde::de::Error::custom)
}
fn visit_string<E: serde::de::Error>(self, v: String) -> Result<Self::Value, E> {
PackageName::from_owned(v).map_err(serde::de::Error::custom)
}
}
deserializer.deserialize_str(Visitor)
}
}