itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2026-02-25 01:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: run cargo fmt

Browse Source
This commit is contained in:
Austin Bonander 2026-02-04 14:51:26 -08:00
parent cd8e35546e
commit e1e99e17dc
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
benches/any/pool.rs
View File

@ -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);
criterion_main!(benches);

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

@ -208,12 +208,14 @@ impl<DB: Database> PoolInner<DB> {
}
#[inline(always)]
async fn finish_acquire(self: &Arc<Self>, conn: ConnectedSlot<ConnectionInner<DB>>) -> Result<PoolConnection<DB>, DisconnectedSlot<ConnectionInner<DB>>> {
let span = tracing::trace_span!(target: "sqlx::pool", "finish_acquire", connection_id=?conn.id);
async fn finish_acquire(
self: &Arc<Self>,
conn: ConnectedSlot<ConnectionInner<DB>>,
) -> Result<PoolConnection<DB>, DisconnectedSlot<ConnectionInner<DB>>> {
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(

12
sqlx-core/src/pool/mod.rs
View File

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

2
sqlx-test/src/lib.rs
View File

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