Skip to content

Commit e1e99e1

Browse files
committed
fix: run cargo fmt
1 parent cd8e355 commit e1e99e1

4 files changed

Lines changed: 17 additions & 17 deletions

File tree

benches/any/pool.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ use std::thread;
55
use std::time::{Duration, Instant};
66
use tracing::Instrument;
77
use tracing_flame::FlameLayer;
8-
use tracing_subscriber::{EnvFilter, Layer};
98
use tracing_subscriber::layer::SubscriberExt;
109
use tracing_subscriber::util::SubscriberInitExt;
10+
use tracing_subscriber::{EnvFilter, Layer};
1111

1212
#[derive(Debug)]
1313
struct Input {
@@ -34,9 +34,7 @@ fn bench_pool(c: &mut Criterion) {
3434
.expect(&format!("error opening path {path:?} (`FLAMEGRAPH_OUT`)"));
3535

3636
tracing_subscriber::registry()
37-
.with(
38-
tracing_subscriber::fmt::layer().with_filter(EnvFilter::from_default_env())
39-
)
37+
.with(tracing_subscriber::fmt::layer().with_filter(EnvFilter::from_default_env()))
4038
.with(layer.with_threads_collapsed(true))
4139
.try_init()
4240
.ok();
@@ -160,4 +158,4 @@ fn bench_pool_with(b: &mut Bencher, input: &Input, database_url: &str) {
160158
}
161159

162160
criterion_group!(benches, bench_pool,);
163-
criterion_main!(benches);
161+
criterion_main!(benches);

sqlx-core/src/pool/inner.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,14 @@ impl<DB: Database> PoolInner<DB> {
208208
}
209209

210210
#[inline(always)]
211-
async fn finish_acquire(self: &Arc<Self>, conn: ConnectedSlot<ConnectionInner<DB>>) -> Result<PoolConnection<DB>, DisconnectedSlot<ConnectionInner<DB>>> {
212-
let span = tracing::trace_span!(target: "sqlx::pool", "finish_acquire", connection_id=?conn.id);
211+
async fn finish_acquire(
212+
self: &Arc<Self>,
213+
conn: ConnectedSlot<ConnectionInner<DB>>,
214+
) -> Result<PoolConnection<DB>, DisconnectedSlot<ConnectionInner<DB>>> {
215+
let span =
216+
tracing::trace_span!(target: "sqlx::pool", "finish_acquire", connection_id=?conn.id);
213217

214-
finish_acquire(self, conn)
215-
.instrument(span)
216-
.await
218+
finish_acquire(self, conn).instrument(span).await
217219
}
218220

219221
pub(crate) async fn try_min_connections(

sqlx-core/src/pool/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ use std::pin::Pin;
6060
use std::sync::Arc;
6161
use std::task::{ready, Context, Poll};
6262

63+
pub use self::connect::{PoolConnectMetadata, PoolConnector};
64+
pub use self::connection::PoolConnection;
65+
use self::inner::PoolInner;
66+
#[doc(hidden)]
67+
pub use self::maybe::MaybePoolConnection;
68+
pub use self::options::{PoolConnectionMetadata, PoolOptions};
6369
use crate::connection::Connection;
6470
use crate::database::Database;
6571
use crate::error::Error;
@@ -69,12 +75,6 @@ use crate::transaction::Transaction;
6975
use event_listener::EventListener;
7076
use futures_core::FusedFuture;
7177
use tracing::Instrument;
72-
pub use self::connect::{PoolConnectMetadata, PoolConnector};
73-
pub use self::connection::PoolConnection;
74-
use self::inner::PoolInner;
75-
#[doc(hidden)]
76-
pub use self::maybe::MaybePoolConnection;
77-
pub use self::options::{PoolConnectionMetadata, PoolOptions};
7878

7979
#[macro_use]
8080
mod executor;

sqlx-test/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use sqlx::pool::PoolOptions;
22
use sqlx::{Connection, Database, Error, Pool};
33
use std::env;
4-
use tracing_subscriber::EnvFilter;
54
use tracing_subscriber::fmt::format::FmtSpan;
5+
use tracing_subscriber::EnvFilter;
66

77
pub fn setup_if_needed() {
88
let _ = dotenvy::dotenv();

0 commit comments

Comments
 (0)