Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 15b6cd5

Browse files
sfacklersfackler
committed
Upgrade type crate versions
Also add the version number to the feature name. This both makes it more obvious when using them and opens the window for support of multiple versions simultaneously in the future.
1 parent 2200286 commit 15b6cd5

File tree

9 files changed

+48
-261
lines changed

9 files changed

+48
-261
lines changed

‎postgres-shared/Cargo.toml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,22 @@ description = "Internal crate used by postgres and postgres-tokio"
77
repository = "https://github.com/sfackler/rust-postgres"
88

99
[features]
10-
with-bit-vec = ["bit-vec"]
11-
with-chrono = ["chrono"]
12-
with-eui48 = ["eui48"]
13-
with-geo = ["geo"]
14-
with-rustc-serialize = ["rustc-serialize"]
15-
with-serde_json = ["serde_json"]
16-
with-time = ["time"]
17-
with-uuid = ["uuid"]
10+
"with-bit-vec-0.5" = ["bit-vec"]
11+
"with-chrono-0.4" = ["chrono"]
12+
"with-eui48-0.3" = ["eui48"]
13+
"with-geo-0.8" = ["geo"]
14+
with-serde_json-1 = ["serde_json"]
15+
"with-uuid-0.6" = ["uuid"]
1816

1917
[dependencies]
2018
hex = "0.3"
2119
fallible-iterator = "0.1.3"
2220
phf = "=0.7.21"
2321
postgres-protocol = { version = "0.3", path = "../postgres-protocol" }
2422

25-
bit-vec = { version = "0.4", optional = true }
23+
bit-vec = { version = "0.5", optional = true }
2624
chrono = { version = "0.4", optional = true }
2725
eui48 = { version = "0.3", optional = true }
28-
geo = { version = "0.4", optional = true }
29-
rustc-serialize = { version = "0.3", optional = true }
26+
geo = { version = "0.8", optional = true }
3027
serde_json = { version = "1.0", optional = true }
31-
time = { version = "0.1.14", optional = true }
32-
uuid = { version = "0.5", optional = true }
28+
uuid = { version = "0.6", optional = true }

‎postgres-shared/src/types/mod.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,17 @@ where
6565
v.to_sql(ty, out)
6666
}
6767

68-
#[cfg(feature = "with-bit-vec")]
68+
#[cfg(feature = "with-bit-vec-0.5")]
6969
mod bit_vec;
70-
#[cfg(feature = "with-chrono")]
70+
#[cfg(feature = "with-chrono-0.4")]
7171
mod chrono;
72-
#[cfg(feature = "with-eui48")]
72+
#[cfg(feature = "with-eui48-0.3")]
7373
mod eui48;
74-
#[cfg(feature = "with-geo")]
74+
#[cfg(feature = "with-geo-0.8")]
7575
mod geo;
76-
#[cfg(feature = "with-rustc-serialize")]
77-
mod rustc_serialize;
78-
#[cfg(feature = "with-serde_json")]
76+
#[cfg(feature = "with-serde_json-1")]
7977
mod serde_json;
80-
#[cfg(feature = "with-time")]
81-
mod time;
82-
#[cfg(feature = "with-uuid")]
78+
#[cfg(feature = "with-uuid-0.6")]
8379
mod uuid;
8480

8581
mod special;

‎postgres-shared/src/types/rustc_serialize.rs

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎postgres-shared/src/types/time.rs

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎postgres/Cargo.toml

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@ categories = ["database"]
1212

1313
[package.metadata.docs.rs]
1414
features = [
15-
"with-bit-vec",
16-
"with-chrono",
17-
"with-eui48",
18-
"with-geo",
19-
"with-rustc-serialize",
20-
"with-serde_json",
21-
"with-time",
22-
"with-uuid",
15+
"with-bit-vec-0.5",
16+
"with-chrono-0.4",
17+
"with-eui48-0.3",
18+
"with-geo-0.8",
19+
"with-serde_json-1",
20+
"with-uuid-0.6",
2321
"with-openssl",
2422
"with-native-tls",
2523
]
@@ -38,14 +36,12 @@ name = "test"
3836
path = "tests/test.rs"
3937

4038
[features]
41-
with-bit-vec = ["postgres-shared/with-bit-vec"]
42-
with-chrono = ["postgres-shared/with-chrono"]
43-
with-eui48 = ["postgres-shared/with-eui48"]
44-
with-geo = ["postgres-shared/with-geo"]
45-
with-rustc-serialize = ["postgres-shared/with-rustc-serialize"]
46-
with-serde_json = ["postgres-shared/with-serde_json"]
47-
with-time = ["postgres-shared/with-time"]
48-
with-uuid = ["postgres-shared/with-uuid"]
39+
"with-bit-vec-0.5" = ["postgres-shared/with-bit-vec-0.5"]
40+
"with-chrono-0.4" = ["postgres-shared/with-chrono-0.4"]
41+
"with-eui48-0.3" = ["postgres-shared/with-eui48-0.3"]
42+
"with-geo-0.8" = ["postgres-shared/with-geo-0.8"]
43+
"with-serde_json-1" = ["postgres-shared/with-serde_json-1"]
44+
"with-uuid-0.6" = ["postgres-shared/with-uuid-0.6"]
4945

