From ec8949f624305b32432e70cdcc8fd8db7535490b Mon Sep 17 00:00:00 2001
From: Marcin S <marcin@realemail.net>
Date: Tue, 5 Sep 2023 12:11:30 +0200
Subject: [PATCH] Remove redundant calls to `borrow()` (#1393)

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>
Co-authored-by: Francisco Aguirre <franciscoaguirreperez@gmail.com>
---
 substrate/client/api/src/lib.rs                      | 5 +----
 substrate/frame/message-queue/src/lib.rs             | 4 ++--
 substrate/frame/support/src/storage/generator/map.rs | 5 ++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/substrate/client/api/src/lib.rs b/substrate/client/api/src/lib.rs
index faadf3663a59..f614a1e30b48 100644
--- a/substrate/client/api/src/lib.rs
+++ b/substrate/client/api/src/lib.rs
@@ -49,7 +49,6 @@ pub trait UsageProvider<Block: sp_runtime::traits::Block> {
 pub mod utils {
 	use sp_blockchain::{Error, HeaderBackend, HeaderMetadata};
 	use sp_runtime::traits::Block as BlockT;
-	use std::borrow::Borrow;
 
 	/// Returns a function for checking block ancestry, the returned function will
 	/// return `true` if the given hash (second parameter) is a descendent of the
@@ -69,10 +68,8 @@ pub mod utils {
 				return Ok(false)
 			}
 
-			let current = current.as_ref().map(|(c, p)| (c.borrow(), p.borrow()));
-
 			let mut hash = hash;
-			if let Some((current_hash, current_parent_hash)) = current {
+			if let Some((current_hash, current_parent_hash)) = &current {
 				if base == current_hash {
 					return Ok(false)
 				}
diff --git a/substrate/frame/message-queue/src/lib.rs b/substrate/frame/message-queue/src/lib.rs
index 9ded84bb035c..7c38dec4b080 100644
--- a/substrate/frame/message-queue/src/lib.rs
+++ b/substrate/frame/message-queue/src/lib.rs
@@ -1092,7 +1092,7 @@ impl<T: Config> Pallet<T> {
 			origin.clone(),
 			page_index,
 			page.first_index,
-			payload.deref(),
+			payload,
 			weight,
 			overweight_limit,
 		) {
@@ -1242,7 +1242,7 @@ impl<T: Config> Pallet<T> {
 					if let Some((_, processed, message)) =
 						page.peek_index(i.try_into().expect("std-only code"))
 					{
-						let msg = String::from_utf8_lossy(message.deref());
+						let msg = String::from_utf8_lossy(message);
 						if processed {
 							page_info.push('*');
 						}
diff --git a/substrate/frame/support/src/storage/generator/map.rs b/substrate/frame/support/src/storage/generator/map.rs
index 90fac4b41c75..1d2511e324dc 100644
--- a/substrate/frame/support/src/storage/generator/map.rs
+++ b/substrate/frame/support/src/storage/generator/map.rs
@@ -21,7 +21,6 @@ use crate::{
 	Never,
 };
 use codec::{Decode, Encode, EncodeLike, FullCodec, FullEncode};
-use sp_std::borrow::Borrow;
 #[cfg(not(feature = "std"))]
 use sp_std::prelude::*;
 
@@ -297,7 +296,7 @@ impl<K: FullEncode, V: FullCodec, G: StorageMap<K, V>> storage::StorageMap<K, V>
 		let ret = f(&mut val);
 		if ret.is_ok() {
 			match G::from_query_to_optional_value(val) {
-				Some(ref val) => unhashed::put(final_key.as_ref(), &val.borrow()),
+				Some(ref val) => unhashed::put(final_key.as_ref(), &val),
 				None => unhashed::kill(final_key.as_ref()),
 			}
 		}
@@ -314,7 +313,7 @@ impl<K: FullEncode, V: FullCodec, G: StorageMap<K, V>> storage::StorageMap<K, V>
 		let ret = f(&mut val);
 		if ret.is_ok() {
 			match val {
-				Some(ref val) => unhashed::put(final_key.as_ref(), &val.borrow()),
+				Some(ref val) => unhashed::put(final_key.as_ref(), &val),
 				None => unhashed::kill(final_key.as_ref()),
 			}
 		}