Update simd-json-derive

Author: Licenser

src/canada.rs

@@ -6,29 +6,56 @@ use std::collections::BTreeMap as Map;
 pub type Canada = FeatureCollection;
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
-#[cfg_attr(feature = "lib-simd-json", derive(simd_json_derive::Serialize))]
+#[cfg_attr(
+    any(feature = "serde", feature = "lib-simd-json"),
+    serde(deny_unknown_fields)
+)]
+#[cfg_attr(
+    feature = "lib-simd-json",
+    derive(simd_json_derive::Serialize, simd_json_derive::Deserialize)
+)]
 pub struct FeatureCollection {
-    #[cfg_attr(feature = "serde", serde(rename = "type"))]
+    #[cfg_attr(
+        any(feature = "serde", feature = "lib-simd-json"),
+        serde(rename = "type")
+    )]
     pub obj_type: ObjType,
     pub features: Vec<Feature>,
 }
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
-#[cfg_attr(feature = "lib-simd-json", derive(simd_json_derive::Serialize))]
+#[cfg_attr(
+    any(feature = "serde", feature = "lib-simd-json"),
+    serde(deny_unknown_fields)
+)]
+#[cfg_attr(
+    feature = "lib-simd-json",
+    derive(simd_json_derive::Serialize, simd_json_derive::Deserialize)
+)]
 pub struct Feature {
-    #[cfg_attr(feature = "serde", serde(rename = "type"))]
+    #[cfg_attr(
+        any(feature = "serde", feature = "lib-simd-json"),
+        serde(rename = "type")
+    )]
     pub obj_type: ObjType,
     pub properties: Map<String, String>,
     pub geometry: Geometry,
 }
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
-#[cfg_attr(feature = "lib-simd-json", derive(simd_json_derive::Serialize))]
+#[cfg_attr(
+    any(feature = "serde", feature = "lib-simd-json"),
+    serde(deny_unknown_fields)
+)]
+#[cfg_attr(
+    feature = "lib-simd-json",
+    derive(simd_json_derive::Serialize, simd_json_derive::Deserialize)
+)]
 pub struct Geometry {
-    #[cfg_attr(feature = "serde", serde(rename = "type"))]
+    #[cfg_attr(
+        any(feature = "serde", feature = "lib-simd-json"),
+        serde(rename = "type")
+    )]
     pub obj_type: ObjType,
     pub coordinates: Vec<Vec<(Latitude, Longitude)>>,
 }

src/color.rs

@@ -12,7 +12,7 @@ use serde::de::{self, Deserialize, Deserializer, Unexpected};
 #[cfg(feature = "serde")]
 use serde::ser::{Serialize, Serializer};
 
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, Debug)]
 pub struct Color(u32);
 
 #[cfg(any(feature = "serde", feature = "lib-rustc-serialize"))]
@@ -99,6 +99,29 @@ impl<'de> Deserialize<'de> for Color {
     }
 }
 
+#[cfg(feature = "lib-simd-json")]
+impl<'input> ::simd_json_derive::Deserialize<'input> for Color {
+    #[inline]
+    fn from_tape(tape: &mut ::simd_json_derive::Tape<'input>) -> simd_json::Result<Self>
+    where
+        Self: std::marker::Sized + 'input,
+    {
+        if let Some(::simd_json::Node::String(s)) = tape.next() {
+            if let Ok(hex) = u32::from_str_radix(s, 16) {
+                Ok(Color(hex))
+            } else {
+                dbg!(Err(::simd_json::Error::generic(
+                    simd_json::ErrorType::ExpectedString,
+                )))
+            }
+        } else {
+            dbg!(Err(::simd_json::Error::generic(
+                simd_json::ErrorType::ExpectedString,
+            )))
+        }
+    }
+}
+
 #[cfg(feature = "lib-rustc-serialize")]
 impl Encodable for Color {
     fn encode<S>(&self, s: &mut S) -> Result<(), S::Error>

src/copy/citm_catalog.rs

@@ -6,12 +6,18 @@ use std::collections::BTreeMap as Map;
 use crate::empty;
 use crate::prim_str::PrimStr;
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
-    feature = "serde",
+    any(feature = "serde", feature = "lib-simd-json"),
+    derive(Serialize, Deserialize)
+)]
+#[cfg_attr(
+    any(feature = "serde", feature = "lib-simd-json"),
     serde(deny_unknown_fields, rename_all = "camelCase")
 )]
