Migrate sr-primitives, sr-sandbox, sr-std and sr-version to the 2018 edition (#1694)

substrate/core/sr-primitives/src/generic/block.rs

@@ -19,10 +19,14 @@
 #[cfg(feature = "std")]
 use std::fmt;
 
+#[cfg(feature = "std")]
+use serde_derive::Serialize;
+
 use rstd::prelude::*;
-use codec::Codec;
-use traits::{self, Member, Block as BlockT, Header as HeaderT, MaybeSerialize};
-use ::Justification;
+use parity_codec_derive::{Encode, Decode};
+use crate::codec::Codec;
+use crate::traits::{self, Member, Block as BlockT, Header as HeaderT, MaybeSerialize};
+use crate::Justification;
 
 /// Something to identify a block.
 #[derive(PartialEq, Eq, Clone)]

substrate/core/sr-primitives/src/generic/checked_extrinsic.rs

@@ -17,7 +17,7 @@
 //! Generic implementation of an extrinsic that has passed the verification
 //! stage.
 
-use traits::{self, Member, SimpleArithmetic, MaybeDisplay};
+use crate::traits::{self, Member, SimpleArithmetic, MaybeDisplay};
 
 /// Definition of something that the external world might want to say; its
 /// existence implies that it has been checked and is good, particularly with

substrate/core/sr-primitives/src/generic/digest.rs

@@ -16,10 +16,14 @@
 
 //! Generic implementation of a digest.
 
-use rstd::prelude::*;
+#[cfg(feature = "std")]
+use serde_derive::Serialize;
 
-use codec::{Decode, Encode, Codec, Input};
-use traits::{self, Member, DigestItem as DigestItemT, MaybeHash};
+use rstd::prelude::*;
+use parity_codec_derive::{Encode, Decode};
+
+use crate::codec::{Decode, Encode, Codec, Input};
+use crate::traits::{self, Member, DigestItem as DigestItemT, MaybeHash};
 
 use substrate_primitives::hash::H512 as Signature;
 

substrate/core/sr-primitives/src/generic/era.rs

@@ -16,7 +16,10 @@
 
 //! Generic implementation of an unchecked (pre-verification) extrinsic.
 
-use codec::{Decode, Encode, Input, Output};
+#[cfg(feature = "std")]
+use serde_derive::{Serialize, Deserialize};
+
+use crate::codec::{Decode, Encode, Input, Output};
 
 pub type Period = u64;
 pub type Phase = u64;

substrate/core/sr-primitives/src/generic/header.rs

@@ -16,10 +16,12 @@
 
 //! Generic implementation of a block header.
 
-use codec::{Decode, Encode, Codec, Input, Output, HasCompact, EncodeAsRef};
-use traits::{self, Member, SimpleArithmetic, SimpleBitOps, MaybeDisplay,
+#[cfg(feature = "std")]
+use serde_derive::Serialize;
+use crate::codec::{Decode, Encode, Codec, Input, Output, HasCompact, EncodeAsRef};
+use crate::traits::{self, Member, SimpleArithmetic, SimpleBitOps, MaybeDisplay,
 	Hash as HashT, DigestItem as DigestItemT, MaybeSerializeDebug, MaybeSerializeDebugButNotDeserialize};
-use generic::Digest;
+use crate::generic::Digest;
 
 /// Abstraction over a block header for a substrate chain.
 #[derive(PartialEq, Eq, Clone)]

substrate/core/sr-primitives/src/generic/mod.rs

@@ -38,7 +38,7 @@ pub use self::header::Header;
 pub use self::block::{Block, SignedBlock, BlockId};
 pub use self::digest::{Digest, DigestItem, DigestItemRef};
 
-use codec::Encode;
+use crate::codec::Encode;
 use rstd::prelude::*;
 
 fn encode_with_vec_prefix<T: Encode, F: Fn(&mut Vec<u8>)>(encoder: F) -> Vec<u8> {

substrate/core/sr-primitives/src/generic/tests.rs

@@ -16,7 +16,7 @@
 
 //! Tests for the generic implementations of Extrinsic/Header/Block.
 
-use codec::{Decode, Encode};
+use crate::codec::{Decode, Encode};
 use substrate_primitives::H256;
 use super::DigestItem;
 
@@ -54,4 +54,4 @@ fn non_system_digest_item_encoding() {
 
 	let decoded: DigestItem<H256, u32> = Decode::decode(&mut &encoded[..]).unwrap();
 	assert_eq!(item, decoded);
-}
+}

substrate/core/sr-primitives/src/generic/unchecked_extrinsic.rs

@@ -20,8 +20,9 @@
 use std::fmt;
 
 use rstd::prelude::*;
-use codec::{Decode, Encode, Codec, Input, HasCompact};
-use traits::{self, Member, SimpleArithmetic, MaybeDisplay, Lookup, Extrinsic};
+use parity_codec_derive::{Encode, Decode};
+use crate::codec::{Decode, Encode, Codec, Input, HasCompact};
+use crate::traits::{self, Member, SimpleArithmetic, MaybeDisplay, Lookup, Extrinsic};
 use super::CheckedExtrinsic;
 
 #[derive(PartialEq, Eq, Clone, Encode, Decode)]
@@ -92,7 +93,7 @@ where
 			Some(SignatureContent{signed, signature, index}) => {
 				let payload = (index, self.function);
 				let signed = context.lookup(signed)?;
-				if !::verify_encoded_lazy(&signature, &payload, &signed) {
+				if !crate::verify_encoded_lazy(&signature, &payload, &signed) {
 					return Err("bad signature in extrinsic")
 				}
 				CheckedExtrinsic {
@@ -172,7 +173,7 @@ where
 
 #[cfg(test)]
 mod test {
-	use codec::{Decode, Encode};
+	use crate::codec::{Decode, Encode};
 	use super::UncheckedExtrinsic;
 
 	#[test]

substrate/core/sr-primitives/src/generic/unchecked_mortal_compact_extrinsic.rs

@@ -21,8 +21,8 @@ use std::fmt;
 
 use rstd::prelude::*;
 use runtime_io::blake2_256;
-use codec::{Decode, Encode, Input, Compact};
-use traits::{self, Member, SimpleArithmetic, MaybeDisplay, CurrentHeight, BlockNumberToHash, Lookup,
+use crate::codec::{Decode, Encode, Input, Compact};
+use crate::traits::{self, Member, SimpleArithmetic, MaybeDisplay, CurrentHeight, BlockNumberToHash, Lookup,
 	Checkable, Extrinsic};
 use super::{CheckedExtrinsic, Era};
 
@@ -190,6 +190,8 @@ impl<Address, Index, Call, Signature> fmt::Debug for UncheckedMortalCompactExtri
 mod tests {
 	use super::*;
 	use runtime_io::blake2_256;
+	use parity_codec_derive::{Encode, Decode};
+	use serde_derive::{Serialize, Deserialize};
 
 	struct TestContext;
 	impl Lookup for TestContext {

substrate/core/sr-primitives/src/generic/unchecked_mortal_extrinsic.rs

@@ -21,8 +21,8 @@ use std::fmt;
 
 use rstd::prelude::*;
 use runtime_io::blake2_256;
-use codec::{Decode, Encode, Input};
-use traits::{self, Member, SimpleArithmetic, MaybeDisplay, CurrentHeight, BlockNumberToHash, Lookup,
+use crate::codec::{Decode, Encode, Input};
+use crate::traits::{self, Member, SimpleArithmetic, MaybeDisplay, CurrentHeight, BlockNumberToHash, Lookup,
 	Checkable, Extrinsic};
 use super::{CheckedExtrinsic, Era};
 
@@ -189,6 +189,8 @@ impl<Address, Index, Call, Signature> fmt::Debug for UncheckedMortalExtrinsic<Ad
 mod tests {
 	use super::*;
 	use runtime_io::blake2_256;
+	use parity_codec_derive::{Encode, Decode};
+	use serde_derive::{Serialize, Deserialize};
 
 	struct TestContext;
 	impl Lookup for TestContext {