Fix clippy warnings after toolchain bump

oasisprotocol · Sep 13, 2023 · 3a9efd6 · 3a9efd6
1 parent 6b36a07
commit 3a9efd6
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 38 deletions.
diff --git a/contract-sdk-macros/src/error_derive.rs b/contract-sdk-macros/src/error_derive.rs
@@ -102,7 +102,8 @@ fn convert_variants(
                     .fields
                     .iter()
                     .enumerate()
-                    .filter_map(|(i, f)| (!f.attrs.is_empty()).then(|| (i, f.ident.clone())));
+                    .filter(|(_, f)| (!f.attrs.is_empty()))
+                    .map(|(i, f)| (i, f.ident.clone()));
                 let source = maybe_sources.next();
                 if maybe_sources.count() != 0 {
                     variant_ident

diff --git a/runtime-sdk-macros/src/error_derive.rs b/runtime-sdk-macros/src/error_derive.rs
@@ -139,7 +139,8 @@ fn convert_variants(
                     .fields
                     .iter()
                     .enumerate()
-                    .filter_map(|(i, f)| (!f.attrs.is_empty()).then(|| (i, f.ident.clone())));
+                    .filter(|(_, f)| (!f.attrs.is_empty()))
+                    .map(|(i, f)| (i, f.ident.clone()));
                 let source = maybe_sources.next();
                 if maybe_sources.count() != 0 {
                     variant_ident
@@ -172,7 +173,8 @@ fn convert_variants(
                     .fields
                     .iter()
                     .enumerate()
-                    .filter_map(|(i, f)| (i != field_index).then(|| {
+                    .filter(|(i, _)| i != &field_index)
+                    .map(|(i, f)| {
                         let pat = match f.ident {
                             Some(ref ident) => Member::Named(ident.clone()),
                             None => Member::Unnamed(Index {
@@ -184,7 +186,7 @@ fn convert_variants(
                         let binding = quote!( #pat: #ident, );
 
                         binding
-                    }));
+                    });
                 let non_source_field_bindings = non_source_fields.clone();
 
                 let source = quote!(source);

diff --git a/runtime-sdk-macros/src/module_derive/method_handler.rs b/runtime-sdk-macros/src/module_derive/method_handler.rs
@@ -60,11 +60,11 @@ impl super::Deriver for DeriveMethodHandler {
         }
 
         let prefetch_impl = {
-            let (handler_names, handler_idents) = filter_by_kind(&handlers, HandlerKind::Prefetch);
+            let (handler_names, handler_idents) = filter_by_kind(handlers, HandlerKind::Prefetch);
 
             // Find call handlers; for every call handler without a corresponding prefetch handler, we'll
             // generate a dummy prefetch handler.
-            let (call_handler_names, _) = filter_by_kind(&handlers, HandlerKind::Call);
+            let (call_handler_names, _) = filter_by_kind(handlers, HandlerKind::Call);
             let handler_names_without_impl: Vec<&syn::Expr> = call_handler_names
                 .iter()
                 .filter(|n| !handler_names.contains(n))
@@ -100,7 +100,7 @@ impl super::Deriver for DeriveMethodHandler {
         };
 
         let dispatch_call_impl = {
-            let (handler_names, handler_idents) = filter_by_kind(&handlers, HandlerKind::Call);
+            let (handler_names, handler_idents) = filter_by_kind(handlers, HandlerKind::Call);
 
             if handler_names.is_empty() {
                 quote! {}
@@ -131,7 +131,7 @@ impl super::Deriver for DeriveMethodHandler {
         };
 
         let dispatch_query_impl = {
-            let (handler_names, handler_idents) = filter_by_kind(&handlers, HandlerKind::Query);
+            let (handler_names, handler_idents) = filter_by_kind(handlers, HandlerKind::Query);
 
             if handler_names.is_empty() {
                 quote! {
@@ -167,7 +167,7 @@ impl super::Deriver for DeriveMethodHandler {
 
         let dispatch_message_result_impl = {
             let (handler_names, handler_idents) =
-                filter_by_kind(&handlers, HandlerKind::MessageResult);
+                filter_by_kind(handlers, HandlerKind::MessageResult);
 
             if handler_names.is_empty() {
                 quote! {}

diff --git a/runtime-sdk-macros/src/module_derive/mod.rs b/runtime-sdk-macros/src/module_derive/mod.rs
@@ -74,6 +74,7 @@ pub fn derive_module(impl_block: syn::ItemImpl) -> TokenStream {
 trait Deriver {
     fn preprocess(&mut self, item: syn::ImplItem) -> Option<syn::ImplItem>;
 
+    #[allow(clippy::borrowed_box)]
     fn derive(&mut self, generics: &syn::Generics, ty: &Box<syn::Type>) -> TokenStream;
 }
 

diff --git a/runtime-sdk/modules/contracts/src/abi/gas.rs b/runtime-sdk/modules/contracts/src/abi/gas.rs
@@ -211,7 +211,7 @@ impl MeteredBlocks {
     }
 }
 
-fn determine_metered_blocks(func: &mut LocalFunction) -> BTreeMap<InstrSeqId, Vec<MeteredBlock>> {
+fn determine_metered_blocks(func: &LocalFunction) -> BTreeMap<InstrSeqId, Vec<MeteredBlock>> {
     // NOTE: This is based on walrus::ir::dfs_in_order but we need more information.
 
     let mut blocks = MeteredBlocks::default();

diff --git a/runtime-sdk/modules/contracts/src/abi/oasis/validation.rs b/runtime-sdk/modules/contracts/src/abi/oasis/validation.rs
@@ -411,7 +411,7 @@ impl<'instr> Visitor<'instr> for FloatScanner {
 impl<Cfg: Config> OasisV1<Cfg> {
     pub(super) fn validate_module(
         &self,
-        module: &mut Module,
+        module: &Module,
         params: &Parameters,
     ) -> Result<Info, Error> {
         // Verify that all required exports are there.

diff --git a/runtime-sdk/modules/contracts/src/types.rs b/runtime-sdk/modules/contracts/src/types.rs
@@ -24,7 +24,7 @@ pub enum Policy {
 impl Policy {
     /// Enforce the given policy by returning an error if the policy is not satisfied by the passed
     /// transaction context.
-    pub fn enforce<C: TxContext>(&self, ctx: &mut C) -> Result<(), Error> {
+    pub fn enforce<C: TxContext>(&self, ctx: &C) -> Result<(), Error> {
         match self {
             // Nobody is allowed to perform the action.
             Policy::Nobody => Err(Error::Forbidden),

diff --git a/runtime-sdk/modules/evm/src/lib.rs b/runtime-sdk/modules/evm/src/lib.rs
@@ -539,7 +539,7 @@ impl<Cfg: Config> Module<Cfg> {
         Ok(exit_value)
     }
 
-    fn derive_caller<C>(ctx: &mut C) -> Result<H160, Error>
+    fn derive_caller<C>(ctx: &C) -> Result<H160, Error>
     where
         C: TxContext,
     {
@@ -590,7 +590,7 @@ impl<Cfg: Config> Module<Cfg> {
     }
 
     fn decode_simulate_call_query<C: Context>(
-        ctx: &mut C,
+        ctx: &C,
         call: types::SimulateCallQuery,
     ) -> Result<(types::SimulateCallQuery, callformat::Metadata), Error> {
         if !Cfg::CONFIDENTIAL {

diff --git a/runtime-sdk/modules/evm/src/signed_call.rs b/runtime-sdk/modules/evm/src/signed_call.rs
@@ -19,7 +19,7 @@ use crate::{
 ///
 /// See [`crate::types::SignedSimulateCallEnvelope`] for details on the signature format.
 pub(crate) fn verify<C: Context, Cfg: Config>(
-    ctx: &mut C,
+    ctx: &C,
     query: SimulateCallQuery,
     leash: Leash,
     mut signature: [u8; 65],

diff --git a/runtime-sdk/modules/evm/src/types.rs b/runtime-sdk/modules/evm/src/types.rs
@@ -108,15 +108,13 @@ pub struct Leash {
 //
 // Thanks to Nick for providing the fancy macros below :)
 
-// This `mod` exists solely to place an `#[allow(warnings)]` around the generated code.
-#[allow(warnings)]
+// This `mod` exists solely to place an `#[allow(...)]` around the generated code.
+#[allow(clippy::assign_op_pattern, clippy::incorrect_clone_impl_on_copy_type)]
 mod eth {
     use std::convert::TryFrom;
 
     use thiserror::Error;
 
-    use super::*;
-
     #[derive(Error, Debug)]
     pub enum NoError {}
 

diff --git a/runtime-sdk/src/context.rs b/runtime-sdk/src/context.rs
@@ -74,7 +74,7 @@ impl State {
     /// Merge a different state into this state.
     pub fn merge_from(&mut self, other: State) {
         for (key, event) in other.events {
-            let events = self.events.entry(key).or_insert_with(Vec::new);
+            let events = self.events.entry(key).or_default();
             events.extend(event);
         }
 
@@ -709,18 +709,18 @@ impl<'a, R: runtime::Runtime> Context for RuntimeBatchContext<'a, R> {
 
     fn emit_event<E: Event>(&mut self, event: E) {
         let etag = event.into_event_tag();
-        let tag = self.block_etags.entry(etag.key).or_insert_with(Vec::new);
+        let tag = self.block_etags.entry(etag.key).or_default();
         tag.push(etag.value);
     }
 
     fn emit_etag(&mut self, etag: EventTag) {
-        let tag = self.block_etags.entry(etag.key).or_insert_with(Vec::new);
+        let tag = self.block_etags.entry(etag.key).or_default();
         tag.push(etag.value);
     }
 
     fn emit_etags(&mut self, etags: EventTags) {
         for (key, val) in etags {
-            let tag = self.block_etags.entry(key).or_insert_with(Vec::new);
+            let tag = self.block_etags.entry(key).or_default();
             tag.extend(val)
         }
     }
@@ -941,18 +941,18 @@ impl<'round, 'store, R: runtime::Runtime> Context for RuntimeTxContext<'round, '
 
     fn emit_event<E: Event>(&mut self, event: E) {
         let etag = event.into_event_tag();
-        let tag = self.etags.entry(etag.key).or_insert_with(Vec::new);
+        let tag = self.etags.entry(etag.key).or_default();
         tag.push(etag.value);
     }
 
     fn emit_etag(&mut self, etag: EventTag) {
-        let tag = self.etags.entry(etag.key).or_insert_with(Vec::new);
+        let tag = self.etags.entry(etag.key).or_default();
         tag.push(etag.value);
     }
 
     fn emit_etags(&mut self, etags: EventTags) {
         for (key, val) in etags {
-            let tag = self.etags.entry(key).or_insert_with(Vec::new);
+            let tag = self.etags.entry(key).or_default();
             tag.extend(val)
         }
     }
@@ -964,7 +964,7 @@ impl<'round, 'store, R: runtime::Runtime> Context for RuntimeTxContext<'round, '
     fn commit(mut self) -> State {
         // Merge unconditional events into regular events on success.
         for (key, val) in self.etags_unconditional {
-            let tag = self.etags.entry(key).or_insert_with(Vec::new);
+            let tag = self.etags.entry(key).or_default();
             tag.extend(val)
         }
 
@@ -1085,10 +1085,7 @@ impl<R: runtime::Runtime> TxContext for RuntimeTxContext<'_, '_, R> {
 
     fn emit_unconditional_event<E: Event>(&mut self, event: E) {
         let etag = event.into_event_tag();
-        let tag = self
-            .etags_unconditional
-            .entry(etag.key)
-            .or_insert_with(Vec::new);
+        let tag = self.etags_unconditional.entry(etag.key).or_default();
         tag.push(etag.value);
     }
 }

diff --git a/runtime-sdk/src/modules/accounts/mod.rs b/runtime-sdk/src/modules/accounts/mod.rs
@@ -388,7 +388,7 @@ impl Module {
                 let den = &addrden.1;
 
                 // Fetch existing account's balances or insert blank ones.
-                let addr_bals = b.entry(*addr).or_insert_with(BTreeMap::new);
+                let addr_bals = b.entry(*addr).or_default();
 
                 // Add to given denomination's balance or insert it if new.
                 addr_bals

diff --git a/runtime-sdk/src/modules/core/mod.rs b/runtime-sdk/src/modules/core/mod.rs
@@ -862,7 +862,7 @@ impl<Cfg: Config> Module<Cfg> {
 }
 
 impl<Cfg: Config> Module<Cfg> {
-    fn get_local_min_gas_price<C: Context>(ctx: &mut C, denom: &token::Denomination) -> u128 {
+    fn get_local_min_gas_price<C: Context>(ctx: &C, denom: &token::Denomination) -> u128 {
         #[allow(clippy::borrow_interior_mutable_const)]
         ctx.local_config(MODULE_NAME)
             .as_ref()
@@ -871,14 +871,14 @@ impl<Cfg: Config> Module<Cfg> {
             .unwrap_or_default()
     }
 
-    fn get_local_max_estimated_gas<C: Context>(ctx: &mut C) -> u64 {
+    fn get_local_max_estimated_gas<C: Context>(ctx: &C) -> u64 {
         ctx.local_config(MODULE_NAME)
             .as_ref()
             .map(|cfg: &LocalConfig| cfg.max_estimated_gas)
             .unwrap_or_default()
     }
 
-    fn enforce_min_gas_price<C: TxContext>(ctx: &mut C, call: &Call) -> Result<(), Error> {
+    fn enforce_min_gas_price<C: TxContext>(ctx: &C, call: &Call) -> Result<(), Error> {
         // If the method is exempt from min gas price requirements, checks always pass.
         #[allow(clippy::borrow_interior_mutable_const)]
         if Cfg::MIN_GAS_PRICE_EXEMPT_METHODS.contains(call.method.as_str()) {

diff --git a/tests/contracts/hello/src/lib.rs b/tests/contracts/hello/src/lib.rs
@@ -476,7 +476,7 @@ impl sdk::Contract for HelloWorld {
     ) -> Result<Option<Self::Response>, Error> {
         // This method is called to handle any replies for emitted messages.
         match reply {
-            Reply::Call { id, result, .. } if id == 0 => {
+            Reply::Call { id: 0, result, .. } => {
                 match result {
                     CallResult::Failed { module, code } => {
                         // Propagate all failures.
@@ -490,7 +490,11 @@ impl sdk::Contract for HelloWorld {
                     }
                 }
             }
-            Reply::Call { id, result, data } if id == 42 => {
+            Reply::Call {
+                id: 42,
+                result,
+                data,
+            } => {
                 let data = cbor::from_value(data.unwrap()).unwrap();
 
                 let result: InstantiateResult = match result {

diff --git a/tests/runtimes/simple-keyvalue/src/keyvalue.rs b/tests/runtimes/simple-keyvalue/src/keyvalue.rs
@@ -290,7 +290,7 @@ impl Module {
         }
     }
 
-    fn get_key_pair<C: Context>(ctx: &mut C, id: &[u8]) -> Result<KeyPair, Error> {
+    fn get_key_pair<C: Context>(ctx: &C, id: &[u8]) -> Result<KeyPair, Error> {
         let kid = get_key_pair_id([id]);
         let kmgr = ctx
             .key_manager()