major fixes

pranav-bhatt · pranav-bhatt · commit 6858566e6601 · 2021-01-26T15:25:41.000+05:30
Signed-off-by: adpranavb2000@gmail.com &lt;adpranavb2000@gmail.com&gt;
diff --git a/src/event/builder.rs b/src/event/builder.rs
@@ -1,4 +1,4 @@
-use super::Event;
+use super::{DisplayError, Event};
 use snafu::Snafu;
 
 /// Trait to implement a builder for [`Event`]:
@@ -41,7 +41,8 @@ pub enum Error {
     ))]
     ParseTimeError {
         attribute_name: &'static str,
-        source: chrono::ParseError,
+        #[snafu(source(from(chrono::ParseError, DisplayError)))]
+        source: DisplayError<chrono::ParseError>,
     },
     #[snafu(display(
         "Error while setting attribute '{}' with uri/uriref type: {}",
@@ -50,6 +51,7 @@ pub enum Error {
     ))]
     ParseUrlError {
         attribute_name: &'static str,
-        source: url::ParseError,
+        #[snafu(source(from(url::ParseError, DisplayError)))]
+        source: DisplayError<url::ParseError>,
     },
 }
diff --git a/src/event/displayerr.rs b/src/event/displayerr.rs
@@ -0,0 +1,25 @@
+use core::fmt::{self, Debug, Display};
+use snafu::Snafu;
+
+#[derive(Clone)]
+pub struct DisplayError<T>(pub T);
+
+impl<T> Debug for DisplayError<T>
+where
+    T: Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl<T> Display for DisplayError<T>
+where
+    T: Display,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl<T> snafu::Error for DisplayError<T> where T: Display + Debug {}
diff --git a/src/event/mod.rs b/src/event/mod.rs
@@ -3,6 +3,8 @@
 mod attributes;
 mod builder;
 mod data;
+mod displayerr;
+mod event;
 mod extensions;
 #[macro_use]
 mod format;
@@ -15,6 +17,8 @@ pub use attributes::{AttributeValue, AttributesReader, AttributesWriter};
 pub use builder::Error as EventBuilderError;
 pub use builder::EventBuilder;
 pub use data::Data;
+pub use displayerr::DisplayError;
+pub use event::Event;
 pub use extensions::ExtensionValue;
 pub(crate) use message::EventBinarySerializer;
 pub(crate) use message::EventStructuredSerializer;
diff --git a/src/event/spec_version.rs b/src/event/spec_version.rs
@@ -1,4 +1,6 @@
 use super::{v03, v10};
+use serde::export::Formatter; // double check
+use snafu::Snafu;
 use std::convert::TryFrom;
 use std::fmt;
 use std::fmt::Formatter;
@@ -60,7 +62,7 @@ impl fmt::Display for UnknownSpecVersion {
     }
 }
 
-impl std::error::Error for UnknownSpecVersion {}
+impl snafu::Error for UnknownSpecVersion {}
 
 impl TryFrom<&str> for SpecVersion {
     type Error = UnknownSpecVersion;
diff --git a/src/event/types.rs b/src/event/types.rs
@@ -1,4 +1,5 @@
 use chrono::{DateTime, Utc};
+use snafu;
 use std::prelude::v1::*;
 use url::Url;
 
diff --git a/src/event/v03/attributes.rs b/src/event/v03/attributes.rs
@@ -162,7 +162,7 @@ impl Default for Attributes {
             datacontenttype: None,
             schemaurl: None,
             subject: None,
-            time: Some(Utc::now()),
+            time: Some(chrono::offset::Utc::now()),
         }
     }
 }
diff --git a/src/event/v03/builder.rs b/src/event/v03/builder.rs
@@ -1,6 +1,7 @@
 use super::Attributes as AttributesV03;
 use crate::event::{
-    Attributes, Data, Event, EventBuilderError, ExtensionValue, TryIntoTime, TryIntoUrl,
+    Attributes, Data, DisplayError, Event, EventBuilderError, ExtensionValue, TryIntoTime,
+    TryIntoUrl,
 };
 use crate::message::MessageAttributeValue;
 use chrono::{DateTime, Utc};
@@ -36,7 +37,7 @@ impl EventBuilder {
             Err(e) => {
                 self.error = Some(EventBuilderError::ParseUrlError {
                     attribute_name: "source",
-                    source: e,
+                    source: DisplayError(e),
                 })
             }
         };
