From 2fdf85b212332647dc4ac47e087df946151feedf Mon Sep 17 00:00:00 2001 From: Tyrel Rink <44035897+tyrelr@users.noreply.github.com> Date: Sun, 27 Nov 2022 10:57:06 -0600 Subject: [PATCH 1/2] fix compilation error with explicit drop --- sqlx-core/src/sqlite/statement/unlock_notify.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sqlx-core/src/sqlite/statement/unlock_notify.rs b/sqlx-core/src/sqlite/statement/unlock_notify.rs index fb47f28281..6a9e3608d4 100644 --- a/sqlx-core/src/sqlite/statement/unlock_notify.rs +++ b/sqlx-core/src/sqlite/statement/unlock_notify.rs @@ -48,10 +48,11 @@ impl Notify { } fn wait(&self) { - let _ = self - .condvar - .wait_while(self.mutex.lock().unwrap(), |fired| !*fired) - .unwrap(); + drop( + self.condvar + .wait_while(self.mutex.lock().unwrap(), |fired| !*fired) + .unwrap(), + ); } fn fire(&self) { From ea2db6ea9bcf8615084b75d27cfa7f411be0b667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Cig=C3=A1nek?= Date: Wed, 18 Jan 2023 16:56:59 +0100 Subject: [PATCH 2/2] Bump libsqlite3-sys to v0.25.2 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- sqlx-core/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a91e65375..eae7758b4d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1546,9 +1546,9 @@ checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db" [[package]] name = "libsqlite3-sys" -version = "0.24.2" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" +checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index 5b55757f1d..ebe489cecd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -148,7 +148,7 @@ rand_xoshiro = "0.6.0" hex = "0.4.3" tempdir = "0.3.7" # Needed to test SQLCipher -libsqlite3-sys = { version = "0.24", features = ["bundled-sqlcipher"] } +libsqlite3-sys = { version = "0.25", features = ["bundled-sqlcipher"] } # # Any diff --git a/sqlx-core/Cargo.toml b/sqlx-core/Cargo.toml index 70f93ef4ae..4b10583c49 100644 --- a/sqlx-core/Cargo.toml +++ b/sqlx-core/Cargo.toml @@ -135,7 +135,7 @@ itoa = "1.0.1" ipnetwork = { version = "0.19.0", default-features = false, optional = true } mac_address = { version = "1.1.2", default-features = false, optional = true } libc = "0.2.112" -libsqlite3-sys = { version = "0.24.1", optional = true, default-features = false, features = [ +libsqlite3-sys = { version = "0.25.2", optional = true, default-features = false, features = [ "pkg-config", "vcpkg", "bundled",