From ad3fb45253eaf006fad37bb961e467ea78853fd1 Mon Sep 17 00:00:00 2001 From: Chris Tsang Date: Tue, 22 Jun 2021 01:30:26 +0800 Subject: [PATCH] cargo fmt --- src/database/connection.rs | 4 +++- src/driver/sqlx_types.rs | 2 +- src/executor/query.rs | 8 ++++++-- src/query/json.rs | 2 +- tests/basic.rs | 9 +++------ tests/setup/mod.rs | 6 ++---- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/database/connection.rs b/src/database/connection.rs index 22acbd09..e2dfbb9b 100644 --- a/src/database/connection.rs +++ b/src/database/connection.rs @@ -1,5 +1,7 @@ use crate::{ExecErr, ExecResult, QueryErr, QueryResult, Statement}; -use sea_query::{MysqlQueryBuilder, PostgresQueryBuilder, QueryStatementBuilder, SqliteQueryBuilder}; +use sea_query::{ + MysqlQueryBuilder, PostgresQueryBuilder, QueryStatementBuilder, SqliteQueryBuilder, +}; use std::{error::Error, fmt}; pub enum DatabaseConnection { diff --git a/src/driver/sqlx_types.rs b/src/driver/sqlx_types.rs index 76876227..5a52572e 100644 --- a/src/driver/sqlx_types.rs +++ b/src/driver/sqlx_types.rs @@ -10,4 +10,4 @@ impl From for ExecErr { fn from(_: sqlx::Error) -> ExecErr { ExecErr } -} \ No newline at end of file +} diff --git a/src/executor/query.rs b/src/executor/query.rs index ff8ec0f6..330c8748 100644 --- a/src/executor/query.rs +++ b/src/executor/query.rs @@ -143,7 +143,9 @@ macro_rules! try_getable_mysql { Ok(row.try_get(column.as_str())?) } #[cfg(feature = "sqlx-sqlite")] - QueryResultRow::SqlxSqlite(_) => panic!("{} unsupported by sqlx-sqlite", stringify!($type)), + QueryResultRow::SqlxSqlite(_) => { + panic!("{} unsupported by sqlx-sqlite", stringify!($type)) + } #[cfg(feature = "mock")] QueryResultRow::Mock(row) => Ok(row.try_get(column.as_str())?), } @@ -163,7 +165,9 @@ macro_rules! try_getable_mysql { } } #[cfg(feature = "sqlx-sqlite")] - QueryResultRow::SqlxSqlite(_) => panic!("{} unsupported by sqlx-sqlite", stringify!($type)), + QueryResultRow::SqlxSqlite(_) => { + panic!("{} unsupported by sqlx-sqlite", stringify!($type)) + } #[cfg(feature = "mock")] QueryResultRow::Mock(row) => match row.try_get(column.as_str()) { Ok(v) => Ok(Some(v)), diff --git a/src/query/json.rs b/src/query/json.rs index 9385dac4..b41309d4 100644 --- a/src/query/json.rs +++ b/src/query/json.rs @@ -46,7 +46,7 @@ impl FromQueryResult for JsonValue { #[cfg(feature = "sqlx-sqlite")] QueryResultRow::SqlxSqlite(row) => { use serde_json::json; - use sqlx::{Column, Sqlite, Row, Type}; + use sqlx::{Column, Row, Sqlite, Type}; let mut map = Map::new(); for column in row.columns() { let col = if !column.name().starts_with(pre) { diff --git a/tests/basic.rs b/tests/basic.rs index f920ff02..f4c4ef74 100644 --- a/tests/basic.rs +++ b/tests/basic.rs @@ -1,4 +1,4 @@ -use sea_orm::{DbConn, entity::*, query::*, sea_query, tests_cfg::*}; +use sea_orm::{entity::*, query::*, sea_query, tests_cfg::*, DbConn}; mod setup; @@ -82,10 +82,7 @@ async fn crud_cake(db: &DbConn) -> Result<(), ExecErr> { .await .map_err(|_| ExecErr)?; - assert_eq!( - None, - apple - ); + assert_eq!(None, apple); Ok(()) -} \ No newline at end of file +} diff --git a/tests/setup/mod.rs b/tests/setup/mod.rs index d6a5079b..ab3a9e8e 100644 --- a/tests/setup/mod.rs +++ b/tests/setup/mod.rs @@ -1,7 +1,5 @@ use sea_orm::{Database, DatabaseConnection}; pub async fn setup() -> DatabaseConnection { - Database::connect("sqlite::memory:") - .await - .unwrap() -} \ No newline at end of file + Database::connect("sqlite::memory:").await.unwrap() +}