itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-10-03 15:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use let else statements in favor of macro (#2213)

Browse Source
This commit is contained in:
OverHash 2023-02-09 08:19:49 +13:00 committed by Austin Bonander
parent 092922e42a
commit 771ab80a62
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,24 +353,19 @@ impl<DB: Database> PoolInner<DB> {
/// Try to maintain `min_connections`, returning any errors (including `PoolTimedOut`). /// Try to maintain `min_connections`, returning any errors (including `PoolTimedOut`).
pub async fn try_min_connections(self: &Arc<Self>, deadline: Instant) -> Result<(), Error> { pub async fn try_min_connections(self: &Arc<Self>, deadline: Instant) -> Result<(), Error> {
macro_rules! unwrap_or_return {
($expr:expr) => {
match $expr {
Some(val) => val,
None => return Ok(()),
}
};
}
while self.size() < self.options.min_connections { while self.size() < self.options.min_connections {
// Don't wait for a semaphore permit. // Don't wait for a semaphore permit.
// //
// If no extra permits are available then we shouldn't be trying to spin up // If no extra permits are available then we shouldn't be trying to spin up
// connections anyway. // connections anyway.
let permit = unwrap_or_return!(self.semaphore.try_acquire(1)); let Some(permit) = self.semaphore.try_acquire(1) else {
return Ok(());
};
// We must always obey `max_connections`. // We must always obey `max_connections`.
let guard = unwrap_or_return!(self.try_increment_size(permit).ok()); let Some(guard) = self.try_increment_size(permit).ok() else {
return Ok(());
};
// We skip `after_release` since the connection was never provided to user code // We skip `after_release` since the connection was never provided to user code
// besides `after_connect`, if they set it. // besides `after_connect`, if they set it.