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

substrate/srml/aura/src/lib.rs

@@ -18,13 +18,11 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[macro_use]
-extern crate srml_support as runtime_support;
-
 pub use timestamp;
 
 use rstd::{result, prelude::*};
-use runtime_support::storage::StorageValue;
+use srml_support::storage::StorageValue;
+use srml_support::{decl_storage, decl_module};
 use primitives::traits::{As, Zero};
 use timestamp::OnTimestampSet;
 #[cfg(feature = "std")]

substrate/srml/aura/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::{Trait, Module};