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

Rename: primitives/sr-std -> primitives/sp-std (#4327)

Browse Source 
* primitives/sr-std -> primitives/std

* fix

* fix conflict

* rstd -> sp-std

* git mv

* fix review

* fix merge
This commit is contained in:
Weiliang Li
2019-12-10 16:26:27 +09:00
committed by Gavin Wood
parent 448dbc89a5
commit 6da9f59d72
210 changed files with 552 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/support/procedural/src/storage/genesis_config/builder_def.rs
+2 -2
View File
@@ -92,7 +92,7 @@ impl BuilderDef {
let key = &map.key;
quote!{{
#data
let data: &#scrate::rstd::vec::Vec<(#key, #value_type)> = data;
let data: &#scrate::sp_std::vec::Vec<(#key, #value_type)> = data;
data.iter().for_each(|(k, v)| {
<#storage_struct as #scrate::#storage_trait>::insert::<
&#key, &#value_type
@@ -105,7 +105,7 @@ impl BuilderDef {
let key2 = &map.key2;
quote!{{
#data
let data: &#scrate::rstd::vec::Vec<(#key1, #key2, #value_type)> = data;
let data: &#scrate::sp_std::vec::Vec<(#key1, #key2, #value_type)> = data;
data.iter().for_each(|(k1, k2, v)| {
<#storage_struct as #scrate::#storage_trait>::insert::<
&#key1, &#key2, &#value_type
substrate/frame/support/procedural/src/storage/metadata.rs
+5 -5
View File
@@ -104,11 +104,11 @@ fn default_byte_getter(
#[doc(hidden)]
pub struct #struct_name<
#runtime_generic, #optional_instance_bound_optional_default
>(pub #scrate::rstd::marker::PhantomData<(#runtime_generic #optional_comma_instance)>);
>(pub #scrate::sp_std::marker::PhantomData<(#runtime_generic #optional_comma_instance)>);
#[cfg(feature = "std")]
#[allow(non_upper_case_globals)]
static #cache_name: #scrate::once_cell::sync::OnceCell<#scrate::rstd::vec::Vec<u8>> =
static #cache_name: #scrate::once_cell::sync::OnceCell<#scrate::sp_std::vec::Vec<u8>> =
#scrate::once_cell::sync::OnceCell::new();
#[cfg(feature = "std")]
@@ -117,7 +117,7 @@ fn default_byte_getter(
for #struct_name<#runtime_generic, #optional_instance>
#where_clause
{
fn default_byte(&self) -> #scrate::rstd::vec::Vec<u8> {
fn default_byte(&self) -> #scrate::sp_std::vec::Vec<u8> {
use #scrate::codec::Encode;
#cache_name.get_or_init(|| {
let def_val: #query_type = #default;
@@ -138,7 +138,7 @@ fn default_byte_getter(
for #struct_name<#runtime_generic, #optional_instance>
#where_clause
{
fn default_byte(&self) -> #scrate::rstd::vec::Vec<u8> {
fn default_byte(&self) -> #scrate::sp_std::vec::Vec<u8> {
use #scrate::codec::Encode;
let def_val: #query_type = #default;
<#query_type as Encode>::encode(&def_val)
@@ -146,7 +146,7 @@ fn default_byte_getter(
}
};
let struct_instance = quote!(
#struct_name::<#runtime_generic, #optional_instance>(#scrate::rstd::marker::PhantomData)
#struct_name::<#runtime_generic, #optional_instance>(#scrate::sp_std::marker::PhantomData)
);
(struct_def, struct_instance)
substrate/frame/support/procedural/src/storage/storage_struct.rs
+1 -1
View File
@@ -68,7 +68,7 @@ pub fn decl_and_impl(scrate: &TokenStream, def: &DeclStorageDefExt) -> TokenStre
#visibility struct #name<
#optional_storage_runtime_bound_comma #optional_instance_bound_optional_default
>(
#scrate::rstd::marker::PhantomData<
#scrate::sp_std::marker::PhantomData<
(#optional_storage_runtime_comma #optional_instance)
>
) #optional_storage_where_clause;