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
@@ -8,7 +8,7 @@ edition = "2018"
codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false }
hash-db = { version = "0.15.2", default-features = false }
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 }
libsecp256k1 = { version = "0.3.0", optional = true }
sp-state-machine = { path = "../../primitives/state-machine", optional = true }
runtime-interface = { package = "sp-runtime-interface", path = "../runtime-interface", default-features = false }
@@ -21,7 +21,7 @@ default = ["std"]
std = [
"primitives/std",
"codec/std",
"rstd/std",
"sp-std/std",
"hash-db/std",
"trie",
"sp-state-machine",
+3 -3
View File
@@ -28,10 +28,10 @@
#![cfg_attr(not(feature = "std"),
doc = "Substrate's runtime standard library as compiled without Rust's standard library.")]
use rstd::vec::Vec;
use sp_std::vec::Vec;
#[cfg(feature = "std")]
use rstd::ops::Deref;
use sp_std::ops::Deref;
#[cfg(feature = "std")]
use primitives::{
@@ -775,7 +775,7 @@ mod allocator_impl {
#[no_mangle]
pub fn panic(info: &core::panic::PanicInfo) -> ! {
unsafe {
let message = rstd::alloc::format!("{}", info);
let message = sp_std::alloc::format!("{}", info);
logging::log(LogLevel::Error, "runtime", message.as_bytes());
core::intrinsics::abort()
}