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
@@ -8,7 +8,7 @@ edition = "2018"
[dependencies]
app-crypto = { package = "sc-application-crypto", path = "../../application-crypto", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
rstd = { package = "sp-std", path = "../../sr-std", default-features = false }
sp-std = { path = "../../std", default-features = false }
sp-api = { path = "../../sr-api", default-features = false }
sp-runtime = { path = "../../runtime", default-features = false }
inherents = { package = "sp-inherents", path = "../../inherents", default-features = false }
@@ -19,7 +19,7 @@ default = ["std"]
std = [
"app-crypto/std",
"codec/std",
"rstd/std",
"sp-std/std",
"sp-api/std",
"sp-runtime/std",
"inherents/std",
@@ -18,7 +18,7 @@
use sp_timestamp::TimestampInherentData;
use inherents::{InherentIdentifier, InherentData, Error};
use rstd::result::Result;
use sp_std::result::Result;
use codec::Decode;
#[cfg(feature = "std")]
@@ -19,7 +19,7 @@
#![cfg_attr(not(feature = "std"), no_std)]
use codec::{Encode, Decode, Codec};
use rstd::vec::Vec;
use sp_std::vec::Vec;
use sp_runtime::ConsensusEngineId;
pub mod inherents;
@@ -8,7 +8,7 @@ edition = "2018"
[dependencies]
app-crypto = { package = "sc-application-crypto", path = "../../application-crypto", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
rstd = { package = "sp-std", path = "../../sr-std", default-features = false }
sp-std = { path = "../../std", default-features = false }
schnorrkel = { version = "0.8.5", features = ["preaudit_deprecated"], optional = true }
sp-api = { path = "../../sr-api", default-features = false }
sp-consensus = { path = "../common", optional = true }
@@ -21,7 +21,7 @@ default = ["std"]
std = [
"app-crypto/std",
"codec/std",
"rstd/std",
"sp-std/std",
"schnorrkel",
"sp-api/std",
"sp-consensus",
@@ -33,7 +33,7 @@ use schnorrkel::{
SignatureError, errors::MultiSignatureStage,
vrf::{VRFProof, VRFOutput, VRF_OUTPUT_LENGTH, VRF_PROOF_LENGTH}
};
use rstd::vec::Vec;
use sp_std::vec::Vec;
/// A BABE pre-runtime digest. This contains all data required to validate a
@@ -23,7 +23,7 @@ use sp_timestamp::TimestampInherentData;
#[cfg(feature = "std")]
use codec::Decode;
use rstd::result::Result;
use sp_std::result::Result;
/// The BABE inherent identifier.
pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"babeslot";
@@ -23,7 +23,7 @@ mod digest;
pub mod inherents;
use codec::{Encode, Decode};
use rstd::vec::Vec;
use sp_std::vec::Vec;
use sp_runtime::{ConsensusEngineId, RuntimeDebug};
#[cfg(feature = "std")]
@@ -13,7 +13,7 @@ primitives = { package = "sp-core", path= "../../core" }
inherents = { package = "sp-inherents", path = "../../inherents" }
futures = { version = "0.3.1", features = ["thread-pool"] }
futures-timer = "0.4.0"
rstd = { package = "sp-std", path = "../../sr-std" }
sp-std = { path = "../../std" }
runtime_version = { package = "sp-version", path = "../../sr-version" }
sp-runtime = { path = "../../runtime" }
codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] }
@@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
sp-api = { path = "../../sr-api", default-features = false }
rstd = { package = "sp-std", path = "../../sr-std", default-features = false }
sp-std = { path = "../../std", default-features = false }
sp-runtime = { path = "../../runtime", default-features = false }
primitives = { package = "sp-core", path = "../../core", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
@@ -15,7 +15,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
[features]
default = ["std"]
std = [
"rstd/std",
"sp-std/std",
"sp-api/std",
"sp-runtime/std",
"primitives/std",
@@ -18,7 +18,7 @@
#![cfg_attr(not(feature = "std"), no_std)]
use rstd::vec::Vec;
use sp_std::vec::Vec;
use sp_runtime::ConsensusEngineId;
use codec::Decode;