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
@@ -9,7 +9,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
serde = { version = "1.0.101", optional = true }
runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-features = false }
sp-runtime = { path = "../../primitives/runtime", default-features = false }
rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
sp-std = { path = "../../primitives/std", default-features = false }
support = { package = "frame-support", path = "../support", default-features = false }
system = { package = "frame-system", path = "../system", default-features = false }
@@ -24,7 +24,7 @@ std = [
"serde",
"runtime-io/std",
"sp-runtime/std",
"rstd/std",
"sp-std/std",
"support/std",
"system/std",
]
+3 -4
View File
@@ -89,7 +89,7 @@ mod mock;
mod tests;
use codec::FullCodec;
use rstd::{
use sp_std::{
fmt::Debug,
prelude::*,
};
@@ -175,7 +175,7 @@ decl_storage! {
}
add_extra_genesis {
config(members): Vec<T::AccountId>;
config(phantom): rstd::marker::PhantomData<I>;
config(phantom): sp_std::marker::PhantomData<I>;
build(|config| {
let mut pool = config.pool.clone();
@@ -218,7 +218,7 @@ decl_event!(
/// See the transaction for who.
CandidateScored,
/// Phantom member, never used.
Dummy(rstd::marker::PhantomData<(AccountId, I)>),
Dummy(sp_std::marker::PhantomData<(AccountId, I)>),
}
);
@@ -453,4 +453,3 @@ impl<T: Trait<I>, I: Instance> Module<T, I> {
Ok(())
}
}