itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-12-29 21:00:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: errors after rebasing

Browse Source
This commit is contained in:
Austin Bonander 2025-08-21 23:41:23 -07:00
parent 782011bec4
commit 29035dd13e
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sqlx-core/src/pool/connection.rs
View File

@ -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);

5
sqlx-core/src/pool/inner.rs
View File

@ -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;