Use geo-types rather than geo

Closes rust-postgres#418

Author: sfackler

postgres/Cargo.toml

@@ -12,7 +12,7 @@ runtime = ["tokio-postgres/runtime", "tokio", "lazy_static", "log"]
 "with-bit-vec-0.5" = ["tokio-postgres/with-bit-vec-0.5"]
 "with-chrono-0.4" = ["tokio-postgres/with-chrono-0.4"]
 "with-eui48-0.4" = ["tokio-postgres/with-eui48-0.4"]
-"with-geo-0.11" = ["tokio-postgres/with-geo-0.11"]
+"with-geo-types-0.4" = ["tokio-postgres/with-geo-types-0.4"]
 "with-serde_json-1" = ["tokio-postgres/with-serde_json-1"]
 "with-uuid-0.7" = ["tokio-postgres/with-uuid-0.7"]
 

tokio-postgres/Cargo.toml

@@ -33,7 +33,7 @@ runtime = ["tokio-tcp", "tokio-timer", "tokio-uds", "futures-cpupool", "lazy_sta
 "with-bit-vec-0.5" = ["bit-vec-05"]
 "with-chrono-0.4" = ["chrono-04"]
 "with-eui48-0.4" = ["eui48-04"]
-"with-geo-0.11" = ["geo-011"]
+"with-geo-types-0.4" = ["geo-types-04"]
 with-serde_json-1 = ["serde-1", "serde_json-1"]
 "with-uuid-0.7" = ["uuid-07"]
 
@@ -58,7 +58,7 @@ tokio-timer = { version = "0.2", optional = true }
 bit-vec-05 = { version = "0.5", package = "bit-vec", optional = true }
 chrono-04 = { version = "0.4", package = "chrono", optional = true }
 eui48-04 = { version = "0.4", package = "eui48", optional = true }
-geo-011 = { version = "0.11", package = "geo", optional = true }
+geo-types-04 = { version = "0.4", package = "geo-types", optional = true }
 serde-1 = { version = "1.0", package = "serde", optional = true }
 serde_json-1 = { version = "1.0", package = "serde_json", optional = true }
 uuid-07 = { version = "0.7", package = "uuid", optional = true }

tokio-postgres/src/types/geo_011.rs tokio-postgres/src/types/geo_types_04.rstokio-postgres/src/types/geo_011.rs renamed to tokio-postgres/src/types/geo_types_04.rs

@@ -1,5 +1,5 @@
 use fallible_iterator::FallibleIterator;
-use geo_011::{Coordinate, LineString, Point, Rect};
+use geo_types_04::{Coordinate, LineString, Point, Rect};
 use postgres_protocol::types;
 use std::error::Error;
 

tokio-postgres/src/types/mod.rs

@@ -78,8 +78,8 @@ mod bit_vec_05;
 mod chrono_04;
 #[cfg(feature = "with-eui48-0.4")]
 mod eui48_04;
-#[cfg(feature = "with-geo-0.11")]
-mod geo_011;
+#[cfg(feature = "with-geo-types-0.4")]
+mod geo_types_04;
 #[cfg(feature = "with-serde_json-1")]
 mod serde_json_1;
 #[cfg(feature = "with-uuid-0.7")]