Skip to content

Commit cc93651

Browse files
authored
Merge pull request sfackler#1074 from ds-cbo/remove-rustc-serialize-dependency
remove rustc-serialize dependency
2 parents ab23ca8 + a8caff1 commit cc93651

File tree

7 files changed

+12
-25
lines changed

7 files changed

+12
-25
lines changed

postgres-types/Cargo.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ chrono-04 = { version = "0.4.16", package = "chrono", default-features = false,
3939
"clock",
4040
], optional = true }
4141
cidr-02 = { version = "0.2", package = "cidr", optional = true }
42+
# eui48-04 will stop compiling and support will be removed
43+
# See https://github.com/sfackler/rust-postgres/issues/1073
4244
eui48-04 = { version = "0.4", package = "eui48", optional = true }
43-
eui48-1 = { version = "1.0", package = "eui48", optional = true }
45+
eui48-1 = { version = "1.0", package = "eui48", optional = true, default-features = false }
4446
geo-types-06 = { version = "0.6", package = "geo-types", optional = true }
4547
geo-types-0_7 = { version = "0.7", package = "geo-types", optional = true }
4648
serde-1 = { version = "1.0", package = "serde", optional = true }

postgres/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
//! | ------- | ----------- | ------------------ | ------- |
5656
//! | `with-bit-vec-0_6` | Enable support for the `bit-vec` crate. | [bit-vec](https://crates.io/crates/bit-vec) 0.6 | no |
5757
//! | `with-chrono-0_4` | Enable support for the `chrono` crate. | [chrono](https://crates.io/crates/chrono) 0.4 | no |
58-
//! | `with-eui48-0_4` | Enable support for the 0.4 version of the `eui48` crate. | [eui48](https://crates.io/crates/eui48) 0.4 | no |
58+
//! | `with-eui48-0_4` | Enable support for the 0.4 version of the `eui48` crate. This is deprecated and will be removed. | [eui48](https://crates.io/crates/eui48) 0.4 | no |
5959
//! | `with-eui48-1` | Enable support for the 1.0 version of the `eui48` crate. | [eui48](https://crates.io/crates/eui48) 1.0 | no |
6060
//! | `with-geo-types-0_6` | Enable support for the 0.6 version of the `geo-types` crate. | [geo-types](https://crates.io/crates/geo-types/0.6.0) 0.6 | no |
6161
//! | `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 |

tokio-postgres/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Change Log
22

3+
## Unreleased
4+
5+
* Disable `rustc-serialize` compatibility of `eui48-1` dependency
6+
* Remove tests for `eui48-04`
7+
8+
39
## v0.7.10 - 2023-08-25
410

511
## Fixed

tokio-postgres/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ tokio = { version = "1.0", features = [
7878

7979
bit-vec-06 = { version = "0.6", package = "bit-vec" }
8080
chrono-04 = { version = "0.4", package = "chrono", default-features = false }
81-
eui48-04 = { version = "0.4", package = "eui48" }
82-
eui48-1 = { version = "1.0", package = "eui48" }
81+
eui48-1 = { version = "1.0", package = "eui48", default-features = false }
8382
geo-types-06 = { version = "0.6", package = "geo-types" }
8483
geo-types-07 = { version = "0.7", package = "geo-types" }
8584
serde-1 = { version = "1.0", package = "serde" }

tokio-postgres/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
//! | `array-impls` | Enables `ToSql` and `FromSql` trait impls for arrays | - | no |
108108
//! | `with-bit-vec-0_6` | Enable support for the `bit-vec` crate. | [bit-vec](https://crates.io/crates/bit-vec) 0.6 | no |
109109
//! | `with-chrono-0_4` | Enable support for the `chrono` crate. | [chrono](https://crates.io/crates/chrono) 0.4 | no |
110-
//! | `with-eui48-0_4` | Enable support for the 0.4 version of the `eui48` crate. | [eui48](https://crates.io/crates/eui48) 0.4 | no |
110+
//! | `with-eui48-0_4` | Enable support for the 0.4 version of the `eui48` crate. This is deprecated and will be removed. | [eui48](https://crates.io/crates/eui48) 0.4 | no |
111111
//! | `with-eui48-1` | Enable support for the 1.0 version of the `eui48` crate. | [eui48](https://crates.io/crates/eui48) 1.0 | no |
112112
//! | `with-geo-types-0_6` | Enable support for the 0.6 version of the `geo-types` crate. | [geo-types](https://crates.io/crates/geo-types/0.6.0) 0.6 | no |
113113
//! | `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 |

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

-18
This file was deleted.

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

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ use bytes::BytesMut;
1717
mod bit_vec_06;
1818
#[cfg(feature = "with-chrono-0_4")]
1919
mod chrono_04;
20-
#[cfg(feature = "with-eui48-0_4")]
21-
mod eui48_04;
2220
#[cfg(feature = "with-eui48-1")]
2321
mod eui48_1;
2422
#[cfg(feature = "with-geo-types-0_6")]

0 commit comments

Comments
 (0)