From 9d52b5820d8f450cbc5ce1e09157fc370d0d1add Mon Sep 17 00:00:00 2001
From: Dmitry Rodionov <d.rodionov@picodata.io>
Date: Wed, 18 Sep 2024 16:29:09 +0300
Subject: [PATCH] fix: clippies and rustc warnings for 1.81
---
src/info.rs | 2 +-
src/luamod.rs | 5 +++--
src/pgproto/backend.rs | 10 ++--------
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/info.rs b/src/info.rs
index 53150a25f0..9fd497fcdc 100644
--- a/src/info.rs
+++ b/src/info.rs
@@ -313,7 +313,7 @@ pub fn proc_get_vshard_config(tier_name: Option<String>) -> Result<RawByteBuf, E
let node = node::global()?;
let tier_name = if let Some(tier_name) = tier_name {
let tier = node.storage.tiers.by_name(&tier_name)?;
- let Some(tier) = tier else {
+ if tier.is_none() {
return Err(Error::NoSuchTier(tier_name));
};
diff --git a/src/luamod.rs b/src/luamod.rs
index 93fb280ea7..c84d12ceae 100644
--- a/src/luamod.rs
+++ b/src/luamod.rs
@@ -684,8 +684,9 @@ pub(crate) fn setup() {
1. code (optional number), default: 0
"},
- tlua::function1(|code: Option<i32>| {
- crate::tarantool::exit(code.unwrap_or(0))
+ #[allow(clippy::unused_unit)] // Needed to suppress dependency_on_unit_never_type_fallback
+ tlua::function1(|code: Option<i32>| -> () {
+ crate::tarantool::exit(code.unwrap_or(0));
}),
);
diff --git a/src/pgproto/backend.rs b/src/pgproto/backend.rs
index 813e7d158b..7b996bd463 100644
--- a/src/pgproto/backend.rs
+++ b/src/pgproto/backend.rs
@@ -294,10 +294,7 @@ impl Backend {
self.execute(None, -1)
};
- simple_query().map_err(|err| {
- close_unnamed();
- err
- })
+ simple_query().inspect_err(|_| close_unnamed())
};
let result = do_simple_query();
@@ -346,10 +343,7 @@ impl Backend {
self.execute(None, -1)
};
- do_execute_query().map_err(|err| {
- close_unnamed();
- err
- })
+ do_execute_query().inspect_err(|_| close_unnamed())
}
/// Handler for a Describe message.
--
GitLab