pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-13 15:11:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply some clippy lints (#11154)

Browse Source 
* Apply some clippy hints

* Revert clippy ci changes

* Update client/cli/src/commands/generate.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/cli/src/commands/inspect_key.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/db/src/bench.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/db/src/bench.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/service/src/client/block_rules.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/service/src/client/block_rules.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/network/src/transactions.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/network/src/protocol.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Revert due to missing `or_default` function.

* Fix compilation and simplify code

* Undo change that corrupts benchmark.

* fix clippy

* Update client/service/test/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/state-db/src/noncanonical.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/state-db/src/noncanonical.rs

remove leftovers!

* Update client/tracing/src/logging/directives.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update utils/fork-tree/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* added needed ref

* Update frame/referenda/src/benchmarking.rs

* Simplify byte-vec creation

* let's just not overlap the ranges

* Correction

* cargo fmt

* Update utils/frame/benchmarking-cli/src/shared/stats.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update utils/frame/benchmarking-cli/src/pallet/command.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update utils/frame/benchmarking-cli/src/pallet/command.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Giles Cope <gilescope@gmail.com>
This commit is contained in:
Falco Hirschenberger
2022-04-30 23:28:27 +02:00
committed by GitHub
parent a990473cf9
commit b581604aa7
368 changed files with 1927 additions and 2236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/support/procedural/src/construct_runtime/expand/config.rs
+2 -6
View File
@@ -43,12 +43,8 @@ pub fn expand_outer_config(
types.extend(expand_config_types(runtime, decl, &config, part_is_generic));
fields.extend(quote!(pub #field_name: #config,));
build_storage_calls.extend(expand_config_build_storage_call(
scrate,
runtime,
decl,
&field_name,
));
build_storage_calls
.extend(expand_config_build_storage_call(scrate, runtime, decl, field_name));
query_genesis_config_part_macros.push(quote! {
#path::__substrate_genesis_config_check::is_genesis_config_defined!(#pallet_name);
#[cfg(feature = "std")]
substrate/frame/support/procedural/src/construct_runtime/mod.rs
+5 -5
View File
@@ -201,7 +201,7 @@ fn construct_runtime_intermediary_expansion(
);
}
Ok(expansion.into())
Ok(expansion)
}
/// All pallets have explicit definition of parts, this will expand to the runtime declaration.
@@ -225,16 +225,16 @@ fn construct_runtime_final_expansion(
})?;
let hidden_crate_name = "construct_runtime";
let scrate = generate_crate_access(&hidden_crate_name, "frame-support");
let scrate_decl = generate_hidden_includes(&hidden_crate_name, "frame-support");
let scrate = generate_crate_access(hidden_crate_name, "frame-support");
let scrate_decl = generate_hidden_includes(hidden_crate_name, "frame-support");
let outer_event = expand::expand_outer_event(&name, &pallets, &scrate)?;
let outer_origin = expand::expand_outer_origin(&name, &system_pallet, &pallets, &scrate)?;
let outer_origin = expand::expand_outer_origin(&name, system_pallet, &pallets, &scrate)?;
let all_pallets = decl_all_pallets(&name, pallets.iter());
let pallet_to_index = decl_pallet_runtime_setup(&name, &pallets, &scrate);
let dispatch = expand::expand_outer_dispatch(&name, &system_pallet, &pallets, &scrate);
let dispatch = expand::expand_outer_dispatch(&name, system_pallet, &pallets, &scrate);
let metadata = expand::expand_runtime_metadata(&name, &pallets, &scrate, &unchecked_extrinsic);
let outer_config = expand::expand_outer_config(&name, &pallets, &scrate);
let inherent =
substrate/frame/support/procedural/src/pallet/expand/call.rs
+1 -1
View File
@@ -68,7 +68,7 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
.args
.iter()
.map(|(_, name, _)| {
syn::Ident::new(&name.to_string().trim_start_matches('_'), name.span())
syn::Ident::new(name.to_string().trim_start_matches('_'), name.span())
})
.collect::<Vec<_>>()
})
substrate/frame/support/procedural/src/pallet/expand/genesis_config.rs
+1 -1
View File
@@ -85,7 +85,7 @@ pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
syn::Item::Enum(syn::ItemEnum { attrs, .. }) |
syn::Item::Struct(syn::ItemStruct { attrs, .. }) |
syn::Item::Type(syn::ItemType { attrs, .. }) => {
if get_doc_literals(&attrs).is_empty() {
if get_doc_literals(attrs).is_empty() {
attrs.push(syn::parse_quote!(
#[doc = r"
Can be used to configure the
substrate/frame/support/procedural/src/pallet/expand/storage.rs
+4 -6
View File
@@ -74,9 +74,7 @@ fn check_prefix_duplicates(
),
);
if let Some(other_dup_err) =
used_prefixes.insert(counter_prefix.clone(), counter_dup_err.clone())
{
if let Some(other_dup_err) = used_prefixes.insert(counter_prefix, counter_dup_err.clone()) {
let mut err = counter_dup_err;
err.combine(other_dup_err);
return Err(err)
@@ -113,7 +111,7 @@ pub fn process_generics(def: &mut Def) -> syn::Result<()> {
_ => unreachable!("Checked by def"),
};
let prefix_ident = prefix_ident(&storage_def);
let prefix_ident = prefix_ident(storage_def);
let type_use_gen = if def.config.has_instance {
quote::quote_spanned!(storage_def.attr_span => T, I)
} else {
@@ -215,7 +213,7 @@ pub fn process_generics(def: &mut Def) -> syn::Result<()> {
/// * generate metadatas
pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
if let Err(e) = process_generics(def) {
return e.into_compile_error().into()
return e.into_compile_error()
}
// Check for duplicate prefixes
@@ -393,7 +391,7 @@ pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
let prefix_structs = def.storages.iter().map(|storage_def| {
let type_impl_gen = &def.type_impl_generics(storage_def.attr_span);
let type_use_gen = &def.type_use_generics(storage_def.attr_span);
let prefix_struct_ident = prefix_ident(&storage_def);
let prefix_struct_ident = prefix_ident(storage_def);
let prefix_struct_vis = &storage_def.vis;
let prefix_struct_const = storage_def.prefix();
let config_where_clause = &def.config.where_clause;
substrate/frame/support/procedural/src/pallet/parse/call.rs
+4 -3
View File
@@ -133,9 +133,10 @@ impl CallDef {
return Err(syn::Error::new(item.span(), "Invalid pallet::call, expected item impl"))
};
let mut instances = vec![];
instances.push(helper::check_impl_gen(&item.generics, item.impl_token.span())?);
instances.push(helper::check_pallet_struct_usage(&item.self_ty)?);
let instances = vec![
helper::check_impl_gen(&item.generics, item.impl_token.span())?,
helper::check_pallet_struct_usage(&item.self_ty)?,
];
if let Some((_, _, for_)) = item.trait_ {
let msg = "Invalid pallet::call, expected no trait ident as in \
substrate/frame/support/procedural/src/pallet/parse/config.rs
+4 -3
View File
@@ -373,9 +373,10 @@ impl ConfigDef {
let found = if item.supertraits.is_empty() {
"none".to_string()
} else {
let mut found = item.supertraits.iter().fold(String::new(), |acc, s| {
format!("{}`{}`, ", acc, quote::quote!(#s).to_string())
});
let mut found = item
.supertraits
.iter()
.fold(String::new(), |acc, s| format!("{}`{}`, ", acc, quote::quote!(#s)));
found.pop();
found.pop();
found
substrate/frame/support/procedural/src/pallet/parse/error.rs
+2 -2
View File
@@ -62,8 +62,8 @@ impl ErrorDef {
return Err(syn::Error::new(item.span(), msg))
}
let mut instances = vec![];
instances.push(helper::check_type_def_gen_no_bounds(&item.generics, item.ident.span())?);
let instances =
vec![helper::check_type_def_gen_no_bounds(&item.generics, item.ident.span())?];
if item.generics.where_clause.is_some() {
let msg = "Invalid pallet::error, where clause is not allowed on pallet error item";
substrate/frame/support/procedural/src/pallet/parse/extra_constants.rs
+4 -3
View File
@@ -87,9 +87,10 @@ impl ExtraConstantsDef {
))
};
let mut instances = vec![];
instances.push(helper::check_impl_gen(&item.generics, item.impl_token.span())?);
instances.push(helper::check_pallet_struct_usage(&item.self_ty)?);
let instances = vec![
helper::check_impl_gen(&item.generics, item.impl_token.span())?,
helper::check_pallet_struct_usage(&item.self_ty)?,
];
if let Some((_, _, for_)) = item.trait_ {
let msg = "Invalid pallet::call, expected no trait ident as in \
substrate/frame/support/procedural/src/pallet/parse/genesis_build.rs
+1 -2
View File
@@ -53,8 +53,7 @@ impl GenesisBuildDef {
})?
.1;
let mut instances = vec![];
instances.push(helper::check_genesis_builder_usage(&item_trait)?);
let instances = vec![helper::check_genesis_builder_usage(item_trait)?];
Ok(Self { attr_span, index, instances, where_clause: item.generics.where_clause.clone() })
}
substrate/frame/support/procedural/src/pallet/parse/genesis_config.rs
+1 -1
View File
@@ -49,7 +49,7 @@ impl GenesisConfigDef {
let mut instances = vec![];
// NOTE: GenesisConfig is not allowed to be only generic on I because it is not supported
// by construct_runtime.
if let Some(u) = helper::check_type_def_optional_gen(&generics, ident.span())? {
if let Some(u) = helper::check_type_def_optional_gen(generics, ident.span())? {
instances.push(u);
}
substrate/frame/support/procedural/src/pallet/parse/hooks.rs
+4 -3
View File
@@ -45,9 +45,10 @@ impl HooksDef {
return Err(syn::Error::new(item.span(), msg))
};
let mut instances = vec![];
instances.push(helper::check_pallet_struct_usage(&item.self_ty)?);
instances.push(helper::check_impl_gen(&item.generics, item.impl_token.span())?);
let instances = vec![
helper::check_pallet_struct_usage(&item.self_ty)?,
helper::check_impl_gen(&item.generics, item.impl_token.span())?,
];
let item_trait = &item
.trait_
substrate/frame/support/procedural/src/pallet/parse/inherent.rs
+4 -3
View File
@@ -50,9 +50,10 @@ impl InherentDef {
return Err(syn::Error::new(item.span(), msg))
}
let mut instances = vec![];
instances.push(helper::check_pallet_struct_usage(&item.self_ty)?);
instances.push(helper::check_impl_gen(&item.generics, item.impl_token.span())?);
let instances = vec![
helper::check_pallet_struct_usage(&item.self_ty)?,
helper::check_impl_gen(&item.generics, item.impl_token.span())?,
];
Ok(InherentDef { index, instances })
}
substrate/frame/support/procedural/src/pallet/parse/origin.rs
+1 -1
View File
@@ -50,7 +50,7 @@ impl OriginDef {
let is_generic = !generics.params.is_empty();
let mut instances = vec![];
if let Some(u) = helper::check_type_def_optional_gen(&generics, item.span())? {
if let Some(u) = helper::check_type_def_optional_gen(generics, item.span())? {
instances.push(u);
} else {
// construct_runtime only allow generic event for instantiable pallet.
substrate/frame/support/procedural/src/pallet/parse/pallet_struct.rs
+2 -2
View File
@@ -155,8 +155,8 @@ impl PalletStructDef {
return Err(syn::Error::new(item.generics.where_clause.span(), msg))
}
let mut instances = vec![];
instances.push(helper::check_type_def_gen_no_bounds(&item.generics, item.ident.span())?);
let instances =
vec![helper::check_type_def_gen_no_bounds(&item.generics, item.ident.span())?];
Ok(Self {
index,
substrate/frame/support/procedural/src/pallet/parse/storage.rs
+8 -6
View File
@@ -272,7 +272,7 @@ fn check_generics(
);
e.pop();
e.pop();
e.push_str(".");
e.push('.');
e
};
@@ -550,7 +550,7 @@ fn process_generics(
let args_span = segment.arguments.span();
let args = match &segment.arguments {
syn::PathArguments::AngleBracketed(args) if args.args.len() != 0 => args,
syn::PathArguments::AngleBracketed(args) if !args.args.is_empty() => args,
_ => {
let msg = "Invalid pallet::storage, invalid number of generic generic arguments, \
expect more that 0 generic arguments.";
@@ -646,13 +646,16 @@ impl StorageDef {
self.rename_as
.as_ref()
.map(syn::LitStr::value)
.unwrap_or(self.ident.to_string())
.unwrap_or_else(|| self.ident.to_string())
}
/// Return either the span of the ident or the span of the literal in the
/// #[storage_prefix] attribute
pub fn prefix_span(&self) -> proc_macro2::Span {
self.rename_as.as_ref().map(syn::LitStr::span).unwrap_or(self.ident.span())
self.rename_as
.as_ref()
.map(syn::LitStr::span)
.unwrap_or_else(|| self.ident.span())
}
pub fn try_from(
@@ -672,8 +675,7 @@ impl StorageDef {
let cfg_attrs = helper::get_item_cfg_attrs(&item.attrs);
let mut instances = vec![];
instances.push(helper::check_type_def_gen(&item.generics, item.ident.span())?);
let instances = vec![helper::check_type_def_gen(&item.generics, item.ident.span())?];
let where_clause = item.generics.where_clause.clone();
let docs = get_doc_literals(&item.attrs);
substrate/frame/support/procedural/src/pallet/parse/validate_unsigned.rs
+4 -3
View File
@@ -52,9 +52,10 @@ impl ValidateUnsignedDef {
return Err(syn::Error::new(item.span(), msg))
}
let mut instances = vec![];
instances.push(helper::check_pallet_struct_usage(&item.self_ty)?);
instances.push(helper::check_impl_gen(&item.generics, item.impl_token.span())?);
let instances = vec![
helper::check_pallet_struct_usage(&item.self_ty)?,
helper::check_impl_gen(&item.generics, item.impl_token.span())?,
];
Ok(ValidateUnsignedDef { index, instances })
}
substrate/frame/support/procedural/src/storage/genesis_config/builder_def.rs
+2 -2
View File
@@ -49,7 +49,7 @@ impl BuilderDef {
let mut data = None;
if let Some(builder) = &line.build {
is_generic |= ext::expr_contains_ident(&builder, &def.module_runtime_generic);
is_generic |= ext::expr_contains_ident(builder, &def.module_runtime_generic);
is_generic |= line.is_generic;
data = Some(match &line.storage_type {
@@ -138,7 +138,7 @@ impl BuilderDef {
}
if let Some(builder) = def.extra_genesis_build.as_ref() {
is_generic |= ext::expr_contains_ident(&builder, &def.module_runtime_generic);
is_generic |= ext::expr_contains_ident(builder, &def.module_runtime_generic);
blocks.push(quote_spanned! { builder.span() =>
let extra_genesis_builder: fn(&Self) = #builder;
substrate/frame/support/procedural/src/storage/instance_trait.rs
+1 -1
View File
@@ -116,7 +116,7 @@ fn create_and_impl_instance_struct(
let instance_trait = quote!( #scrate::traits::Instance );
let instance_struct = &instance_def.instance_struct;
let prefix = format!("{}{}", instance_def.prefix, def.crate_name.to_string());
let prefix = format!("{}{}", instance_def.prefix, def.crate_name);
let doc = &instance_def.doc;
let index = instance_def.index;
substrate/frame/support/procedural/src/storage/mod.rs
+1 -1
View File
@@ -259,7 +259,7 @@ impl StorageLineDefExt {
) -> Self {
let is_generic = match &storage_def.storage_type {
StorageLineTypeDef::Simple(value) =>
ext::type_contains_ident(&value, &def.module_runtime_generic),
ext::type_contains_ident(value, &def.module_runtime_generic),
StorageLineTypeDef::Map(map) =>
ext::type_contains_ident(&map.key, &def.module_runtime_generic) ||
ext::type_contains_ident(&map.value, &def.module_runtime_generic),