From 29035dd13e36102f39584c83bebcd10ca04c3134 Mon Sep 17 00:00:00 2001
From: Austin Bonander <austin.bonander@gmail.com>
Date: Thu, 21 Aug 2025 23:41:23 -0700
Subject: [PATCH] fix: errors after rebasing

---
 sqlx-core/src/pool/connection.rs | 1 -
 sqlx-core/src/pool/inner.rs      | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sqlx-core/src/pool/connection.rs b/sqlx-core/src/pool/connection.rs
index 76e4e24b..2ab315fa 100644
--- a/sqlx-core/src/pool/connection.rs
+++ b/sqlx-core/src/pool/connection.rs
@@ -12,7 +12,6 @@ use super::inner::{is_beyond_max_lifetime, PoolInner};
 use crate::pool::connect::{ConnectPermit, ConnectionId};
 use crate::pool::options::PoolConnectionMetadata;
 use crate::rt;
-use std::future::Future;
 
 const RETURN_TO_POOL_TIMEOUT: Duration = Duration::from_secs(5);
 const CLOSE_ON_DROP_TIMEOUT: Duration = Duration::from_secs(5);
diff --git a/sqlx-core/src/pool/inner.rs b/sqlx-core/src/pool/inner.rs
index 5eb1d203..5a37f17e 100644
--- a/sqlx-core/src/pool/inner.rs
+++ b/sqlx-core/src/pool/inner.rs
@@ -4,8 +4,7 @@ use crate::error::Error;
 use crate::pool::{CloseEvent, Pool, PoolConnection, PoolConnector, PoolOptions};
 
 use std::cmp;
-use std::future::{self, Future};
-use std::pin::pin;
+use std::future::Future;
 use std::pin::pin;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
@@ -18,7 +17,7 @@ use crate::rt::JoinHandle;
 use crate::{private_tracing_dynamic_event, rt};
 use either::Either;
 use futures_util::future::{self, OptionFuture};
-use futures_util::{FutureExt};
+use futures_util::FutureExt;
 use std::time::{Duration, Instant};
 use tracing::Level;