From 03f1f2dc166069af5e6019f279f8458e850a8249 Mon Sep 17 00:00:00 2001
From: librelois <c@elo.tf>
Date: Thu, 1 Apr 2021 20:30:09 +0200
Subject: [PATCH] [style] comply to latest clippy version
---
neon/native/src/server.rs | 1 +
neon/native/src/wot/write_in_file.rs | 2 +-
rust-bins/duniter-launcher/src/duniter_ts_args.rs | 3 +--
rust-bins/duniter-launcher/src/main.rs | 1 +
rust-libs/dubp-wot/src/lib.rs | 2 +-
rust-libs/duniter-bc-reader/src/lib.rs | 2 +-
rust-libs/duniter-dbs/src/lib.rs | 1 +
rust-libs/duniter-dbs/src/values/block_db.rs | 9 ++++-----
rust-libs/duniter-dbs/src/values/block_head_db.rs | 4 ++--
rust-libs/duniter-dbs/src/values/block_meta.rs | 6 +++---
.../duniter-dbs/src/values/block_number_array_db.rs | 4 ++--
rust-libs/duniter-dbs/src/values/cindex_db.rs | 4 ++--
rust-libs/duniter-dbs/src/values/dunp_head.rs | 3 +--
rust-libs/duniter-dbs/src/values/idty_db.rs | 2 +-
rust-libs/duniter-dbs/src/values/iindex_db.rs | 4 ++--
rust-libs/duniter-dbs/src/values/kick_db.rs | 4 ++--
rust-libs/duniter-dbs/src/values/mindex_db.rs | 4 ++--
rust-libs/duniter-dbs/src/values/peer_card.rs | 3 +--
rust-libs/duniter-dbs/src/values/sindex_db.rs | 4 ++--
rust-libs/duniter-dbs/src/values/tx_db.rs | 3 +--
rust-libs/duniter-dbs/src/values/txs.rs | 5 ++---
rust-libs/duniter-dbs/src/values/ud_entry_db.rs | 4 ++--
rust-libs/duniter-dbs/src/values/utxo.rs | 4 ++--
rust-libs/duniter-dbs/src/values/wallet_db.rs | 4 ++--
.../duniter-dbs/src/values/wallet_script_with_sa.rs | 2 +-
rust-libs/modules/gva/db/src/values/gva_idty_db.rs | 2 +-
rust-libs/modules/gva/db/src/values/gva_tx.rs | 3 +--
rust-libs/tools/kv_typed/src/lib.rs | 1 +
28 files changed, 44 insertions(+), 47 deletions(-)
diff --git a/neon/native/src/server.rs b/neon/native/src/server.rs
index 4036b565e..b159b807e 100644
--- a/neon/native/src/server.rs
+++ b/neon/native/src/server.rs
@@ -450,6 +450,7 @@ impl DbTx {
}
}
+#[allow(clippy::upper_case_acronyms)]
#[derive(Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
struct HeadWS2Pv1ConfStringified {
diff --git a/neon/native/src/wot/write_in_file.rs b/neon/native/src/wot/write_in_file.rs
index 746dc40e6..7f6044403 100644
--- a/neon/native/src/wot/write_in_file.rs
+++ b/neon/native/src/wot/write_in_file.rs
@@ -39,7 +39,7 @@ pub(crate) fn write_and_compress_bytes_in_file(
) -> Result<(), std::io::Error> {
let file = File::create(file_path)?;
let mut e = ZlibEncoder::new(file, compression);
- e.write_all(&datas[..])?;
+ e.write_all(datas)?;
e.finish()?;
Ok(())
diff --git a/rust-bins/duniter-launcher/src/duniter_ts_args.rs b/rust-bins/duniter-launcher/src/duniter_ts_args.rs
index 6a7e59c9b..ff76068a9 100644
--- a/rust-bins/duniter-launcher/src/duniter_ts_args.rs
+++ b/rust-bins/duniter-launcher/src/duniter_ts_args.rs
@@ -39,8 +39,7 @@ fn gen_webstart_args(args: &DuniterWebstartArgs, duniter_ts_args: &mut Vec<Strin
}
pub(crate) fn gen_duniter_ts_args(args: &DuniterArgs, duniter_js_exe: String) -> Vec<String> {
- let mut duniter_ts_args = Vec::new();
- duniter_ts_args.push(duniter_js_exe);
+ let mut duniter_ts_args = vec![duniter_js_exe];
if let Some(ref home) = args.home {
duniter_ts_args.push("--home".to_owned());
duniter_ts_args.push(home.to_str().expect("invalid home path").to_owned());
diff --git a/rust-bins/duniter-launcher/src/main.rs b/rust-bins/duniter-launcher/src/main.rs
index d83279acd..53807347b 100644
--- a/rust-bins/duniter-launcher/src/main.rs
+++ b/rust-bins/duniter-launcher/src/main.rs
@@ -13,6 +13,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
+#![allow(clippy::upper_case_acronyms)]
#![deny(
clippy::unwrap_used,
missing_debug_implementations,
diff --git a/rust-libs/dubp-wot/src/lib.rs b/rust-libs/dubp-wot/src/lib.rs
index 29fb11e06..dbfc71b4b 100644
--- a/rust-libs/dubp-wot/src/lib.rs
+++ b/rust-libs/dubp-wot/src/lib.rs
@@ -67,7 +67,7 @@ mod tests {
fn write_bin_file(file_path: &Path, datas: &[u8]) -> Result<(), std::io::Error> {
let mut file = std::fs::File::create(file_path)?;
- file.write_all(&datas[..])?;
+ file.write_all(datas)?;
Ok(())
}
diff --git a/rust-libs/duniter-bc-reader/src/lib.rs b/rust-libs/duniter-bc-reader/src/lib.rs
index 68ae0c41f..222795751 100644
--- a/rust-libs/duniter-bc-reader/src/lib.rs
+++ b/rust-libs/duniter-bc-reader/src/lib.rs
@@ -26,5 +26,5 @@ use dubp::crypto::hashs::Hash;
use duniter_dbs::{databases::bc_v2::BcV2DbReadable, kv_typed::prelude::*, HashKeyV2};
pub fn tx_exist<BcDb: BcV2DbReadable>(bc_db_ro: &BcDb, hash: Hash) -> KvResult<bool> {
- Ok(bc_db_ro.txs_hashs().contains_key(&HashKeyV2(hash))?)
+ bc_db_ro.txs_hashs().contains_key(&HashKeyV2(hash))
}
diff --git a/rust-libs/duniter-dbs/src/lib.rs b/rust-libs/duniter-dbs/src/lib.rs
index 048cade01..9b4229e91 100644
--- a/rust-libs/duniter-dbs/src/lib.rs
+++ b/rust-libs/duniter-dbs/src/lib.rs
@@ -13,6 +13,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
+#![allow(clippy::upper_case_acronyms)]
#![deny(
clippy::unwrap_used,
missing_copy_implementations,
diff --git a/rust-libs/duniter-dbs/src/values/block_db.rs b/rust-libs/duniter-dbs/src/values/block_db.rs
index d106801be..c288cda97 100644
--- a/rust-libs/duniter-dbs/src/values/block_db.rs
+++ b/rust-libs/duniter-dbs/src/values/block_db.rs
@@ -76,8 +76,8 @@ impl kv_typed::prelude::FromBytes for BlockDbV1 {
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
let json_str = std::str::from_utf8(bytes).expect("corrupted db : invalid utf8 bytes");
- Ok(serde_json::from_str(&json_str)
- .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))?)
+ serde_json::from_str(&json_str)
+ .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))
}
}
@@ -131,8 +131,7 @@ impl kv_typed::prelude::FromBytes for BlockDbV2 {
type Err = CorruptedBytes;
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
- Ok(bincode::deserialize(&bytes)
- .map_err(|e| CorruptedBytes(format!("{}: '{:?}'", e, bytes)))?)
+ bincode::deserialize(&bytes).map_err(|e| CorruptedBytes(format!("{}: '{:?}'", e, bytes)))
}
}
@@ -145,7 +144,7 @@ impl ToDumpString for BlockDbV2 {
#[cfg(feature = "explorer")]
impl ExplorableValue for BlockDbV2 {
fn from_explorer_str(source: &str) -> Result<Self, FromExplorerValueErr> {
- Ok(serde_json::from_str(source).map_err(|e| FromExplorerValueErr(e.into()))?)
+ serde_json::from_str(source).map_err(|e| FromExplorerValueErr(e.into()))
}
fn to_explorer_json(&self) -> KvResult<serde_json::Value> {
serde_json::to_value(self).map_err(|e| KvError::DeserError(e.into()))
diff --git a/rust-libs/duniter-dbs/src/values/block_head_db.rs b/rust-libs/duniter-dbs/src/values/block_head_db.rs
index 73601c007..97c3f6a04 100644
--- a/rust-libs/duniter-dbs/src/values/block_head_db.rs
+++ b/rust-libs/duniter-dbs/src/values/block_head_db.rs
@@ -63,8 +63,8 @@ impl kv_typed::prelude::FromBytes for BlockHeadDbV1 {
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
let json_str = std::str::from_utf8(bytes).expect("corrupted db : invalid utf8 bytes");
- Ok(serde_json::from_str(&json_str)
- .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))?)
+ serde_json::from_str(&json_str)
+ .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))
}
}
diff --git a/rust-libs/duniter-dbs/src/values/block_meta.rs b/rust-libs/duniter-dbs/src/values/block_meta.rs
index 7c23377cb..949a644d9 100644
--- a/rust-libs/duniter-dbs/src/values/block_meta.rs
+++ b/rust-libs/duniter-dbs/src/values/block_meta.rs
@@ -62,7 +62,7 @@ impl kv_typed::prelude::FromBytes for BlockMetaV2 {
type Err = bincode::Error;
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
- Ok(bincode::deserialize(bytes)?)
+ bincode::deserialize(bytes)
}
}
@@ -75,8 +75,8 @@ impl ToDumpString for BlockMetaV2 {
#[cfg(feature = "explorer")]
impl ExplorableValue for BlockMetaV2 {
fn from_explorer_str(json_str: &str) -> std::result::Result<Self, FromExplorerValueErr> {
- Ok(serde_json::from_str(&json_str)
- .map_err(|e| FromExplorerValueErr(format!("{}: '{}'", e, json_str).into()))?)
+ serde_json::from_str(&json_str)
+ .map_err(|e| FromExplorerValueErr(format!("{}: '{}'", e, json_str).into()))
}
fn to_explorer_json(&self) -> KvResult<serde_json::Value> {
serde_json::to_value(self).map_err(|e| KvError::DeserError(e.into()))
diff --git a/rust-libs/duniter-dbs/src/values/block_number_array_db.rs b/rust-libs/duniter-dbs/src/values/block_number_array_db.rs
index 8a11d2d73..e4b5f0c36 100644
--- a/rust-libs/duniter-dbs/src/values/block_number_array_db.rs
+++ b/rust-libs/duniter-dbs/src/values/block_number_array_db.rs
@@ -31,8 +31,8 @@ impl kv_typed::prelude::FromBytes for BlockNumberArrayV1 {
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
let json_str = std::str::from_utf8(bytes).expect("corrupted db : invalid utf8 bytes");
//println!("json_str='{}'", &json_str);
- Ok(serde_json::from_str(&json_str)
- .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))?)
+ serde_json::from_str(&json_str)
+ .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))
}
}
diff --git a/rust-libs/duniter-dbs/src/values/cindex_db.rs b/rust-libs/duniter-dbs/src/values/cindex_db.rs
index 20f1a7503..ded4657e5 100644
--- a/rust-libs/duniter-dbs/src/values/cindex_db.rs
+++ b/rust-libs/duniter-dbs/src/values/cindex_db.rs
@@ -34,8 +34,8 @@ impl kv_typed::prelude::FromBytes for CIndexDbV1 {
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
let json_str = std::str::from_utf8(bytes).expect("corrupted db : invalid utf8 bytes");
//println!("json_str='{}'", &json_str);
- Ok(serde_json::from_str(&json_str)
- .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))?)
+ serde_json::from_str(&json_str)
+ .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))
}
}
diff --git a/rust-libs/duniter-dbs/src/values/dunp_head.rs b/rust-libs/duniter-dbs/src/values/dunp_head.rs
index d977f52bf..bf42b21a4 100644
--- a/rust-libs/duniter-dbs/src/values/dunp_head.rs
+++ b/rust-libs/duniter-dbs/src/values/dunp_head.rs
@@ -103,8 +103,7 @@ impl kv_typed::prelude::FromBytes for DunpHeadDbV1 {
type Err = CorruptedBytes;
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
- Ok(bincode::deserialize(&bytes)
- .map_err(|e| CorruptedBytes(format!("{}: '{:?}'", e, bytes)))?)
+ bincode::deserialize(&bytes).map_err(|e| CorruptedBytes(format!("{}: '{:?}'", e, bytes)))
}
}
diff --git a/rust-libs/duniter-dbs/src/values/idty_db.rs b/rust-libs/duniter-dbs/src/values/idty_db.rs
index 284d81474..504f79950 100644
--- a/rust-libs/duniter-dbs/src/values/idty_db.rs
+++ b/rust-libs/duniter-dbs/src/values/idty_db.rs
@@ -31,7 +31,7 @@ impl kv_typed::prelude::FromBytes for IdtyDbV2 {
type Err = bincode::Error;
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
- Ok(bincode::deserialize(bytes)?)
+ bincode::deserialize(bytes)
}
}
diff --git a/rust-libs/duniter-dbs/src/values/iindex_db.rs b/rust-libs/duniter-dbs/src/values/iindex_db.rs
index 337dd6891..947494fbd 100644
--- a/rust-libs/duniter-dbs/src/values/iindex_db.rs
+++ b/rust-libs/duniter-dbs/src/values/iindex_db.rs
@@ -31,8 +31,8 @@ impl kv_typed::prelude::FromBytes for IIndexDbV1 {
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
let json_str = std::str::from_utf8(bytes).expect("corrupted db : invalid utf8 bytes");
//println!("json_str='{}'", &json_str);
- Ok(serde_json::from_str(&json_str)
- .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))?)
+ serde_json::from_str(&json_str)
+ .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))
}
}
diff --git a/rust-libs/duniter-dbs/src/values/kick_db.rs b/rust-libs/duniter-dbs/src/values/kick_db.rs
index af8047750..b616cdc75 100644
--- a/rust-libs/duniter-dbs/src/values/kick_db.rs
+++ b/rust-libs/duniter-dbs/src/values/kick_db.rs
@@ -33,8 +33,8 @@ impl kv_typed::prelude::FromBytes for KickDbV1 {
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
let json_str = std::str::from_utf8(bytes).expect("corrupted db : invalid utf8 bytes");
- Ok(serde_json::from_str(&json_str)
- .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))?)
+ serde_json::from_str(&json_str)
+ .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))
}
}
diff --git a/rust-libs/duniter-dbs/src/values/mindex_db.rs b/rust-libs/duniter-dbs/src/values/mindex_db.rs
index 0f9727b65..eb7d42a35 100644
--- a/rust-libs/duniter-dbs/src/values/mindex_db.rs
+++ b/rust-libs/duniter-dbs/src/values/mindex_db.rs
@@ -31,8 +31,8 @@ impl kv_typed::prelude::FromBytes for MIndexDbV1 {
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
let json_str = std::str::from_utf8(bytes).expect("corrupted db : invalid utf8 bytes");
//println!("json_str='{}'", &json_str);
- Ok(serde_json::from_str(&json_str)
- .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))?)
+ serde_json::from_str(&json_str)
+ .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))
}
}
diff --git a/rust-libs/duniter-dbs/src/values/peer_card.rs b/rust-libs/duniter-dbs/src/values/peer_card.rs
index 1ab3665d5..ee08696d7 100644
--- a/rust-libs/duniter-dbs/src/values/peer_card.rs
+++ b/rust-libs/duniter-dbs/src/values/peer_card.rs
@@ -37,8 +37,7 @@ impl kv_typed::prelude::FromBytes for PeerCardDbV1 {
type Err = CorruptedBytes;
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
- Ok(bincode::deserialize(&bytes)
- .map_err(|e| CorruptedBytes(format!("{}: '{:?}'", e, bytes)))?)
+ bincode::deserialize(&bytes).map_err(|e| CorruptedBytes(format!("{}: '{:?}'", e, bytes)))
}
}
diff --git a/rust-libs/duniter-dbs/src/values/sindex_db.rs b/rust-libs/duniter-dbs/src/values/sindex_db.rs
index 5b8676a0a..4d5b9f204 100644
--- a/rust-libs/duniter-dbs/src/values/sindex_db.rs
+++ b/rust-libs/duniter-dbs/src/values/sindex_db.rs
@@ -54,8 +54,8 @@ impl kv_typed::prelude::FromBytes for SIndexDBV1 {
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
let json_str = std::str::from_utf8(bytes).expect("corrupted db : invalid utf8 bytes");
- Ok(serde_json::from_str(&json_str)
- .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))?)
+ serde_json::from_str(&json_str)
+ .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))
}
}
diff --git a/rust-libs/duniter-dbs/src/values/tx_db.rs b/rust-libs/duniter-dbs/src/values/tx_db.rs
index f5009f85f..bcc06d149 100644
--- a/rust-libs/duniter-dbs/src/values/tx_db.rs
+++ b/rust-libs/duniter-dbs/src/values/tx_db.rs
@@ -30,8 +30,7 @@ impl kv_typed::prelude::FromBytes for PendingTxDbV2 {
type Err = CorruptedBytes;
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
- Ok(bincode::deserialize(&bytes)
- .map_err(|e| CorruptedBytes(format!("{}: '{:?}'", e, bytes)))?)
+ bincode::deserialize(&bytes).map_err(|e| CorruptedBytes(format!("{}: '{:?}'", e, bytes)))
}
}
diff --git a/rust-libs/duniter-dbs/src/values/txs.rs b/rust-libs/duniter-dbs/src/values/txs.rs
index 7ca96cc1b..f150673ef 100644
--- a/rust-libs/duniter-dbs/src/values/txs.rs
+++ b/rust-libs/duniter-dbs/src/values/txs.rs
@@ -30,8 +30,7 @@ impl kv_typed::prelude::FromBytes for BlockTxsDbV2 {
type Err = CorruptedBytes;
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
- Ok(bincode::deserialize(&bytes)
- .map_err(|e| CorruptedBytes(format!("{}: '{:?}'", e, bytes)))?)
+ bincode::deserialize(&bytes).map_err(|e| CorruptedBytes(format!("{}: '{:?}'", e, bytes)))
}
}
@@ -44,7 +43,7 @@ impl ToDumpString for BlockTxsDbV2 {
#[cfg(feature = "explorer")]
impl ExplorableValue for BlockTxsDbV2 {
fn from_explorer_str(source: &str) -> Result<Self, FromExplorerValueErr> {
- Ok(serde_json::from_str(source).map_err(|e| FromExplorerValueErr(e.into()))?)
+ serde_json::from_str(source).map_err(|e| FromExplorerValueErr(e.into()))
}
fn to_explorer_json(&self) -> KvResult<serde_json::Value> {
serde_json::to_value(self).map_err(|e| KvError::DeserError(e.into()))
diff --git a/rust-libs/duniter-dbs/src/values/ud_entry_db.rs b/rust-libs/duniter-dbs/src/values/ud_entry_db.rs
index a632580f9..a32efd774 100644
--- a/rust-libs/duniter-dbs/src/values/ud_entry_db.rs
+++ b/rust-libs/duniter-dbs/src/values/ud_entry_db.rs
@@ -40,8 +40,8 @@ impl kv_typed::prelude::FromBytes for UdEntryDbV1 {
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
let json_str = std::str::from_utf8(bytes).expect("corrupted db : invalid utf8 bytes");
- Ok(serde_json::from_str(&json_str)
- .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))?)
+ serde_json::from_str(&json_str)
+ .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))
}
}
diff --git a/rust-libs/duniter-dbs/src/values/utxo.rs b/rust-libs/duniter-dbs/src/values/utxo.rs
index c76a95878..dc5b60e56 100644
--- a/rust-libs/duniter-dbs/src/values/utxo.rs
+++ b/rust-libs/duniter-dbs/src/values/utxo.rs
@@ -121,7 +121,7 @@ impl kv_typed::prelude::FromBytes for BlockUtxosV2Db {
type Err = bincode::Error;
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
- Ok(bincode::deserialize(bytes)?)
+ bincode::deserialize(bytes)
}
}
@@ -137,7 +137,7 @@ impl ExplorableValue for BlockUtxosV2Db {
unimplemented!()
}
fn to_explorer_json(&self) -> KvResult<serde_json::Value> {
- Ok(serde_json::to_value(self).map_err(|e| KvError::DeserError(e.into()))?)
+ serde_json::to_value(self).map_err(|e| KvError::DeserError(e.into()))
}
}
diff --git a/rust-libs/duniter-dbs/src/values/wallet_db.rs b/rust-libs/duniter-dbs/src/values/wallet_db.rs
index 80624be95..465346100 100644
--- a/rust-libs/duniter-dbs/src/values/wallet_db.rs
+++ b/rust-libs/duniter-dbs/src/values/wallet_db.rs
@@ -33,8 +33,8 @@ impl kv_typed::prelude::FromBytes for WalletDbV1 {
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
let json_str = std::str::from_utf8(bytes).expect("corrupted db : invalid utf8 bytes");
- Ok(serde_json::from_str(&json_str)
- .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))?)
+ serde_json::from_str(&json_str)
+ .map_err(|e| CorruptedBytes(format!("{}: '{}'", e, json_str)))
}
}
diff --git a/rust-libs/duniter-dbs/src/values/wallet_script_with_sa.rs b/rust-libs/duniter-dbs/src/values/wallet_script_with_sa.rs
index 03f2105df..5d40dd95a 100644
--- a/rust-libs/duniter-dbs/src/values/wallet_script_with_sa.rs
+++ b/rust-libs/duniter-dbs/src/values/wallet_script_with_sa.rs
@@ -47,6 +47,6 @@ impl ExplorableValue for WalletScriptWithSourceAmountV1Db {
unimplemented!()
}
fn to_explorer_json(&self) -> KvResult<serde_json::Value> {
- Ok(serde_json::to_value(self).map_err(|e| KvError::DeserError(e.into()))?)
+ serde_json::to_value(self).map_err(|e| KvError::DeserError(e.into()))
}
}
diff --git a/rust-libs/modules/gva/db/src/values/gva_idty_db.rs b/rust-libs/modules/gva/db/src/values/gva_idty_db.rs
index df6966b78..9bb918af8 100644
--- a/rust-libs/modules/gva/db/src/values/gva_idty_db.rs
+++ b/rust-libs/modules/gva/db/src/values/gva_idty_db.rs
@@ -33,7 +33,7 @@ impl kv_typed::prelude::FromBytes for GvaIdtyDbV1 {
type Err = bincode::Error;
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
- Ok(bincode::deserialize(bytes)?)
+ bincode::deserialize(bytes)
}
}
diff --git a/rust-libs/modules/gva/db/src/values/gva_tx.rs b/rust-libs/modules/gva/db/src/values/gva_tx.rs
index 5bb8deaf7..258fae77c 100644
--- a/rust-libs/modules/gva/db/src/values/gva_tx.rs
+++ b/rust-libs/modules/gva/db/src/values/gva_tx.rs
@@ -35,8 +35,7 @@ impl kv_typed::prelude::FromBytes for GvaTxDbV1 {
type Err = CorruptedBytes;
fn from_bytes(bytes: &[u8]) -> std::result::Result<Self, Self::Err> {
- Ok(bincode::deserialize(&bytes)
- .map_err(|e| CorruptedBytes(format!("{}: '{:?}'", e, bytes)))?)
+ bincode::deserialize(&bytes).map_err(|e| CorruptedBytes(format!("{}: '{:?}'", e, bytes)))
}
}
diff --git a/rust-libs/tools/kv_typed/src/lib.rs b/rust-libs/tools/kv_typed/src/lib.rs
index 35ff39a97..b2487256d 100644
--- a/rust-libs/tools/kv_typed/src/lib.rs
+++ b/rust-libs/tools/kv_typed/src/lib.rs
@@ -15,6 +15,7 @@
//! Strongly typed key-value storage
+#![allow(clippy::upper_case_acronyms, clippy::from_over_into)]
#![deny(
clippy::unwrap_used,
missing_copy_implementations,
--
GitLab