5046
with-openssl = ["openssl"]
5147
with-native-tls = ["native-tls"]
@@ -62,7 +58,6 @@ socket2 = { version = "0.3.5", features = ["unix"] }
6258

6359
openssl = { version = "0.9.23", optional = true }
6460
native-tls = { version = "0.1", optional = true }
65-
rustc-serialize = { version = "0.3", optional = true }
6661
schannel = { version = "0.1", optional = true }
6762
security-framework = { version = "0.1.2", optional = true }
6863

@@ -73,11 +68,9 @@ postgres-shared = { version = "0.4.1", path = "../postgres-shared" }
7368
hex = "0.3"
7469
url = "1.0"
7570

76-
bit-vec = "0.4"
71+
bit-vec = "0.5"
7772
chrono = "0.4"
7873
eui48 = "0.3"
79-
geo = "0.4"
80-
rustc-serialize = "0.3"
74+
geo = "0.8"
8175
serde_json = "1.0"
82-
time = "0.1.14"
83-
uuid = "0.5"
76+
uuid = "0.6"

‎postgres/tests/types/mod.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,17 @@ use std::result;
88
use postgres::types::{FromSql, FromSqlOwned, IsNull, Kind, ToSql, Type, WrongType};
99
use postgres::{Connection, TlsMode};
1010

11-
#[cfg(feature = "with-bit-vec")]
11+
#[cfg(feature = "with-bit-vec-0.5")]
1212
mod bit_vec;
13-
#[cfg(feature = "with-chrono")]
13+
#[cfg(feature = "with-chrono-0.4")]
1414
mod chrono;
15-
#[cfg(feature = "with-eui48")]
15+
#[cfg(feature = "with-eui48-0.3")]
1616
mod eui48;
17-
#[cfg(feature = "with-geo")]
17+
#[cfg(feature = "with-geo-0.8")]
1818
mod geo;
19-
#[cfg(feature = "with-rustc-serialize")]
20-
mod rustc_serialize;
21-
#[cfg(feature = "with-serde_json")]
19+
#[cfg(feature = "with-serde_json-1")]
2220
mod serde_json;
23-
#[cfg(feature = "with-time")]
24-
mod time;
25-
#[cfg(feature = "with-uuid")]
21+
#[cfg(feature = "with-uuid-0.6")]
2622
mod uuid;
2723

2824
fn test_type<T, S>(sql_type: &str, checks: &[(T, S)])

‎postgres/tests/types/rustc_serialize.rs

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎postgres/tests/types/time.rs

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎tokio-postgres/Cargo.toml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,25 @@ categories = ["database"]
1111

1212
[package.metadata.docs.rs]
1313
features = [
14-
"with-bit-vec",
15-
"with-chrono",
16-
"with-eui48",
17-
"with-geo",
18-
"with-rustc-serialize",
19-
"with-serde_json",
20-
"with-time",
21-
"with-uuid",
14+
"with-bit-vec-0.5",
15+
"with-chrono-0.4",
16+
"with-eui48-0.3",
17+
"with-geo-0.8",
18+
"with-serde_json-1",
19+
"with-uuid-0.6",
2220
"with-openssl",
2321
]
2422

2523
[badges]
2624
circle-ci = { repository = "sfackler/rust-postgres" }
2725

2826
[features]
29-
with-bit-vec = ["postgres-shared/with-bit-vec"]
30-
with-chrono = ["postgres-shared/with-chrono"]
31-
with-eui48 = ["postgres-shared/with-eui48"]
32-
with-geo = ["postgres-shared/with-geo"]
33-
with-rustc-serialize = ["postgres-shared/with-rustc-serialize"]
34-
with-serde_json = ["postgres-shared/with-serde_json"]
35-
with-time = ["postgres-shared/with-time"]
36-
with-uuid = ["postgres-shared/with-uuid"]
27+
"with-bit-vec-0.5" = ["postgres-shared/with-bit-vec-0.5"]
28+
"with-chrono-0.4" = ["postgres-shared/with-chrono-0.4"]
29+
"with-eui48-0.3" = ["postgres-shared/with-eui48-0.3"]
30+
"with-geo-0.8" = ["postgres-shared/with-geo-0.8"]
31+
"with-serde_json-1" = ["postgres-shared/with-serde_json-1"]
32+
"with-uuid-0.6" = ["postgres-shared/with-uuid-0.6"]
3733

3834
with-openssl = ["tokio-openssl", "openssl"]
3935

0 commit comments

Comments
 (0)