-#[cfg_attr(feature = "lib-simd-json", derive(simd_json_derive::Serialize))]
+#[cfg_attr(
+    feature = "lib-simd-json",
+    derive(simd_json_derive::Serialize, simd_json_derive::Deserialize)
+)]
 pub struct CitmCatalog {
     pub area_names: Map<IdStr, String>,
     pub audience_sub_category_names: Map<IdStr, String>,
@@ -29,12 +35,18 @@ pub struct CitmCatalog {
 pub type Id = u32;
 pub type IdStr = PrimStr<u32>;
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
-    feature = "serde",
+    any(feature = "serde", feature = "lib-simd-json"),
+    derive(Serialize, Deserialize)
+)]
+#[cfg_attr(
+    any(feature = "serde", feature = "lib-simd-json"),
     serde(deny_unknown_fields, rename_all = "camelCase")
 )]
-#[cfg_attr(feature = "lib-simd-json", derive(simd_json_derive::Serialize))]
+#[cfg_attr(
+    feature = "lib-simd-json",
+    derive(simd_json_derive::Serialize, simd_json_derive::Deserialize)
+)]
 pub struct Event {
     pub description: (),
     pub id: Id,
@@ -46,12 +58,18 @@ pub struct Event {
     pub topic_ids: Vec<Id>,
 }
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
-    feature = "serde",
+    any(feature = "serde", feature = "lib-simd-json"),
+    derive(Serialize, Deserialize)
+)]
+#[cfg_attr(
+    any(feature = "serde", feature = "lib-simd-json"),
     serde(deny_unknown_fields, rename_all = "camelCase")
 )]
-#[cfg_attr(feature = "lib-simd-json", derive(simd_json_derive::Serialize))]
+#[cfg_attr(
+    feature = "lib-simd-json",
+    derive(simd_json_derive::Serialize, simd_json_derive::Deserialize)
+)]
 pub struct Performance {
     pub event_id: Id,
     pub id: Id,
@@ -64,35 +82,53 @@ pub struct Performance {
     pub venue_code: String,
 }
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
-    feature = "serde",
+    any(feature = "serde", feature = "lib-simd-json"),
+    derive(Serialize, Deserialize)
+)]
+#[cfg_attr(
+    any(feature = "serde", feature = "lib-simd-json"),
     serde(deny_unknown_fields, rename_all = "camelCase")
 )]
-#[cfg_attr(feature = "lib-simd-json", derive(simd_json_derive::Serialize))]
+#[cfg_attr(
+    feature = "lib-simd-json",
+    derive(simd_json_derive::Serialize, simd_json_derive::Deserialize)
+)]
 pub struct Price {
     pub amount: u32,
     pub audience_sub_category_id: Id,
     pub seat_category_id: Id,
 }
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
-    feature = "serde",
+    any(feature = "serde", feature = "lib-simd-json"),
+    derive(Serialize, Deserialize)
+)]
+#[cfg_attr(
+    any(feature = "serde", feature = "lib-simd-json"),
     serde(deny_unknown_fields, rename_all = "camelCase")
 )]
-#[cfg_attr(feature = "lib-simd-json", derive(simd_json_derive::Serialize))]
+#[cfg_attr(
+    feature = "lib-simd-json",
+    derive(simd_json_derive::Serialize, simd_json_derive::Deserialize)
+)]
 pub struct SeatCategory {
     pub areas: Vec<Area>,
     pub seat_category_id: Id,
 }
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[cfg_attr(
-    feature = "serde",
+    any(feature = "serde", feature = "lib-simd-json"),
+    derive(Serialize, Deserialize)
+)]
+#[cfg_attr(
+    any(feature = "serde", feature = "lib-simd-json"),
     serde(deny_unknown_fields, rename_all = "camelCase")
 )]
-#[cfg_attr(feature = "lib-simd-json", derive(simd_json_derive::Serialize))]
+#[cfg_attr(
+    feature = "lib-simd-json",
+    derive(simd_json_derive::Serialize, simd_json_derive::Deserialize)
+)]
 pub struct Area {
     pub area_id: Id,
     pub block_ids: empty::Array,