From e1e99e17dc7049cc8a79d33d3dc27afa4e805fa3 Mon Sep 17 00:00:00 2001 From: Austin Bonander Date: Wed, 4 Feb 2026 14:51:26 -0800 Subject: [PATCH] fix: run `cargo fmt` --- benches/any/pool.rs | 8 +++----- sqlx-core/src/pool/inner.rs | 12 +++++++----- sqlx-core/src/pool/mod.rs | 12 ++++++------ sqlx-test/src/lib.rs | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/benches/any/pool.rs b/benches/any/pool.rs index 0163590f3..16867f97f 100644 --- a/benches/any/pool.rs +++ b/benches/any/pool.rs @@ -5,9 +5,9 @@ use std::thread; use std::time::{Duration, Instant}; use tracing::Instrument; use tracing_flame::FlameLayer; -use tracing_subscriber::{EnvFilter, Layer}; use tracing_subscriber::layer::SubscriberExt; use tracing_subscriber::util::SubscriberInitExt; +use tracing_subscriber::{EnvFilter, Layer}; #[derive(Debug)] struct Input { @@ -34,9 +34,7 @@ fn bench_pool(c: &mut Criterion) { .expect(&format!("error opening path {path:?} (`FLAMEGRAPH_OUT`)")); tracing_subscriber::registry() - .with( - tracing_subscriber::fmt::layer().with_filter(EnvFilter::from_default_env()) - ) + .with(tracing_subscriber::fmt::layer().with_filter(EnvFilter::from_default_env())) .with(layer.with_threads_collapsed(true)) .try_init() .ok(); @@ -160,4 +158,4 @@ fn bench_pool_with(b: &mut Bencher, input: &Input, database_url: &str) { } criterion_group!(benches, bench_pool,); -criterion_main!(benches); \ No newline at end of file +criterion_main!(benches); diff --git a/sqlx-core/src/pool/inner.rs b/sqlx-core/src/pool/inner.rs index 775b89764..1d76f25a4 100644 --- a/sqlx-core/src/pool/inner.rs +++ b/sqlx-core/src/pool/inner.rs @@ -208,12 +208,14 @@ impl PoolInner { } #[inline(always)] - async fn finish_acquire(self: &Arc, conn: ConnectedSlot>) -> Result, DisconnectedSlot>> { - let span = tracing::trace_span!(target: "sqlx::pool", "finish_acquire", connection_id=?conn.id); + async fn finish_acquire( + self: &Arc, + conn: ConnectedSlot>, + ) -> Result, DisconnectedSlot>> { + let span = + tracing::trace_span!(target: "sqlx::pool", "finish_acquire", connection_id=?conn.id); - finish_acquire(self, conn) - .instrument(span) - .await + finish_acquire(self, conn).instrument(span).await } pub(crate) async fn try_min_connections( diff --git a/sqlx-core/src/pool/mod.rs b/sqlx-core/src/pool/mod.rs index 224ee8ffb..f9515d134 100644 --- a/sqlx-core/src/pool/mod.rs +++ b/sqlx-core/src/pool/mod.rs @@ -60,6 +60,12 @@ use std::pin::Pin; use std::sync::Arc; use std::task::{ready, Context, Poll}; +pub use self::connect::{PoolConnectMetadata, PoolConnector}; +pub use self::connection::PoolConnection; +use self::inner::PoolInner; +#[doc(hidden)] +pub use self::maybe::MaybePoolConnection; +pub use self::options::{PoolConnectionMetadata, PoolOptions}; use crate::connection::Connection; use crate::database::Database; use crate::error::Error; @@ -69,12 +75,6 @@ use crate::transaction::Transaction; use event_listener::EventListener; use futures_core::FusedFuture; use tracing::Instrument; -pub use self::connect::{PoolConnectMetadata, PoolConnector}; -pub use self::connection::PoolConnection; -use self::inner::PoolInner; -#[doc(hidden)] -pub use self::maybe::MaybePoolConnection; -pub use self::options::{PoolConnectionMetadata, PoolOptions}; #[macro_use] mod executor; diff --git a/sqlx-test/src/lib.rs b/sqlx-test/src/lib.rs index 6a8b9d112..c8a8ad857 100644 --- a/sqlx-test/src/lib.rs +++ b/sqlx-test/src/lib.rs @@ -1,8 +1,8 @@ use sqlx::pool::PoolOptions; use sqlx::{Connection, Database, Error, Pool}; use std::env; -use tracing_subscriber::EnvFilter; use tracing_subscriber::fmt::format::FmtSpan; +use tracing_subscriber::EnvFilter; pub fn setup_if_needed() { let _ = dotenvy::dotenv();