Added support for geo-types 0.7 via with-geo-types-0_7 feature

michaelkirk · michaelkirk · commit 37fb39202a58 · 2021-01-25T09:30:30.000-06:00
diff --git a/postgres-types/CHANGELOG.md b/postgres-types/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## Unreleased
+
+### Added
+
+* Added support for `geo-types` 0.7 via `with-geo-types-0_7` feature.
+
 ## v0.2.0 - 2020-12-25
 
 ### Changed
diff --git a/postgres-types/Cargo.toml b/postgres-types/Cargo.toml
@@ -15,7 +15,7 @@ derive = ["postgres-derive"]
 with-bit-vec-0_6 = ["bit-vec-06"]
 with-chrono-0_4 = ["chrono-04"]
 with-eui48-0_4 = ["eui48-04"]
-with-geo-types-0_6 = ["geo-types-06"]
+with-geo-types-0_7 = ["geo-types-0_7"]
 with-serde_json-1 = ["serde-1", "serde_json-1"]
 with-uuid-0_8 = ["uuid-08"]
 with-time-0_2 = ["time-02"]
@@ -29,7 +29,7 @@ postgres-derive = { version = "0.4.0", optional = true, path = "../postgres-deri
 bit-vec-06 = { version = "0.6", package = "bit-vec", optional = true }
 chrono-04 = { version = "0.4.16", package = "chrono", default-features = false, features = ["clock"], optional = true }
 eui48-04 = { version = "0.4", package = "eui48", optional = true }
-geo-types-06 = { version = "0.6", package = "geo-types", optional = true }
+geo-types-0_7 = { version = "0.7", 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-08 = { version = "0.8", package = "uuid", optional = true }
diff --git a/postgres-types/src/geo_types_07.rs b/postgres-types/src/geo_types_07.rs
@@ -1,6 +1,6 @@
 use bytes::BytesMut;
 use fallible_iterator::FallibleIterator;
-use geo_types_06::{Coordinate, LineString, Point, Rect};
+use geo_types_0_7::{Coordinate, LineString, Point, Rect};
 use postgres_protocol::types;
 use std::error::Error;
 
diff --git a/postgres-types/src/lib.rs b/postgres-types/src/lib.rs
@@ -194,8 +194,8 @@ mod bit_vec_06;
 mod chrono_04;
 #[cfg(feature = "with-eui48-0_4")]
 mod eui48_04;
-#[cfg(feature = "with-geo-types-0_6")]
-mod geo_types_06;
+#[cfg(feature = "with-geo-types-0_7")]
+mod geo_types_07;
 #[cfg(feature = "with-serde_json-1")]
 mod serde_json_1;
 #[cfg(feature = "with-time-0_2")]
diff --git a/postgres/CHANGELOG.md b/postgres/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## Unreleased
+
+### Added
+
+* Added support for `geo-types` 0.7 via `with-geo-types-0_7` feature.
+
 ## v0.19.0 - 2020-12-25
 
 ### Changed
diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
@@ -24,7 +24,7 @@ circle-ci = { repository = "sfackler/rust-postgres" }
 with-bit-vec-0_6 = ["tokio-postgres/with-bit-vec-0_6"]
 with-chrono-0_4 = ["tokio-postgres/with-chrono-0_4"]
 with-eui48-0_4 = ["tokio-postgres/with-eui48-0_4"]
-with-geo-types-0_6 = ["tokio-postgres/with-geo-types-0_6"]
+with-geo-types-0_7 = ["tokio-postgres/with-geo-types-0_7"]
 with-serde_json-1 = ["tokio-postgres/with-serde_json-1"]
 with-uuid-0_8 = ["tokio-postgres/with-uuid-0_8"]
 with-time-0_2 = ["tokio-postgres/with-time-0_2"]
diff --git a/postgres/src/lib.rs b/postgres/src/lib.rs
@@ -56,8 +56,7 @@
 //! | `with-bit-vec-0_6` | Enable support for the `bit-vec` crate. | [bit-vec](https://crates.io/crates/bit-vec) 0.6 | no |
 //! | `with-chrono-0_4` | Enable support for the `chrono` crate. | [chrono](https://crates.io/crates/chrono) 0.4 | no |
 //! | `with-eui48-0_4` | Enable support for the `eui48` crate. | [eui48](https://crates.io/crates/eui48) 0.4 | no |
-//! | `with-geo-types-0_4` | Enable support for the 0.4 version of the `geo-types` crate. | [geo-types](https://crates.io/crates/geo-types/0.4.0) 0.4 | no |
-//! | `with-geo-types-0_5` | Enable support for the 0.5 version of the `geo-types` crate. | [geo-types](https://crates.io/crates/geo-types/0.5.0) 0.5 | no |
+//! | `with-geo-types-0_7` | Enable support for the 0.7 version of the `geo-types` crate. | [geo-types](https://crates.io/crates/geo-types/0.7.0) 0.7 | no |
 //! | `with-serde_json-1` | Enable support for the `serde_json` crate. | [serde_json](https://crates.io/crates/serde_json) 1.0 | no |
 //! | `with-uuid-0_8` | Enable support for the `uuid` crate. | [uuid](https://crates.io/crates/uuid) 0.8 | no |
 //! | `with-time-0_2` | Enable support for the `time` crate. | [time](https://crates.io/crates/time) 0.2 | no |
diff --git a/tokio-postgres/CHANGELOG.md b/tokio-postgres/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## Unreleased
+
+### Added
+
+* Added support for `geo-types` 0.7 via `with-geo-types-0_7` feature.
+
 ## v0.7.0 - 2020-12-25
 
 ### Changed
diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
@@ -30,7 +30,7 @@ runtime = ["tokio/net", "tokio/time"]
 with-bit-vec-0_6 = ["postgres-types/with-bit-vec-0_6"]
 with-chrono-0_4 = ["postgres-types/with-chrono-0_4"]
 with-eui48-0_4 = ["postgres-types/with-eui48-0_4"]
-with-geo-types-0_6 = ["postgres-types/with-geo-types-0_6"]
+with-geo-types-0_7 = ["postgres-types/with-geo-types-0_7"]
 with-serde_json-1 = ["postgres-types/with-serde_json-1"]
 with-uuid-0_8 = ["postgres-types/with-uuid-0_8"]
 with-time-0_2 = ["postgres-types/with-time-0_2"]
@@ -60,7 +60,7 @@ criterion = "0.3"
 bit-vec-06 = { version = "0.6", package = "bit-vec" }
 chrono-04 = { version = "0.4", package = "chrono", default-features = false }
 eui48-04 = { version = "0.4", package = "eui48" }
-geo-types-06 = { version = "0.6", package = "geo-types" }
+geo-types-07 = { version = "0.7", package = "geo-types" }
 serde-1 = { version = "1.0", package = "serde" }
 serde_json-1 = { version = "1.0", package = "serde_json" }
 uuid-08 = { version = "0.8", package = "uuid" }
diff --git a/tokio-postgres/src/lib.rs b/tokio-postgres/src/lib.rs
@@ -107,8 +107,7 @@
 //! | `with-bit-vec-0_6` | Enable support for the `bit-vec` crate. | [bit-vec](https://crates.io/crates/bit-vec) 0.6 | no |
 //! | `with-chrono-0_4` | Enable support for the `chrono` crate. | [chrono](https://crates.io/crates/chrono) 0.4 | no |
 //! | `with-eui48-0_4` | Enable support for the `eui48` crate. | [eui48](https://crates.io/crates/eui48) 0.4 | no |
-//! | `with-geo-types-0_4` | Enable support for the 0.4 version of the `geo-types` crate. | [geo-types](https://crates.io/crates/geo-types/0.4.0) 0.4 | no |
-//! | `with-geo-types-0_5` | Enable support for the 0.5 version of the `geo-types` crate. | [geo-types](https://crates.io/crates/geo-types/0.5.0) 0.5 | no |
+//! | `with-geo-types-0_7` | Enable support for the 0.7 version of the `geo-types` crate. | [geo-types](https://crates.io/crates/geo-types/0.7.0) 0.7 | no |
 //! | `with-serde_json-1` | Enable support for the `serde_json` crate. | [serde_json](https://crates.io/crates/serde_json) 1.0 | no |
 //! | `with-uuid-0_8` | Enable support for the `uuid` crate. | [uuid](https://crates.io/crates/uuid) 0.8 | no |
 //! | `with-time-0_2` | Enable support for the `time` crate. | [time](https://crates.io/crates/time) 0.2 | no |
diff --git a/tokio-postgres/tests/test/types/geo_types_04.rs b/tokio-postgres/tests/test/types/geo_types_04.rs
diff --git a/tokio-postgres/tests/test/types/geo_types_07.rs b/tokio-postgres/tests/test/types/geo_types_07.rs
@@ -1,4 +1,5 @@
-use geo_types_06::{Coordinate, LineString, Point, Rect};
+#[cfg(feature = "with-geo-types-0_7")]
+use geo_types_07::{Coordinate, LineString, Point, Rect};
 
 use crate::types::test_type;
 
diff --git a/tokio-postgres/tests/test/types/mod.rs b/tokio-postgres/tests/test/types/mod.rs
@@ -19,10 +19,8 @@ mod bit_vec_06;
 mod chrono_04;
 #[cfg(feature = "with-eui48-0_4")]
 mod eui48_04;
-#[cfg(feature = "with-geo-types-0_4")]
-mod geo_types_04;
-#[cfg(feature = "with-geo-types-0_6")]
-mod geo_types_06;
+#[cfg(feature = "with-geo-types-0_7")]
+mod geo_types_07;
 #[cfg(feature = "with-serde_json-1")]
 mod serde_json_1;
 #[cfg(feature = "with-time-0_2")]
