Migrate srml crates to the 2018 edition (#1755)

substrate/srml/democracy/Cargo.toml

@@ -2,32 +2,35 @@
 name = "srml-democracy"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
 
 [dependencies]
 hex-literal = "0.1.0"
 serde = { version = "1.0", default-features = false }
+serde_derive = { version = "1.0", optional = true }
 safe-mix = { version = "1.0", default-features = false}
 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 }
-sr-std = { path = "../../core/sr-std", default-features = false }
-sr-io = { path = "../../core/sr-io", default-features = false }
-sr-primitives = { path = "../../core/sr-primitives", default-features = false }
+rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
+runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false }
 srml-support = { path = "../support", default-features = false }
-srml-balances = { path = "../balances", default-features = false }
-srml-system = { path = "../system", default-features = false }
+system = { package = "srml-system", path = "../system", default-features = false }
+
+[dev-dependencies]
+substrate-primitives = { path = "../../core/primitives", default-features = false }
+balances = { package = "srml-balances", path = "../balances", default-features = false }
 
 [features]
 default = ["std"]
 std = [
 	"serde/std",
+	"serde_derive",
 	"safe-mix/std",
 	"parity-codec/std",
-	"substrate-primitives/std",
-	"sr-std/std",
-	"sr-io/std",
+	"rstd/std",
+	"runtime_io/std",
 	"srml-support/std",
-	"sr-primitives/std",
-	"srml-balances/std",
-	"srml-system/std",
+	"primitives/std",
+	"system/std",
 ]

substrate/srml/democracy/src/lib.rs

@@ -18,26 +18,12 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[cfg(test)]
-extern crate substrate_primitives;
-#[cfg(test)]
-extern crate srml_balances as balances;
-
-#[macro_use]
-extern crate parity_codec_derive;
-extern crate sr_std as rstd;
-#[macro_use]
-extern crate srml_support;
-
-extern crate parity_codec as codec;
-extern crate sr_io as runtime_io;
-extern crate sr_primitives as primitives;
-extern crate srml_system as system;
-
 use rstd::prelude::*;
 use rstd::result;
 use primitives::traits::{Zero, As};
+use parity_codec_derive::{Encode, Decode};
 use srml_support::{StorageValue, StorageMap, Parameter, Dispatchable, IsSubType};
+use srml_support::{decl_module, decl_storage, decl_event, ensure};
 use srml_support::traits::{Currency, OnFreeBalanceZero, EnsureAccountLiquid};
 use srml_support::dispatch::Result;
 use system::ensure_signed;
@@ -440,6 +426,7 @@ impl<T: Trait> EnsureAccountLiquid<T::AccountId> for Module<T> {
 mod tests {
 	use super::*;
 	use runtime_io::with_externalities;
+	use srml_support::{impl_outer_origin, impl_outer_dispatch, assert_noop, assert_ok};
 	use substrate_primitives::{H256, Blake2Hasher};
 	use primitives::BuildStorage;
 	use primitives::traits::{BlakeTwo256, IdentityLookup};

substrate/srml/democracy/src/vote_threshold.rs

@@ -16,6 +16,9 @@
 
 //! Voting thresholds.
 
+#[cfg(feature = "std")]
+use serde_derive::{Serialize, Deserialize};
+use parity_codec_derive::{Encode, Decode};
 use primitives::traits::{Zero, IntegerSquareRoot};
 use rstd::ops::{Add, Mul, Div, Rem};