From bd9964060d60893762d0c8f9f60d943a13388f09 Mon Sep 17 00:00:00 2001 From: Paolo Barbolini Date: Fri, 27 Jun 2025 09:32:25 +0200 Subject: [PATCH 1/3] Fix latest clippy warnings --- src/conn/routines/prepare.rs | 2 +- src/error/mod.rs | 10 +++------- src/opts/mod.rs | 2 +- src/queryable/query_result/mod.rs | 4 ++-- src/queryable/transaction.rs | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/conn/routines/prepare.rs b/src/conn/routines/prepare.rs index 1fa1d300..63c23d3a 100644 --- a/src/conn/routines/prepare.rs +++ b/src/conn/routines/prepare.rs @@ -38,7 +38,7 @@ impl Routine> for PrepareRoutine { // The statement may contain sensitive data. Restrict to DEBUG. span.record( "mysql_async.query.sql", - String::from_utf8_lossy(&*self.query).as_ref(), + String::from_utf8_lossy(&self.query).as_ref(), ); } diff --git a/src/error/mod.rs b/src/error/mod.rs index 2f8de211..a9ccec53 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/opts/mod.rs b/src/opts/mod.rs index 1923756a..277dcea6 100644 --- a/src/opts/mod.rs +++ b/src/opts/mod.rs @@ -149,7 +149,7 @@ pub enum PathOrBuf<'a> { impl<'a> PathOrBuf<'a> { /// Will either read data from disk or return the buffered data. - pub async fn read(&self) -> io::Result> { + pub async fn read(&self) -> io::Result> { match self { PathOrBuf::Path(x) => tokio::fs::read(x.as_ref()).await.map(Cow::Owned), PathOrBuf::Buf(x) => Ok(Cow::Borrowed(x.as_ref())), diff --git a/src/queryable/query_result/mod.rs b/src/queryable/query_result/mod.rs index a83ebd6a..db9bcc74 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 b857f1a7..ea4b28da 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?; } From aa9cd151776527dca9e0973cf479fae450851494 Mon Sep 17 00:00:00 2001 From: Paolo Barbolini Date: Fri, 27 Jun 2025 09:32:33 +0200 Subject: [PATCH 2/3] Upgrade `lru` to v0.16 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 98d09bac..609f8f38 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ futures-core = "0.3" futures-util = "0.3" futures-sink = "0.3" keyed_priority_queue = "0.4" -lru = "0.14.0" +lru = "0.16.0" mysql_common = { version = "0.35.4", default-features = false } pem = "3.0" percent-encoding = "2.1.0" From 1ef71e59d11bccb1f60ebd10a3f391cde08f4411 Mon Sep 17 00:00:00 2001 From: Paolo Barbolini Date: Fri, 27 Jun 2025 09:33:10 +0200 Subject: [PATCH 3/3] Upgrade `webpki-roots` to v1 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 609f8f38..e0271c81 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -62,7 +62,7 @@ version = "2.1.0" optional = true [dependencies.webpki-roots] -version = "0.26.1" +version = "1.0.0" optional = true [dev-dependencies]