Merge pull request #31 from arcnmx/serdetuple

remove serde_tuple

Author: greaka

model/Cargo.toml

@@ -15,7 +15,6 @@ name = "gw2lib_model"
 path = "src/lib.rs"
 
 [dependencies]
-serde_tuple = "0.5.0"
 urlencoding = "2.1.2"
 
 [dependencies.either]

model/src/maps/continents.rs

@@ -3,19 +3,28 @@ mod floors;
 use std::collections::BTreeSet;
 
 use serde::{ser::SerializeSeq, Deserialize, Deserializer, Serialize, Serializer};
-use serde_tuple::{Deserialize_tuple, Serialize_tuple};
 
 pub use crate::maps::continents::floors::*;
 use crate::{BulkEndpoint, Endpoint, EndpointWithId};
 
 pub type ContinentId = u32;
 
-#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Serialize_tuple, Deserialize_tuple)]
-#[cfg_attr(test, serde(deny_unknown_fields))]
+#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(from = "[u32; 2]", into = "[u32; 2]")]
 pub struct Dimensions {
     pub width: u32,
     pub height: u32,
 }
+impl From<[u32; 2]> for Dimensions {
+    fn from([width, height]: [u32; 2]) -> Self {
+        Self { width, height }
+    }
+}
+impl From<Dimensions> for [u32; 2] {
+    fn from(v: Dimensions) -> Self {
+        [v.width, v.height]
+    }
+}
 
 #[derive(Clone, Debug, Serialize)]
 #[cfg_attr(test, serde(deny_unknown_fields))]

model/src/maps/continents/floors.rs

@@ -4,7 +4,6 @@ use std::{
 };
 
 use serde::{Deserialize, Serialize};
-use serde_tuple::{Deserialize_tuple, Serialize_tuple};
 
 use crate::{
     maps::{
@@ -43,26 +42,68 @@ impl Display for ContinentFloorId {
     }
 }
 
-#[derive(Clone, Debug, PartialOrd, PartialEq, Serialize_tuple, Deserialize_tuple)]
-#[cfg_attr(test, serde(deny_unknown_fields))]
+#[derive(Clone, Debug, PartialOrd, PartialEq, Serialize, Deserialize)]
+#[serde(from = "[f32; 2]", into = "[f32; 2]")]
 pub struct Coordinates {
     pub x: f32,
     pub y: f32,
 }
+impl From<[f32; 2]> for Coordinates {
+    fn from([x, y]: [f32; 2]) -> Self {
+        Self { x, y }
+    }
+}
+impl From<Coordinates> for [f32; 2] {
+    fn from(v: Coordinates) -> Self {
+        [v.x, v.y]
+    }
+}
 
-#[derive(Clone, Debug, PartialOrd, PartialEq, Serialize_tuple, Deserialize_tuple)]
-#[cfg_attr(test, serde(deny_unknown_fields))]
+#[derive(Clone, Debug, PartialOrd, PartialEq, Serialize, Deserialize)]
+#[serde(from = "[Coordinates; 2]", into = "[Coordinates; 2]")]
 pub struct ContinentRectangle {
     pub top_left: Coordinates,
     pub bottom_right: Coordinates,
 }
+impl<C: Into<Coordinates>> From<[C; 2]> for ContinentRectangle {
+    fn from([top_left, bottom_right]: [C; 2]) -> Self {
+        Self {
+            top_left: top_left.into(),
+            bottom_right: bottom_right.into(),
+        }
+    }
+}
+impl<C> From<ContinentRectangle> for [C; 2]
+where
+    Coordinates: Into<C>,
+{
+    fn from(v: ContinentRectangle) -> Self {
+        [v.top_left.into(), v.bottom_right.into()]
+    }
+}
 
-#[derive(Clone, Debug, PartialOrd, PartialEq, Serialize_tuple, Deserialize_tuple)]
-#[cfg_attr(test, serde(deny_unknown_fields))]
+#[derive(Clone, Debug, PartialOrd, PartialEq, Serialize, Deserialize)]
+#[serde(from = "[Coordinates; 2]", into = "[Coordinates; 2]")]
 pub struct MapRectangle {
     pub bottom_left: Coordinates,
     pub top_right: Coordinates,
 }
+impl<C: Into<Coordinates>> From<[C; 2]> for MapRectangle {
+    fn from([bottom_left, top_right]: [C; 2]) -> Self {
+        Self {
+            bottom_left: bottom_left.into(),
+            top_right: top_right.into(),
+        }
+    }
+}
+impl<C> From<MapRectangle> for [C; 2]
+where
+    Coordinates: Into<C>,
+{
+    fn from(v: MapRectangle) -> Self {
+        [v.bottom_left.into(), v.top_right.into()]
+    }
+}
 
 #[derive(Clone, PartialEq, Eq, PartialOrd, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]