From 6949b84e8c577a7df4f55963e3d79f91ac8d45bd Mon Sep 17 00:00:00 2001 From: Ryan Leckey Date: Wed, 15 Jul 2020 02:31:57 -0700 Subject: [PATCH] style: rustfmt --- sqlx-core/src/mssql/type_info.rs | 2 +- sqlx-core/src/postgres/types/mod.rs | 2 +- sqlx-core/src/postgres/types/record.rs | 2 +- sqlx-core/src/postgres/types/void.rs | 6 +++--- sqlx-core/src/row.rs | 2 +- sqlx-core/src/value.rs | 2 +- src/lib.rs | 2 +- tests/sqlite/sqlite.rs | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sqlx-core/src/mssql/type_info.rs b/sqlx-core/src/mssql/type_info.rs index 2fb12492..6721380f 100644 --- a/sqlx-core/src/mssql/type_info.rs +++ b/sqlx-core/src/mssql/type_info.rs @@ -1,6 +1,6 @@ use std::fmt::{self, Display, Formatter}; -use crate::mssql::protocol::type_info::{TypeInfo as ProtocolTypeInfo, DataType}; +use crate::mssql::protocol::type_info::{DataType, TypeInfo as ProtocolTypeInfo}; use crate::type_info::TypeInfo; #[derive(Debug, Clone, PartialEq, Eq)] diff --git a/sqlx-core/src/postgres/types/mod.rs b/sqlx-core/src/postgres/types/mod.rs index 065934b3..c8a19768 100644 --- a/sqlx-core/src/postgres/types/mod.rs +++ b/sqlx-core/src/postgres/types/mod.rs @@ -156,7 +156,6 @@ use crate::types::Type; mod array; mod bool; mod bytes; -mod void; mod float; mod int; mod interval; @@ -165,6 +164,7 @@ mod range; mod record; mod str; mod tuple; +mod void; #[cfg(feature = "bigdecimal")] mod bigdecimal; diff --git a/sqlx-core/src/postgres/types/record.rs b/sqlx-core/src/postgres/types/record.rs index 758f3927..412813a0 100644 --- a/sqlx-core/src/postgres/types/record.rs +++ b/sqlx-core/src/postgres/types/record.rs @@ -5,8 +5,8 @@ use crate::encode::Encode; use crate::error::{mismatched_types, BoxDynError}; use crate::postgres::type_info::{PgType, PgTypeKind}; use crate::postgres::{PgArgumentBuffer, PgTypeInfo, PgValueFormat, PgValueRef, Postgres}; -use crate::types::Type; use crate::type_info::TypeInfo; +use crate::types::Type; #[doc(hidden)] pub struct PgRecordEncoder<'a> { diff --git a/sqlx-core/src/postgres/types/void.rs b/sqlx-core/src/postgres/types/void.rs index 699db8d4..8d1926fb 100644 --- a/sqlx-core/src/postgres/types/void.rs +++ b/sqlx-core/src/postgres/types/void.rs @@ -1,7 +1,7 @@ -use crate::types::Type; -use crate::error::BoxDynError; use crate::decode::Decode; -use crate::postgres::{PgTypeInfo, Postgres, PgValueRef}; +use crate::error::BoxDynError; +use crate::postgres::{PgTypeInfo, PgValueRef, Postgres}; +use crate::types::Type; impl Type for () { fn type_info() -> PgTypeInfo { diff --git a/sqlx-core/src/row.rs b/sqlx-core/src/row.rs index 12837323..74546f1b 100644 --- a/sqlx-core/src/row.rs +++ b/sqlx-core/src/row.rs @@ -3,8 +3,8 @@ use std::fmt::Debug; use crate::database::{Database, HasValueRef}; use crate::decode::Decode; use crate::error::{mismatched_types, Error}; -use crate::types::Type; use crate::type_info::TypeInfo; +use crate::types::Type; use crate::value::ValueRef; /// A type that can be used to index into a [`Row`]. diff --git a/sqlx-core/src/value.rs b/sqlx-core/src/value.rs index 2f117d59..bf9ef6a3 100644 --- a/sqlx-core/src/value.rs +++ b/sqlx-core/src/value.rs @@ -1,8 +1,8 @@ use crate::database::{Database, HasValueRef}; use crate::decode::Decode; use crate::error::{mismatched_types, Error}; -use crate::types::Type; use crate::type_info::TypeInfo; +use crate::types::Type; /// An owned value from the database. pub trait Value { diff --git a/src/lib.rs b/src/lib.rs index 2dde1894..125342ba 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -131,8 +131,8 @@ pub mod prelude { pub use super::Acquire; pub use super::ConnectOptions; pub use super::Connection; - pub use super::Done; pub use super::Decode; + pub use super::Done; pub use super::Encode; pub use super::Executor; pub use super::FromRow; diff --git a/tests/sqlite/sqlite.rs b/tests/sqlite/sqlite.rs index e62057b8..46be4632 100644 --- a/tests/sqlite/sqlite.rs +++ b/tests/sqlite/sqlite.rs @@ -94,7 +94,7 @@ async fn it_maths() -> anyhow::Result<()> { #[sqlx_macros::test] async fn it_can_describe_with_pragma() -> anyhow::Result<()> { - use sqlx::{ValueRef, TypeInfo, Decode}; + use sqlx::{Decode, TypeInfo, ValueRef}; let mut conn = new::().await?;