fix: adapt code to fluent-uri upgrade

Signed-off-by: David Bernard <[email protected]>

Author: davidB

cdevents-sdk/src/error.rs

@@ -7,11 +7,13 @@ pub enum Error {
     #[error("Empty data in cloudevent")]
     DataNotFoundInCloudEvent,
     #[error(transparent)]
-    UriParseError( #[from] fluent_uri::error::ParseError<String>),
+    UriParseError( #[from] fluent_uri::ParseError),
     #[error(transparent)]
     SerdeJsonError( #[from] serde_json::Error),
     #[error("unknown error")]
     Unknown,
     #[error("{0} should be non-empty")]
-    EmptyString(&'static str)
+    EmptyString(&'static str),
+    #[error(transparent)]
+    InfallibleError( #[from] std::convert::Infallible),
 }

cdevents-sdk/src/serde.rs

@@ -26,21 +26,24 @@ pub(crate) mod datetime {
     }
 }
 
-pub(crate) mod fluent_uri {
-    use serde::{de::Error, Deserialize, Deserializer, Serializer};
+// pub(crate) mod fluent_uri {
+//     use serde::{de::Error, Deserialize, Deserializer, Serializer};
 
-    pub fn deserialize<'de, D>(deserializer: D) -> Result<fluent_uri::UriRef<String>, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let txt = String::deserialize(deserializer)?;
-        fluent_uri::UriRef::parse(txt).map_err(D::Error::custom)
-    }
+//     pub fn deserialize<'de, D>(deserializer: D) -> Result<fluent_uri::UriRef<String>, D::Error>
+//     where
+//         D: Deserializer<'de>,
+//     {
+//         let txt = String::deserialize(deserializer)?;
+//         fluent_uri::UriRef::parse(txt).map_err(|e| match e {
+//                 fluent_uri::
+//             }
+//             D::Error::custom)
+//     }
 
-    pub fn serialize<S>(input: &fluent_uri::UriRef<String>, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serializer.collect_str(input.as_str())
-    }
-}
+//     pub fn serialize<S>(input: &fluent_uri::UriRef<String>, serializer: S) -> Result<S::Ok, S::Error>
+//     where
+//         S: Serializer,
+//     {
+//         serializer.collect_str(input.as_str())
+//     }
+// }

cdevents-sdk/src/uri.rs

@@ -15,7 +15,7 @@ use crate::UriReference;
 #[cfg_attr(feature = "testkit", derive(Arbitrary))]
 pub struct Uri(
     #[cfg_attr(feature = "testkit", proptest(value = "fluent_uri::UriRef::parse(\"https://example.com/\".to_owned()).unwrap()"))] //TODO generate random value
-    #[serde(with = "crate::serde::fluent_uri")]
+    //#[serde(with = "crate::serde::fluent_uri")]
     pub(crate) fluent_uri::UriRef<String>
 );
 
@@ -32,7 +32,7 @@ impl FromStr for Uri {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         //TODO check it's not a reference URI
-        fluent_uri::UriRef::parse(s.to_owned()).map_err(Self::Err::from).map(Uri)
+        fluent_uri::UriRef::parse(s.to_owned()).map_err(|(e,_)| Self::Err::from(e)).map(Uri)
     }
 }
 
@@ -48,15 +48,15 @@ impl TryFrom<&str> for Uri {
     type Error = crate::Error;
 
     fn try_from(s: &str) -> Result<Self, Self::Error> {
-        fluent_uri::UriRef::parse(s.to_owned()).map_err(Self::Error::from).map(Uri)
+        fluent_uri::UriRef::parse(s.to_owned()).map_err(|(e, _)| Self::Error::from(e)).map(Uri)
     }
 }
 
 impl TryFrom<String> for Uri {
     type Error = crate::Error;
 
     fn try_from(s: String) -> Result<Self, Self::Error> {
-        fluent_uri::UriRef::parse(s).map_err(Self::Error::from).map(Uri)
+        fluent_uri::UriRef::parse(s).map_err(|(e, _)| Self::Error::from(e)).map(Uri)
     }
 }
 

cdevents-sdk/src/uri_reference.rs

@@ -5,7 +5,7 @@ use crate::Uri;
 
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 pub struct UriReference(
-    #[serde(with = "crate::serde::fluent_uri")]
+    //#[serde(with = "crate::serde::fluent_uri")]
     pub(crate) fluent_uri::UriRef<String>
 );
 
@@ -21,14 +21,15 @@ impl FromStr for UriReference {
     type Err = crate::Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        fluent_uri::UriRef::parse(s.to_owned()).map_err(Self::Err::from).map(UriReference)
+        fluent_uri::UriRef::parse(s.to_owned()).map_err(|(e,_)| Self::Err::from(e)).map(UriReference)
     }
 }
 
 impl TryFrom<Uri> for UriReference {
     type Error = crate::Error;
 
     fn try_from(s: Uri) -> Result<Self, Self::Error> {
+        //fluent_uri::UriRef::try_from(s.0).map_err(Self::Error::from).map(UriReference)
         Ok(UriReference(s.0))
     }
 }
@@ -37,15 +38,15 @@ impl TryFrom<&str> for UriReference {
     type Error = crate::Error;
 
     fn try_from(s: &str) -> Result<Self, Self::Error> {
-        fluent_uri::UriRef::parse(s.to_owned()).map_err(Self::Error::from).map(UriReference)
+        fluent_uri::UriRef::parse(s.to_owned()).map_err(|(e,_)| Self::Error::from(e)).map(UriReference)
     }
 }
 
 impl TryFrom<String> for UriReference {
     type Error = crate::Error;
 
     fn try_from(s: String) -> Result<Self, Self::Error> {
-        fluent_uri::UriRef::parse(s).map_err(Self::Error::from).map(UriReference)
+        fluent_uri::UriRef::parse(s).map_err(|(e,_)| Self::Error::from(e)).map(UriReference)
     }
 }