diff --git a/sqlx-cli/src/prepare.rs b/sqlx-cli/src/prepare.rs index 4da3db5f3..b38ddc1cc 100644 --- a/sqlx-cli/src/prepare.rs +++ b/sqlx-cli/src/prepare.rs @@ -1,5 +1,6 @@ use anyhow::{bail, Context}; use cargo_metadata::MetadataCommand; +use console::style; use sqlx::any::{AnyConnectOptions, AnyKind}; use std::collections::BTreeMap; use std::fs::File; @@ -7,7 +8,6 @@ use std::process::Command; use std::str::FromStr; use std::time::SystemTime; use std::{env, fs}; -use console::style; type QueryData = BTreeMap; type JsonObject = serde_json::Map; @@ -24,8 +24,10 @@ pub fn run(url: &str, cargo_args: Vec) -> anyhow::Result<()> { let data = run_prepare_step(cargo_args)?; if data.is_empty() { - println!("{} no queries found; do you have the `offline` feature enabled", - style("warning:").yellow()); + println!( + "{} no queries found; do you have the `offline` feature enabled", + style("warning:").yellow() + ); } serde_json::to_writer_pretty( diff --git a/sqlx-core/src/any/connection/executor.rs b/sqlx-core/src/any/connection/executor.rs index e1a54c9ed..d08af4538 100644 --- a/sqlx-core/src/any/connection/executor.rs +++ b/sqlx-core/src/any/connection/executor.rs @@ -4,7 +4,7 @@ use futures_core::stream::BoxStream; use futures_util::{StreamExt, TryStreamExt}; use crate::any::connection::AnyConnectionKind; -use crate::any::{Any, AnyColumn, AnyDone, AnyConnection, AnyRow, AnyTypeInfo}; +use crate::any::{Any, AnyColumn, AnyConnection, AnyDone, AnyRow, AnyTypeInfo}; use crate::database::Database; use crate::error::Error; use crate::executor::{Execute, Executor}; diff --git a/sqlx-core/src/any/database.rs b/sqlx-core/src/any/database.rs index 20884e60e..25d0e3154 100644 --- a/sqlx-core/src/any/database.rs +++ b/sqlx-core/src/any/database.rs @@ -1,7 +1,6 @@ use crate::any::{ - AnyArgumentBuffer, AnyArguments, AnyColumn, AnyConnection, AnyRow, AnyTransactionManager, - AnyTypeInfo, AnyValue, AnyValueRef, - AnyDone, + AnyArgumentBuffer, AnyArguments, AnyColumn, AnyConnection, AnyDone, AnyRow, + AnyTransactionManager, AnyTypeInfo, AnyValue, AnyValueRef, }; use crate::database::{Database, HasArguments, HasStatementCache, HasValueRef}; diff --git a/sqlx-core/src/any/done.rs b/sqlx-core/src/any/done.rs index aac0b33ae..d91e77339 100644 --- a/sqlx-core/src/any/done.rs +++ b/sqlx-core/src/any/done.rs @@ -1,5 +1,5 @@ -use crate::done::Done; use crate::any::Any; +use crate::done::Done; use std::iter::{Extend, IntoIterator}; #[derive(Debug, Default)] diff --git a/sqlx-core/src/any/mod.rs b/sqlx-core/src/any/mod.rs index de5f2ab83..203223e0c 100644 --- a/sqlx-core/src/any/mod.rs +++ b/sqlx-core/src/any/mod.rs @@ -11,11 +11,11 @@ mod arguments; pub(crate) mod column; mod connection; mod database; +mod done; mod kind; mod options; pub(crate) mod row; mod transaction; -mod done; pub(crate) mod type_info; pub mod types; pub(crate) mod value; @@ -28,9 +28,9 @@ pub use column::AnyColumn; pub use connection::AnyConnection; pub use database::Any; pub use decode::AnyDecode; +pub use done::AnyDone; pub use encode::AnyEncode; pub use kind::AnyKind; -pub use done::AnyDone; pub use options::AnyConnectOptions; pub use r#type::AnyType; pub use row::AnyRow;