From f35ebbdb41a85d682d323a96185f10043dc8ccc8 Mon Sep 17 00:00:00 2001 From: Austin Bonander Date: Fri, 27 Feb 2026 18:34:02 -0800 Subject: [PATCH] fix warnings --- sqlx-core/src/pool/connect.rs | 13 +------------ sqlx-core/src/pool/connection.rs | 2 +- sqlx-core/src/pool/connection_set.rs | 10 ++-------- sqlx-core/src/rt/mod.rs | 3 +-- sqlx-test/src/lib.rs | 2 +- 5 files changed, 6 insertions(+), 24 deletions(-) diff --git a/sqlx-core/src/pool/connect.rs b/sqlx-core/src/pool/connect.rs index edd39a941..920096763 100644 --- a/sqlx-core/src/pool/connect.rs +++ b/sqlx-core/src/pool/connect.rs @@ -366,7 +366,6 @@ impl DynConnector { pub struct ConnectTask { handle: JoinHandle>>, - shared: Arc, } pub struct ConnectTaskShared { @@ -400,17 +399,7 @@ impl ConnectTask { shared.clone(), )); - Self { handle, shared } - } - - pub fn cancel(&self) -> Option { - self.shared.cancel_event.notify(1); - - self.shared - .last_error - .lock() - .unwrap_or_else(|e| e.into_inner()) - .take() + Self { handle } } } diff --git a/sqlx-core/src/pool/connection.rs b/sqlx-core/src/pool/connection.rs index 2696819cf..c700eaa04 100644 --- a/sqlx-core/src/pool/connection.rs +++ b/sqlx-core/src/pool/connection.rs @@ -2,7 +2,7 @@ use std::fmt::{self, Debug, Formatter}; use std::future::{self, Future}; use std::io; use std::ops::{Deref, DerefMut}; -use std::sync::{Arc, Weak}; +use std::sync::Weak; use std::time::{Duration, Instant}; use crate::connection::Connection; diff --git a/sqlx-core/src/pool/connection_set.rs b/sqlx-core/src/pool/connection_set.rs index 445c2ecfa..275ff36cd 100644 --- a/sqlx-core/src/pool/connection_set.rs +++ b/sqlx-core/src/pool/connection_set.rs @@ -2,17 +2,11 @@ use crate::ext::future::race; use crate::rt; use crate::sync::{AsyncMutex, AsyncMutexGuardArc}; use event_listener::{listener, Event, EventListener, IntoNotification}; -use futures_util::future::{Fuse, FusedFuture}; use futures_util::stream::FuturesUnordered; -use futures_util::{FutureExt, StreamExt}; -use std::cmp; -use std::future::Future; -use std::ops::{Deref, DerefMut, RangeInclusive, RangeToInclusive}; -use std::pin::{pin, Pin}; +use futures_util::StreamExt; +use std::ops::{Deref, DerefMut, RangeInclusive}; use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering}; use std::sync::Arc; -use std::task::{ready, Poll}; -use std::time::Duration; use tracing::Instrument; pub struct ConnectionSet { diff --git a/sqlx-core/src/rt/mod.rs b/sqlx-core/src/rt/mod.rs index 862cf6ced..c1f76f646 100644 --- a/sqlx-core/src/rt/mod.rs +++ b/sqlx-core/src/rt/mod.rs @@ -6,7 +6,6 @@ use std::time::{Duration, Instant}; use cfg_if::cfg_if; use futures_core::Stream; -use futures_util::StreamExt; use pin_project_lite::pin_project; #[cfg(feature = "_rt-async-io")] @@ -220,7 +219,7 @@ where #[inline(always)] fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { - let mut this = self.project(); + let this = self.project(); if let Poll::Ready(out) = this.future.poll(cx) { return Poll::Ready(Some(out)); diff --git a/sqlx-test/src/lib.rs b/sqlx-test/src/lib.rs index c8a8ad857..2cc45d864 100644 --- a/sqlx-test/src/lib.rs +++ b/sqlx-test/src/lib.rs @@ -23,7 +23,7 @@ where let db_url = env::var("DATABASE_URL").map_err(|e| Error::Configuration(Box::new(e)))?; - Ok(DB::Connection::connect(&db_url).await?) + DB::Connection::connect(&db_url).await } // Make a new pool