From f64fccdd6cac8f7cacaa7f702c0ce4bf2d977ae4 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Mon, 3 Oct 2022 23:50:00 +0800
Subject: [PATCH] Remove unnecessary Clone trait bounds on CountedStorageMap
(#12402)
* Remove unnecessary Clone trait bounds on CountedStorageMap
* cargo fmt
---
.../support/src/storage/types/counted_map.rs | 21 ++++++++-----------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/substrate/frame/support/src/storage/types/counted_map.rs b/substrate/frame/support/src/storage/types/counted_map.rs
index c4027acfe72..8c19434767f 100644
--- a/substrate/frame/support/src/storage/types/counted_map.rs
+++ b/substrate/frame/support/src/storage/types/counted_map.rs
@@ -143,10 +143,7 @@ where
}
/// Store a value to be associated with the given key from the map.
- pub fn insert<KeyArg: EncodeLike<Key> + Clone, ValArg: EncodeLike<Value>>(
- key: KeyArg,
- val: ValArg,
- ) {
+ pub fn insert<KeyArg: EncodeLike<Key>, ValArg: EncodeLike<Value>>(key: KeyArg, val: ValArg) {
if !<Self as MapWrapper>::Map::contains_key(Ref::from(&key)) {
CounterFor::<Prefix>::mutate(|value| value.saturating_inc());
}
@@ -154,7 +151,7 @@ where
}
/// Remove the value under a key.
- pub fn remove<KeyArg: EncodeLike<Key> + Clone>(key: KeyArg) {
+ pub fn remove<KeyArg: EncodeLike<Key>>(key: KeyArg) {
if <Self as MapWrapper>::Map::contains_key(Ref::from(&key)) {
CounterFor::<Prefix>::mutate(|value| value.saturating_dec());
}
@@ -162,7 +159,7 @@ where
}
/// Mutate the value under a key.
- pub fn mutate<KeyArg: EncodeLike<Key> + Clone, R, F: FnOnce(&mut QueryKind::Query) -> R>(
+ pub fn mutate<KeyArg: EncodeLike<Key>, R, F: FnOnce(&mut QueryKind::Query) -> R>(
key: KeyArg,
f: F,
) -> R {
@@ -173,7 +170,7 @@ where
/// Mutate the item, only if an `Ok` value is returned.
pub fn try_mutate<KeyArg, R, E, F>(key: KeyArg, f: F) -> Result<R, E>
where
- KeyArg: EncodeLike<Key> + Clone,
+ KeyArg: EncodeLike<Key>,
F: FnOnce(&mut QueryKind::Query) -> Result<R, E>,
{
Self::try_mutate_exists(key, |option_value_ref| {
@@ -187,7 +184,7 @@ where
}
/// Mutate the value under a key. Deletes the item if mutated to a `None`.
- pub fn mutate_exists<KeyArg: EncodeLike<Key> + Clone, R, F: FnOnce(&mut Option<Value>) -> R>(
+ pub fn mutate_exists<KeyArg: EncodeLike<Key>, R, F: FnOnce(&mut Option<Value>) -> R>(
key: KeyArg,
f: F,
) -> R {
@@ -200,7 +197,7 @@ where
/// or if the storage item does not exist (`None`), independent of the `QueryType`.
pub fn try_mutate_exists<KeyArg, R, E, F>(key: KeyArg, f: F) -> Result<R, E>
where
- KeyArg: EncodeLike<Key> + Clone,
+ KeyArg: EncodeLike<Key>,
F: FnOnce(&mut Option<Value>) -> Result<R, E>,
{
<Self as MapWrapper>::Map::try_mutate_exists(key, |option_value| {
@@ -222,7 +219,7 @@ where
}
/// Take the value under a key.
- pub fn take<KeyArg: EncodeLike<Key> + Clone>(key: KeyArg) -> QueryKind::Query {
+ pub fn take<KeyArg: EncodeLike<Key>>(key: KeyArg) -> QueryKind::Query {
let removed_value = <Self as MapWrapper>::Map::mutate_exists(key, |value| value.take());
if removed_value.is_some() {
CounterFor::<Prefix>::mutate(|value| value.saturating_dec());
@@ -240,7 +237,7 @@ where
/// `[item]`. Any default value set for the storage item will be ignored on overwrite.
pub fn append<Item, EncodeLikeItem, EncodeLikeKey>(key: EncodeLikeKey, item: EncodeLikeItem)
where
- EncodeLikeKey: EncodeLike<Key> + Clone,
+ EncodeLikeKey: EncodeLike<Key>,
Item: Encode,
EncodeLikeItem: EncodeLike<Item>,
Value: StorageAppend<Item>,
@@ -355,7 +352,7 @@ where
/// Is only available if `Value` of the storage implements [`StorageTryAppend`].
pub fn try_append<KArg, Item, EncodeLikeItem>(key: KArg, item: EncodeLikeItem) -> Result<(), ()>
where
- KArg: EncodeLike<Key> + Clone,
+ KArg: EncodeLike<Key>,
Item: Encode,
EncodeLikeItem: EncodeLike<Item>,
Value: StorageTryAppend<Item>,
--
GitLab