diff --git a/src/conn/mod.rs b/src/conn/mod.rs index 9188941..f89815c 100644 --- a/src/conn/mod.rs +++ b/src/conn/mod.rs @@ -1450,21 +1450,20 @@ mod test { let _ = conn.query_drop("DROP USER 'test_user'@'%'").await; - let query = format!("CREATE USER 'test_user'@'%' IDENTIFIED WITH {}", plug); + let query = format!("CREATE USER 'test_user'@'%' IDENTIFIED WITH {plug}"); conn.query_drop(query).await.unwrap(); if conn.inner.version < (8, 0, 11) { - conn.query_drop(format!("SET old_passwords = {}", val)) + conn.query_drop(format!("SET old_passwords = {val}")) .await .unwrap(); conn.query_drop(format!( - "SET PASSWORD FOR 'test_user'@'%' = PASSWORD('{}')", - pass + "SET PASSWORD FOR 'test_user'@'%' = PASSWORD('{pass}')" )) .await .unwrap(); } else { - conn.query_drop(format!("SET PASSWORD FOR 'test_user'@'%' = '{}'", pass)) + conn.query_drop(format!("SET PASSWORD FOR 'test_user'@'%' = '{pass}'")) .await .unwrap(); }; @@ -1481,11 +1480,11 @@ mod test { } if crate::test_misc::test_compression() { - assert!(format!("{:?}", conn).contains("Compression")); + assert!(format!("{conn:?}").contains("Compression")); } if crate::test_misc::test_ssl() { - assert!(format!("{:?}", conn).contains("Tls")); + assert!(format!("{conn:?}").contains("Tls")); } conn.disconnect().await?; @@ -1781,9 +1780,8 @@ mod test { let mut conn = Conn::new(get_opts()).await?; for x in (MAX_PAYLOAD_LEN - 2)..=(MAX_PAYLOAD_LEN + 2) { let long_string = "A".repeat(x); - let result: Vec<(String, u8)> = conn - .query(format!(r"SELECT '{}', 231", long_string)) - .await?; + let result: Vec<(String, u8)> = + conn.query(format!(r"SELECT '{long_string}', 231")).await?; assert_eq!((long_string, 231_u8), result[0]); } conn.disconnect().await?; @@ -2318,7 +2316,7 @@ mod test { .tcp_port(listen_addr.port()); let server_err = match Conn::new(opts).await { Err(Error::Server(server_err)) => server_err, - other => panic!("expected server error but got: {:?}", other), + other => panic!("expected server error but got: {other:?}"), }; assert_eq!( server_err, diff --git a/src/conn/pool/mod.rs b/src/conn/pool/mod.rs index 53688d9..13f8c92 100644 --- a/src/conn/pool/mod.rs +++ b/src/conn/pool/mod.rs @@ -627,7 +627,7 @@ mod test { // now we'll kill connections.. for id in ids { - master.query_drop(format!("KILL {}", id)).await?; + master.query_drop(format!("KILL {id}")).await?; } // now check, that they're still in the pool.. diff --git a/src/error/mod.rs b/src/error/mod.rs index 2f8de21..a9ccec5 100644 --- a/src/error/mod.rs +++ b/src/error/mod.rs @@ -315,14 +315,10 @@ impl From for IoError { fn from(err: PacketCodecError) -> Self { match err { PacketCodecError::Io(err) => err.into(), - PacketCodecError::PacketTooLarge => { - io::Error::new(io::ErrorKind::Other, "packet too large").into() - } - PacketCodecError::PacketsOutOfSync => { - io::Error::new(io::ErrorKind::Other, "packet out of order").into() - } + PacketCodecError::PacketTooLarge => io::Error::other("packet too large").into(), + PacketCodecError::PacketsOutOfSync => io::Error::other("packet out of order").into(), PacketCodecError::BadCompressedPacketHeader => { - io::Error::new(io::ErrorKind::Other, "bad compressed packet header").into() + io::Error::other("bad compressed packet header").into() } } } diff --git a/src/io/mod.rs b/src/io/mod.rs index e5705a9..f4a0fc8 100644 --- a/src/io/mod.rs +++ b/src/io/mod.rs @@ -26,7 +26,7 @@ use std::{ future::Future, io::{ self, - ErrorKind::{BrokenPipe, NotConnected, Other}, + ErrorKind::{BrokenPipe, NotConnected}, }, mem::replace, net::SocketAddr, @@ -141,7 +141,7 @@ impl Future for CheckTcpStream<'_> { let mut buf = [0_u8; 1]; match self.0.try_read(&mut buf) { Ok(0) => Poll::Ready(Err(io::Error::new(BrokenPipe, "broken pipe"))), - Ok(_) => Poll::Ready(Err(io::Error::new(Other, "stream should be empty"))), + Ok(_) => Poll::Ready(Err(io::Error::other("stream should be empty"))), Err(err) if err.kind() == io::ErrorKind::WouldBlock => Poll::Ready(Ok(())), Err(err) => Poll::Ready(Err(err)), } diff --git a/src/queryable/query_result/mod.rs b/src/queryable/query_result/mod.rs index a83ebd6..db9bcc7 100644 --- a/src/queryable/query_result/mod.rs +++ b/src/queryable/query_result/mod.rs @@ -100,8 +100,8 @@ where self.conn .get_pending_result() .map(|pending_result| match pending_result { - Some(PendingResult::Pending(meta)) => meta.columns().len() > 0, - Some(PendingResult::Taken(meta)) => meta.columns().len() > 0, + Some(PendingResult::Pending(meta)) => !meta.columns().is_empty(), + Some(PendingResult::Taken(meta)) => !meta.columns().is_empty(), None => false, }) .unwrap_or(false) diff --git a/src/queryable/transaction.rs b/src/queryable/transaction.rs index b857f1a..ea4b28d 100644 --- a/src/queryable/transaction.rs +++ b/src/queryable/transaction.rs @@ -154,7 +154,7 @@ impl<'a> Transaction<'a> { } if let Some(isolation_level) = isolation_level { - let query = format!("SET TRANSACTION ISOLATION LEVEL {}", isolation_level); + let query = format!("SET TRANSACTION ISOLATION LEVEL {isolation_level}"); conn.as_mut().query_drop(query).await?; }