From 80d35a9d18bd275b6f2c5a94ff829d052dcaed35 Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Tue, 28 Jun 2022 16:13:38 +0800 Subject: [PATCH] cargo fmt --- src/database/stream/metric.rs | 16 ++++++++++++---- src/database/stream/query.rs | 23 +++++++++++++---------- src/database/stream/transaction.rs | 23 +++++++++++++---------- 3 files changed, 38 insertions(+), 24 deletions(-) diff --git a/src/database/stream/metric.rs b/src/database/stream/metric.rs index b0afab67..c7b51174 100644 --- a/src/database/stream/metric.rs +++ b/src/database/stream/metric.rs @@ -1,8 +1,8 @@ -use std::{time::Duration, pin::Pin, task::Poll}; +use std::{pin::Pin, task::Poll, time::Duration}; use futures::Stream; -use crate::{QueryResult, DbErr, Statement}; +use crate::{DbErr, QueryResult, Statement}; pub(crate) struct MetricStream<'a> { metric_callback: &'a Option, @@ -12,7 +12,12 @@ pub(crate) struct MetricStream<'a> { } impl<'a> MetricStream<'a> { - pub(crate) fn new(metric_callback: &'a Option, stmt: &'a Statement, elapsed: Option, stream: S) -> Self + pub(crate) fn new( + metric_callback: &'a Option, + stmt: &'a Statement, + elapsed: Option, + stream: S, + ) -> Self where S: Stream> + 'a + Send, { @@ -33,7 +38,10 @@ impl<'a> Stream for MetricStream<'a> { cx: &mut std::task::Context<'_>, ) -> Poll> { let this = self.get_mut(); - let _start = this.metric_callback.is_some().then(std::time::SystemTime::now); + let _start = this + .metric_callback + .is_some() + .then(std::time::SystemTime::now); let res = Pin::new(&mut this.stream).poll_next(cx); if let (Some(_start), Some(elapsed)) = (_start, &mut this.elapsed) { *elapsed += _start.elapsed().unwrap_or_default(); diff --git a/src/database/stream/query.rs b/src/database/stream/query.rs index eb66cc77..e165e505 100644 --- a/src/database/stream/query.rs +++ b/src/database/stream/query.rs @@ -127,9 +127,10 @@ impl QueryStream { InnerConnection::MySql(c) => { let query = crate::driver::sqlx_mysql::sqlx_query(stmt); let _start = _metric_callback.is_some().then(SystemTime::now); - let stream = c.fetch(query) - .map_ok(Into::into) - .map_err(crate::sqlx_error_to_query_err); + let stream = c + .fetch(query) + .map_ok(Into::into) + .map_err(crate::sqlx_error_to_query_err); let elapsed = _start.map(|s| s.elapsed().unwrap_or_default()); MetricStream::new(_metric_callback, stmt, elapsed, stream) } @@ -137,9 +138,10 @@ impl QueryStream { InnerConnection::Postgres(c) => { let query = crate::driver::sqlx_postgres::sqlx_query(stmt); let _start = _metric_callback.is_some().then(SystemTime::now); - let stream = c.fetch(query) - .map_ok(Into::into) - .map_err(crate::sqlx_error_to_query_err); + let stream = c + .fetch(query) + .map_ok(Into::into) + .map_err(crate::sqlx_error_to_query_err); let elapsed = _start.map(|s| s.elapsed().unwrap_or_default()); MetricStream::new(_metric_callback, stmt, elapsed, stream) } @@ -147,9 +149,10 @@ impl QueryStream { InnerConnection::Sqlite(c) => { let query = crate::driver::sqlx_sqlite::sqlx_query(stmt); let _start = _metric_callback.is_some().then(SystemTime::now); - let stream = c.fetch(query) - .map_ok(Into::into) - .map_err(crate::sqlx_error_to_query_err); + let stream = c + .fetch(query) + .map_ok(Into::into) + .map_err(crate::sqlx_error_to_query_err); let elapsed = _start.map(|s| s.elapsed().unwrap_or_default()); MetricStream::new(_metric_callback, stmt, elapsed, stream) } @@ -159,7 +162,7 @@ impl QueryStream { let stream = c.fetch(stmt); let elapsed = _start.map(|s| s.elapsed().unwrap_or_default()); MetricStream::new(_metric_callback, stmt, elapsed, stream) - }, + } #[allow(unreachable_patterns)] _ => unreachable!(), }, diff --git a/src/database/stream/transaction.rs b/src/database/stream/transaction.rs index 96b00982..734f749e 100644 --- a/src/database/stream/transaction.rs +++ b/src/database/stream/transaction.rs @@ -51,9 +51,10 @@ impl<'a> TransactionStream<'a> { InnerConnection::MySql(c) => { let query = crate::driver::sqlx_mysql::sqlx_query(stmt); let _start = _metric_callback.is_some().then(SystemTime::now); - let stream = c.fetch(query) - .map_ok(Into::into) - .map_err(crate::sqlx_error_to_query_err); + let stream = c + .fetch(query) + .map_ok(Into::into) + .map_err(crate::sqlx_error_to_query_err); let elapsed = _start.map(|s| s.elapsed().unwrap_or_default()); MetricStream::new(_metric_callback, stmt, elapsed, stream) } @@ -61,9 +62,10 @@ impl<'a> TransactionStream<'a> { InnerConnection::Postgres(c) => { let query = crate::driver::sqlx_postgres::sqlx_query(stmt); let _start = _metric_callback.is_some().then(SystemTime::now); - let stream = c.fetch(query) - .map_ok(Into::into) - .map_err(crate::sqlx_error_to_query_err); + let stream = c + .fetch(query) + .map_ok(Into::into) + .map_err(crate::sqlx_error_to_query_err); let elapsed = _start.map(|s| s.elapsed().unwrap_or_default()); MetricStream::new(_metric_callback, stmt, elapsed, stream) } @@ -71,9 +73,10 @@ impl<'a> TransactionStream<'a> { InnerConnection::Sqlite(c) => { let query = crate::driver::sqlx_sqlite::sqlx_query(stmt); let _start = _metric_callback.is_some().then(SystemTime::now); - let stream = c.fetch(query) - .map_ok(Into::into) - .map_err(crate::sqlx_error_to_query_err); + let stream = c + .fetch(query) + .map_ok(Into::into) + .map_err(crate::sqlx_error_to_query_err); let elapsed = _start.map(|s| s.elapsed().unwrap_or_default()); MetricStream::new(_metric_callback, stmt, elapsed, stream) } @@ -83,7 +86,7 @@ impl<'a> TransactionStream<'a> { let stream = c.fetch(stmt); let elapsed = _start.map(|s| s.elapsed().unwrap_or_default()); MetricStream::new(_metric_callback, stmt, elapsed, stream) - }, + } #[allow(unreachable_patterns)] _ => unreachable!(), },