From 5d9acb1eb15dce2a17fc9d6f68adf6519355ebc5 Mon Sep 17 00:00:00 2001 From: Jakub Wieczorek Date: Wed, 24 Jun 2020 12:28:21 +0200 Subject: [PATCH] Add support for the 0.6 version of `geo_types`. This change drops the support for the 0.5 version by renaming the feature, as no version of `postgres` with it included has ever been released. --- postgres-types/Cargo.toml | 4 ++-- postgres-types/src/{geo_types_05.rs => geo_types_06.rs} | 2 +- postgres-types/src/lib.rs | 4 ++-- postgres/Cargo.toml | 2 +- tokio-postgres/Cargo.toml | 4 ++-- .../tests/test/types/{geo_types_05.rs => geo_types_06.rs} | 2 +- tokio-postgres/tests/test/types/mod.rs | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) rename postgres-types/src/{geo_types_05.rs => geo_types_06.rs} (97%) rename tokio-postgres/tests/test/types/{geo_types_05.rs => geo_types_06.rs} (95%) diff --git a/postgres-types/Cargo.toml b/postgres-types/Cargo.toml index 57cc79c85..afda3093d 100644 --- a/postgres-types/Cargo.toml +++ b/postgres-types/Cargo.toml @@ -16,7 +16,7 @@ with-bit-vec-0_6 = ["bit-vec-06"] with-chrono-0_4 = ["chrono-04"] with-eui48-0_4 = ["eui48-04"] with-geo-types-0_4 = ["geo-types-04"] -with-geo-types-0_5 = ["geo-types-05"] +with-geo-types-0_6 = ["geo-types-06"] with-serde_json-1 = ["serde-1", "serde_json-1"] with-uuid-0_8 = ["uuid-08"] with-time-0_2 = ["time-02"] @@ -31,7 +31,7 @@ bit-vec-06 = { version = "0.6", package = "bit-vec", optional = true } chrono-04 = { version = "0.4", package = "chrono", optional = true } eui48-04 = { version = "0.4", package = "eui48", optional = true } geo-types-04 = { version = "0.4", package = "geo-types", optional = true } -geo-types-05 = { version = "0.5", package = "geo-types", optional = true } +geo-types-06 = { version = "0.6", 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_05.rs b/postgres-types/src/geo_types_06.rs similarity index 97% rename from postgres-types/src/geo_types_05.rs rename to postgres-types/src/geo_types_06.rs index f169134e3..0f0b14fd9 100644 --- a/postgres-types/src/geo_types_05.rs +++ b/postgres-types/src/geo_types_06.rs @@ -1,6 +1,6 @@ use bytes::BytesMut; use fallible_iterator::FallibleIterator; -use geo_types_05::{Coordinate, LineString, Point, Rect}; +use geo_types_06::{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 index e78cedf4a..258b68edc 100644 --- a/postgres-types/src/lib.rs +++ b/postgres-types/src/lib.rs @@ -196,8 +196,8 @@ mod chrono_04; mod eui48_04; #[cfg(feature = "with-geo-types-0_4")] mod geo_types_04; -#[cfg(feature = "with-geo-types-0_5")] -mod geo_types_05; +#[cfg(feature = "with-geo-types-0_6")] +mod geo_types_06; #[cfg(feature = "with-serde_json-1")] mod serde_json_1; #[cfg(feature = "with-time-0_2")] diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml index 4742396e3..cd199e27f 100644 --- a/postgres/Cargo.toml +++ b/postgres/Cargo.toml @@ -25,7 +25,7 @@ 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_4 = ["tokio-postgres/with-geo-types-0_4"] -with-geo-types-0_5 = ["tokio-postgres/with-geo-types-0_5"] +with-geo-types-0_6 = ["tokio-postgres/with-geo-types-0_6"] 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/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml index aaed29ae3..63c2dc6ce 100644 --- a/tokio-postgres/Cargo.toml +++ b/tokio-postgres/Cargo.toml @@ -31,7 +31,7 @@ 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_4 = ["postgres-types/with-geo-types-0_4"] -with-geo-types-0_5 = ["postgres-types/with-geo-types-0_5"] +with-geo-types-0_6 = ["postgres-types/with-geo-types-0_6"] 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"] @@ -61,7 +61,7 @@ bit-vec-06 = { version = "0.6", package = "bit-vec" } chrono-04 = { version = "0.4", package = "chrono" } eui48-04 = { version = "0.4", package = "eui48" } geo-types-04 = { version = "0.4", package = "geo-types" } -geo-types-05 = { version = "0.5", package = "geo-types" } +geo-types-06 = { version = "0.6", 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/tests/test/types/geo_types_05.rs b/tokio-postgres/tests/test/types/geo_types_06.rs similarity index 95% rename from tokio-postgres/tests/test/types/geo_types_05.rs rename to tokio-postgres/tests/test/types/geo_types_06.rs index 334dc0b13..7195abc06 100644 --- a/tokio-postgres/tests/test/types/geo_types_05.rs +++ b/tokio-postgres/tests/test/types/geo_types_06.rs @@ -1,4 +1,4 @@ -use geo_types_05::{Coordinate, LineString, Point, Rect}; +use geo_types_06::{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 index 9f96019fe..168ca3a4d 100644 --- a/tokio-postgres/tests/test/types/mod.rs +++ b/tokio-postgres/tests/test/types/mod.rs @@ -20,8 +20,8 @@ mod chrono_04; mod eui48_04; #[cfg(feature = "with-geo-types-0_4")] mod geo_types_04; -#[cfg(feature = "with-geo-types-0_5")] -mod geo_types_05; +#[cfg(feature = "with-geo-types-0_6")] +mod geo_types_06; #[cfg(feature = "with-serde_json-1")] mod serde_json_1; #[cfg(feature = "with-time-0_2")]