From 943f1e441a6ecac887e434293f0d70afeb4bf4f0 Mon Sep 17 00:00:00 2001 From: Ryan Leckey Date: Thu, 18 Feb 2021 23:40:42 -0800 Subject: [PATCH] style: remove unused imports --- sqlx-core/src/executor.rs | 2 +- sqlx-mysql/src/connection/command.rs | 5 ----- sqlx-mysql/src/connection/executor.rs | 2 +- sqlx-mysql/src/connection/executor/columns.rs | 1 - sqlx-mysql/src/connection/executor/execute.rs | 2 +- sqlx-mysql/src/connection/executor/fetch_all.rs | 6 +++--- sqlx-mysql/src/connection/executor/fetch_optional.rs | 4 ++-- sqlx-mysql/src/connection/executor/raw_prepare.rs | 2 +- sqlx-mysql/src/connection/executor/raw_query.rs | 8 ++++---- sqlx-mysql/src/connection/flush.rs | 3 --- sqlx-mysql/src/protocol/execute.rs | 5 ++--- sqlx-mysql/src/protocol/packet.rs | 4 +--- sqlx-mysql/src/protocol/prepare_ok.rs | 4 ++-- sqlx-mysql/src/raw_value.rs | 2 +- sqlx-mysql/src/types/uint.rs | 4 +--- 15 files changed, 20 insertions(+), 34 deletions(-) diff --git a/sqlx-core/src/executor.rs b/sqlx-core/src/executor.rs index 705a091f..4f4002fc 100644 --- a/sqlx-core/src/executor.rs +++ b/sqlx-core/src/executor.rs @@ -1,7 +1,7 @@ #[cfg(feature = "async")] use futures_util::future::{self, BoxFuture, FutureExt, TryFutureExt}; -use crate::{Arguments, Database, Execute, Runtime}; +use crate::{Database, Execute, Runtime}; /// Describes a type that can execute SQL queries on a self-provided database connection. /// diff --git a/sqlx-mysql/src/connection/command.rs b/sqlx-mysql/src/connection/command.rs index 4868ab04..ed892d5e 100644 --- a/sqlx-mysql/src/connection/command.rs +++ b/sqlx-mysql/src/connection/command.rs @@ -1,14 +1,9 @@ use std::collections::VecDeque; -use std::hint::unreachable_unchecked; use std::marker::PhantomData; -use std::mem; use std::ops::{Deref, DerefMut}; use sqlx_core::Result; -use crate::protocol::{PrepareResponse, QueryResponse, QueryStep, ResultPacket, Status}; -use crate::{MySqlConnection, MySqlDatabaseError}; - pub(crate) struct CommandQueue(pub(super) VecDeque); impl CommandQueue { diff --git a/sqlx-mysql/src/connection/executor.rs b/sqlx-mysql/src/connection/executor.rs index db72ba7d..2188e182 100644 --- a/sqlx-mysql/src/connection/executor.rs +++ b/sqlx-mysql/src/connection/executor.rs @@ -1,6 +1,6 @@ #[cfg(feature = "async")] use futures_util::{future::BoxFuture, FutureExt}; -use sqlx_core::{Arguments, Execute, Executor, Result, Runtime}; +use sqlx_core::{Execute, Executor, Result, Runtime}; use crate::{MySql, MySqlConnection, MySqlQueryResult, MySqlRow}; diff --git a/sqlx-mysql/src/connection/executor/columns.rs b/sqlx-mysql/src/connection/executor/columns.rs index e9c26902..eda3535c 100644 --- a/sqlx-mysql/src/connection/executor/columns.rs +++ b/sqlx-mysql/src/connection/executor/columns.rs @@ -1,7 +1,6 @@ use sqlx_core::{Result, Runtime}; use crate::connection::command::QueryCommand; -use crate::protocol::ColumnDefinition; use crate::stream::MySqlStream; use crate::MySqlColumn; diff --git a/sqlx-mysql/src/connection/executor/execute.rs b/sqlx-mysql/src/connection/executor/execute.rs index 8023d0f0..a1676a41 100644 --- a/sqlx-mysql/src/connection/executor/execute.rs +++ b/sqlx-mysql/src/connection/executor/execute.rs @@ -1,7 +1,7 @@ use sqlx_core::{Execute, Result, Runtime}; use crate::connection::command::QueryCommand; -use crate::protocol::{Query, QueryResponse, QueryStep, Status}; +use crate::protocol::{QueryResponse, QueryStep, Status}; use crate::{MySql, MySqlConnection, MySqlQueryResult}; macro_rules! impl_execute { diff --git a/sqlx-mysql/src/connection/executor/fetch_all.rs b/sqlx-mysql/src/connection/executor/fetch_all.rs index 801d571c..f4912c69 100644 --- a/sqlx-mysql/src/connection/executor/fetch_all.rs +++ b/sqlx-mysql/src/connection/executor/fetch_all.rs @@ -1,8 +1,8 @@ -use sqlx_core::{Arguments, Execute, Result, Runtime}; +use sqlx_core::{Execute, Result, Runtime}; use crate::connection::command::QueryCommand; -use crate::protocol::{self, Query, QueryResponse, QueryStep, Status}; -use crate::{MySql, MySqlConnection, MySqlRawValueFormat, MySqlRow}; +use crate::protocol::{QueryResponse, QueryStep, Status}; +use crate::{MySql, MySqlConnection, MySqlRow}; macro_rules! impl_fetch_all { ($(@$blocking:ident)? $self:ident, $query:ident) => {{ diff --git a/sqlx-mysql/src/connection/executor/fetch_optional.rs b/sqlx-mysql/src/connection/executor/fetch_optional.rs index b8a95d5f..478b6bd7 100644 --- a/sqlx-mysql/src/connection/executor/fetch_optional.rs +++ b/sqlx-mysql/src/connection/executor/fetch_optional.rs @@ -1,8 +1,8 @@ use sqlx_core::{Execute, Result, Runtime}; use crate::connection::command::QueryCommand; -use crate::protocol::{Query, QueryResponse, QueryStep, Status}; -use crate::{MySql, MySqlConnection, MySqlRawValueFormat, MySqlRow}; +use crate::protocol::{QueryResponse, QueryStep, Status}; +use crate::{MySql, MySqlConnection, MySqlRow}; macro_rules! impl_fetch_optional { ($(@$blocking:ident)? $self:ident, $query:ident) => {{ diff --git a/sqlx-mysql/src/connection/executor/raw_prepare.rs b/sqlx-mysql/src/connection/executor/raw_prepare.rs index d2949686..7fdbe705 100644 --- a/sqlx-mysql/src/connection/executor/raw_prepare.rs +++ b/sqlx-mysql/src/connection/executor/raw_prepare.rs @@ -1,7 +1,7 @@ use sqlx_core::{Result, Runtime}; use crate::connection::command::PrepareCommand; -use crate::protocol::{ColumnDefinition, Prepare, PrepareResponse}; +use crate::protocol::{Prepare, PrepareResponse}; use crate::raw_statement::RawStatement; use crate::{MySqlColumn, MySqlTypeInfo}; diff --git a/sqlx-mysql/src/connection/executor/raw_query.rs b/sqlx-mysql/src/connection/executor/raw_query.rs index 7efbf1d0..b4cc981a 100644 --- a/sqlx-mysql/src/connection/executor/raw_query.rs +++ b/sqlx-mysql/src/connection/executor/raw_query.rs @@ -1,13 +1,13 @@ -use sqlx_core::{Arguments, Execute, Result, Runtime}; +use sqlx_core::{Execute, Result, Runtime}; -use crate::protocol::{self, Query, QueryResponse, QueryStep, Status}; -use crate::{MySql, MySqlConnection, MySqlRawValueFormat, MySqlRow}; +use crate::protocol::{self, Query}; +use crate::{MySql, MySqlConnection, MySqlRawValueFormat}; macro_rules! impl_raw_query { ($(@$blocking:ident)? $self:ident, $query:ident) => {{ let format = if let Some(arguments) = $query.arguments() { // prepare the statement for execution - let statement = raw_prepare!($(@$blocking:ident)? $self, $query.sql()); + let statement = raw_prepare!($(@$blocking)? $self, $query.sql()); // execute the prepared statement $self.stream.write_packet(&protocol::Execute { diff --git a/sqlx-mysql/src/connection/flush.rs b/sqlx-mysql/src/connection/flush.rs index 96990422..ed31d3c7 100644 --- a/sqlx-mysql/src/connection/flush.rs +++ b/sqlx-mysql/src/connection/flush.rs @@ -1,6 +1,3 @@ -use std::collections::VecDeque; -use std::hint::unreachable_unchecked; - use sqlx_core::{Error, Result}; use crate::connection::command::{Command, CommandQueue, PrepareCommand, QueryCommand}; diff --git a/sqlx-mysql/src/protocol/execute.rs b/sqlx-mysql/src/protocol/execute.rs index 97e4e26f..552e48f6 100644 --- a/sqlx-mysql/src/protocol/execute.rs +++ b/sqlx-mysql/src/protocol/execute.rs @@ -1,10 +1,9 @@ use std::fmt::{self, Debug, Formatter}; -use sqlx_core::arguments::Argument; use sqlx_core::io::Serialize; -use sqlx_core::{Arguments, Encode, Result, Type, TypeEncode}; +use sqlx_core::{Arguments, Result}; -use super::{ColumnDefinition, Command}; +use super::Command; use crate::{MySql, MySqlOutput, MySqlTypeId, MySqlTypeInfo}; // https://dev.mysql.com/doc/dev/mysql-server/8.0.12/mysql__com_8h.html#a3e5e9e744ff6f7b989a604fd669977da diff --git a/sqlx-mysql/src/protocol/packet.rs b/sqlx-mysql/src/protocol/packet.rs index aae06ff9..79911a72 100644 --- a/sqlx-mysql/src/protocol/packet.rs +++ b/sqlx-mysql/src/protocol/packet.rs @@ -2,9 +2,7 @@ use std::fmt::Debug; use bytes::Bytes; use sqlx_core::io::Deserialize; -use sqlx_core::{Error, Result}; - -use crate::MySqlDatabaseError; +use sqlx_core::Result; #[derive(Debug)] pub(crate) struct Packet { diff --git a/sqlx-mysql/src/protocol/prepare_ok.rs b/sqlx-mysql/src/protocol/prepare_ok.rs index 26de0d03..df591dc8 100644 --- a/sqlx-mysql/src/protocol/prepare_ok.rs +++ b/sqlx-mysql/src/protocol/prepare_ok.rs @@ -1,8 +1,8 @@ use bytes::{Buf, Bytes}; -use sqlx_core::io::{Deserialize, Serialize}; +use sqlx_core::io::Deserialize; use sqlx_core::Result; -use super::{Capabilities, Command}; +use super::Capabilities; /// Response from a successful `COM_STMT_PREPARE`. /// diff --git a/sqlx-mysql/src/raw_value.rs b/sqlx-mysql/src/raw_value.rs index cca97584..84c62f4a 100644 --- a/sqlx-mysql/src/raw_value.rs +++ b/sqlx-mysql/src/raw_value.rs @@ -2,7 +2,7 @@ use std::str::from_utf8; use bytes::Bytes; use sqlx_core::decode::{Error as DecodeError, Result as DecodeResult}; -use sqlx_core::{Decode, Runtime}; +use sqlx_core::Decode; use crate::{MySql, MySqlTypeInfo}; diff --git a/sqlx-mysql/src/types/uint.rs b/sqlx-mysql/src/types/uint.rs index 2927994f..d067eefe 100644 --- a/sqlx-mysql/src/types/uint.rs +++ b/sqlx-mysql/src/types/uint.rs @@ -1,15 +1,13 @@ use std::cmp; use std::convert::{TryFrom, TryInto}; use std::error::Error as StdError; -use std::num::TryFromIntError; use std::str::FromStr; use bytes::Buf; -use sqlx_core::{decode, encode, Database, TypeEncode}; +use sqlx_core::{decode, encode}; use sqlx_core::{Decode, Encode, Type}; use crate::type_info::MySqlTypeInfo; -use crate::MySqlRawValueFormat::*; use crate::{MySql, MySqlOutput, MySqlRawValue, MySqlRawValueFormat, MySqlTypeId}; // https://dev.mysql.com/doc/internals/en/binary-protocol-value.html#packet-ProtocolBinary