From ed8cb40245ad5f50aecb517bec7cd3dfd3946a8b Mon Sep 17 00:00:00 2001 From: Ryan Leckey Date: Thu, 2 Jan 2020 23:49:42 -0800 Subject: [PATCH] Remove more unused imports --- sqlx-core/src/mysql/connection.rs | 4 +--- sqlx-core/src/mysql/executor.rs | 5 ++--- sqlx-core/src/mysql/rsa.rs | 6 +++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/sqlx-core/src/mysql/connection.rs b/sqlx-core/src/mysql/connection.rs index 4b51dc980..4005e35ca 100644 --- a/sqlx-core/src/mysql/connection.rs +++ b/sqlx-core/src/mysql/connection.rs @@ -5,11 +5,9 @@ use async_std::net::{Shutdown, TcpStream}; use byteorder::{ByteOrder, LittleEndian}; use futures_core::future::BoxFuture; use sha1::Sha1; -use sha2::{Digest, Sha256}; use crate::cache::StatementCache; use crate::connection::Connection; -use crate::executor::Executor; use crate::io::{Buf, BufMut, BufStream}; use crate::mysql::error::MySqlError; use crate::mysql::protocol::{ @@ -306,7 +304,7 @@ impl MySqlConnection { self.send(&[public_key_request_id][..]).await?; // server sends a public key response - let mut packet = self.receive().await?.packet(); + let packet = self.receive().await?.packet(); let rsa_pub_key = &packet[1..]; // The password string data must be NUL terminated diff --git a/sqlx-core/src/mysql/executor.rs b/sqlx-core/src/mysql/executor.rs index cb681451f..f35c11080 100644 --- a/sqlx-core/src/mysql/executor.rs +++ b/sqlx-core/src/mysql/executor.rs @@ -6,10 +6,9 @@ use futures_core::stream::BoxStream; use crate::describe::{Column, Describe}; use crate::executor::Executor; -use crate::mysql::error::MySqlError; use crate::mysql::protocol::{ Capabilities, ColumnCount, ColumnDefinition, ComQuery, ComStmtExecute, ComStmtPrepare, - ComStmtPrepareOk, Cursor, Decode, EofPacket, ErrPacket, OkPacket, Row, Type, + ComStmtPrepareOk, Cursor, Decode, EofPacket, OkPacket, Row, Type, }; use crate::mysql::{MySql, MySqlArguments, MySqlConnection, MySqlRow}; @@ -148,7 +147,7 @@ impl MySqlConnection { async fn step(&mut self, columns: &[Type], binary: bool) -> crate::Result> { let capabilities = self.capabilities; - let packet = ret_if_none!(self.try_receive().await?); + ret_if_none!(self.try_receive().await?); match self.packet[0] { 0xfe if self.packet.len() < 0xffffff => { diff --git a/sqlx-core/src/mysql/rsa.rs b/sqlx-core/src/mysql/rsa.rs index 4cd4528be..6be0bb2aa 100644 --- a/sqlx-core/src/mysql/rsa.rs +++ b/sqlx-core/src/mysql/rsa.rs @@ -1,4 +1,4 @@ -use digest::{Digest, DynDigest}; +use digest::Digest; use num_bigint::BigUint; use rand::{thread_rng, Rng}; @@ -125,8 +125,8 @@ fn oaep_encrypt( oeap_mgf1_xor(seed, &mut digest, db); { - let mut m = BigUint::from_bytes_be(&em); - let mut c = internals_encrypt(pub_key, &m).to_bytes_be(); + let m = BigUint::from_bytes_be(&em); + let c = internals_encrypt(pub_key, &m).to_bytes_be(); internals_copy_with_left_pad(&mut em, &c); }