From cca096355f0277784393d4b67b8d34ebfffbda3c Mon Sep 17 00:00:00 2001 From: Ryan Leckey Date: Wed, 11 Mar 2020 09:20:24 -0700 Subject: [PATCH] Run rustfmt --- sqlx-core/src/mysql/executor.rs | 4 ++-- sqlx-core/src/mysql/protocol/auth_switch.rs | 2 +- sqlx-core/src/mysql/protocol/eof.rs | 2 +- sqlx-core/src/mysql/protocol/err.rs | 2 +- sqlx-core/src/mysql/protocol/ok.rs | 2 +- sqlx-core/src/mysql/protocol/row.rs | 2 +- sqlx-core/src/postgres/database.rs | 1 - sqlx-core/src/postgres/protocol/backend_key_data.rs | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sqlx-core/src/mysql/executor.rs b/sqlx-core/src/mysql/executor.rs index 46800531a..a589e0a41 100644 --- a/sqlx-core/src/mysql/executor.rs +++ b/sqlx-core/src/mysql/executor.rs @@ -4,8 +4,8 @@ use crate::cursor::Cursor; use crate::describe::{Column, Describe}; use crate::executor::{Execute, Executor, RefExecutor}; use crate::mysql::protocol::{ - self, ColumnDefinition, ComQuery, ComStmtExecute, ComStmtPrepare, ComStmtPrepareOk, - FieldFlags, Status, + self, ColumnDefinition, ComQuery, ComStmtExecute, ComStmtPrepare, ComStmtPrepareOk, FieldFlags, + Status, }; use crate::mysql::{MySql, MySqlArguments, MySqlCursor, MySqlTypeInfo}; diff --git a/sqlx-core/src/mysql/protocol/auth_switch.rs b/sqlx-core/src/mysql/protocol/auth_switch.rs index dfeb95f57..23e7dcfa7 100644 --- a/sqlx-core/src/mysql/protocol/auth_switch.rs +++ b/sqlx-core/src/mysql/protocol/auth_switch.rs @@ -1,5 +1,5 @@ use crate::io::Buf; -use crate::mysql::protocol::{AuthPlugin}; +use crate::mysql::protocol::AuthPlugin; // https://dev.mysql.com/doc/dev/mysql-server/8.0.12/page_protocol_connection_phase_packets_protocol_auth_switch_request.html #[derive(Debug)] diff --git a/sqlx-core/src/mysql/protocol/eof.rs b/sqlx-core/src/mysql/protocol/eof.rs index cb1688571..f8e80031a 100644 --- a/sqlx-core/src/mysql/protocol/eof.rs +++ b/sqlx-core/src/mysql/protocol/eof.rs @@ -1,7 +1,7 @@ use byteorder::LittleEndian; use crate::io::Buf; -use crate::mysql::protocol::{Status}; +use crate::mysql::protocol::Status; // https://dev.mysql.com/doc/dev/mysql-server/8.0.12/page_protocol_basic_eof_packet.html // https://mariadb.com/kb/en/eof_packet/ diff --git a/sqlx-core/src/mysql/protocol/err.rs b/sqlx-core/src/mysql/protocol/err.rs index 0dd782a29..595560e74 100644 --- a/sqlx-core/src/mysql/protocol/err.rs +++ b/sqlx-core/src/mysql/protocol/err.rs @@ -1,7 +1,7 @@ use byteorder::LittleEndian; use crate::io::Buf; -use crate::mysql::protocol::{Capabilities}; +use crate::mysql::protocol::Capabilities; // https://dev.mysql.com/doc/dev/mysql-server/8.0.12/page_protocol_basic_err_packet.html // https://mariadb.com/kb/en/err_packet/ diff --git a/sqlx-core/src/mysql/protocol/ok.rs b/sqlx-core/src/mysql/protocol/ok.rs index 30f3f9740..0639d09dd 100644 --- a/sqlx-core/src/mysql/protocol/ok.rs +++ b/sqlx-core/src/mysql/protocol/ok.rs @@ -2,7 +2,7 @@ use byteorder::LittleEndian; use crate::io::Buf; use crate::mysql::io::BufExt; -use crate::mysql::protocol::{Status}; +use crate::mysql::protocol::Status; // https://dev.mysql.com/doc/dev/mysql-server/8.0.12/page_protocol_basic_ok_packet.html // https://mariadb.com/kb/en/ok_packet/ diff --git a/sqlx-core/src/mysql/protocol/row.rs b/sqlx-core/src/mysql/protocol/row.rs index 9d74dcd91..92f517d67 100644 --- a/sqlx-core/src/mysql/protocol/row.rs +++ b/sqlx-core/src/mysql/protocol/row.rs @@ -3,7 +3,7 @@ use std::ops::Range; use byteorder::{ByteOrder, LittleEndian}; use crate::io::Buf; -use crate::mysql::protocol::{TypeId}; +use crate::mysql::protocol::TypeId; pub(crate) struct Row<'c> { buffer: &'c [u8], diff --git a/sqlx-core/src/postgres/database.rs b/sqlx-core/src/postgres/database.rs index 4709b9557..5792f464e 100644 --- a/sqlx-core/src/postgres/database.rs +++ b/sqlx-core/src/postgres/database.rs @@ -15,7 +15,6 @@ impl Database for Postgres { } impl<'a> HasRow<'a> for Postgres { - // TODO: Can we drop the `type Database = _` type Database = Postgres; type Row = super::PgRow<'a>; diff --git a/sqlx-core/src/postgres/protocol/backend_key_data.rs b/sqlx-core/src/postgres/protocol/backend_key_data.rs index 74f29670b..69394a774 100644 --- a/sqlx-core/src/postgres/protocol/backend_key_data.rs +++ b/sqlx-core/src/postgres/protocol/backend_key_data.rs @@ -24,7 +24,7 @@ impl BackendKeyData { #[cfg(test)] mod tests { - use super::{BackendKeyData, }; + use super::BackendKeyData; const BACKEND_KEY_DATA: &[u8] = b"\0\0'\xc6\x89R\xc5+";