Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove redundant calls to borrow() #1393

Merged
merged 6 commits into from
Sep 5, 2023
Merged

Remove redundant calls to borrow() #1393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
04880a8
Remove redundant calls to `borrow()`
mrcnski Sep 4, 2023
63360f7
Merge branch 'master' into mrcnski/remove-redundant-borrow
franciscoaguirre Sep 4, 2023
a0b841a
Update substrate/client/api/src/lib.rs
mrcnski Sep 5, 2023
ccdd73e
Remove unused imports
mrcnski Sep 5, 2023
64b632a
Remove redundant `deref()`
mrcnski Sep 5, 2023
2108441
Merge remote-tracking branch 'origin/mrcnski/remove-redundant-borrow'…
mrcnski Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions substrate/client/api/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions substrate/frame/message-queue/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,7 +1092,7 @@ impl<T: Config> Pallet<T> {
origin.clone(),
page_index,
page.first_index,
payload.deref(),
payload,
weight,
overweight_limit,
) {
Expand Down Expand Up @@ -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('*');
}
Expand Down
5 changes: 2 additions & 3 deletions substrate/frame/support/src/storage/generator/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;

Expand Down Expand Up @@ -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()),
}
}
Expand All @@ -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()),
}
}
Expand Down