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

Make decl_storage generated code respect clippy (#6065)

Browse Source 
* fix clippy for code generated by decl_storage

* use as_ref
This commit is contained in:
thiolliere
2020-05-18 18:43:18 +02:00
committed by GitHub
parent cd0ffec1fe
commit 4644be3c90
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/support/procedural/src/storage/genesis_config/builder_def.rs
+8 -2
View File
@@ -55,10 +55,16 @@ impl BuilderDef {
data = Some(match &line.storage_type {
StorageLineTypeDef::Simple(_) if line.is_option =>
quote_spanned!(builder.span() =>
let data = (#builder)(self);
// NOTE: the type of `data` is specified when used later in the code
let builder: fn(&Self) -> _ = #builder;
let data = builder(self);
let data = Option::as_ref(&data);
),
_ => quote_spanned!(builder.span() => let data = &(#builder)(self); ),
_ => quote_spanned!(builder.span() =>
// NOTE: the type of `data` is specified when used later in the code
let builder: fn(&Self) -> _ = #builder;
let data = &builder(self);
),
});
} else if let Some(config) = &line.config {
is_generic |= line.is_generic;
substrate/frame/support/procedural/src/storage/storage_struct.rs
+9 -6
View File
@@ -86,7 +86,10 @@ pub fn decl_and_impl(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStre
Ident::new(INHERENT_INSTANCE_NAME, Span::call_site())
};
let storage_name_str = syn::LitStr::new(&line.name.to_string(), line.name.span());
let storage_name_bstr = syn::LitByteStr::new(
line.name.to_string().as_ref(),
line.name.span()
);
let storage_generator_trait = &line.storage_generator_trait;
let storage_struct = &line.storage_struct;
@@ -107,7 +110,7 @@ pub fn decl_and_impl(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStre
}
fn storage_prefix() -> &'static [u8] {
#storage_name_str.as_bytes()
#storage_name_bstr
}
fn from_optional_value_to_query(v: Option<#value_type>) -> Self::Query {
@@ -131,7 +134,7 @@ pub fn decl_and_impl(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStre
}
fn storage_prefix() -> &'static [u8] {
#storage_name_str.as_bytes()
#storage_name_bstr
}
}
@@ -146,7 +149,7 @@ pub fn decl_and_impl(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStre
}
fn storage_prefix() -> &'static [u8] {
#storage_name_str.as_bytes()
#storage_name_bstr
}
fn from_optional_value_to_query(v: Option<#value_type>) -> Self::Query {
@@ -171,7 +174,7 @@ pub fn decl_and_impl(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStre
}
fn storage_prefix() -> &'static [u8] {
#storage_name_str.as_bytes()
#storage_name_bstr
}
}
@@ -189,7 +192,7 @@ pub fn decl_and_impl(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStre
}
fn storage_prefix() -> &'static [u8] {
#storage_name_str.as_bytes()
#storage_name_bstr
}
fn from_optional_value_to_query(v: Option<#value_type>) -> Self::Query {