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
@@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
wasmi = { version = "0.6.2", optional = true }
primitives = { package = "sp-core", path = "../core", default-features = false }
rstd = { package = "sp-std", path = "../sr-std", default-features = false }
sp-std = { path = "../std", default-features = false }
runtime-io = { package = "sp-io", path = "../sr-io", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
@@ -20,7 +20,7 @@ default = ["std"]
std = [
"wasmi",
"primitives/std",
"rstd/std",
"sp-std/std",
"codec/std",
"runtime-io/std",
]
+1 -1
View File
@@ -38,7 +38,7 @@
#![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(not(feature = "std"), feature(core_intrinsics))]
use rstd::prelude::*;
use sp_std::prelude::*;
pub use primitives::sandbox::{TypedValue, ReturnValue, HostError};
+2 -2
View File
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
use rstd::collections::btree_map::BTreeMap;
use rstd::fmt;
use sp_std::collections::btree_map::BTreeMap;
use sp_std::fmt;
use wasmi::{
Externals, FuncInstance, FuncRef, GlobalDescriptor, GlobalRef, ImportResolver,
@@ -14,14 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
use rstd::{prelude::*, slice, marker, mem, vec, rc::Rc};
use sp_std::{prelude::*, slice, marker, mem, vec, rc::Rc};
use codec::{Decode, Encode};
use primitives::sandbox as sandbox_primitives;
use super::{Error, TypedValue, ReturnValue, HostFuncType};
use runtime_io::sandbox;
mod ffi {
use rstd::mem;
use sp_std::mem;
use super::HostFuncType;
/// Index into the default table that points to a `HostFuncType`.