Merge pull request #1207 from sfackler/cidr-fixes

Cleanup cidr features
sfackler · Feb 2, 2025 · 7ee61f3 · 7ee61f3
2 parents 0785381 + a5eaea1
commit 7ee61f3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -84,7 +84,7 @@ jobs:
       - run: docker compose up -d
       - uses: sfackler/actions/rustup@master
         with:
-          version: 1.75.0
+          version: 1.81.0
       - run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT
         id: rust-version
       - uses: actions/cache@v3

diff --git a/postgres-types/src/lib.rs b/postgres-types/src/lib.rs
@@ -491,6 +491,8 @@ impl WrongType {
 /// | `chrono::DateTime<FixedOffset>` | TIMESTAMP WITH TIME ZONE            |
 /// | `chrono::NaiveDate`             | DATE                                |
 /// | `chrono::NaiveTime`             | TIME                                |
+/// | `cidr::IpCidr`                  | CIDR                                |
+/// | `cidr::IpInet`                  | INET                                |
 /// | `time::PrimitiveDateTime`       | TIMESTAMP                           |
 /// | `time::OffsetDateTime`          | TIMESTAMP WITH TIME ZONE            |
 /// | `time::Date`                    | DATE                                |
@@ -842,6 +844,8 @@ pub enum IsNull {
 /// | `chrono::DateTime<FixedOffset>` | TIMESTAMP WITH TIME ZONE            |
 /// | `chrono::NaiveDate`             | DATE                                |
 /// | `chrono::NaiveTime`             | TIME                                |
+/// | `cidr::IpCidr`                  | CIDR                                |
+/// | `cidr::IpInet`                  | INET                                |
 /// | `time::PrimitiveDateTime`       | TIMESTAMP                           |
 /// | `time::OffsetDateTime`          | TIMESTAMP WITH TIME ZONE            |
 /// | `time::Date`                    | DATE                                |

diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
@@ -24,6 +24,8 @@ circle-ci = { repository = "sfackler/rust-postgres" }
 array-impls = ["tokio-postgres/array-impls"]
 with-bit-vec-0_6 = ["tokio-postgres/with-bit-vec-0_6"]
 with-chrono-0_4 = ["tokio-postgres/with-chrono-0_4"]
+with-cidr-0_2 = ["tokio-postgres/with-cidr-0_2"]
+with-cidr-0_3 = ["tokio-postgres/with-cidr-0_3"]
 with-eui48-0_4 = ["tokio-postgres/with-eui48-0_4"]
 with-eui48-1 = ["tokio-postgres/with-eui48-1"]
 with-geo-types-0_6 = ["tokio-postgres/with-geo-types-0_6"]

diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
@@ -30,6 +30,8 @@ runtime = ["tokio/net", "tokio/time"]
 array-impls = ["postgres-types/array-impls"]
 with-bit-vec-0_6 = ["postgres-types/with-bit-vec-0_6"]
 with-chrono-0_4 = ["postgres-types/with-chrono-0_4"]
+with-cidr-0_2 = ["postgres-types/with-cidr-0_2"]
+with-cidr-0_3 = ["postgres-types/with-cidr-0_3"]
 with-eui48-0_4 = ["postgres-types/with-eui48-0_4"]
 with-eui48-1 = ["postgres-types/with-eui48-1"]
 with-geo-types-0_6 = ["postgres-types/with-geo-types-0_6"]