Fix Deserialize

Author: functora

rust/functora-tagged/src/lib.rs

@@ -16,7 +16,7 @@ pub trait Refine<Tag>: Clone + Sized {
 }
 
 #[derive(Debug, Error)]
-#[error("Refine error: {0}")]
+#[error("Refine failed: {0}")]
 pub struct RefineError<Rep, Tag>(pub Rep::RefineErrorRep)
 where
     Rep: Refine<Tag>;
@@ -118,18 +118,18 @@ where
 #[cfg(feature = "serde")]
 impl<'de, Rep, Tag> Deserialize<'de> for Tagged<Rep, Tag>
 where
-    Rep: FromStr + Refine<Tag>,
-    Rep::Err: Debug + Display,
+    Rep: Deserialize<'de> + Refine<Tag>,
 {
     fn deserialize<D>(
         deserializer: D,
     ) -> Result<Self, D::Error>
     where
         D: serde::Deserializer<'de>,
     {
-        let s = String::deserialize(deserializer)?;
-        Tagged::from_str(&s)
-            .map_err(serde::de::Error::custom)
+        Rep::deserialize(deserializer).and_then(|rep| {
+            Tagged::new(rep)
+                .map_err(serde::de::Error::custom)
+        })
     }
 }
 

rust/functora-tagged/tests/integration.rs

@@ -177,7 +177,7 @@ fn test_serde_user_id_invalid_refine() {
     let err = toml::from_str::<Wrapper>(toml).unwrap_err();
     assert!(
         err.to_string().contains("Refine failed"),
-        "Deserialization should fail with a Refine error for invalid user_id"
+        "Unexpected failure: {err}"
     );
     let toml = r#"user_id = "user_123""#;
     let wrapper: Wrapper = toml::from_str(toml).unwrap();