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

substrate/srml/support/procedural/Cargo.toml

@@ -2,6 +2,7 @@
 name = "srml-support-procedural"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
 
 [lib]
 proc-macro = true

substrate/srml/support/procedural/src/lib.rs

@@ -21,16 +21,6 @@
 #![recursion_limit="256"]
 
 extern crate proc_macro;
-extern crate proc_macro2;
-
-#[macro_use]
-extern crate syn;
-
-#[macro_use]
-extern crate quote;
-
-#[macro_use]
-extern crate srml_support_procedural_tools;
 
 mod storage;
 

substrate/srml/support/procedural/src/storage/mod.rs

@@ -19,8 +19,9 @@
 // end::description[]
 
 use srml_support_procedural_tools::syn_ext as ext;
+use srml_support_procedural_tools::{ToTokens, Parse, custom_keyword, custom_keyword_impl};
 
-use syn::Ident;
+use syn::{Ident, Token};
 use syn::token::CustomKeyword;
 
 pub mod transformation;

substrate/srml/support/procedural/src/storage/transformation.rs

@@ -31,8 +31,10 @@ use syn::{
 	parse::{
 		Error,
 		Result,
-	}
+	},
+	parse_macro_input,
 };
+use quote::quote;
 
 use super::*;
 

substrate/srml/support/procedural/tools/Cargo.toml

@@ -2,6 +2,7 @@
 name = "srml-support-procedural-tools"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
 
 [dependencies]
 srml-support-procedural-tools-derive = { path = "./derive" }

substrate/srml/support/procedural/tools/derive/Cargo.toml

@@ -2,6 +2,7 @@
 name = "srml-support-procedural-tools-derive"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
 
 [lib]
 proc-macro = true

substrate/srml/support/procedural/tools/derive/src/lib.rs

@@ -18,21 +18,14 @@
 //! Use to derive parsing for parsing struct.
 // end::description[]
 
-
 #![recursion_limit = "128"]
 
-#[macro_use]
-extern crate syn;
-
-#[macro_use]
-extern crate quote;
-
 extern crate proc_macro;
-extern crate proc_macro2;
 
 use proc_macro::TokenStream;
 use proc_macro2::Span;
-
+use syn::parse_macro_input;
+use quote::quote;
 
 pub(crate) fn fields_idents(
 	fields: impl Iterator<Item = syn::Field>,

substrate/srml/support/procedural/tools/src/lib.rs

@@ -18,17 +18,11 @@
 //! Proc macro helpers for procedural macros
 // end::description[]
 
-extern crate syn;
-#[macro_use]
-extern crate quote;
-extern crate proc_macro2;
-
 extern crate proc_macro;
 
-#[macro_use] extern crate srml_support_procedural_tools_derive;
-
 // reexport proc macros
 pub use srml_support_procedural_tools_derive::*;
+pub use quote;
 
 pub mod syn_ext;
 
@@ -68,10 +62,10 @@ fn generate_hidden_includes_mod_name(unique_id: &str) -> Ident {
 /// Generates the access to the `subtrate_client` crate.
 pub fn generate_crate_access(unique_id: &str, def_crate: &str) -> TokenStream {
 	if ::std::env::var("CARGO_PKG_NAME").unwrap() == def_crate {
-		quote!( crate )
+		quote::quote!( crate )
 	} else {
 		let mod_name = generate_hidden_includes_mod_name(unique_id);
-		quote!( self::#mod_name::hidden_include )
+		quote::quote!( self::#mod_name::hidden_include )
 	}.into()
 }
 
@@ -82,7 +76,7 @@ pub fn generate_hidden_includes(unique_id: &str, def_crate: &str, crate_id: &str
 		TokenStream::new()
 	} else {
 		let mod_name = generate_hidden_includes_mod_name(unique_id);
-		quote!(
+		quote::quote!(
 			#[doc(hidden)]
 			mod #mod_name {
 				pub extern crate #crate_id as hidden_include;

substrate/srml/support/procedural/tools/src/syn_ext.rs

@@ -25,9 +25,10 @@ use syn::parse::{
 };
 use syn::token::CustomKeyword;
 use proc_macro2::TokenStream as T2;
-use quote::ToTokens;
+use quote::{ToTokens, quote};
 use std::iter::once;
 use syn::Ident;
+use srml_support_procedural_tools_derive::{ToTokens, Parse};
 
 /// stop parsing here getting remaining token as content
 /// Warn duplicate stream (part of)

substrate/srml/support/src/lib.rs

@@ -74,7 +74,7 @@ macro_rules! fail {
 macro_rules! ensure {
 	( $x:expr, $y:expr ) => {{
 		if !$x {
-			fail!($y);
+			$crate::fail!($y);
 		}
 	}}
 }
@@ -84,7 +84,7 @@ macro_rules! ensure {
 macro_rules! assert_noop {
 	( $x:expr , $y:expr ) => {
 		let h = runtime_io::storage_root();
-		assert_err!($x, $y);
+		$crate::assert_err!($x, $y);
 		assert_eq!(h, runtime_io::storage_root());
 	}
 }