diff --git a/sqlx-core/src/blocking/connection.rs b/sqlx-core/src/blocking/connection.rs index d7dd7be9..f402bc89 100644 --- a/sqlx-core/src/blocking/connection.rs +++ b/sqlx-core/src/blocking/connection.rs @@ -1,6 +1,5 @@ -use crate::Describe; - use super::{Close, Connect, ConnectOptions, Runtime}; +use crate::Describe; /// A unique connection (session) with a specific database. /// @@ -21,7 +20,7 @@ where fn describe<'x, 'e, 'q>( &'e mut self, - query: &'q str + query: &'q str, ) -> crate::Result> where 'e: 'x, diff --git a/sqlx-core/src/connection.rs b/sqlx-core/src/connection.rs index 48cf4632..bb2b06ad 100644 --- a/sqlx-core/src/connection.rs +++ b/sqlx-core/src/connection.rs @@ -33,7 +33,7 @@ where #[cfg(feature = "async")] fn describe<'x, 'e, 'q>( &'e mut self, - query: &'q str + query: &'q str, ) -> BoxFuture<'x, crate::Result>> where Rt: crate::Async, diff --git a/sqlx-core/src/io/buf_stream.rs b/sqlx-core/src/io/buf_stream.rs index 274594b8..c68075f4 100644 --- a/sqlx-core/src/io/buf_stream.rs +++ b/sqlx-core/src/io/buf_stream.rs @@ -1,5 +1,5 @@ -use std::marker::PhantomData; use std::cmp; +use std::marker::PhantomData; use std::ops::{Deref, DerefMut}; use bytes::{Bytes, BytesMut}; diff --git a/sqlx-postgres/src/error/client.rs b/sqlx-postgres/src/error/client.rs index 81fef2c0..3a9229a3 100644 --- a/sqlx-postgres/src/error/client.rs +++ b/sqlx-postgres/src/error/client.rs @@ -1,9 +1,11 @@ -use crate::protocol::backend::BackendMessageType; -use sqlx_core::ClientError; use std::error::Error as StdError; use std::fmt::{self, Display, Formatter}; use std::str::Utf8Error; +use sqlx_core::ClientError; + +use crate::protocol::backend::BackendMessageType; + #[derive(Debug)] #[non_exhaustive] pub enum PgClientError { diff --git a/sqlx-postgres/src/error/database.rs b/sqlx-postgres/src/error/database.rs index e69de29b..8b137891 100644 --- a/sqlx-postgres/src/error/database.rs +++ b/sqlx-postgres/src/error/database.rs @@ -0,0 +1 @@ + diff --git a/sqlx-postgres/src/protocol/backend/key_data.rs b/sqlx-postgres/src/protocol/backend/key_data.rs index 98049456..f26842f9 100644 --- a/sqlx-postgres/src/protocol/backend/key_data.rs +++ b/sqlx-postgres/src/protocol/backend/key_data.rs @@ -22,10 +22,11 @@ impl Deserialize<'_> for KeyData { #[cfg(test)] mod tests { - use super::KeyData; use bytes::Bytes; use sqlx_core::io::Deserialize; + use super::KeyData; + #[test] fn should_deserialize() { let m = KeyData::deserialize(Bytes::from_static(b"\0\0'\xc6\x89R\xc5+")).unwrap(); diff --git a/sqlx-postgres/src/protocol/backend/message.rs b/sqlx-postgres/src/protocol/backend/message.rs index 1e995b98..9559046d 100644 --- a/sqlx-postgres/src/protocol/backend/message.rs +++ b/sqlx-postgres/src/protocol/backend/message.rs @@ -1,11 +1,12 @@ use std::convert::TryFrom; use std::fmt::Debug; -use crate::PgClientError; use bytes::Bytes; use sqlx_core::io::Deserialize; use sqlx_core::{Error, Result}; +use crate::PgClientError; + /// Type of the *incoming* message. /// /// Postgres does use the same message format for client and server messages but we are only diff --git a/sqlx-postgres/src/protocol/backend/ready_for_query.rs b/sqlx-postgres/src/protocol/backend/ready_for_query.rs index 9d43b6aa..b03b49a5 100644 --- a/sqlx-postgres/src/protocol/backend/ready_for_query.rs +++ b/sqlx-postgres/src/protocol/backend/ready_for_query.rs @@ -1,8 +1,9 @@ -use crate::PgClientError; use bytes::{Buf, Bytes}; use sqlx_core::io::Deserialize; use sqlx_core::{Error, Result}; +use crate::PgClientError; + #[derive(Debug)] #[repr(u8)] pub(crate) enum TransactionStatus { diff --git a/sqlx-postgres/src/protocol/backend/row_description.rs b/sqlx-postgres/src/protocol/backend/row_description.rs index 44da99c4..9d680d0e 100644 --- a/sqlx-postgres/src/protocol/backend/row_description.rs +++ b/sqlx-postgres/src/protocol/backend/row_description.rs @@ -1,8 +1,9 @@ +use std::num::{NonZeroI16, NonZeroI32}; + use bytes::{Buf, Bytes}; use bytestring::ByteString; use sqlx_core::io::{BufExt, Deserialize}; use sqlx_core::Result; -use std::num::{NonZeroI16, NonZeroI32}; #[derive(Debug)] pub(crate) struct RowDescription { diff --git a/sqlx-postgres/src/protocol/frontend/bind.rs b/sqlx-postgres/src/protocol/frontend/bind.rs index 05d8c119..b42e59f6 100644 --- a/sqlx-postgres/src/protocol/frontend/bind.rs +++ b/sqlx-postgres/src/protocol/frontend/bind.rs @@ -1,8 +1,9 @@ +use sqlx_core::io::{Serialize, WriteExt}; +use sqlx_core::Result; + use crate::io::PgWriteExt; use crate::protocol::frontend::{PortalRef, StatementRef}; use crate::PgArguments; -use sqlx_core::io::{Serialize, WriteExt}; -use sqlx_core::Result; pub(crate) struct Bind<'a> { pub(crate) portal: PortalRef, diff --git a/sqlx-postgres/src/protocol/frontend/close.rs b/sqlx-postgres/src/protocol/frontend/close.rs index ba7144e7..af7d3162 100644 --- a/sqlx-postgres/src/protocol/frontend/close.rs +++ b/sqlx-postgres/src/protocol/frontend/close.rs @@ -1,8 +1,9 @@ -use crate::io::PgWriteExt; -use crate::protocol::frontend::Target; use sqlx_core::io::{Serialize, WriteExt}; use sqlx_core::Result; +use crate::io::PgWriteExt; +use crate::protocol::frontend::Target; + #[derive(Debug)] pub(crate) struct Close { target: Target, diff --git a/sqlx-postgres/src/protocol/frontend/describe.rs b/sqlx-postgres/src/protocol/frontend/describe.rs index 7eb84ddf..05671952 100644 --- a/sqlx-postgres/src/protocol/frontend/describe.rs +++ b/sqlx-postgres/src/protocol/frontend/describe.rs @@ -1,8 +1,9 @@ -use crate::io::PgWriteExt; -use crate::protocol::frontend::Target; use sqlx_core::io::{Serialize, WriteExt}; use sqlx_core::Result; +use crate::io::PgWriteExt; +use crate::protocol::frontend::Target; + #[derive(Debug)] pub(crate) struct Describe { target: Target, diff --git a/sqlx-postgres/src/protocol/frontend/execute.rs b/sqlx-postgres/src/protocol/frontend/execute.rs index 8934d9ef..3e7f6f24 100644 --- a/sqlx-postgres/src/protocol/frontend/execute.rs +++ b/sqlx-postgres/src/protocol/frontend/execute.rs @@ -1,8 +1,9 @@ -use crate::io::PgWriteExt; -use crate::protocol::frontend::PortalRef; use sqlx_core::io::Serialize; use sqlx_core::Result; +use crate::io::PgWriteExt; +use crate::protocol::frontend::PortalRef; + #[derive(Debug)] pub(crate) struct Execute { pub(crate) portal: PortalRef, diff --git a/sqlx-postgres/src/protocol/frontend/parse.rs b/sqlx-postgres/src/protocol/frontend/parse.rs index e9bf43a7..58b23aae 100644 --- a/sqlx-postgres/src/protocol/frontend/parse.rs +++ b/sqlx-postgres/src/protocol/frontend/parse.rs @@ -1,8 +1,9 @@ -use crate::io::PgWriteExt; -use crate::protocol::frontend::{PortalRef, StatementRef}; use sqlx_core::io::{Serialize, WriteExt}; use sqlx_core::Result; +use crate::io::PgWriteExt; +use crate::protocol::frontend::{PortalRef, StatementRef}; + #[derive(Debug)] pub(crate) struct Parse<'a> { pub(crate) statement: StatementRef, diff --git a/sqlx-postgres/src/protocol/frontend/password.rs b/sqlx-postgres/src/protocol/frontend/password.rs index 0efc847a..83e92208 100644 --- a/sqlx-postgres/src/protocol/frontend/password.rs +++ b/sqlx-postgres/src/protocol/frontend/password.rs @@ -1,8 +1,9 @@ -use crate::io::PgWriteExt; use md5::{Digest, Md5}; use sqlx_core::io::Serialize; use sqlx_core::Result; +use crate::io::PgWriteExt; + #[derive(Debug)] pub(crate) struct Password<'a>(pub(crate) &'a str); diff --git a/sqlx-postgres/src/protocol/frontend/query.rs b/sqlx-postgres/src/protocol/frontend/query.rs index 0c19e22b..5027ca39 100644 --- a/sqlx-postgres/src/protocol/frontend/query.rs +++ b/sqlx-postgres/src/protocol/frontend/query.rs @@ -1,7 +1,8 @@ -use crate::io::PgWriteExt; use sqlx_core::io::Serialize; use sqlx_core::Result; +use crate::io::PgWriteExt; + #[derive(Debug)] pub(crate) struct Query<'a>(pub(crate) &'a str); diff --git a/sqlx-postgres/src/protocol/frontend/target.rs b/sqlx-postgres/src/protocol/frontend/target.rs index 226e91b9..d2a84524 100644 --- a/sqlx-postgres/src/protocol/frontend/target.rs +++ b/sqlx-postgres/src/protocol/frontend/target.rs @@ -1,8 +1,9 @@ -use crate::io::PgWriteExt; -use crate::protocol::frontend::{PortalRef, StatementRef}; use sqlx_core::io::Serialize; use sqlx_core::Result; +use crate::io::PgWriteExt; +use crate::protocol::frontend::{PortalRef, StatementRef}; + /// Target a command at a portal *or* statement. /// Used by [`Describe`] and [`Close`]. #[derive(Debug)] diff --git a/sqlx/src/mysql/blocking/connection.rs b/sqlx/src/mysql/blocking/connection.rs index a1caf47c..e233f353 100644 --- a/sqlx/src/mysql/blocking/connection.rs +++ b/sqlx/src/mysql/blocking/connection.rs @@ -1,7 +1,7 @@ use crate::blocking::{Close, Connect, Connection, Executor, Runtime}; use crate::mysql::connection::MySqlConnection; use crate::mysql::{MySql, MySqlConnectOptions, MySqlQueryResult, MySqlRow}; -use crate::{Blocking, Execute, Result, Describe}; +use crate::{Blocking, Describe, Execute, Result}; impl MySqlConnection { /// Open a new database connection. @@ -70,10 +70,7 @@ impl Connection for MySqlConnection { } #[inline] - fn describe<'x, 'e, 'q>( - &'e mut self, - query: &'q str, - ) -> Result> + fn describe<'x, 'e, 'q>(&'e mut self, query: &'q str) -> Result> where 'e: 'x, 'q: 'x, diff --git a/sqlx/src/mysql/connection.rs b/sqlx/src/mysql/connection.rs index 44f5f3e2..94bc1f54 100644 --- a/sqlx/src/mysql/connection.rs +++ b/sqlx/src/mysql/connection.rs @@ -8,7 +8,7 @@ use sqlx_core::{Execute, Executor}; use super::{MySql, MySqlConnectOptions, MySqlQueryResult, MySqlRow}; #[cfg(feature = "blocking")] use crate::blocking; -use crate::{Arguments, Describe, Close, Connect, Connection, DefaultRuntime, Runtime}; +use crate::{Arguments, Close, Connect, Connection, DefaultRuntime, Describe, Runtime}; #[cfg(feature = "async")] use crate::{Async, Result}; @@ -134,10 +134,7 @@ impl Connection for MySqlConnection { #[cfg(feature = "async")] #[inline] - fn describe<'x, 'e, 'q>( - &'e mut self, - query: &'q str, - ) -> BoxFuture<'x, Result>> + fn describe<'x, 'e, 'q>(&'e mut self, query: &'q str) -> BoxFuture<'x, Result>> where Rt: Async, 'e: 'x,