Merge #209

209: Make serde optional for 'geo'. r=frewsxcv a=frewsxcv Fixes #207. Co-authored-by: Corey Farwell <coreyf@rwell.org>
georust · May 5, 2018 · 7068aea · 7068aea
2 parents f629f1b + 7ef9361
commit 7068aea
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/geo/Cargo.toml b/geo/Cargo.toml
@@ -14,19 +14,19 @@ travis-ci = { repository = "georust/rust-geo" }
 
 [dependencies]
 num-traits = "0.2"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", optional = true, features = ["derive"] }
 spade = "1.3.0"
 failure = "0.1.1"
 postgis = { version = "0.5", optional = true }
 proj-sys = { version = "0.6.1", optional = true }
 libc = { version = "0.2.39", optional = true }
-geo-types = { version = "0.1.0", features = ["serde", "spade"] }
+geo-types = { version = "0.1.0", features = ["spade"] }
 
 [features]
 default = []
 postgis-integration = ["postgis"]
 proj = ["proj-sys", "libc"]
+use-serde = ["serde", "geo-types/serde"]
 
 [dev-dependencies]
 approx = "0.1.1"

diff --git a/geo/src/lib.rs b/geo/src/lib.rs
@@ -1,7 +1,8 @@
 extern crate geo_types;
 extern crate num_traits;
+#[cfg(feature = "use-serde")]
 #[macro_use]
-extern crate serde_derive;
+extern crate serde;
 extern crate spade;
 #[cfg(feature = "postgis-integration")]
 extern crate postgis;

diff --git a/geo/src/types.rs b/geo/src/types.rs
@@ -7,7 +7,8 @@ use ::{CoordinateType, Point};
 pub static COORD_PRECISION: f32 = 1e-1; // 0.1m
 
 /// A container for the bounding box of a [`Geometry`](enum.Geometry.html)
-#[derive(PartialEq, Clone, Copy, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "use-serde", derive(Serialize, Deserialize))]
+#[derive(PartialEq, Clone, Copy, Debug)]
 pub struct Bbox<T>
 where
     T: CoordinateType,
@@ -19,7 +20,8 @@ where
 }
 
 /// A container for indices of the minimum and maximum points of a [`Geometry`](enum.Geometry.html)
-#[derive(PartialEq, Clone, Copy, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "use-serde", derive(Serialize, Deserialize))]
+#[derive(PartialEq, Clone, Copy, Debug)]
 pub struct Extremes {
     pub ymin: usize,
     pub xmax: usize,
@@ -39,7 +41,8 @@ impl From<Vec<usize>> for Extremes {
 }
 
 /// A container for the coordinates of the minimum and maximum points of a [`Geometry`](enum.Geometry.html)
-#[derive(PartialEq, Clone, Copy, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "use-serde", derive(Serialize, Deserialize))]
+#[derive(PartialEq, Clone, Copy, Debug)]
 pub struct ExtremePoint<T>
 where
     T: CoordinateType,
@@ -139,7 +142,8 @@ where
 }
 
 /// The result of trying to find the closest spot on an object to a point.
-#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
+#[cfg_attr(feature = "use-serde", derive(Serialize, Deserialize))]
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub enum Closest<F: Float> {
     /// The point actually intersects with the object.
     Intersection(Point<F>),