Migrate smrl-treasury and srml-upgrade-key to the 2018 edition (#1725)

substrate/srml/consensus/Cargo.toml

@@ -7,6 +7,7 @@ edition = "2018"
 [dependencies]
 hex-literal = "0.1.0"
 serde = { version = "1.0", default-features = false }
+serde_derive = { version = "1.0", optional = true }
 parity-codec = { version = "3.0", default-features = false }
 parity-codec-derive = { version = "3.0", default-features = false }
 substrate-primitives = { path = "../../core/primitives", default-features = false }
@@ -23,6 +24,7 @@ runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features =
 default = ["std"]
 std = [
 	"serde/std",
+	"serde_derive",
 	"parity-codec/std",
 	"substrate-primitives/std",
 	"rstd/std",

substrate/srml/consensus/src/lib.rs

@@ -18,16 +18,15 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[macro_use]
-extern crate srml_support as runtime_support;
-
+#[cfg(feature = "std")]
+use serde_derive::Serialize;
 use rstd::prelude::*;
 use parity_codec as codec;
 use codec::Encode;
 use parity_codec_derive::{Encode, Decode};
-use runtime_support::{storage, Parameter};
-use runtime_support::storage::StorageValue;
-use runtime_support::storage::unhashed::StorageVec;
+use srml_support::{storage, Parameter, decl_storage, decl_module};
+use srml_support::storage::StorageValue;
+use srml_support::storage::unhashed::StorageVec;
 use primitives::traits::{MaybeSerializeDebug, Member};
 use substrate_primitives::storage::well_known_keys;
 use system::{ensure_signed, ensure_inherent};

substrate/srml/consensus/src/mock.rs

@@ -19,6 +19,7 @@
 #![cfg(test)]
 
 use primitives::{BuildStorage, traits::IdentityLookup, testing::{Digest, DigestItem, Header, UintAuthorityId}};
+use srml_support::impl_outer_origin;
 use runtime_io;
 use substrate_primitives::{H256, Blake2Hasher};
 use crate::{GenesisConfig, Trait, Module};