Cleaned up cargo.toml+fixes

Author: pranav-bhatt

Cargo.toml

@@ -16,16 +16,27 @@ categories = ["web-programming", "encoding", "data-structures"]
 [lib]
 name = "cloudevents"
 
+[features]
+default = ["std"]
+chrono_no_std = ["chrono/serde", "chrono/alloc", "chrono/clock"]
+no_std = ["no-std-compat", "serde_no_std", "chrono_no_std", "base64/alloc"]
+serde_no_std = ["serde/derive", "serde/alloc", "serde_json/alloc"]
+std = ["snafu/std", "snafu/guide", "serde/std", "serde_json/std", "chrono/std", "base64/std", "url"]
+
 [dependencies]
-serde = { version = "^1.0", default-features=false,features = ["derive","alloc"] }
-serde_json = { version = "^1.0", default-features = false, features = ["alloc"] }
-chrono = { version = "^0.4", default-features=false ,features = ["serde","alloc","clock"] }
+base64 = { version = "^0.12", default-features = false }
+chrono = { version = "^0.4", default-features = false }
 delegate-attr = "^0.2"
-base64 = { version = "^0.12", default-features = false, features = ["alloc"] }
-url = { version = "^2.1", features = ["serde"] }
-snafu = "^0.6"
-bitflags = "^1.2"
-no-std-compat = { version = "^0.4.1", features = ["alloc"] }
+serde = { version = "^1.0", default-features=false }
+serde_json = { version = "^1.0", default-features = false, features = ["alloc"] }
+serde-value = "^0.7"
+snafu = { version = "^0.6",default-features = false }
+url = { version = "^2.1", features = ["serde"], optional=true }
+
+[dependencies.no-std-compat]
+version = "^0.4.1"
+features = ["alloc", "compat_hash", "compat_sync", "compat_macros"]
+optional=true
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies]
 hostname = "^0.3"

src/event/attributes.rs

@@ -6,7 +6,11 @@ use chrono::{DateTime, Utc};
 use serde::Serializer;
 use std::fmt;
 use std::prelude::v1::*;
+
+#[cfg(feature = "std")]
 use url::Url;
+#[cfg(not(feature = "std"))]
+use String as Url;
 
 /// Enum representing a borrowed value of a CloudEvent attribute.
 /// This represents the types defined in the [CloudEvent spec type system](https://github.com/cloudevents/spec/blob/v1.0/spec.md#type-system)
@@ -253,6 +257,7 @@ impl Attributes {
     }
 }
 