@@ -59,7 +60,7 @@ impl EventBuilder {
             Err(e) => {
                 self.error = Some(EventBuilderError::ParseTimeError {
                     attribute_name: "time",
-                    source: e,
+                    source: DisplayError(e),
                 })
             }
         };
@@ -99,7 +100,7 @@ impl EventBuilder {
             Err(e) => {
                 self.error = Some(EventBuilderError::ParseUrlError {
                     attribute_name: "schemaurl",
-                    source: e,
+                    source: DisplayError(e),
                 })
             }
         };
diff --git a/src/event/v10/builder.rs b/src/event/v10/builder.rs
@@ -1,6 +1,7 @@
 use super::Attributes as AttributesV10;
 use crate::event::{
-    Attributes, Data, Event, EventBuilderError, ExtensionValue, TryIntoTime, TryIntoUrl,
+    Attributes, Data, DisplayError, Event, EventBuilderError, ExtensionValue, TryIntoTime,
+    TryIntoUrl,
 };
 use crate::message::MessageAttributeValue;
 use chrono::{DateTime, Utc};
@@ -36,7 +37,7 @@ impl EventBuilder {
             Err(e) => {
                 self.error = Some(EventBuilderError::ParseUrlError {
                     attribute_name: "source",
-                    source: e,
+                    source: DisplayError(e),
                 })
             }
         };
@@ -59,7 +60,7 @@ impl EventBuilder {
             Err(e) => {
                 self.error = Some(EventBuilderError::ParseTimeError {
                     attribute_name: "time",
-                    source: e,
+                    source: DisplayError(e),
                 })
             }
         };
@@ -99,7 +100,7 @@ impl EventBuilder {
             Err(e) => {
                 self.error = Some(EventBuilderError::ParseUrlError {
                     attribute_name: "dataschema",
-                    source: e,
+                    source: DisplayError(e),
                 })
             }
         };
diff --git a/src/lib.rs b/src/lib.rs
@@ -41,6 +41,7 @@
 #![deny(broken_intra_doc_links)]
 #![no_std]
 
+extern crate core_error;
 extern crate no_std_compat as std;
 
 extern crate serde;
diff --git a/src/message/deserializer.rs b/src/message/deserializer.rs
@@ -1,4 +1,4 @@
-use super::{BinarySerializer, Encoding, Error, Result, StructuredSerializer};
+use super::{BinarySerializer, Encoding, Result, StructuredSerializer};
 use crate::event::{EventBinarySerializer, EventStructuredSerializer};
 use crate::Event;
 
@@ -46,7 +46,7 @@ where
         match self.encoding() {
             Encoding::BINARY => BinaryDeserializer::into_event(self),
             Encoding::STRUCTURED => StructuredDeserializer::into_event(self),
-            _ => Err(Error::WrongEncoding {}),
+            _ => Err(super::error::Error::WrongEncoding {}),
         }
     }
 
diff --git a/src/message/error.rs b/src/message/error.rs
@@ -1,6 +1,29 @@
+use core::fmt::{self, Debug, Display};
 use snafu::Snafu;
 use std::prelude::v1::*;
 
+struct DisplayError<T>(pub T);
+
+impl<T> Debug for DisplayError<T>
+where
+    T: Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl<T> Display for DisplayError<T>
+where
+    T: Display,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl<T> snafu::Error for DisplayError<T> where T: Display + Debug {}
+
 /// Represents an error during serialization/deserialization process
 #[derive(Debug, Snafu)]
 pub enum Error {
@@ -20,21 +43,39 @@ pub enum Error {
     },
     #[snafu(display("Error while parsing a time string: {}", source))]
     #[snafu(context(false))]
-    ParseTimeError { source: chrono::ParseError },
+    ParseTimeError {
+        #[snafu(source(from(chrono::ParseError, DisplayError)))]
+        source: DisplayError<chrono::ParseError>,
+    },
     #[snafu(display("Error while parsing a url: {}", source))]
     #[snafu(context(false))]
-    ParseUrlError { source: url::ParseError },
+    ParseUrlError {
+        #[snafu(source(from(url::ParseError, DisplayError)))]
+        source: DisplayError<url::ParseError>,
+    },
     #[snafu(display("Error while decoding base64: {}", source))]
     #[snafu(context(false))]
-    Base64DecodingError { source: base64::DecodeError },
+    Base64DecodingError {
+        #[snafu(source(from(base64::DecodeError, DisplayError)))]
+        source: DisplayError<base64::DecodeError>,
+    },
     #[snafu(display("Error while serializing/deserializing to json: {}", source))]
     #[snafu(context(false))]
-    SerdeJsonError { source: serde_json::Error },
+    SerdeJsonError {
+        #[snafu(source(from(serde_json::Error, DisplayError)))]
+        source: DisplayError<serde_json::Error>,
+    },
     #[snafu(display("IO Error: {}", source))]
     #[snafu(context(false))]
-    IOError { source: super::no_std_io::Error },
-    #[snafu(display("Other error: {:?}", source))]
-    Other { source: Box<dyn std::error::Error> },
+    IOError {
+        #[snafu(source(from(super::no_std_io::IoError, DisplayError)))]
+        source: DisplayError<super::no_std_io::IoError>,
+    },
+    #[snafu(display("Other error: {}", source))]
+    Other {
+        #[snafu(source(from(Box<dyn core_error::Error>, DisplayError)))]
+        source: DisplayError<Box<dyn core_error::Error>>,
+    },
 }
 
 /// Result type alias for return values during serialization/deserialization process
