Skip to content

Commit 5d9acb1

Browse files
committed
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.
1 parent 598fc0f commit 5d9acb1

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

postgres-types/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ with-bit-vec-0_6 = ["bit-vec-06"]
1616
with-chrono-0_4 = ["chrono-04"]
1717
with-eui48-0_4 = ["eui48-04"]
1818
with-geo-types-0_4 = ["geo-types-04"]
19-
with-geo-types-0_5 = ["geo-types-05"]
19+
with-geo-types-0_6 = ["geo-types-06"]
2020
with-serde_json-1 = ["serde-1", "serde_json-1"]
2121
with-uuid-0_8 = ["uuid-08"]
2222
with-time-0_2 = ["time-02"]
@@ -31,7 +31,7 @@ bit-vec-06 = { version = "0.6", package = "bit-vec", optional = true }
3131
chrono-04 = { version = "0.4", package = "chrono", optional = true }
3232
eui48-04 = { version = "0.4", package = "eui48", optional = true }
3333
geo-types-04 = { version = "0.4", package = "geo-types", optional = true }
34-
geo-types-05 = { version = "0.5", package = "geo-types", optional = true }
34+
geo-types-06 = { version = "0.6", package = "geo-types", optional = true }
3535
serde-1 = { version = "1.0", package = "serde", optional = true }
3636
serde_json-1 = { version = "1.0", package = "serde_json", optional = true }
3737
uuid-08 = { version = "0.8", package = "uuid", optional = true }

postgres-types/src/geo_types_05.rs renamed to postgres-types/src/geo_types_06.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use bytes::BytesMut;
22
use fallible_iterator::FallibleIterator;
3-
use geo_types_05::{Coordinate, LineString, Point, Rect};
3+
use geo_types_06::{Coordinate, LineString, Point, Rect};
44
use postgres_protocol::types;
55
use std::error::Error;
66

postgres-types/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ mod chrono_04;
196196
mod eui48_04;
197197
#[cfg(feature = "with-geo-types-0_4")]
198198
mod geo_types_04;
199-
#[cfg(feature = "with-geo-types-0_5")]
200-
mod geo_types_05;
199+
#[cfg(feature = "with-geo-types-0_6")]
200+
mod geo_types_06;
201201
#[cfg(feature = "with-serde_json-1")]
202202
mod serde_json_1;
203203
#[cfg(feature = "with-time-0_2")]

postgres/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ with-bit-vec-0_6 = ["tokio-postgres/with-bit-vec-0_6"]
2525
with-chrono-0_4 = ["tokio-postgres/with-chrono-0_4"]
2626
with-eui48-0_4 = ["tokio-postgres/with-eui48-0_4"]
2727
with-geo-types-0_4 = ["tokio-postgres/with-geo-types-0_4"]
28-
with-geo-types-0_5 = ["tokio-postgres/with-geo-types-0_5"]
28+
with-geo-types-0_6 = ["tokio-postgres/with-geo-types-0_6"]
2929
with-serde_json-1 = ["tokio-postgres/with-serde_json-1"]
3030
with-uuid-0_8 = ["tokio-postgres/with-uuid-0_8"]
3131
with-time-0_2 = ["tokio-postgres/with-time-0_2"]

tokio-postgres/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ with-bit-vec-0_6 = ["postgres-types/with-bit-vec-0_6"]
3131
with-chrono-0_4 = ["postgres-types/with-chrono-0_4"]
3232
with-eui48-0_4 = ["postgres-types/with-eui48-0_4"]
3333
with-geo-types-0_4 = ["postgres-types/with-geo-types-0_4"]
34-
with-geo-types-0_5 = ["postgres-types/with-geo-types-0_5"]
34+
with-geo-types-0_6 = ["postgres-types/with-geo-types-0_6"]
3535
with-serde_json-1 = ["postgres-types/with-serde_json-1"]
3636
with-uuid-0_8 = ["postgres-types/with-uuid-0_8"]
3737
with-time-0_2 = ["postgres-types/with-time-0_2"]
@@ -61,7 +61,7 @@ bit-vec-06 = { version = "0.6", package = "bit-vec" }
6161
chrono-04 = { version = "0.4", package = "chrono" }
6262
eui48-04 = { version = "0.4", package = "eui48" }
6363
geo-types-04 = { version = "0.4", package = "geo-types" }
64-
geo-types-05 = { version = "0.5", package = "geo-types" }
64+
geo-types-06 = { version = "0.6", package = "geo-types" }
6565
serde-1 = { version = "1.0", package = "serde" }
6666
serde_json-1 = { version = "1.0", package = "serde_json" }
6767
uuid-08 = { version = "0.8", package = "uuid" }

tokio-postgres/tests/test/types/geo_types_05.rs renamed to tokio-postgres/tests/test/types/geo_types_06.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use geo_types_05::{Coordinate, LineString, Point, Rect};
1+
use geo_types_06::{Coordinate, LineString, Point, Rect};
22

33
use crate::types::test_type;
44

tokio-postgres/tests/test/types/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ mod chrono_04;
2020
mod eui48_04;
2121
#[cfg(feature = "with-geo-types-0_4")]
2222
mod geo_types_04;
23-
#[cfg(feature = "with-geo-types-0_5")]
24-
mod geo_types_05;
23+
#[cfg(feature = "with-geo-types-0_6")]
24+
mod geo_types_06;
2525
#[cfg(feature = "with-serde_json-1")]
2626
mod serde_json_1;
2727
#[cfg(feature = "with-time-0_2")]

0 commit comments

Comments
 (0)