runtime: Rename rstd to sp_std.

runtime-modules/content-working-group/Cargo.toml

@@ -7,7 +7,7 @@ edition = '2018'
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
-rstd = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 system = { package = 'frame-system', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-arithmetic = { package = 'sp-arithmetic', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
@@ -32,7 +32,7 @@ default = ['std']
 std = [
 	'serde',
 	'codec/std',
-	'rstd/std',
+	'sp-std/std',
 	'frame-support/std',
 	'system/std',
 	'sp-arithmetic/std',

runtime-modules/content-working-group/src/genesis.rs

@@ -1,7 +1,7 @@
 #![cfg(test)]
 
 use crate::{Trait, *};
-use rstd::map;
+use sp_std::map;
 
 use common::constraints::InputValidationLengthConstraint;
 

runtime-modules/content-working-group/src/lib.rs

@@ -22,11 +22,11 @@ use serde::{Deserialize, Serialize};
 use codec::{Decode, Encode};
 use frame_support::traits::{Currency, ExistenceRequirement, WithdrawReasons};
 use frame_support::{decl_event, decl_module, decl_storage, ensure};
-use rstd::borrow::ToOwned;
-use rstd::collections::{btree_map::BTreeMap, btree_set::BTreeSet};
-use rstd::vec;
-use rstd::vec::Vec;
 use sp_arithmetic::traits::{One, Zero};
+use sp_std::borrow::ToOwned;
+use sp_std::collections::{btree_map::BTreeMap, btree_set::BTreeSet};
+use sp_std::vec;
+use sp_std::vec::Vec;
 use system::{ensure_root, ensure_signed};
 
 use common::constraints::InputValidationLengthConstraint;
@@ -785,7 +785,7 @@ macro_rules! ensure_on_wrapped_error {
 //derive_from_impl(hiring::BeginAcceptingApplicationsError)
 //derive_from_impl(hiring::BeginAcceptingApplicationsError)
 
-impl rstd::convert::From<WrappedError<hiring::BeginAcceptingApplicationsError>> for &str {
+impl sp_std::convert::From<WrappedError<hiring::BeginAcceptingApplicationsError>> for &str {
     fn from(wrapper: WrappedError<hiring::BeginAcceptingApplicationsError>) -> Self {
         match wrapper.error {
             hiring::BeginAcceptingApplicationsError::OpeningDoesNotExist => {
@@ -798,7 +798,7 @@ impl rstd::convert::From<WrappedError<hiring::BeginAcceptingApplicationsError>>
     }
 }
 
-impl rstd::convert::From<WrappedError<hiring::AddOpeningError>> for &str {
+impl sp_std::convert::From<WrappedError<hiring::AddOpeningError>> for &str {
     fn from(wrapper: WrappedError<hiring::AddOpeningError>) -> Self {
         match wrapper.error {
             hiring::AddOpeningError::OpeningMustActivateInTheFuture => {
@@ -827,7 +827,7 @@ impl rstd::convert::From<WrappedError<hiring::AddOpeningError>> for &str {
     }
 }
 
-impl rstd::convert::From<WrappedError<hiring::BeginReviewError>> for &str {
+impl sp_std::convert::From<WrappedError<hiring::BeginReviewError>> for &str {
     fn from(wrapper: WrappedError<hiring::BeginReviewError>) -> Self {
         match wrapper.error {
             hiring::BeginReviewError::OpeningDoesNotExist => {
@@ -840,7 +840,7 @@ impl rstd::convert::From<WrappedError<hiring::BeginReviewError>> for &str {
     }
 }
 
-impl<T: hiring::Trait> rstd::convert::From<WrappedError<hiring::FillOpeningError<T>>> for &str {
+impl<T: hiring::Trait> sp_std::convert::From<WrappedError<hiring::FillOpeningError<T>>> for &str {
     fn from(wrapper: WrappedError<hiring::FillOpeningError<T>>) -> Self {
         match wrapper.error {
             hiring::FillOpeningError::<T>::OpeningDoesNotExist => MSG_FULL_CURATOR_OPENING_OPENING_DOES_NOT_EXIST,
@@ -878,7 +878,7 @@ impl<T: hiring::Trait> rstd::convert::From<WrappedError<hiring::FillOpeningError
     }
 }
 
-impl rstd::convert::From<WrappedError<hiring::DeactivateApplicationError>> for &str {
+impl sp_std::convert::From<WrappedError<hiring::DeactivateApplicationError>> for &str {
     fn from(wrapper: WrappedError<hiring::DeactivateApplicationError>) -> Self {
         match wrapper.error {
             hiring::DeactivateApplicationError::ApplicationDoesNotExist => {
@@ -900,7 +900,9 @@ impl rstd::convert::From<WrappedError<hiring::DeactivateApplicationError>> for &
     }
 }
 
-impl rstd::convert::From<WrappedError<membership::ControllerAccountForMemberCheckFailed>> for &str {
+impl sp_std::convert::From<WrappedError<membership::ControllerAccountForMemberCheckFailed>>
+    for &str
+{
     fn from(wrapper: WrappedError<membership::ControllerAccountForMemberCheckFailed>) -> Self {
         match wrapper.error {
             membership::ControllerAccountForMemberCheckFailed::NotMember => {
@@ -913,7 +915,7 @@ impl rstd::convert::From<WrappedError<membership::ControllerAccountForMemberChec
     }
 }
 
-impl rstd::convert::From<WrappedError<hiring::AddApplicationError>> for &str {
+impl sp_std::convert::From<WrappedError<hiring::AddApplicationError>> for &str {
     fn from(wrapper: WrappedError<hiring::AddApplicationError>) -> Self {
         match wrapper.error {
             hiring::AddApplicationError::OpeningDoesNotExist => {
@@ -938,7 +940,7 @@ impl rstd::convert::From<WrappedError<hiring::AddApplicationError>> for &str {
     }
 }
 
-impl rstd::convert::From<WrappedError<membership::MemberControllerAccountDidNotSign>> for &str {
+impl sp_std::convert::From<WrappedError<membership::MemberControllerAccountDidNotSign>> for &str {
     fn from(wrapper: WrappedError<membership::MemberControllerAccountDidNotSign>) -> Self {
         match wrapper.error {
             membership::MemberControllerAccountDidNotSign::UnsignedOrigin => {

runtime-modules/content-working-group/src/tests.rs

@@ -4,8 +4,8 @@ use super::genesis;
 use super::mock::*;
 
 use frame_support::{assert_err, assert_ok, traits::Currency, StorageValue};
-use rstd::collections::{btree_map::BTreeMap, btree_set::BTreeSet};
 use sp_arithmetic::traits::One;
+use sp_std::collections::{btree_map::BTreeMap, btree_set::BTreeSet};
 use system::RawOrigin;
 
 use common::constraints::InputValidationLengthConstraint;

runtime-modules/forum/Cargo.toml

@@ -11,7 +11,7 @@ frame-support = { package = 'frame-support', default-features = false, git = 'ht
 system = { package = 'frame-system', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-arithmetic = { package = 'sp-arithmetic', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-runtime = { package = 'sp-runtime', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
-rstd = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 timestamp = { package = 'pallet-timestamp', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 common = { package = 'pallet-common', default-features = false, path = '../common'}
 
@@ -26,7 +26,7 @@ std = [
 	'codec/std',
 	'frame-support/std',
 	'system/std',
-	'rstd/std',
+	'sp-std/std',
 	'sp-arithmetic/std',
 	'sp-runtime/std',
 	'timestamp/std',

runtime-modules/forum/src/lib.rs

@@ -15,11 +15,11 @@ pub type DispatchResult = Result<(), &'static str>;
 
 use codec::{Codec, Decode, Encode};
 use frame_support::{decl_event, decl_module, decl_storage, ensure, Parameter};
-use rstd::borrow::ToOwned;
-use rstd::vec;
-use rstd::vec::Vec;
 use sp_arithmetic::traits::{BaseArithmetic, One};
 use sp_runtime::traits::{MaybeSerialize, Member};
+use sp_std::borrow::ToOwned;
+use sp_std::vec;
+use sp_std::vec::Vec;
 
 mod mock;
 mod tests;

runtime-modules/governance/Cargo.toml

@@ -7,7 +7,7 @@ edition = '2018'
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
-rstd = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 system = { package = 'frame-system', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-arithmetic = { package = 'sp-arithmetic', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
@@ -28,7 +28,7 @@ default = ['std']
 std = [
 	'serde',
 	'codec/std',
-	'rstd/std',
+	'sp-std/std',
 	'frame-support/std',
 	'system/std',
 	'sp-arithmetic/std',

runtime-modules/governance/src/council.rs

@@ -1,7 +1,7 @@
 use frame_support::{debug, decl_event, decl_module, decl_storage, ensure};
-use rstd::vec;
-use rstd::vec::Vec;
 use sp_arithmetic::traits::{One, Zero};
+use sp_std::vec;
+use sp_std::vec::Vec;
 use system::ensure_root;
 
 pub use super::election::{self, CouncilElected, Seat, Seats};

runtime-modules/governance/src/election.rs

@@ -35,12 +35,12 @@ use serde::{Deserialize, Serialize};
 use codec::{Decode, Encode};
 use frame_support::traits::{Currency, ReservableCurrency};
 use frame_support::{decl_event, decl_module, decl_storage, ensure};
-use rstd::collections::btree_map::BTreeMap;
-use rstd::ops::Add;
-use rstd::vec;
-use rstd::vec::Vec;
 use sp_arithmetic::traits::Zero;
 use sp_runtime::traits::Hash;
+use sp_std::collections::btree_map::BTreeMap;
+use sp_std::ops::Add;
+use sp_std::vec;
+use sp_std::vec::Vec;
 use system::{ensure_root, ensure_signed};
 
 use super::sealed_vote::SealedVote;
@@ -324,7 +324,7 @@ impl<T: Trait> Module<T> {
             Self::move_to_announcing_stage();
         } else {
             // upper limit on applicants that will move to voting stage
-            let limit = rstd::cmp::max(Self::council_size_usize(), Self::candidacy_limit_usize());
+            let limit = sp_std::cmp::max(Self::council_size_usize(), Self::candidacy_limit_usize());
             let applicants_to_drop = Self::find_least_staked_applicants(&mut applicants, limit);
 
             Self::drop_applicants(applicants_to_drop);

runtime-modules/governance/src/sealed_vote.rs

@@ -1,6 +1,6 @@
 use codec::{Decode, Encode};
 use frame_support::ensure;
-use rstd::vec::Vec;
+use sp_std::vec::Vec;
 
 #[derive(Clone, Copy, Encode, Decode, Default)]
 pub struct SealedVote<AccountId, Stake, Hash, Vote>

runtime-modules/governance/src/stake.rs

@@ -1,6 +1,6 @@
 use codec::{Decode, Encode};
-use rstd::cmp::Ordering;
 use sp_arithmetic::traits::BaseArithmetic;
+use sp_std::cmp::Ordering;
 
 #[derive(Encode, Decode, Clone, Copy, Default, Debug)]
 pub struct Stake<Balance>

runtime-modules/hiring/Cargo.toml

@@ -7,7 +7,7 @@ edition = '2018'
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
-rstd = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 system = { package = 'frame-system', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-arithmetic = { package = 'sp-arithmetic', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
@@ -25,7 +25,7 @@ default = ['std']
 std = [
 	'serde',
 	'codec/std',
-	'rstd/std',
+	'sp-std/std',
 	'frame-support/std',
 	'system/std',
 	'sp-arithmetic/std',

runtime-modules/hiring/src/hiring/application.rs

@@ -1,6 +1,6 @@
 use codec::{Decode, Encode};
-use rstd::clone::Clone;
-use rstd::vec::Vec;
+use sp_std::clone::Clone;
+use sp_std::vec::Vec;
 
 use crate::hiring::StakePurpose;
 

runtime-modules/hiring/src/hiring/opening.rs

@@ -1,7 +1,7 @@
-use rstd::clone::Clone;
-use rstd::collections::btree_set::BTreeSet;
-use rstd::prelude::*;
-use rstd::vec::Vec;
+use sp_std::clone::Clone;
+use sp_std::collections::btree_set::BTreeSet;
+use sp_std::prelude::*;
+use sp_std::vec::Vec;
 
 use codec::{Decode, Encode};
 #[cfg(feature = "std")]

runtime-modules/hiring/src/lib.rs

@@ -28,14 +28,14 @@ use codec::Codec;
 use frame_support::storage::IterableStorageMap;
 use frame_support::traits::{Currency, Imbalance};
 use frame_support::{decl_module, decl_storage, ensure, Parameter};
-use rstd::cell::RefCell;
-use rstd::collections::btree_map::BTreeMap;
-use rstd::collections::btree_set::BTreeSet;
-use rstd::iter::Iterator;
-use rstd::rc::Rc;
-use rstd::vec::Vec;
 use sp_arithmetic::traits::{BaseArithmetic, One, Zero};
 use sp_runtime::traits::{MaybeSerialize, Member};
+use sp_std::cell::RefCell;
+use sp_std::collections::btree_map::BTreeMap;
+use sp_std::collections::btree_set::BTreeSet;
+use sp_std::iter::Iterator;
+use sp_std::rc::Rc;
+use sp_std::vec::Vec;
 
 use stake::{InitiateUnstakingError, Stake, StakeActionError, StakingError, Trait as StakeTrait};
 

runtime-modules/hiring/src/mock.rs

@@ -1,14 +1,14 @@
 #![cfg(test)]
 
 use frame_support::{impl_outer_origin, parameter_types};
-use rstd::cell::{Cell, RefCell};
-use rstd::rc::Rc;
 use sp_core::H256;
 use sp_runtime::{
     testing::Header,
     traits::{BlakeTwo256, IdentityLookup},
     Perbill,
 };
+use sp_std::cell::{Cell, RefCell};
+use sp_std::rc::Rc;
 use std::panic;
 
 use crate::hiring::ApplicationDeactivationCause;
@@ -126,7 +126,9 @@ thread_local! {
 }
 
 // Sets stake handler implementation in hiring module. Mockall frameworks integration
-pub(crate) fn set_stake_handler_impl(mock: Rc<rstd::cell::RefCell<dyn crate::StakeHandler<Test>>>) {
+pub(crate) fn set_stake_handler_impl(
+    mock: Rc<sp_std::cell::RefCell<dyn crate::StakeHandler<Test>>>,
+) {
     // Hiring::staking.mock_safe(move || MockResult::Return(mock.clone()));
     THREAD_LOCAL_STAKE_HANDLER.with(|f| {
         *f.borrow_mut() = mock.clone();

runtime-modules/hiring/src/test/mod.rs

@@ -8,8 +8,8 @@ use public_api::*;
 use crate::mock::Test;
 use crate::*;
 
-use rstd::cell::RefCell;
-use rstd::rc::Rc;
+use sp_std::cell::RefCell;
+use sp_std::rc::Rc;
 
 use std::panic;
 
@@ -22,6 +22,6 @@ pub(crate) type Balance =
 
 // Debug test object content. Recurring temporary usage - do not delete.
 #[allow(dead_code)]
-pub fn debug_print<T: rstd::fmt::Debug>(obj: T) {
+pub fn debug_print<T: sp_std::fmt::Debug>(obj: T) {
     println!("{:?}", obj);
 }

runtime-modules/hiring/src/test/public_api/add_application.rs

@@ -1,6 +1,6 @@
 use crate::mock::*;
 use crate::test::*;
-use rstd::collections::btree_map::BTreeMap;
+use sp_std::collections::btree_map::BTreeMap;
 use stake::NegativeImbalance;
 
 use crate::test::public_api::*;

runtime-modules/hiring/src/test/public_api/add_opening.rs

@@ -6,7 +6,7 @@ use crate::{
     ActivateOpeningAt, ActiveOpeningStage, AddOpeningError, ApplicationRationingPolicy, Opening,
     OpeningStage, StakePurpose, StakingPolicy,
 };
-use rstd::collections::btree_set::BTreeSet;
+use sp_std::collections::btree_set::BTreeSet;
 
 pub static HUMAN_READABLE_TEXT: &[u8] = b"HUMAN_READABLE_TEXT!!!!";
 

runtime-modules/hiring/src/test/public_api/begin_accepting_applications.rs

@@ -1,6 +1,6 @@
 use crate::mock::*;
 use crate::test::*;
-use rstd::collections::btree_set::BTreeSet;
+use sp_std::collections::btree_set::BTreeSet;
 
 #[test]
 fn begin_accepting_applications_fails_with_no_opening() {

runtime-modules/hiring/src/test/public_api/cancel_opening.rs

@@ -2,7 +2,7 @@ use crate::mock::*;
 use crate::test::*;
 
 use crate::test::public_api::*;
-use rstd::collections::btree_map::BTreeMap;
+use sp_std::collections::btree_map::BTreeMap;
 
 /*
 Not covered:

runtime-modules/hiring/src/test/public_api/ensure_can_add_application.rs

@@ -2,7 +2,7 @@ use crate::mock::*;
 use crate::test::*;
 
 use crate::hiring::*;
-use rstd::collections::btree_set::BTreeSet;
+use sp_std::collections::btree_set::BTreeSet;
 
 #[test]
 fn ensure_can_add_application_fails_with_no_opening() {

runtime-modules/hiring/src/test/public_api/fill_opening.rs

@@ -2,8 +2,8 @@ use crate::mock::*;
 use crate::test::*;
 
 use crate::test::public_api::*;
-use rstd::collections::btree_set::BTreeSet;
-use rstd::result::Result;
+use sp_std::collections::btree_set::BTreeSet;
+use sp_std::result::Result;
 
 /*
 Not covered:

runtime-modules/hiring/src/test/public_api/mod.rs

@@ -15,9 +15,9 @@ pub use add_opening::{AddOpeningFixture, HUMAN_READABLE_TEXT};
 pub use deactivate_application::DeactivateApplicationFixture;
 
 use crate::mock::Test;
-use rstd::cell::RefCell;
-use rstd::collections::btree_map::BTreeMap;
-use rstd::rc::Rc;
+use sp_std::cell::RefCell;
+use sp_std::collections::btree_map::BTreeMap;
+use sp_std::rc::Rc;
 
 fn default_mock_for_creating_stake() -> Rc<RefCell<crate::MockStakeHandler<Test>>> {
     let mut mock = crate::MockStakeHandler::<Test>::new();
@@ -25,7 +25,7 @@ fn default_mock_for_creating_stake() -> Rc<RefCell<crate::MockStakeHandler<Test>
     mock.expect_stake().times(1).returning(|_, _| Ok(()));
     mock.expect_create_stake().times(1).returning(|| 0);
 
-    Rc::new(rstd::cell::RefCell::new(mock))
+    Rc::new(sp_std::cell::RefCell::new(mock))
 }
 
 fn default_mock_for_unstaking() -> Rc<RefCell<crate::MockStakeHandler<Test>>> {

runtime-modules/hiring/src/test/smoke.rs

@@ -1,7 +1,7 @@
 use super::*;
 use crate::mock::*;
 
-use rstd::collections::btree_set::BTreeSet;
+use sp_std::collections::btree_set::BTreeSet;
 
 /**
 Main hiring workflow:

runtime-modules/hiring/src/test/staking_module/would_application_get_added.rs

@@ -108,7 +108,7 @@ fn would_application_get_added_with_too_low_stake_with_mocks() {
                     }),
                 });
 
-                Rc::new(rstd::cell::RefCell::new(mock))
+                Rc::new(sp_std::cell::RefCell::new(mock))
             };
 
             set_stake_handler_impl(mock.clone());

runtime-modules/membership/Cargo.toml

@@ -7,7 +7,7 @@ edition = '2018'
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
-rstd = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 system = { package = 'frame-system', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-arithmetic = { package = 'sp-arithmetic', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
@@ -27,7 +27,7 @@ std = [
 	'codec/std',
 	'frame-support/std',
 	'system/std',
-	'rstd/std',
+	'sp-std/std',
 	'sp-arithmetic/std',
 	'sp-runtime/std',
 	'timestamp/std',

runtime-modules/membership/src/lib.rs

@@ -12,11 +12,11 @@ mod tests;
 use codec::{Codec, Decode, Encode};
 use frame_support::traits::Currency;
 use frame_support::{decl_event, decl_module, decl_storage, ensure, Parameter};
-use rstd::borrow::ToOwned;
-use rstd::vec;
-use rstd::vec::Vec;
 use sp_arithmetic::traits::{BaseArithmetic, One};
 use sp_runtime::traits::{MaybeSerialize, Member};
+use sp_std::borrow::ToOwned;
+use sp_std::vec;
+use sp_std::vec::Vec;
 use system::{ensure_root, ensure_signed};
 
 use common::currency::{BalanceOf, GovernanceCurrency};

runtime-modules/memo/Cargo.toml

@@ -7,7 +7,7 @@ edition = '2018'
 [dependencies]
 codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
 sp-arithmetic = { package = 'sp-arithmetic', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
-rstd = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 system = { package = 'frame-system', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 common = { package = 'pallet-common', default-features = false, path = '../common'}
@@ -17,7 +17,7 @@ default = ['std']
 std = [
 	'codec/std',
 	'sp-arithmetic/std',
-	'rstd/std',
+	'sp-std/std',
 	'frame-support/std',
 	'system/std',
 	'common/std',

runtime-modules/memo/src/lib.rs

@@ -3,8 +3,8 @@
 
 use frame_support::traits::Currency;
 use frame_support::{decl_event, decl_module, decl_storage, ensure};
-use rstd::vec::Vec;
 use sp_arithmetic::traits::Zero;
+use sp_std::vec::Vec;
 use system::ensure_signed;
 
 use common::currency::GovernanceCurrency;

runtime-modules/proposals/codex/Cargo.toml

@@ -7,7 +7,7 @@ edition = '2018'
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
-rstd = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-arithmetic = { package = 'sp-arithmetic', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-runtime = { package = 'sp-runtime', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
@@ -40,7 +40,7 @@ default = ['std']
 std = [
     'serde',
     'codec/std',
-    'rstd/std',
+    'sp-std/std',
     'frame-support/std',
     'sp-arithmetic/std',
     'sp-runtime/std',

runtime-modules/proposals/codex/src/lib.rs

@@ -68,10 +68,10 @@ mod tests;
 use frame_support::dispatch::DispatchResult;
 use frame_support::traits::{Currency, Get};
 use frame_support::{decl_error, decl_module, decl_storage, ensure, print};
-use rstd::clone::Clone;
-use rstd::str::from_utf8;
-use rstd::vec::Vec;
 use sp_arithmetic::traits::Zero;
+use sp_std::clone::Clone;
+use sp_std::str::from_utf8;
+use sp_std::vec::Vec;
 use system::ensure_root;
 
 use common::origin::ActorOriginValidator;

runtime-modules/proposals/codex/src/proposal_types/mod.rs

@@ -3,9 +3,9 @@
 pub(crate) mod parameters;
 
 use codec::{Decode, Encode};
-use rstd::vec::Vec;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
+use sp_std::vec::Vec;
 
 use crate::ElectionParameters;
 use common::working_group::WorkingGroup;

runtime-modules/proposals/discussion/Cargo.toml

@@ -7,7 +7,7 @@ edition = '2018'
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
-rstd = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 system = { package = 'frame-system', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 membership = { package = 'pallet-membership', default-features = false, path = '../../membership'}
@@ -25,7 +25,7 @@ default = ['std']
 std = [
 	'serde',
 	'codec/std',
-	'rstd/std',
+	'sp-std/std',
 	'frame-support/std',
 	'system/std',
     'membership/std',

runtime-modules/proposals/discussion/src/lib.rs

@@ -51,8 +51,8 @@ mod types;
 use frame_support::dispatch::{DispatchError, DispatchResult};
 use frame_support::traits::Get;
 use frame_support::{decl_error, decl_event, decl_module, decl_storage, ensure, Parameter};
-use rstd::clone::Clone;
-use rstd::vec::Vec;
+use sp_std::clone::Clone;
+use sp_std::vec::Vec;
 
 use common::origin::ActorOriginValidator;
 use types::{DiscussionPost, DiscussionThread, ThreadCounter};

runtime-modules/proposals/discussion/src/types.rs

@@ -1,9 +1,9 @@
 #![warn(missing_docs)]
 
 use codec::{Decode, Encode};
-use rstd::vec::Vec;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
+use sp_std::vec::Vec;
 
 /// Represents a discussion thread
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]

runtime-modules/proposals/engine/Cargo.toml

@@ -7,7 +7,7 @@ edition = '2018'
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
-rstd = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 system = { package = 'frame-system', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 timestamp = { package = 'pallet-timestamp', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
@@ -28,7 +28,7 @@ default = ['std']
 std = [
 	'serde',
 	'codec/std',
-	'rstd/std',
+	'sp-std/std',
 	'frame-support/std',
 	'system/std',
 	'timestamp/std',

runtime-modules/proposals/engine/src/lib.rs

@@ -134,8 +134,8 @@ use frame_support::traits::{Currency, Get};
 use frame_support::{
     decl_error, decl_event, decl_module, decl_storage, ensure, print, Parameter, StorageDoubleMap,
 };
-use rstd::vec::Vec;
 use sp_arithmetic::traits::Zero;
+use sp_std::vec::Vec;
 use system::{ensure_root, RawOrigin};
 
 use common::origin::ActorOriginValidator;

runtime-modules/proposals/engine/src/tests/mock/proposals.rs

@@ -1,7 +1,7 @@
 //! Contains executable proposal extrinsic mocks
 
 use frame_support::decl_module;
-use rstd::vec::Vec;
+use sp_std::vec::Vec;
 pub trait Trait: system::Trait {}
 
 decl_module! {

runtime-modules/proposals/engine/src/tests/mock/stakes.rs

@@ -1,6 +1,6 @@
 #![cfg(test)]
 
-use rstd::marker::PhantomData;
+use sp_std::marker::PhantomData;
 use std::cell::RefCell;
 use std::panic;
 use std::rc::Rc;

runtime-modules/proposals/engine/src/tests/mod.rs

@@ -7,7 +7,7 @@ use codec::Encode;
 use frame_support::dispatch::DispatchResult;
 use frame_support::traits::{Currency, OnFinalize, OnInitialize};
 use frame_support::{StorageDoubleMap, StorageMap, StorageValue};
-use rstd::rc::Rc;
+use sp_std::rc::Rc;
 use system::RawOrigin;
 use system::{EventRecord, Phase};
 

runtime-modules/proposals/engine/src/types/mod.rs

@@ -6,13 +6,13 @@
 use codec::{Decode, Encode};
 use frame_support::dispatch::DispatchResult;
 use frame_support::traits::Currency;
-use rstd::boxed::Box;
-use rstd::cmp::PartialOrd;
-use rstd::ops::Add;
-use rstd::vec::Vec;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sp_runtime::Perbill;
+use sp_std::boxed::Box;
+use sp_std::cmp::PartialOrd;
+use sp_std::ops::Add;
+use sp_std::vec::Vec;
 
 mod proposal_statuses;
 mod stakes;

runtime-modules/proposals/engine/src/types/proposal_statuses.rs

@@ -1,9 +1,9 @@
 #![warn(missing_docs)]
 
 use codec::{Decode, Encode};
-use rstd::vec::Vec;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
+use sp_std::vec::Vec;
 
 use crate::ActiveStake;
 

runtime-modules/proposals/engine/src/types/stakes.rs

@@ -3,9 +3,9 @@
 use super::{BalanceOf, CurrencyOf, NegativeImbalance};
 use crate::Trait;
 use frame_support::traits::{Currency, ExistenceRequirement, WithdrawReasons};
-use rstd::convert::From;
-use rstd::marker::PhantomData;
-use rstd::rc::Rc;
+use sp_std::convert::From;
+use sp_std::marker::PhantomData;
+use sp_std::rc::Rc;
 
 // Mocking dependencies for testing
 #[cfg(test)]

runtime-modules/service-discovery/Cargo.toml

@@ -7,7 +7,7 @@ edition = '2018'
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
-rstd = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 system = { package = 'frame-system', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-runtime = { package = 'sp-runtime', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
@@ -30,7 +30,7 @@ default = ['std']
 std = [
 	'serde',
 	'codec/std',
-	'rstd/std',
+	'sp-std/std',
 	'frame-support/std',
 	'system/std',
 	'sp-runtime/std',

runtime-modules/service-discovery/src/lib.rs

@@ -27,7 +27,7 @@ use codec::{Decode, Encode};
 use serde::{Deserialize, Serialize};
 
 use frame_support::{decl_event, decl_module, decl_storage, ensure};
-use rstd::vec::Vec;
+use sp_std::vec::Vec;
 use system::ensure_root;
 /*
   Although there is support for ed25519 keys as the IPNS identity key and we could potentially

runtime-modules/stake/Cargo.toml

@@ -6,7 +6,7 @@ edition = '2018'
 
 [dependencies]
 codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
-rstd = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 system = { package = 'frame-system', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-arithmetic = { package = 'sp-arithmetic', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
@@ -22,7 +22,7 @@ balances = { package = 'pallet-balances', default-features = false, git = 'https
 default = ['std']
 std = [
 	'codec/std',
-	'rstd/std',
+	'sp-std/std',
 	'frame-support/std',
 	'system/std',
 	'sp-arithmetic/std',

runtime-modules/stake/src/lib.rs

@@ -5,11 +5,11 @@ use codec::{Codec, Decode, Encode};
 use frame_support::storage::IterableStorageMap;
 use frame_support::traits::{Currency, ExistenceRequirement, Get, Imbalance, WithdrawReasons};
 use frame_support::{decl_module, decl_storage, ensure, Parameter};
-use rstd::collections::btree_map::BTreeMap;
-use rstd::prelude::*;
 use sp_arithmetic::traits::{BaseArithmetic, One, Zero};
 use sp_runtime::traits::{AccountIdConversion, MaybeSerialize, Member};
 use sp_runtime::ModuleId;
+use sp_std::collections::btree_map::BTreeMap;
+use sp_std::prelude::*;
 
 mod errors;
 pub use errors::*;

runtime-modules/storage/Cargo.toml

@@ -7,7 +7,7 @@ edition = '2018'
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
-rstd = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 system = { package = 'frame-system', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-arithmetic = { package = 'sp-arithmetic', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
@@ -31,7 +31,7 @@ default = ['std']
 std = [
 	'serde',
 	'codec/std',
-	'rstd/std',
+	'sp-std/std',
 	'frame-support/std',
 	'system/std',
 	'sp-arithmetic/std',

runtime-modules/storage/src/data_directory.rs

@@ -25,9 +25,9 @@ use codec::{Decode, Encode};
 use frame_support::dispatch::DispatchResult;
 use frame_support::traits::Get;
 use frame_support::{decl_error, decl_event, decl_module, decl_storage, ensure, Parameter};
-use rstd::collections::btree_map::BTreeMap;
-use rstd::vec::Vec;
 use sp_runtime::traits::{MaybeSerialize, Member};
+use sp_std::collections::btree_map::BTreeMap;
+use sp_std::vec::Vec;
 use system::ensure_root;
 
 use common::origin::ActorOriginValidator;

runtime-modules/storage/src/data_object_storage_registry.rs

@@ -25,9 +25,9 @@
 use codec::{Codec, Decode, Encode};
 use frame_support::dispatch::DispatchResult;
 use frame_support::{decl_error, decl_event, decl_module, decl_storage, ensure, Parameter};
-use rstd::vec::Vec;
 use sp_arithmetic::traits::BaseArithmetic;
 use sp_runtime::traits::{MaybeSerialize, Member};
+use sp_std::vec::Vec;
 
 use crate::data_directory::{self, ContentIdExists};
 use crate::{StorageProviderId, StorageWorkingGroup, StorageWorkingGroupInstance};

runtime-modules/storage/src/data_object_type_registry.rs

@@ -26,9 +26,9 @@ use codec::{Codec, Decode, Encode};
 use frame_support::dispatch::DispatchError;
 use frame_support::weights::Weight;
 use frame_support::{decl_error, decl_event, decl_module, decl_storage, Parameter};
-use rstd::vec::Vec;
 use sp_arithmetic::traits::BaseArithmetic;
 use sp_runtime::traits::{MaybeSerialize, Member};
+use sp_std::vec::Vec;
 
 use crate::{StorageWorkingGroup, StorageWorkingGroupInstance};
 

runtime-modules/storage/src/tests/data_directory.rs

@@ -1,7 +1,7 @@
 #![cfg(test)]
 
 use frame_support::dispatch::DispatchError;
-use rstd::collections::btree_map::BTreeMap;
+use sp_std::collections::btree_map::BTreeMap;
 use system::RawOrigin;
 
 use super::mock::*;

runtime-modules/versioned-store-permissions/Cargo.toml

@@ -6,7 +6,7 @@ edition = '2018'
 
 [dependencies]
 codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
-rstd = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 system = { package = 'frame-system', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-arithmetic = { package = 'sp-arithmetic', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
@@ -22,7 +22,7 @@ timestamp = { package = 'pallet-timestamp', default-features = false, git = 'htt
 default = ['std']
 std = [
 	'codec/std',
-	'rstd/std',
+	'sp-std/std',
 	'frame-support/std',
 	'system/std',
 	'sp-arithmetic/std',

runtime-modules/versioned-store-permissions/src/constraint.rs

@@ -1,5 +1,5 @@
 use codec::{Decode, Encode};
-use rstd::collections::btree_set::BTreeSet;
+use sp_std::collections::btree_set::BTreeSet;
 
 /// Reference to a specific property of a specific class.
 #[derive(Encode, Decode, Eq, PartialEq, Ord, PartialOrd, Clone, Debug)]

runtime-modules/versioned-store-permissions/src/credentials.rs

@@ -1,6 +1,6 @@
 use codec::{Decode, Encode};
-use rstd::collections::btree_set::BTreeSet;
-use rstd::vec::Vec;
+use sp_std::collections::btree_set::BTreeSet;
+use sp_std::vec::Vec;
 
 #[derive(Encode, Decode, Eq, PartialEq, Clone, Debug)]
 pub struct CredentialSet<Credential>(BTreeSet<Credential>);

runtime-modules/versioned-store-permissions/src/lib.rs

@@ -3,10 +3,10 @@
 
 use codec::Codec;
 use frame_support::{decl_module, decl_storage, ensure, Parameter};
-use rstd::collections::btree_map::BTreeMap;
-use rstd::vec::Vec;
 use sp_arithmetic::traits::BaseArithmetic;
 use sp_runtime::traits::{MaybeSerialize, Member};
+use sp_std::collections::btree_map::BTreeMap;
+use sp_std::vec::Vec;
 
 //TODO: Convert errors to the Substrate decl_error! macro.
 /// Result with string error message. This exists for backward compatibility purpose.

runtime-modules/versioned-store-permissions/src/operations.rs

@@ -1,7 +1,7 @@
 use codec::{Decode, Encode};
-use rstd::collections::btree_map::BTreeMap;
-use rstd::vec;
-use rstd::vec::Vec;
+use sp_std::collections::btree_map::BTreeMap;
+use sp_std::vec;
+use sp_std::vec::Vec;
 use versioned_store::{ClassId, ClassPropertyValue, EntityId, PropertyValue};
 
 #[derive(Encode, Decode, Eq, PartialEq, Clone, Debug)]

runtime-modules/versioned-store-permissions/src/tests.rs

@@ -2,7 +2,7 @@
 
 use super::*;
 use crate::mock::*;
-use rstd::collections::btree_set::BTreeSet;
+use sp_std::collections::btree_set::BTreeSet;
 use versioned_store::PropertyType;
 
 use frame_support::{assert_err, assert_ok};

runtime-modules/versioned-store/Cargo.toml

@@ -7,7 +7,7 @@ edition = '2018'
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
-rstd = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 system = { package = 'frame-system', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 
@@ -23,7 +23,7 @@ default = ['std']
 std = [
 	'serde',
 	'codec/std',
-	'rstd/std',
+	'sp-std/std',
 	'frame-support/std',
 	'system/std',
 ]

runtime-modules/versioned-store/src/lib.rs

@@ -16,9 +16,9 @@ use serde::{Deserialize, Serialize};
 
 use codec::{Decode, Encode};
 use frame_support::{decl_event, decl_module, decl_storage, ensure};
-use rstd::collections::btree_set::BTreeSet;
-use rstd::vec;
-use rstd::vec::Vec;
+use sp_std::collections::btree_set::BTreeSet;
+use sp_std::vec;
+use sp_std::vec::Vec;
 
 mod example;
 mod mock;
@@ -350,7 +350,7 @@ impl<T: Trait> Module<T> {
 
         // TODO Use BTreeSet for prop unique names when switched to Substrate 2.
         // There is no support for BTreeSet in Substrate 1 runtime.
-        // use rstd::collections::btree_set::BTreeSet;
+        // use sp_std::collections::btree_set::BTreeSet;
         let mut unique_prop_names = BTreeSet::new();
         for prop in class.properties.iter() {
             unique_prop_names.insert(prop.name.clone());

runtime-modules/working-group/Cargo.toml

@@ -7,7 +7,7 @@ edition = '2018'
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
-rstd = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 frame-support = { package = 'frame-support', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 system = { package = 'frame-system', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-arithmetic = { package = 'sp-arithmetic', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
@@ -30,7 +30,7 @@ default = ['std']
 std = [
 	'serde',
 	'codec/std',
-	'rstd/std',
+	'sp-std/std',
 	'frame-support/std',
 	'system/std',
 	'sp-arithmetic/std',

runtime-modules/working-group/src/errors.rs

@@ -329,7 +329,7 @@ macro_rules! ensure_on_wrapped_error {
 }
 
 impl<T: Trait<I>, I: Instance>
-    rstd::convert::From<WrappedError<hiring::BeginAcceptingApplicationsError>> for Error<T, I>
+    sp_std::convert::From<WrappedError<hiring::BeginAcceptingApplicationsError>> for Error<T, I>
 {
     fn from(wrapper: WrappedError<hiring::BeginAcceptingApplicationsError>) -> Self {
         match wrapper.error {
@@ -343,7 +343,7 @@ impl<T: Trait<I>, I: Instance>
     }
 }
 
-impl<T: Trait<I>, I: Instance> rstd::convert::From<WrappedError<hiring::AddOpeningError>>
+impl<T: Trait<I>, I: Instance> sp_std::convert::From<WrappedError<hiring::AddOpeningError>>
     for Error<T, I>
 {
     fn from(wrapper: WrappedError<hiring::AddOpeningError>) -> Self {
@@ -372,7 +372,7 @@ impl<T: Trait<I>, I: Instance> rstd::convert::From<WrappedError<hiring::AddOpeni
     }
 }
 
-impl<T: Trait<I>, I: Instance> rstd::convert::From<WrappedError<hiring::BeginReviewError>>
+impl<T: Trait<I>, I: Instance> sp_std::convert::From<WrappedError<hiring::BeginReviewError>>
     for Error<T, I>
 {
     fn from(wrapper: WrappedError<hiring::BeginReviewError>) -> Self {
@@ -387,7 +387,7 @@ impl<T: Trait<I>, I: Instance> rstd::convert::From<WrappedError<hiring::BeginRev
     }
 }
 
-impl<T: Trait<I>, I: Instance> rstd::convert::From<WrappedError<hiring::FillOpeningError<T>>>
+impl<T: Trait<I>, I: Instance> sp_std::convert::From<WrappedError<hiring::FillOpeningError<T>>>
     for Error<T, I>
 {
     fn from(wrapper: WrappedError<hiring::FillOpeningError<T>>) -> Self {
@@ -453,8 +453,8 @@ impl<T: Trait<I>, I: Instance> rstd::convert::From<WrappedError<hiring::FillOpen
     }
 }
 
-impl<T: Trait<I>, I: Instance> rstd::convert::From<WrappedError<hiring::DeactivateApplicationError>>
-    for Error<T, I>
+impl<T: Trait<I>, I: Instance>
+    sp_std::convert::From<WrappedError<hiring::DeactivateApplicationError>> for Error<T, I>
 {
     fn from(wrapper: WrappedError<hiring::DeactivateApplicationError>) -> Self {
         match wrapper.error {
@@ -477,7 +477,7 @@ impl<T: Trait<I>, I: Instance> rstd::convert::From<WrappedError<hiring::Deactiva
     }
 }
 
-impl<T: Trait<I>, I: Instance> rstd::convert::From<WrappedError<hiring::AddApplicationError>>
+impl<T: Trait<I>, I: Instance> sp_std::convert::From<WrappedError<hiring::AddApplicationError>>
     for Error<T, I>
 {
     fn from(wrapper: WrappedError<hiring::AddApplicationError>) -> Self {
@@ -505,7 +505,7 @@ impl<T: Trait<I>, I: Instance> rstd::convert::From<WrappedError<hiring::AddAppli
 }
 
 impl<T: Trait<I>, I: Instance>
-    rstd::convert::From<WrappedError<membership::MemberControllerAccountDidNotSign>>
+    sp_std::convert::From<WrappedError<membership::MemberControllerAccountDidNotSign>>
     for Error<T, I>
 {
     fn from(wrapper: WrappedError<membership::MemberControllerAccountDidNotSign>) -> Self {
@@ -523,7 +523,7 @@ impl<T: Trait<I>, I: Instance>
     }
 }
 
-impl<T: Trait<I>, I: Instance> rstd::convert::From<WrappedError<recurringrewards::RewardsError>>
+impl<T: Trait<I>, I: Instance> sp_std::convert::From<WrappedError<recurringrewards::RewardsError>>
     for Error<T, I>
 {
     fn from(wrapper: WrappedError<recurringrewards::RewardsError>) -> Self {
@@ -545,7 +545,7 @@ impl<T: Trait<I>, I: Instance> rstd::convert::From<WrappedError<recurringrewards
 }
 
 impl<T: Trait<I>, I: Instance>
-    rstd::convert::From<WrappedError<stake::StakeActionError<stake::InitiateUnstakingError>>>
+    sp_std::convert::From<WrappedError<stake::StakeActionError<stake::InitiateUnstakingError>>>
     for Error<T, I>
 {
     fn from(wrapper: WrappedError<stake::StakeActionError<stake::InitiateUnstakingError>>) -> Self {
@@ -574,7 +574,7 @@ impl<T: Trait<I>, I: Instance>
 }
 
 impl<T: Trait<I>, I: Instance>
-    rstd::convert::From<
+    sp_std::convert::From<
         WrappedError<stake::StakeActionError<stake::IncreasingStakeFromAccountError>>,
     > for Error<T, I>
 {
@@ -606,7 +606,7 @@ impl<T: Trait<I>, I: Instance>
 }
 
 impl<T: Trait<I>, I: Instance>
-    rstd::convert::From<WrappedError<stake::StakeActionError<stake::IncreasingStakeError>>>
+    sp_std::convert::From<WrappedError<stake::StakeActionError<stake::IncreasingStakeError>>>
     for Error<T, I>
 {
     fn from(wrapper: WrappedError<stake::StakeActionError<stake::IncreasingStakeError>>) -> Self {
@@ -628,7 +628,7 @@ impl<T: Trait<I>, I: Instance>
 }
 
 impl<T: Trait<I>, I: Instance>
-    rstd::convert::From<WrappedError<stake::StakeActionError<stake::DecreasingStakeError>>>
+    sp_std::convert::From<WrappedError<stake::StakeActionError<stake::DecreasingStakeError>>>
     for Error<T, I>
 {
     fn from(wrapper: WrappedError<stake::StakeActionError<stake::DecreasingStakeError>>) -> Self {
@@ -656,7 +656,7 @@ impl<T: Trait<I>, I: Instance>
 }
 
 impl<T: Trait<I>, I: Instance>
-    rstd::convert::From<WrappedError<stake::StakeActionError<stake::ImmediateSlashingError>>>
+    sp_std::convert::From<WrappedError<stake::StakeActionError<stake::ImmediateSlashingError>>>
     for Error<T, I>
 {
     fn from(wrapper: WrappedError<stake::StakeActionError<stake::ImmediateSlashingError>>) -> Self {
@@ -672,7 +672,7 @@ impl<T: Trait<I>, I: Instance>
     }
 }
 
-impl<T: Trait<I>, I: Instance> rstd::convert::From<WrappedError<minting::GeneralError>>
+impl<T: Trait<I>, I: Instance> sp_std::convert::From<WrappedError<minting::GeneralError>>
     for Error<T, I>
 {
     fn from(wrapper: WrappedError<minting::GeneralError>) -> Self {

runtime-modules/working-group/src/lib.rs

@@ -56,10 +56,10 @@ use frame_support::dispatch::{DispatchError, DispatchResult};
 use frame_support::storage::IterableStorageMap;
 use frame_support::traits::{Currency, ExistenceRequirement, Get, Imbalance, WithdrawReasons};
 use frame_support::{decl_event, decl_module, decl_storage, ensure, print, StorageValue};
-use rstd::collections::{btree_map::BTreeMap, btree_set::BTreeSet};
-use rstd::vec;
-use rstd::vec::Vec;
 use sp_arithmetic::traits::{Bounded, One, Zero};
+use sp_std::collections::{btree_map::BTreeMap, btree_set::BTreeSet};
+use sp_std::vec;
+use sp_std::vec::Vec;
 use system::{ensure_root, ensure_signed};
 
 use crate::types::ExitInitiationOrigin;
@@ -327,7 +327,7 @@ decl_storage! {
             map hasher(blake2_128_concat) HiringApplicationId<T> =>  MemberId<T>;
     }
         add_extra_genesis {
-        config(phantom): rstd::marker::PhantomData<I>;
+        config(phantom): sp_std::marker::PhantomData<I>;
         config(storage_working_group_mint_capacity): minting::BalanceOf<T>;
         config(opening_human_readable_text_constraint): InputValidationLengthConstraint;
         config(worker_application_human_readable_text_constraint): InputValidationLengthConstraint;

runtime-modules/working-group/src/types.rs

@@ -1,7 +1,7 @@
 #![warn(missing_docs)]
 
 use codec::{Decode, Encode};
-use rstd::collections::btree_set::BTreeSet;
+use sp_std::collections::btree_set::BTreeSet;
 
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};

runtime/Cargo.toml

@@ -12,7 +12,7 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = 'parity-scale-codec', version = '1.3.1', default-features = false, features = ['derive'] }
 
 # Substrate primitives
-rstd = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
+sp-std = { package = 'sp-std', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-arithmetic = { package = 'sp-arithmetic', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-runtime = { package = 'sp-runtime', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
 sp-offchain = { package = 'sp-offchain', default-features = false, git = 'https://github.com/paritytech/substrate.git', rev = '00768a1f21a579c478fe5d4f51e1fa71f7db9fd4'}
@@ -87,7 +87,7 @@ std = [
     'codec/std',
 
     # Substrate primitives
-    'rstd/std',
+    'sp-std/std',
     'sp-core/std',
     'sp-api/std',
     'sp-version/std',

runtime/src/integration/proposals/council_origin_validator.rs

@@ -1,6 +1,6 @@
 #![warn(missing_docs)]
 
-use rstd::marker::PhantomData;
+use sp_std::marker::PhantomData;
 
 use common::origin::ActorOriginValidator;
 use proposals_engine::VotersParameters;

runtime/src/integration/proposals/membership_origin_validator.rs

@@ -1,6 +1,6 @@
 #![warn(missing_docs)]
 
-use rstd::marker::PhantomData;
+use sp_std::marker::PhantomData;
 
 use common::origin::ActorOriginValidator;
 use system::ensure_signed;

runtime/src/integration/proposals/proposal_encoder.rs

@@ -5,9 +5,9 @@ use working_group::OpeningType;
 
 use codec::Encode;
 use frame_support::print;
-use rstd::collections::btree_set::BTreeSet;
-use rstd::marker::PhantomData;
-use rstd::vec::Vec;
+use sp_std::collections::btree_set::BTreeSet;
+use sp_std::marker::PhantomData;
+use sp_std::vec::Vec;
 
 // The macro binds working group outer-level Call with the provided inner-level working group
 // extrinsic call. Outer-call is defined by the provided WorkingGroup param expression.

runtime/src/integration/proposals/staking_events_handler.rs

@@ -2,7 +2,7 @@
 
 use frame_support::traits::{Currency, Imbalance};
 use frame_support::StorageMap;
-use rstd::marker::PhantomData;
+use sp_std::marker::PhantomData;
 
 // Balance alias
 type BalanceOf<T> =

runtime/src/integration/storage.rs

@@ -1,5 +1,5 @@
 use frame_support::traits::Randomness;
-use rstd::vec::Vec;
+use sp_std::vec::Vec;
 
 use crate::{ActorId, Runtime};
 

runtime/src/integration/working_group.rs

@@ -1,5 +1,5 @@
 use frame_support::StorageMap;
-use rstd::marker::PhantomData;
+use sp_std::marker::PhantomData;
 
 use crate::StorageWorkingGroupInstance;
 use stake::{BalanceOf, NegativeImbalance};

runtime/src/lib.rs

@@ -30,8 +30,6 @@ use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
 use pallet_session::historical as pallet_session_historical;
 use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment};
 use pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
-use rstd::boxed::Box;
-use rstd::vec::Vec;
 use sp_api::impl_runtime_apis;
 use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
 use sp_core::crypto::KeyTypeId;
@@ -45,6 +43,8 @@ use sp_runtime::{
     create_runtime_str, generic, impl_opaque_keys, ApplyExtrinsicResult, FixedPointNumber,
     MultiSignature, Perbill, Perquintill,
 };
+use sp_std::boxed::Box;
+use sp_std::vec::Vec;
 #[cfg(feature = "std")]
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;

runtime/src/tests/proposals_integration/working_group_proposals.rs

@@ -8,7 +8,7 @@ use proposals_codex::AddOpeningParameters;
 use working_group::{OpeningPolicyCommitment, RewardPolicy};
 
 use crate::{Balance, BlockNumber, StorageWorkingGroupInstance};
-use rstd::collections::btree_set::BTreeSet;
+use sp_std::collections::btree_set::BTreeSet;
 
 type StorageWorkingGroup = working_group::Module<Runtime, StorageWorkingGroupInstance>;