Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions src/conn/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
};
Expand All @@ -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?;
Expand Down Expand Up @@ -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?;
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/conn/pool/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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..
Expand Down
10 changes: 3 additions & 7 deletions src/error/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -315,14 +315,10 @@ impl From<PacketCodecError> 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()
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/io/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use std::{
future::Future,
io::{
self,
ErrorKind::{BrokenPipe, NotConnected, Other},
ErrorKind::{BrokenPipe, NotConnected},
},
mem::replace,
net::SocketAddr,
Expand Down Expand Up @@ -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)),
}
Expand Down
4 changes: 2 additions & 2 deletions src/queryable/query_result/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/queryable/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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?;
}

Expand Down
Loading