diff --git a/sqlx-core/src/any/connection/executor.rs b/sqlx-core/src/any/connection/executor.rs index 04c7280c..560d8180 100644 --- a/sqlx-core/src/any/connection/executor.rs +++ b/sqlx-core/src/any/connection/executor.rs @@ -1,5 +1,7 @@ use crate::any::connection::AnyConnectionKind; -use crate::any::{Any, AnyColumn, AnyConnection, AnyQueryResult, AnyRow, AnyStatement, AnyTypeInfo}; +use crate::any::{ + Any, AnyColumn, AnyConnection, AnyQueryResult, AnyRow, AnyStatement, AnyTypeInfo, +}; use crate::database::Database; use crate::describe::Describe; use crate::error::Error; diff --git a/sqlx-core/src/any/database.rs b/sqlx-core/src/any/database.rs index fa511be0..72239e65 100644 --- a/sqlx-core/src/any/database.rs +++ b/sqlx-core/src/any/database.rs @@ -1,6 +1,6 @@ use crate::any::{ - AnyArgumentBuffer, AnyArguments, AnyColumn, AnyConnection, AnyQueryResult, AnyRow, AnyStatement, - AnyTransactionManager, AnyTypeInfo, AnyValue, AnyValueRef, + AnyArgumentBuffer, AnyArguments, AnyColumn, AnyConnection, AnyQueryResult, AnyRow, + AnyStatement, AnyTransactionManager, AnyTypeInfo, AnyValue, AnyValueRef, }; use crate::database::{Database, HasArguments, HasStatement, HasStatementCache, HasValueRef}; diff --git a/sqlx-core/src/mssql/connection/executor.rs b/sqlx-core/src/mssql/connection/executor.rs index 37c6f0c3..caa9f6c3 100644 --- a/sqlx-core/src/mssql/connection/executor.rs +++ b/sqlx-core/src/mssql/connection/executor.rs @@ -10,7 +10,8 @@ use crate::mssql::protocol::packet::PacketType; use crate::mssql::protocol::rpc::{OptionFlags, Procedure, RpcRequest}; use crate::mssql::protocol::sql_batch::SqlBatch; use crate::mssql::{ - Mssql, MssqlArguments, MssqlConnection, MssqlQueryResult, MssqlRow, MssqlStatement, MssqlTypeInfo, + Mssql, MssqlArguments, MssqlConnection, MssqlQueryResult, MssqlRow, MssqlStatement, + MssqlTypeInfo, }; use either::Either; use futures_core::future::BoxFuture; diff --git a/sqlx-core/src/mssql/mod.rs b/sqlx-core/src/mssql/mod.rs index 186e8fee..068e77a7 100644 --- a/sqlx-core/src/mssql/mod.rs +++ b/sqlx-core/src/mssql/mod.rs @@ -7,8 +7,8 @@ mod database; mod error; mod io; mod options; -mod query_result; mod protocol; +mod query_result; mod row; mod statement; mod transaction; diff --git a/sqlx-core/src/mysql/connection/executor.rs b/sqlx-core/src/mysql/connection/executor.rs index b7767f6d..012714d7 100644 --- a/sqlx-core/src/mysql/connection/executor.rs +++ b/sqlx-core/src/mysql/connection/executor.rs @@ -88,7 +88,8 @@ impl MySqlConnection { sql: &'q str, arguments: Option, persistent: bool, - ) -> Result, Error>> + 'e, Error> { + ) -> Result, Error>> + 'e, Error> + { let mut logger = QueryLogger::new(sql, self.log_settings.clone()); self.stream.wait_until_ready().await?; diff --git a/sqlx-core/src/mysql/mod.rs b/sqlx-core/src/mysql/mod.rs index 3f8ea4ce..dc7f9699 100644 --- a/sqlx-core/src/mysql/mod.rs +++ b/sqlx-core/src/mysql/mod.rs @@ -8,8 +8,8 @@ mod database; mod error; mod io; mod options; -mod query_result; mod protocol; +mod query_result; mod row; mod statement; mod transaction; diff --git a/sqlx-core/src/postgres/connection/describe.rs b/sqlx-core/src/postgres/connection/describe.rs index f1448898..f9e2ebf3 100644 --- a/sqlx-core/src/postgres/connection/describe.rs +++ b/sqlx-core/src/postgres/connection/describe.rs @@ -6,8 +6,8 @@ use crate::postgres::type_info::{PgCustomType, PgType, PgTypeKind}; use crate::postgres::{PgArguments, PgColumn, PgConnection, PgTypeInfo}; use crate::query_as::query_as; use crate::query_scalar::{query_scalar, query_scalar_with}; -use crate::HashMap; use crate::types::Json; +use crate::HashMap; use futures_core::future::BoxFuture; use std::fmt::Write; use std::sync::Arc; diff --git a/sqlx-core/src/postgres/connection/executor.rs b/sqlx-core/src/postgres/connection/executor.rs index 6e8e4238..ee2ab768 100644 --- a/sqlx-core/src/postgres/connection/executor.rs +++ b/sqlx-core/src/postgres/connection/executor.rs @@ -9,8 +9,8 @@ use crate::postgres::message::{ use crate::postgres::statement::PgStatementMetadata; use crate::postgres::type_info::PgType; use crate::postgres::{ - statement::PgStatement, PgArguments, PgConnection, PgQueryResult, PgRow, PgTypeInfo, PgValueFormat, - Postgres, + statement::PgStatement, PgArguments, PgConnection, PgQueryResult, PgRow, PgTypeInfo, + PgValueFormat, Postgres, }; use either::Either; use futures_core::future::BoxFuture; diff --git a/sqlx-core/src/sqlite/database.rs b/sqlx-core/src/sqlite/database.rs index fe06a07b..7bda649b 100644 --- a/sqlx-core/src/sqlite/database.rs +++ b/sqlx-core/src/sqlite/database.rs @@ -1,7 +1,8 @@ use crate::database::{Database, HasArguments, HasStatement, HasStatementCache, HasValueRef}; use crate::sqlite::{ - SqliteArgumentValue, SqliteArguments, SqliteColumn, SqliteConnection, SqliteQueryResult, SqliteRow, - SqliteStatement, SqliteTransactionManager, SqliteTypeInfo, SqliteValue, SqliteValueRef, + SqliteArgumentValue, SqliteArguments, SqliteColumn, SqliteConnection, SqliteQueryResult, + SqliteRow, SqliteStatement, SqliteTransactionManager, SqliteTypeInfo, SqliteValue, + SqliteValueRef, }; /// Sqlite database driver.