Merge pull request #347 from linebender/try-from-string-name

Implement `TryFrom<String>` for `Name`
linebender · May 23, 2024 · bc069f4 · bc069f4
2 parents e8ea936 + 98965f0
commit bc069f4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/name.rs b/src/name.rs
@@ -101,6 +101,18 @@ impl FromStr for Name {
     }
 }
 
+impl TryFrom<String> for Name {
+    type Error = NamingError;
+
+    fn try_from(value: String) -> Result<Self, Self::Error> {
+        if is_valid(&value) {
+            Ok(Name(value.into()))
+        } else {
+            Err(NamingError::Invalid(value))
+        }
+    }
+}
+
 impl<'de> Deserialize<'de> for Name {
     fn deserialize<D>(deserializer: D) -> Result<Name, D::Error>
     where

diff --git a/src/serde_xml_plist.rs b/src/serde_xml_plist.rs
@@ -38,7 +38,7 @@ mod de {
 
     pub(super) struct DictWrapper(pub(super) Dictionary);
 
-    struct ValueWrapper(Value);
+    struct ValueWrapper;
 
     struct ArrayWrapper(Vec<Value>);
 
@@ -135,7 +135,7 @@ mod de {
         where
             D: Deserializer<'de>,
         {
-            deserializer.deserialize_any(ValueVisitor).map(ValueWrapper)
+            deserializer.deserialize_any(ValueVisitor).map(|_| ValueWrapper)
         }
     }