+#[cfg(feature = "std")]
 #[cfg(not(target_arch = "wasm32"))]
 pub(crate) fn default_hostname() -> Url {
     Url::parse(
@@ -269,6 +274,7 @@ pub(crate) fn default_hostname() -> Url {
     .unwrap()
 }
 
+#[cfg(feature = "std")]
 #[cfg(target_arch = "wasm32")]
 pub(crate) fn default_hostname() -> Url {
     use std::str::FromStr;
@@ -282,3 +288,8 @@ pub(crate) fn default_hostname() -> Url {
     )
     .unwrap()
 }
+
+#[cfg(not(feature = "std"))]
+pub(crate) fn default_hostname() -> Url {
+    String::from("http://localhost")
+}

src/event/mod.rs

@@ -45,7 +45,7 @@ use std::collections::HashMap;
 use std::prelude::v1::*;
 use url::Url;
 
-use core::fmt::{self,Debug, Display};
+use core::fmt::{self, Debug, Display};
 /// Data structure that represents a [CloudEvent](https://github.com/cloudevents/spec/blob/master/spec.md).
 /// It provides methods to get the attributes through [`AttributesReader`]
 /// and write them through [`AttributesWriter`].
@@ -237,7 +237,7 @@ impl Event {
     }
 }
 
-// Facilitates compatibility with snafu::Error for external objects 
+// Facilitates compatibility with snafu::Error for external objects
 
 #[derive(PartialEq, Eq, Clone)]
 pub struct DisplayError<T>(pub T);
@@ -262,7 +262,6 @@ where
 
 impl<T> snafu::Error for DisplayError<T> where T: Display + Debug {}
 
-
 #[cfg(test)]
 mod tests {
     use super::*;

src/event/spec_version.rs

@@ -3,6 +3,7 @@ use serde::export::Formatter;
 use std::convert::TryFrom;
 use std::fmt;
 use std::prelude::v1::*;
+use std::vec;
 
 pub(crate) const SPEC_VERSIONS: [&str; 2] = ["0.3", "1.0"];
 

src/event/v10/attributes.rs

@@ -4,9 +4,13 @@ use crate::message::{BinarySerializer, MessageAttributeValue};
 use chrono::{DateTime, Utc};
 use core::fmt::Debug;
 use std::prelude::v1::*;
-use url::Url;
 use uuid::Uuid;
 
+#[cfg(feature = "std")]
+use url::Url;
+#[cfg(not(feature = "std"))]
+use String as Url;
+
 pub(crate) const ATTRIBUTE_NAMES: [&str; 8] = [
     "specversion",
     "id",
@@ -206,6 +210,20 @@ impl AttributesConverter for Attributes {
         self
     }
 
+    #[cfg(feature = "std")]
+    fn into_v03(self) -> AttributesV03 {
+        AttributesV03 {
+            id: self.id,
+            ty: self.ty,
+            source: self.source,
+            datacontenttype: self.datacontenttype,
+            schemaurl: self.dataschema,
+            subject: self.subject,
+            time: self.time,
+        }
+    }
+
+    #[cfg(not(feature = "std"))]
     fn into_v03(self) -> AttributesV03 {
         AttributesV03 {
             id: self.id,

src/lib.rs

@@ -41,8 +41,10 @@
 #![deny(broken_intra_doc_links)]
 #![no_std]
 
-extern crate core_error;
+#[cfg(not(feature = "std"))]
 extern crate no_std_compat as std;
+#[cfg(feature = "std")]
+extern crate std;
 
 extern crate serde;
 extern crate serde_json;

src/message/error.rs

@@ -65,16 +65,17 @@ pub enum Error {
         #[snafu(source(from(serde_json::Error, DisplayError)))]
         source: DisplayError<serde_json::Error>,
     },
+
+    #[cfg(feature = "std")]
     #[snafu(display("IO Error: {}", source))]
     #[snafu(context(false))]
-    IOError {
-        #[snafu(source(from(super::no_std_io::IoError, DisplayError)))]
-        source: DisplayError<super::no_std_io::IoError>,
-    },
+    IOError { source: std::io::Error },
+
+    #[cfg(feature = "std")]
     #[snafu(display("Other error: {}", source))]
     Other {
-        #[snafu(source(from(Box<dyn core_error::Error>, DisplayError)))]
-        source: DisplayError<Box<dyn core_error::Error>>,
+        //#[snafu(source(from(Box<dyn core_error::Error>, DisplayError)))]
+        source: Box<dyn std::error::Error + Send + Sync>,
     },
 }
 

src/message/mod.rs

@@ -5,13 +5,11 @@
 mod deserializer;
 mod encoding;
 mod error;
-mod no_std_io;
 mod serializer;
 mod types;
 
 pub use deserializer::*;
 pub use encoding::*;
 pub use error::*;
-pub use no_std_io::{IoError, Read, Write};
 pub use serializer::*;
 pub use types::MessageAttributeValue;

src/message/types.rs

@@ -3,7 +3,11 @@ use chrono::{DateTime, Utc};
 use std::convert::TryInto;
 use std::fmt;
 use std::prelude::v1::*;
+
+#[cfg(feature = "std")]
 use url::Url;
+#[cfg(not(feature = "std"))]
+use String as Url;
 
 /// Union type representing a [CloudEvent context attribute type](https://github.com/cloudevents/spec/blob/v1.0/spec.md#type-system).
 #[derive(PartialEq, Eq, Debug, Clone)]
@@ -33,13 +37,22 @@ impl TryInto<DateTime<Utc>> for MessageAttributeValue {
 impl TryInto<Url> for MessageAttributeValue {
     type Error = super::Error;
 
+    #[cfg(feature = "std")]
     fn try_into(self) -> Result<Url, Self::Error> {
         match self {
             MessageAttributeValue::Uri(u) => Ok(u),
             MessageAttributeValue::UriRef(u) => Ok(u),
             v => Ok(Url::parse(v.to_string().as_ref())?),
         }
     }
+    #[cfg(not(feature = "std"))]
+    fn try_into(self) -> Result<Url, Self::Error> {
+        match self {
+            MessageAttributeValue::Uri(u) => Ok(u),
+            MessageAttributeValue::UriRef(u) => Ok(u),
+            v => Ok(v.to_string()),
+        }
+    }
 }
 
 impl fmt::Display for MessageAttributeValue {