diff --git a/bin/node/bench/src/tempdb.rs b/bin/node/bench/src/tempdb.rs index 2aafd013a586a..f3fd693d21fe1 100644 --- a/bin/node/bench/src/tempdb.rs +++ b/bin/node/bench/src/tempdb.rs @@ -90,7 +90,7 @@ impl TempDatabase { }, DatabaseType::ParityDb => Arc::new(ParityDbWrapper({ let mut options = parity_db::Options::with_columns(self.0.path(), 1); - let mut column_options = &mut options.columns[0]; + let column_options = &mut options.columns[0]; column_options.ref_counted = true; column_options.preimage = true; column_options.uniform = true; diff --git a/client/db/src/parity_db.rs b/client/db/src/parity_db.rs index 01562081a8f4f..b7068f2430ef7 100644 --- a/client/db/src/parity_db.rs +++ b/client/db/src/parity_db.rs @@ -54,16 +54,16 @@ pub fn open>( ]; for i in compressed { - let mut column = &mut config.columns[i as usize]; + let column = &mut config.columns[i as usize]; column.compression = parity_db::CompressionType::Lz4; } - let mut state_col = &mut config.columns[columns::STATE as usize]; + let state_col = &mut config.columns[columns::STATE as usize]; state_col.ref_counted = true; state_col.preimage = true; state_col.uniform = true; - let mut tx_col = &mut config.columns[columns::TRANSACTION as usize]; + let tx_col = &mut config.columns[columns::TRANSACTION as usize]; tx_col.ref_counted = true; tx_col.preimage = true; tx_col.uniform = true; diff --git a/client/db/src/pinned_blocks_cache.rs b/client/db/src/pinned_blocks_cache.rs index 7b346b4631eee..46c9287fb19ac 100644 --- a/client/db/src/pinned_blocks_cache.rs +++ b/client/db/src/pinned_blocks_cache.rs @@ -168,7 +168,7 @@ impl PinnedBlocksCache { /// Attach body to an existing cache item pub fn insert_body(&mut self, hash: Block::Hash, extrinsics: Option>) { match self.cache.peek_mut(&hash) { - Some(mut entry) => { + Some(entry) => { entry.body = Some(extrinsics); log::trace!( target: LOG_TARGET, @@ -192,7 +192,7 @@ impl PinnedBlocksCache { justifications: Option, ) { match self.cache.peek_mut(&hash) { - Some(mut entry) => { + Some(entry) => { entry.justifications = Some(justifications); log::trace!( target: LOG_TARGET, diff --git a/client/network/src/protocol/notifications/handler.rs b/client/network/src/protocol/notifications/handler.rs index 665b646ecdcfa..0ac2e250a2ea3 100644 --- a/client/network/src/protocol/notifications/handler.rs +++ b/client/network/src/protocol/notifications/handler.rs @@ -467,7 +467,7 @@ impl ConnectionHandler for NotifsHandler { match event { ConnectionEvent::FullyNegotiatedInbound(inbound) => { let (mut in_substream_open, protocol_index) = inbound.protocol; - let mut protocol_info = &mut self.protocols[protocol_index]; + let protocol_info = &mut self.protocols[protocol_index]; match protocol_info.state { State::Closed { pending_opening } => { diff --git a/client/network/sync/src/state.rs b/client/network/sync/src/state.rs index 0fcf17158179e..305f0ee6838a2 100644 --- a/client/network/sync/src/state.rs +++ b/client/network/sync/src/state.rs @@ -150,7 +150,7 @@ where } else { values.key_values }; - let mut entry = self.state.entry(values.state_root).or_default(); + let entry = self.state.entry(values.state_root).or_default(); if entry.0.len() > 0 && entry.1.len() > 1 { // Already imported child_trie with same root. // Warning this will not work with parallel download. diff --git a/client/statement-store/src/lib.rs b/client/statement-store/src/lib.rs index 2e2bb3bd3b430..4acb89a05f7d1 100644 --- a/client/statement-store/src/lib.rs +++ b/client/statement-store/src/lib.rs @@ -236,7 +236,7 @@ impl Index { let priority = Priority(statement.priority().unwrap_or(0)); self.entries.insert(hash, (account, priority, statement.data_len())); self.total_size += statement.data_len(); - let mut account_info = self.accounts.entry(account).or_default(); + let account_info = self.accounts.entry(account).or_default(); account_info.data_size += statement.data_len(); if let Some(channel) = statement.channel() { account_info.channels.insert(channel, ChannelEntry { hash, priority }); @@ -530,7 +530,7 @@ impl Store { let mut config = parity_db::Options::with_columns(&path, col::COUNT); - let mut statement_col = &mut config.columns[col::STATEMENTS as usize]; + let statement_col = &mut config.columns[col::STATEMENTS as usize]; statement_col.ref_counted = false; statement_col.preimage = true; statement_col.uniform = true; diff --git a/frame/bounties/src/lib.rs b/frame/bounties/src/lib.rs index 14f7b45cb9aa1..07ac23a9d8010 100644 --- a/frame/bounties/src/lib.rs +++ b/frame/bounties/src/lib.rs @@ -361,7 +361,7 @@ pub mod pallet { ) -> DispatchResult { let max_amount = T::SpendOrigin::ensure_origin(origin)?; Bounties::::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult { - let mut bounty = maybe_bounty.as_mut().ok_or(Error::::InvalidIndex)?; + let bounty = maybe_bounty.as_mut().ok_or(Error::::InvalidIndex)?; ensure!( bounty.value <= max_amount, pallet_treasury::Error::::InsufficientPermission @@ -396,7 +396,7 @@ pub mod pallet { let curator = T::Lookup::lookup(curator)?; Bounties::::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult { - let mut bounty = maybe_bounty.as_mut().ok_or(Error::::InvalidIndex)?; + let bounty = maybe_bounty.as_mut().ok_or(Error::::InvalidIndex)?; ensure!( bounty.value <= max_amount, pallet_treasury::Error::::InsufficientPermission @@ -444,7 +444,7 @@ pub mod pallet { .or_else(|_| T::RejectOrigin::ensure_origin(origin).map(|_| None))?; Bounties::::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult { - let mut bounty = maybe_bounty.as_mut().ok_or(Error::::InvalidIndex)?; + let bounty = maybe_bounty.as_mut().ok_or(Error::::InvalidIndex)?; let slash_curator = |curator: &T::AccountId, curator_deposit: &mut BalanceOf| { @@ -527,7 +527,7 @@ pub mod pallet { let signer = ensure_signed(origin)?; Bounties::::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult { - let mut bounty = maybe_bounty.as_mut().ok_or(Error::::InvalidIndex)?; + let bounty = maybe_bounty.as_mut().ok_or(Error::::InvalidIndex)?; match bounty.status { BountyStatus::CuratorProposed { ref curator } => { @@ -571,7 +571,7 @@ pub mod pallet { let beneficiary = T::Lookup::lookup(beneficiary)?; Bounties::::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult { - let mut bounty = maybe_bounty.as_mut().ok_or(Error::::InvalidIndex)?; + let bounty = maybe_bounty.as_mut().ok_or(Error::::InvalidIndex)?; // Ensure no active child bounties before processing the call. ensure!( diff --git a/frame/child-bounties/src/lib.rs b/frame/child-bounties/src/lib.rs index 094b41822c433..14c1907af2c46 100644 --- a/frame/child-bounties/src/lib.rs +++ b/frame/child-bounties/src/lib.rs @@ -331,7 +331,7 @@ pub mod pallet { parent_bounty_id, child_bounty_id, |maybe_child_bounty| -> DispatchResult { - let mut child_bounty = + let child_bounty = maybe_child_bounty.as_mut().ok_or(BountiesError::::InvalidIndex)?; // Ensure child-bounty is in expected state. @@ -396,7 +396,7 @@ pub mod pallet { parent_bounty_id, child_bounty_id, |maybe_child_bounty| -> DispatchResult { - let mut child_bounty = + let child_bounty = maybe_child_bounty.as_mut().ok_or(BountiesError::::InvalidIndex)?; // Ensure child-bounty is in expected state. @@ -473,7 +473,7 @@ pub mod pallet { parent_bounty_id, child_bounty_id, |maybe_child_bounty| -> DispatchResult { - let mut child_bounty = + let child_bounty = maybe_child_bounty.as_mut().ok_or(BountiesError::::InvalidIndex)?; let slash_curator = |curator: &T::AccountId, @@ -591,7 +591,7 @@ pub mod pallet { parent_bounty_id, child_bounty_id, |maybe_child_bounty| -> DispatchResult { - let mut child_bounty = + let child_bounty = maybe_child_bounty.as_mut().ok_or(BountiesError::::InvalidIndex)?; // Ensure child-bounty is in active state. diff --git a/frame/nomination-pools/benchmarking/src/lib.rs b/frame/nomination-pools/benchmarking/src/lib.rs index 137b9e9af63e3..30bef6221c968 100644 --- a/frame/nomination-pools/benchmarking/src/lib.rs +++ b/frame/nomination-pools/benchmarking/src/lib.rs @@ -609,7 +609,7 @@ frame_benchmarking::benchmarks! { let (depositor, pool_account) = create_pool_account::(0, min_create_bond, None); BondedPools::::mutate(&1, |maybe_pool| { // Force the pool into an invalid state - maybe_pool.as_mut().map(|mut pool| pool.points = min_create_bond * 10u32.into()); + maybe_pool.as_mut().map(|pool| pool.points = min_create_bond * 10u32.into()); }); let caller = account("caller", 0, USER_SEED); diff --git a/frame/staking/src/pallet/mod.rs b/frame/staking/src/pallet/mod.rs index 35aa2626e3b7c..d8a7de2193bae 100644 --- a/frame/staking/src/pallet/mod.rs +++ b/frame/staking/src/pallet/mod.rs @@ -1006,9 +1006,7 @@ pub mod pallet { // Note: in case there is no current era it is fine to bond one era more. let era = Self::current_era().unwrap_or(0) + T::BondingDuration::get(); - if let Some(mut chunk) = - ledger.unlocking.last_mut().filter(|chunk| chunk.era == era) - { + if let Some(chunk) = ledger.unlocking.last_mut().filter(|chunk| chunk.era == era) { // To keep the chunk count down, we only keep one chunk per era. Since // `unlocking` is a FiFo queue, if a chunk exists for `era` we know that it will // be the last one. diff --git a/frame/support/src/storage/generator/double_map.rs b/frame/support/src/storage/generator/double_map.rs index 5da68873b10e6..00a3f1bc7c1ce 100644 --- a/frame/support/src/storage/generator/double_map.rs +++ b/frame/support/src/storage/generator/double_map.rs @@ -21,7 +21,7 @@ use crate::{ Never, }; use codec::{Decode, Encode, EncodeLike, FullCodec, FullEncode}; -use sp_std::{borrow::Borrow, prelude::*}; +use sp_std::prelude::*; /// Generator for `StorageDoubleMap` used by `decl_storage`. /// @@ -78,7 +78,7 @@ pub trait StorageDoubleMap { KArg1: EncodeLike, { let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix()); - let key_hashed = k1.borrow().using_encoded(Self::Hasher1::hash); + let key_hashed = k1.using_encoded(Self::Hasher1::hash); let mut final_key = Vec::with_capacity(storage_prefix.len() + key_hashed.as_ref().len()); @@ -95,8 +95,8 @@ pub trait StorageDoubleMap { KArg2: EncodeLike, { let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix()); - let key1_hashed = k1.borrow().using_encoded(Self::Hasher1::hash); - let key2_hashed = k2.borrow().using_encoded(Self::Hasher2::hash); + let key1_hashed = k1.using_encoded(Self::Hasher1::hash); + let key2_hashed = k2.using_encoded(Self::Hasher2::hash); let mut final_key = Vec::with_capacity( storage_prefix.len() + key1_hashed.as_ref().len() + key2_hashed.as_ref().len(), @@ -198,7 +198,7 @@ where KArg2: EncodeLike, VArg: EncodeLike, { - unhashed::put(&Self::storage_double_map_final_key(k1, k2), &val.borrow()) + unhashed::put(&Self::storage_double_map_final_key(k1, k2), &val) } fn remove(k1: KArg1, k2: KArg2) @@ -336,8 +336,8 @@ where let old_key = { let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix()); - let key1_hashed = key1.borrow().using_encoded(OldHasher1::hash); - let key2_hashed = key2.borrow().using_encoded(OldHasher2::hash); + let key1_hashed = key1.using_encoded(OldHasher1::hash); + let key2_hashed = key2.using_encoded(OldHasher2::hash); let mut final_key = Vec::with_capacity( storage_prefix.len() + key1_hashed.as_ref().len() + key2_hashed.as_ref().len(), diff --git a/frame/support/src/storage/generator/map.rs b/frame/support/src/storage/generator/map.rs index 3b36b9bddb704..3cd7bea2fe7b2 100644 --- a/frame/support/src/storage/generator/map.rs +++ b/frame/support/src/storage/generator/map.rs @@ -68,7 +68,7 @@ pub trait StorageMap { KeyArg: EncodeLike, { let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix()); - let key_hashed = key.borrow().using_encoded(Self::Hasher::hash); + let key_hashed = key.using_encoded(Self::Hasher::hash); let mut final_key = Vec::with_capacity(storage_prefix.len() + key_hashed.as_ref().len()); @@ -327,7 +327,7 @@ impl> storage::StorageMap fn migrate_key>(key: KeyArg) -> Option { let old_key = { let storage_prefix = storage_prefix(Self::module_prefix(), Self::storage_prefix()); - let key_hashed = key.borrow().using_encoded(OldHasher::hash); + let key_hashed = key.using_encoded(OldHasher::hash); let mut final_key = Vec::with_capacity(storage_prefix.len() + key_hashed.as_ref().len()); diff --git a/primitives/npos-elections/src/lib.rs b/primitives/npos-elections/src/lib.rs index 253a231602f77..9239a2d90d309 100644 --- a/primitives/npos-elections/src/lib.rs +++ b/primitives/npos-elections/src/lib.rs @@ -470,7 +470,7 @@ pub fn to_support_map( // build support struct. for StakedAssignment { who, distribution } in assignments.iter() { for (c, weight_extended) in distribution.iter() { - let mut support = supports.entry(c.clone()).or_default(); + let support = supports.entry(c.clone()).or_default(); support.total = support.total.saturating_add(*weight_extended); support.voters.push((who.clone(), *weight_extended)); }