diff --git a/src/message/mod.rs b/src/message/mod.rs
@@ -9,9 +9,9 @@ mod no_std_io;
 mod serializer;
 mod types;
 
-pub use no_std_io::{Error,Read,Write};
 pub use deserializer::*;
 pub use encoding::*;
 pub use error::*;
+pub use no_std_io::{IoError, Read, Write};
 pub use serializer::*;
 pub use types::MessageAttributeValue;
diff --git a/src/message/no_std_io.rs b/src/message/no_std_io.rs
@@ -98,12 +98,18 @@
 #[cfg(all(feature = "alloc", not(feature = "std")))]
 extern crate alloc;
 
+pub type Result<T> = core::result::Result<T, IoError>;
+
 #[derive(Debug)]
-pub struct Error {
+pub struct IoError {
     _private: (),
 }
 
-pub type Result<T> = core::result::Result<T, Error>;
+impl core::fmt::Display for IoError {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        write!(f, "()")
+    }
+}
 
 pub trait Read {
     fn read(&mut self, buf: &mut [u8]) -> Result<usize>;
@@ -205,4 +211,4 @@ mod impls_on_std {
             Error { _private: () }
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`use super::{v03, v10};`
	`2`	`+use serde::export::Formatter; // double check`
	`3`	`+use snafu::Snafu;`
`2`	`4`	`use std::convert::TryFrom;`
`3`	`5`	`use std::fmt;`
`4`	`6`	`use std::fmt::Formatter;`
`@@ -60,7 +62,7 @@ impl fmt::Display for UnknownSpecVersion {`
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`
`63`		`-impl std::error::Error for UnknownSpecVersion {}`
	`65`	`+impl snafu::Error for UnknownSpecVersion {}`
`64`	`66`
`65`	`67`	`impl TryFrom<&str> for SpecVersion {`
`66`	`68`	`type Error = UnknownSpecVersion;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`use chrono::{DateTime, Utc};`
	`2`	`+use snafu;`
`2`	`3`	`use std::prelude::v1::*;`
`3`	`4`	`use url::Url;`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ impl Default for Attributes {`
`162`	`162`	`datacontenttype: None,`
`163`	`163`	`schemaurl: None,`
`164`	`164`	`subject: None,`
`165`		`- time: Some(Utc::now()),`
	`165`	`+ time: Some(chrono::offset::Utc::now()),`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use super::{BinarySerializer, Encoding, Error, Result, StructuredSerializer};`
	`1`	`+use super::{BinarySerializer, Encoding, Result, StructuredSerializer};`
`2`	`2`	`use crate::event::{EventBinarySerializer, EventStructuredSerializer};`
`3`	`3`	`use crate::Event;`
`4`	`4`
`@@ -46,7 +46,7 @@ where`
`46`	`46`	`match self.encoding() {`
`47`	`47`	`Encoding::BINARY => BinaryDeserializer::into_event(self),`
`48`	`48`	`Encoding::STRUCTURED => StructuredDeserializer::into_event(self),`
`49`		`- _ => Err(Error::WrongEncoding {}),`
	`49`	`+ _ => Err(super::error::Error::WrongEncoding {}),`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`