Migrate everything to the 2018 edition (#1758)

substrate/core/test-runtime/Cargo.toml

@@ -20,7 +20,7 @@ rstd = { package = "sr-std", path = "../sr-std", default-features = false }
 runtime_io = { package = "sr-io", path = "../sr-io", default-features = false }
 runtime_primitives = { package = "sr-primitives", path = "../sr-primitives", default-features = false }
 runtime_version = { package = "sr-version", path = "../sr-version", default-features = false }
-srml-support = { path = "../../srml/support", default-features = false }
+runtime_support = { package = "srml-support", path = "../../srml/support", default-features = false }
 cfg-if = "0.1.6"
 
 [dev-dependencies]
@@ -38,7 +38,7 @@ std = [
 	"parity-codec/std",
 	"rstd/std",
 	"runtime_io/std",
-	"srml-support/std",
+	"runtime_support/std",
 	"primitives/std",
 	"inherents/std",
 	"runtime_primitives/std",

substrate/core/test-runtime/src/lib.rs

@@ -18,9 +18,6 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[macro_use]
-extern crate srml_support as runtime_support;
-
 #[cfg(feature = "std")] pub mod genesismap;
 pub mod system;
 

substrate/core/test-runtime/src/system.rs

@@ -20,6 +20,7 @@
 use rstd::prelude::*;
 use runtime_io::{storage_root, enumerated_trie_root, storage_changes_root, twox_128};
 use runtime_support::storage::{self, StorageValue, StorageMap};
+use runtime_support::storage_items;
 use runtime_primitives::traits::{Hash as HashT, BlakeTwo256, Digest as DigestT};
 use runtime_primitives::generic;
 use runtime_primitives::{ApplyError, ApplyOutcome, ApplyResult, transaction_validity::TransactionValidity};