From 0703ef6c66c8656b9eb9798d3035b5065a00d96f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 6 Mar 2025 06:39:04 +0000 Subject: [PATCH 1/4] Update Rust crate rusqlite to 0.34 --- Cargo.lock | 25 +++++++++++++++++-------- Cargo.toml | 2 +- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c72e84f14..036e510b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1113,7 +1113,7 @@ dependencies = [ "slog-term", "statistical", "tempfile", - "thiserror 1.0.66", + "thiserror 1.0.69", "tokio", "tokio-rustls 0.24.1", "tokio-util", @@ -1957,6 +1957,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" + [[package]] name = "foreign-types" version = "0.3.2" @@ -2253,14 +2259,17 @@ name = "hashbrown" version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +dependencies = [ + "foldhash", +] [[package]] name = "hashlink" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.15.2", ] [[package]] @@ -2938,9 +2947,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.30.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" +checksum = "fbb8270bb4060bd76c6e96f20c52d80620f1d82a3470885694e41e0f81ef6fe7" dependencies = [ "pkg-config", "vcpkg", @@ -5039,9 +5048,9 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.32.1" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e" +checksum = "37e34486da88d8e051c7c0e23c3f15fd806ea8546260aa2fec247e97242ec143" dependencies = [ "bitflags 2.6.0", "fallible-iterator", diff --git a/Cargo.toml b/Cargo.toml index 19f33c392..04870560d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -80,7 +80,7 @@ rand_chacha = "0.3.1" reedline = "0.38.0" reqwest = { version = "0.12", features = ["default", "blocking", "json", "stream"] } ringbuffer = "0.15.0" -rusqlite = { version = "0.32" } +rusqlite = { version = "0.34" } rustls-pemfile = { version = "1.0.4" } schemars = { version = "0.8", features = [ "chrono", "uuid1" ] } serde = { version = "1", features = [ "derive" ] } From ec606b64ee992a78867a79eb54453f220fc9c82a Mon Sep 17 00:00:00 2001 From: Alan Hanson Date: Mon, 17 Mar 2025 13:19:11 -0700 Subject: [PATCH 2/4] fix cargo hakari --- workspace-hack/Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index f64b1c887..5ffbb62b3 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -31,6 +31,7 @@ futures-executor = { version = "0.3" } futures-sink = { version = "0.3" } futures-util = { version = "0.3", features = ["channel", "io", "sink"] } getrandom = { version = "0.2", default-features = false, features = ["std"] } +hashbrown = { version = "0.15", default-features = false, features = ["default-hasher", "inline-more"] } hex = { version = "0.4", features = ["serde"] } indexmap = { version = "2", features = ["serde"] } libc = { version = "0.2", features = ["extra_traits"] } @@ -80,6 +81,7 @@ futures-executor = { version = "0.3" } futures-sink = { version = "0.3" } futures-util = { version = "0.3", features = ["channel", "io", "sink"] } getrandom = { version = "0.2", default-features = false, features = ["std"] } +hashbrown = { version = "0.15", default-features = false, features = ["default-hasher", "inline-more"] } hex = { version = "0.4", features = ["serde"] } indexmap = { version = "2", features = ["serde"] } libc = { version = "0.2", features = ["extra_traits"] } From 96a2d320486ba6821e20772d1f95c60ea7e4c251 Mon Sep 17 00:00:00 2001 From: Alan Hanson Date: Mon, 17 Mar 2025 13:22:58 -0700 Subject: [PATCH 3/4] more lock file updates --- Cargo.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.lock b/Cargo.lock index 6a24d75d5..660fccf4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1330,6 +1330,7 @@ dependencies = [ "futures-sink", "futures-util", "getrandom 0.2.11", + "hashbrown 0.15.2", "hex", "hyper", "hyper-rustls", From fdcbe7c02b32172eab2bf904ea2de2b8f8e93672 Mon Sep 17 00:00:00 2001 From: Alan Hanson Date: Mon, 17 Mar 2025 13:42:02 -0700 Subject: [PATCH 4/4] Now add the workspace-hack cargo.toml --- workspace-hack/Cargo.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 76edca6ca..0c715f2c1 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -30,7 +30,6 @@ futures-core = { version = "0.3" } futures-executor = { version = "0.3" } futures-sink = { version = "0.3" } futures-util = { version = "0.3", features = ["channel", "io", "sink"] } -getrandom = { version = "0.2", default-features = false, features = ["std"] } hashbrown = { version = "0.15", default-features = false, features = ["default-hasher", "inline-more"] } hex = { version = "0.4", features = ["serde"] } indexmap = { version = "2", features = ["serde"] } @@ -80,7 +79,6 @@ futures-core = { version = "0.3" } futures-executor = { version = "0.3" } futures-sink = { version = "0.3" } futures-util = { version = "0.3", features = ["channel", "io", "sink"] } -getrandom = { version = "0.2", default-features = false, features = ["std"] } hashbrown = { version = "0.15", default-features = false, features = ["default-hasher", "inline-more"] } hex = { version = "0.4", features = ["serde"] } indexmap = { version = "2", features = ["serde"] }