Relaxed clippy fixes/nits (#2661)

This PR contains just a few clippy fixes and nits, which are, however,
relaxed by workspace clippy settings here:
https://github.com/paritytech/polkadot-sdk/blob/master/Cargo.toml#L483-L506

---------

Co-authored-by: Dmitry Sinyavin <[email protected]>
Co-authored-by: ordian <[email protected]>
Co-authored-by: command-bot <>
Co-authored-by: Bastian Köcher <[email protected]>

Author: 4 people

pallet-xcm/src/mock.rs

@@ -28,9 +28,7 @@ use polkadot_parachain_primitives::primitives::Id as ParaId;
 use polkadot_runtime_parachains::origin;
 use sp_core::H256;
 use sp_runtime::{traits::IdentityLookup, AccountId32, BuildStorage};
-pub use sp_std::{
-	cell::RefCell, collections::btree_map::BTreeMap, fmt::Debug, marker::PhantomData,
-};
+pub use sp_std::cell::RefCell;
 use xcm::prelude::*;
 #[allow(deprecated)]
 use xcm_builder::CurrencyAdapter as XcmCurrencyAdapter;

procedural/src/builder_pattern.rs

@@ -87,8 +87,8 @@ fn generate_builder_raw_impl(name: &Ident, data_enum: &DataEnum) -> TokenStream2
 	let methods = data_enum.variants.iter().map(|variant| {
 		let variant_name = &variant.ident;
 		let method_name_string = &variant_name.to_string().to_snake_case();
-		let method_name = syn::Ident::new(&method_name_string, variant_name.span());
-		let docs = get_doc_comments(&variant);
+		let method_name = syn::Ident::new(method_name_string, variant_name.span());
+		let docs = get_doc_comments(variant);
 		let method = match &variant.fields {
 			Fields::Unit => {
 				quote! {
@@ -148,9 +148,7 @@ fn generate_builder_impl(name: &Ident, data_enum: &DataEnum) -> Result<TokenStre
 		.iter()
 		.map(|variant| {
 			let maybe_builder_attr = variant.attrs.iter().find(|attr| match attr.meta {
-				Meta::List(ref list) => {
-					return list.path.is_ident("builder");
-				},
+				Meta::List(ref list) => list.path.is_ident("builder"),
 				_ => false,
 			});
 			let builder_attr = match maybe_builder_attr {
@@ -159,7 +157,7 @@ fn generate_builder_impl(name: &Ident, data_enum: &DataEnum) -> Result<TokenStre
 				                          * holding register */
 			};
 			let Meta::List(ref list) = builder_attr.meta else { unreachable!("We checked before") };
-			let inner_ident: Ident = syn::parse2(list.tokens.clone().into()).map_err(|_| {
+			let inner_ident: Ident = syn::parse2(list.tokens.clone()).map_err(|_| {
 				Error::new_spanned(&builder_attr, "Expected `builder(loads_holding)`")
 			})?;
 			let ident_to_match: Ident = syn::parse_quote!(loads_holding);
@@ -177,8 +175,8 @@ fn generate_builder_impl(name: &Ident, data_enum: &DataEnum) -> Result<TokenStre
 		.map(|variant| {
 			let variant_name = &variant.ident;
 			let method_name_string = &variant_name.to_string().to_snake_case();
-			let method_name = syn::Ident::new(&method_name_string, variant_name.span());
-			let docs = get_doc_comments(&variant);
+			let method_name = syn::Ident::new(method_name_string, variant_name.span());
+			let docs = get_doc_comments(variant);
 			let method = match &variant.fields {
 				Fields::Unnamed(fields) => {
 					let arg_names: Vec<_> = fields
@@ -217,7 +215,7 @@ fn generate_builder_impl(name: &Ident, data_enum: &DataEnum) -> Result<TokenStre
 				},
 				_ =>
 					return Err(Error::new_spanned(
-						&variant,
+						variant,
 						"Instructions that load the holding register should take operands",
 					)),
 			};
@@ -235,14 +233,14 @@ fn generate_builder_impl(name: &Ident, data_enum: &DataEnum) -> Result<TokenStre
 	let buy_execution_method = data_enum
 		.variants
 		.iter()
-		.find(|variant| variant.ident.to_string() == "BuyExecution")
+		.find(|variant| variant.ident == "BuyExecution")
 		.map_or(
 			Err(Error::new_spanned(&data_enum.variants, "No BuyExecution instruction")),
 			|variant| {
 				let variant_name = &variant.ident;
 				let method_name_string = &variant_name.to_string().to_snake_case();
-				let method_name = syn::Ident::new(&method_name_string, variant_name.span());
-				let docs = get_doc_comments(&variant);
+				let method_name = syn::Ident::new(method_name_string, variant_name.span());
+				let docs = get_doc_comments(variant);
 				let fields = match &variant.fields {
 					Fields::Named(fields) => {
 						let arg_names: Vec<_> =
@@ -263,7 +261,7 @@ fn generate_builder_impl(name: &Ident, data_enum: &DataEnum) -> Result<TokenStre
 					},
 					_ =>
 						return Err(Error::new_spanned(
-							&variant,
+							variant,
 							"BuyExecution should have named fields",
 						)),
 				};
@@ -289,19 +287,19 @@ fn generate_builder_unpaid_impl(name: &Ident, data_enum: &DataEnum) -> Result<To
 	let unpaid_execution_variant = data_enum
 		.variants
 		.iter()
-		.find(|variant| variant.ident.to_string() == "UnpaidExecution")
+		.find(|variant| variant.ident == "UnpaidExecution")
 		.ok_or(Error::new_spanned(&data_enum.variants, "No UnpaidExecution instruction"))?;
 	let unpaid_execution_ident = &unpaid_execution_variant.ident;
 	let unpaid_execution_method_name = Ident::new(
 		&unpaid_execution_ident.to_string().to_snake_case(),
 		unpaid_execution_ident.span(),
 	);
-	let docs = get_doc_comments(&unpaid_execution_variant);
+	let docs = get_doc_comments(unpaid_execution_variant);
 	let fields = match &unpaid_execution_variant.fields {
 		Fields::Named(fields) => fields,
 		_ =>
 			return Err(Error::new_spanned(
-				&unpaid_execution_variant,
+				unpaid_execution_variant,
 				"UnpaidExecution should have named fields",
 			)),
 	};

xcm-builder/src/currency_adapter.rs

@@ -116,7 +116,7 @@ impl<
 		.map_err(|_| XcmError::NotWithdrawable)
 	}
 	fn accrue_checked(checked_account: AccountId, amount: Currency::Balance) {
-		Currency::deposit_creating(&checked_account, amount);
+		let _ = Currency::deposit_creating(&checked_account, amount);
 		Currency::deactivate(amount);
 	}
 	fn reduce_checked(checked_account: AccountId, amount: Currency::Balance) {
@@ -218,7 +218,7 @@ impl<
 		let amount = Matcher::matches_fungible(what).ok_or(Error::AssetNotHandled)?;
 		let who =
 			AccountIdConverter::convert_location(who).ok_or(Error::AccountIdConversionFailed)?;
-		Currency::withdraw(&who, amount, WithdrawReasons::TRANSFER, AllowDeath)
+		let _ = Currency::withdraw(&who, amount, WithdrawReasons::TRANSFER, AllowDeath)
 			.map_err(|e| XcmError::FailedToTransactAsset(e.into()))?;
 		Ok(what.clone().into())
 	}

xcm-builder/src/tests/mock.rs

@@ -27,20 +27,16 @@ pub use crate::{
 };
 use frame_support::traits::{ContainsPair, Everything};
 pub use frame_support::{
-	dispatch::{
-		DispatchInfo, DispatchResultWithPostInfo, GetDispatchInfo, Parameter, PostDispatchInfo,
-	},
+	dispatch::{DispatchInfo, DispatchResultWithPostInfo, GetDispatchInfo, PostDispatchInfo},
 	ensure, match_types, parameter_types,
 	sp_runtime::{traits::Dispatchable, DispatchError, DispatchErrorWithPostInfo},
-	traits::{ConstU32, Contains, Get, IsInVec},
+	traits::{Contains, Get, IsInVec},
 };
 pub use parity_scale_codec::{Decode, Encode};
-pub use sp_io::hashing::blake2_256;
 pub use sp_std::{
 	cell::{Cell, RefCell},
 	collections::{btree_map::BTreeMap, btree_set::BTreeSet},
 	fmt::Debug,
-	marker::PhantomData,
 };
 pub use xcm::latest::{prelude::*, Weight};
 use xcm_executor::traits::{Properties, QueryHandler, QueryResponseStatus};