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

* 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
+2 -2
View File
@@ -19,7 +19,7 @@ log = { version = "0.4.8", optional = true }
memory-db = { version = "0.15.2", default-features = false }
offchain-primitives = { package = "sp-offchain", path = "../../../primitives/offchain", default-features = false}
primitives = { package = "sp-core", path = "../../../primitives/core", default-features = false }
rstd = { package = "sp-std", path = "../../../primitives/sr-std", default-features = false }
sp-std = { path = "../../../primitives/std", default-features = false }
runtime-interface = { package = "sp-runtime-interface", path = "../../../primitives/runtime-interface", default-features = false}
runtime_io = { package = "sp-io", path = "../../../primitives/sr-io", default-features = false }
runtime_support = { package = "frame-support", path = "../../../frame/support", default-features = false }
@@ -63,7 +63,7 @@ std = [
"offchain-primitives/std",
"primitives/std",
"primitives/std",
"rstd/std",
"sp-std/std",
"runtime-interface/std",
"runtime_io/std",
"runtime_support/std",
+2 -2
View File
@@ -22,7 +22,7 @@
pub mod genesismap;
pub mod system;
use rstd::{prelude::*, marker::PhantomData};
use sp_std::{prelude::*, marker::PhantomData};
use codec::{Encode, Decode, Input, Error};
use primitives::{Blake2Hasher, OpaqueMetadata, RuntimeDebug};
@@ -415,7 +415,7 @@ fn code_using_trie() -> u64 {
].to_vec();
let mut mdb = PrefixedMemoryDB::default();
let mut root = rstd::default::Default::default();
let mut root = sp_std::default::Default::default();
let _ = {
let v = &pairs;
let mut t = TrieDBMut::<Blake2Hasher>::new(&mut mdb, &mut root);
+1 -1
View File
@@ -17,7 +17,7 @@
//! System manager: Handles all of the top-level stuff; executing block/transaction, setting code
//! and depositing logs.
use rstd::prelude::*;
use sp_std::prelude::*;
use runtime_io::{
storage::root as storage_root, storage::changes_root as storage_changes_root,
hashing::blake2_256,