From 50290893d2396fe1c247985666edcba076d5383f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2026 00:22:07 +0000 Subject: [PATCH 1/2] chore(deps): bump bit-vec from 0.8.0 to 0.10.1 Bumps [bit-vec](https://github.com/contain-rs/bit-vec) from 0.8.0 to 0.10.1. - [Changelog](https://github.com/contain-rs/bit-vec/blob/master/RELEASES.md) - [Commits](https://github.com/contain-rs/bit-vec/commits) --- updated-dependencies: - dependency-name: bit-vec dependency-version: 0.10.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 88 +++++++++++++++++++++++++++++- examples/advanced-types/Cargo.toml | 2 +- 2 files changed, 86 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d23b45c..861453f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7,7 +7,7 @@ name = "advanced-types" version = "0.1.0" dependencies = [ "bigdecimal", - "bit-vec", + "bit-vec 0.10.1", "chrono", "sqlx", "tokio", @@ -206,6 +206,16 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" +[[package]] +name = "bit-vec" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5727b15fa97d4f4fee0a3b7c3d550ed0269f54329207b86388de918604e31269" +dependencies = [ + "borsh", + "serde", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -321,6 +331,30 @@ dependencies = [ "tokio", ] +[[package]] +name = "borsh" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a" +dependencies = [ + "borsh-derive", + "bytes", + "cfg_aliases", +] + +[[package]] +name = "borsh-derive" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cdfe656708a01f89b451a7d36466e6fe6c414de0aa18fc54f864f6f9ca9f56" +dependencies = [ + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 3.0.4", +] + [[package]] name = "bs58" version = "0.5.1" @@ -1782,6 +1816,15 @@ dependencies = [ "syn 3.0.4", ] +[[package]] +name = "proc-macro-crate" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" +dependencies = [ + "toml_edit", +] + [[package]] name = "proc-macro2" version = "1.0.107" @@ -2344,7 +2387,7 @@ checksum = "05b44e85bf579a8eeb4ceaa77a3a523baf2bf0e9bac7e40f405d537b5d2d5ccb" dependencies = [ "base64 0.22.1", "bigdecimal", - "bit-vec", + "bit-vec 0.8.0", "bytes", "cfg-if", "chrono", @@ -2453,7 +2496,7 @@ dependencies = [ "atoi", "base64 0.22.1", "bigdecimal", - "bit-vec", + "bit-vec 0.8.0", "bitflags 2.13.1", "byteorder", "chrono", @@ -2803,6 +2846,36 @@ dependencies = [ "tokio", ] +[[package]] +name = "toml_datetime" +version = "1.1.1+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" +dependencies = [ + "serde_core", +] + +[[package]] +name = "toml_edit" +version = "0.25.13+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6975367e4d2ef766d86af01ffad14b622fecc8d4357a998fbc4deb6e9bacaf9b" +dependencies = [ + "indexmap 2.14.0", + "toml_datetime", + "toml_parser", + "winnow", +] + +[[package]] +name = "toml_parser" +version = "1.1.3+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56" +dependencies = [ + "winnow", +] + [[package]] name = "tonic" version = "0.14.6" @@ -3288,6 +3361,15 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "winnow" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" +dependencies = [ + "memchr", +] + [[package]] name = "wit-bindgen" version = "0.57.1" diff --git a/examples/advanced-types/Cargo.toml b/examples/advanced-types/Cargo.toml index d1eef16..2496991 100644 --- a/examples/advanced-types/Cargo.toml +++ b/examples/advanced-types/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] bigdecimal = "0.4" -bit-vec = "0.8" +bit-vec = "0.10" chrono = "0.4" sqlx = { workspace = true } tokio = { workspace = true } From 598883a680958d3658173fabb2573d0c64eb42fb Mon Sep 17 00:00:00 2001 From: Jared Randall Date: Wed, 26 Aug 2026 17:33:12 -0700 Subject: [PATCH 2/2] fix(deps): use SQLx BitVec re-export --- Cargo.lock | 87 +---------------------- README.md | 2 +- examples/advanced-types/Cargo.toml | 1 - examples/advanced-types/src/main.rs | 2 +- examples/advanced-types/src/queries.rs | 4 +- src/types.rs | 2 +- tests/codegen.rs | 5 +- tests/snapshots/codegen__range_types.snap | 2 +- 8 files changed, 12 insertions(+), 93 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 861453f..e842d00 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7,7 +7,6 @@ name = "advanced-types" version = "0.1.0" dependencies = [ "bigdecimal", - "bit-vec 0.10.1", "chrono", "sqlx", "tokio", @@ -206,16 +205,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" -[[package]] -name = "bit-vec" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5727b15fa97d4f4fee0a3b7c3d550ed0269f54329207b86388de918604e31269" -dependencies = [ - "borsh", - "serde", -] - [[package]] name = "bitflags" version = "1.3.2" @@ -331,30 +320,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "borsh" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a" -dependencies = [ - "borsh-derive", - "bytes", - "cfg_aliases", -] - -[[package]] -name = "borsh-derive" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cdfe656708a01f89b451a7d36466e6fe6c414de0aa18fc54f864f6f9ca9f56" -dependencies = [ - "once_cell", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 3.0.4", -] - [[package]] name = "bs58" version = "0.5.1" @@ -1816,15 +1781,6 @@ dependencies = [ "syn 3.0.4", ] -[[package]] -name = "proc-macro-crate" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" -dependencies = [ - "toml_edit", -] - [[package]] name = "proc-macro2" version = "1.0.107" @@ -2387,7 +2343,7 @@ checksum = "05b44e85bf579a8eeb4ceaa77a3a523baf2bf0e9bac7e40f405d537b5d2d5ccb" dependencies = [ "base64 0.22.1", "bigdecimal", - "bit-vec 0.8.0", + "bit-vec", "bytes", "cfg-if", "chrono", @@ -2496,7 +2452,7 @@ dependencies = [ "atoi", "base64 0.22.1", "bigdecimal", - "bit-vec 0.8.0", + "bit-vec", "bitflags 2.13.1", "byteorder", "chrono", @@ -2846,36 +2802,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml_datetime" -version = "1.1.1+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" -dependencies = [ - "serde_core", -] - -[[package]] -name = "toml_edit" -version = "0.25.13+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6975367e4d2ef766d86af01ffad14b622fecc8d4357a998fbc4deb6e9bacaf9b" -dependencies = [ - "indexmap 2.14.0", - "toml_datetime", - "toml_parser", - "winnow", -] - -[[package]] -name = "toml_parser" -version = "1.1.3+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56" -dependencies = [ - "winnow", -] - [[package]] name = "tonic" version = "0.14.6" @@ -3361,15 +3287,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "winnow" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" -dependencies = [ - "memchr", -] - [[package]] name = "wit-bindgen" version = "0.57.1" diff --git a/README.md b/README.md index 25c9539..5dfe17f 100644 --- a/README.md +++ b/README.md @@ -157,7 +157,7 @@ directly without re-collecting. | `tsrange` | `sqlx::postgres::types::PgRange` | | `tstzrange` | `sqlx::postgres::types::PgRange>` | | `daterange` | `sqlx::postgres::types::PgRange` | -| `bit` / `varbit` | `bit_vec::BitVec` | +| `bit` / `varbit` | `sqlx::types::BitVec` | | PostgreSQL ENUM | generated Rust enum | | PostgreSQL composite | generated Rust struct | diff --git a/examples/advanced-types/Cargo.toml b/examples/advanced-types/Cargo.toml index 2496991..3a2cb5c 100644 --- a/examples/advanced-types/Cargo.toml +++ b/examples/advanced-types/Cargo.toml @@ -6,7 +6,6 @@ publish = false [dependencies] bigdecimal = "0.4" -bit-vec = "0.10" chrono = "0.4" sqlx = { workspace = true } tokio = { workspace = true } diff --git a/examples/advanced-types/src/main.rs b/examples/advanced-types/src/main.rs index 70470c4..d893f2a 100644 --- a/examples/advanced-types/src/main.rs +++ b/examples/advanced-types/src/main.rs @@ -23,7 +23,7 @@ async fn test_advanced_types_roundtrip() { .await .unwrap(); - let flags = bit_vec::BitVec::from_bytes(&[0b10101010]); + let flags = sqlx::types::BitVec::from_bytes(&[0b10101010]); let now = chrono::Utc::now(); let later = now + chrono::Duration::hours(1); let window = sqlx::postgres::types::PgRange::from(( diff --git a/examples/advanced-types/src/queries.rs b/examples/advanced-types/src/queries.rs index ea9bef8..3748ea0 100644 --- a/examples/advanced-types/src/queries.rs +++ b/examples/advanced-types/src/queries.rs @@ -44,7 +44,7 @@ const GET_EVENT: &str = "SELECT id, name, flags, event_window FROM events WHERE pub struct GetEventRow { pub id: i64, pub name: String, - pub flags: bit_vec::BitVec, + pub flags: sqlx::types::BitVec, pub event_window: sqlx::postgres::types::PgRange>, } pub async fn get_event(mut db: E, id: i64) -> Result { @@ -58,7 +58,7 @@ const LIST_EVENTS: &str = "SELECT id, name, flags, event_window FROM events"; pub struct ListEventsRow { pub id: i64, pub name: String, - pub flags: bit_vec::BitVec, + pub flags: sqlx::types::BitVec, pub event_window: sqlx::postgres::types::PgRange>, } pub async fn list_events(mut db: E) -> Result, sqlx::Error> { diff --git a/src/types.rs b/src/types.rs index 67d13f7..e9bc370 100644 --- a/src/types.rs +++ b/src/types.rs @@ -202,7 +202,7 @@ impl TypeMap { // Bit types for n in ["bit", "varbit", "pg_catalog.varbit"] { - defaults.insert(n, ("bit_vec::BitVec", false)); + defaults.insert(n, ("sqlx::types::BitVec", false)); } let mut type_overrides: HashMap = HashMap::new(); diff --git a/tests/codegen.rs b/tests/codegen.rs index bb7a2e9..30ae849 100644 --- a/tests/codegen.rs +++ b/tests/codegen.rs @@ -504,7 +504,10 @@ fn snapshot_range_types() { let code = String::from_utf8(resp.files[0].contents.clone()).unwrap(); assert_codegen_snapshot("range_types", &code); assert!(code.contains("PgRange"), "expected PgRange in:\n{code}"); - assert!(code.contains("BitVec"), "expected BitVec in:\n{code}"); + assert!( + code.contains("sqlx::types::BitVec"), + "expected SQLx BitVec in:\n{code}" + ); } #[test] diff --git a/tests/snapshots/codegen__range_types.snap b/tests/snapshots/codegen__range_types.snap index 51e2964..13ed403 100644 --- a/tests/snapshots/codegen__range_types.snap +++ b/tests/snapshots/codegen__range_types.snap @@ -48,7 +48,7 @@ pub const GET_EVENT_WINDOW: &str = "SELECT id, window, flags FROM events WHERE i pub struct GetEventWindowRow { pub id: i64, pub window: sqlx::postgres::types::PgRange>, - pub flags: bit_vec::BitVec, + pub flags: sqlx::types::BitVec, } pub async fn get_event_window( mut db: E,