update ethabi-derive, serde, serde_json, serde_derive, syn && quote (#9553)

2018-09-13 21:37:28 +02:00
parent 7a367698fe
commit 0c3b70f2fb
5 changed files with 37 additions and 60 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -478,13 +478,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "ethabi-derive"
-version = "6.0.1"
+version = "6.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "ethabi 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "heck 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -527,7 +528,7 @@ dependencies = [
 "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethabi 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethabi-contract 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethabi-derive 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-derive 6.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethash 1.12.0",
 "ethcore-bloom-journal 0.1.0",
 "ethcore-io 1.12.0",
@@ -752,7 +753,7 @@ dependencies = [
 "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethabi 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethabi-contract 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethabi-derive 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-derive 6.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore 1.12.0",
 "ethcore-io 1.12.0",
 "ethcore-logger 1.12.0",
@@ -790,7 +791,7 @@ dependencies = [
 "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethabi 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethabi-contract 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethabi-derive 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-derive 6.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore 1.12.0",
 "ethcore-logger 1.12.0",
 "ethcore-sync 1.12.0",
@@ -1868,7 +1869,7 @@ version = "1.12.0"
 dependencies = [
 "ethabi 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethabi-contract 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethabi-derive 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-derive 6.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore 1.12.0",
 "ethcore-io 1.12.0",
 "ethcore-network 1.12.0",
@@ -2102,7 +2103,7 @@ version = "1.12.0"
 dependencies = [
 "ethabi 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethabi-contract 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethabi-derive 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-derive 6.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethereum-types 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "fake-fetch 0.0.1",
 "fetch 0.1.0",
@@ -2318,7 +2319,7 @@ version = "1.12.0"
 dependencies = [
 "ethabi 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethabi-contract 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethabi-derive 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-derive 6.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore 1.12.0",
 "ethcore-sync 1.12.0",
 "ethereum-types 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2567,14 +2568,6 @@ dependencies = [
 "smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "proc-macro2"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "0.4.19"
@@ -2627,14 +2620,6 @@ name = "quick-error"
 version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"

-[[package]]
-name = "quote"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "quote"
 version = "0.6.8"
@@ -2760,7 +2745,7 @@ version = "0.0.1"
 dependencies = [
 "ethabi 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethabi-contract 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethabi-derive 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ethabi-derive 6.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
 "keccak-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2818,9 +2803,10 @@ dependencies = [
 name = "rlp_derive"
 version = "0.1.0"
 dependencies = [
- "quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "rlp 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -3091,16 +3077,6 @@ name = "strsim"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"

-[[package]]
-name = "syn"
-version = "0.13.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "syn"
 version = "0.15.4"
@@ -3932,7 +3908,7 @@ dependencies = [
 "checksum eth-secp256k1 0.5.7 (git+https://github.com/paritytech/rust-secp256k1)" = "<none>"
 "checksum ethabi 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "36c7bf66bd7ff02c3bc512a276a0f95300e3abb87060704fddf588ae11b86d99"
 "checksum ethabi-contract 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "795e25fd868e12a59ca235dbe1f6cc8f1eba8f67d6a39438b29535e0126e0c27"
-"checksum ethabi-derive 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6853ea4d3aa9ee8cda9252c7e3f3080e6af58796e9ae3d8cfd90d3f03f6c0fb9"
+"checksum ethabi-derive 6.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "66a587250c8190be9d6ae28d67b8957ed97cb9eee2e272173a20593ab054a075"
 "checksum ethbloom 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a93a43ce2e9f09071449da36bfa7a1b20b950ee344b6904ff23de493b03b386"
 "checksum ethereum-types 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "35b3c5a18bc5e73a32a110ac743ec04b02bbbcd3b71d3118d40a6113d509378a"
 "checksum ethereum-types-serialize 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ac59a21a9ce98e188f3dace9eb67a6c4a3c67ec7fbc7218cb827852679dc002"
@@ -4054,13 +4030,11 @@ dependencies = [
 "checksum primal-check 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8e65f96c0a171f887198c274392c99a116ef65aa7f53f3b6d4902f493965c2d1"
 "checksum primal-estimate 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "56ea4531dde757b56906493c8604641da14607bf9cdaa80fb9c9cabd2429f8d5"
 "checksum primal-sieve 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "da2d6ed369bb4b0273aeeb43f07c105c0117717cbae827b20719438eb2eb798c"
-"checksum proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7"
 "checksum proc-macro2 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)" = "ffe022fb8c8bd254524b0b3305906c1921fa37a84a644e29079a9e62200c3901"
 "checksum protobuf 1.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "52fbc45bf6709565e44ef31847eb7407b3c3c80af811ee884a04da071dcca12b"
 "checksum pulldown-cmark 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8361e81576d2e02643b04950e487ec172b687180da65c731c03cf336784e6c07"
 "checksum pwasm-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "90d2b3c5bf24275fc77db6b14ec00a7a085d8ff9d1c4215fb6f6263e8d7b01bc"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
-"checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
 "checksum quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dd636425967c33af890042c483632d33fa7a18f19ad1d7ea72e8998c6ef8dea5"
 "checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1"
 "checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
@@ -4114,7 +4088,6 @@ dependencies = [
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694"
 "checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
-"checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
 "checksum syn 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9056ebe7f2d6a38bc63171816fd1d3430da5a43896de21676dc5c0a4b8274a11"
 "checksum take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b157868d8ac1f56b64604539990685fa7611d8fa9e5476cf0c02cf34d32917c5"
 "checksum target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe"
--- a/util/rlp_derive/Cargo.toml
+++ b/util/rlp_derive/Cargo.toml
@@ -8,8 +8,9 @@ name = "rlp_derive"
 proc-macro = true

 [dependencies]
-syn = "0.13"
-quote = "0.5"
+syn = "0.15"
+quote = "0.6"
+proc-macro2 = "0.4"

 [dev-dependencies]
 rlp = "0.2.4"
--- a/util/rlp_derive/src/de.rs
+++ b/util/rlp_derive/src/de.rs
@@ -14,11 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

-use {syn, quote};
+use syn;
+use proc_macro2::{TokenStream, Span};

 struct ParseQuotes {
-	single: quote::Tokens,
-	list: quote::Tokens,
+	single: TokenStream,
+	list: TokenStream,
 	takes_index: bool,
 }

@@ -38,7 +39,7 @@ fn decodable_wrapper_parse_quotes() -> ParseQuotes {
 	}
 }

-pub fn impl_decodable(ast: &syn::DeriveInput) -> quote::Tokens {
+pub fn impl_decodable(ast: &syn::DeriveInput) -> TokenStream {
 	let body = match ast.data {
 		syn::Data::Struct(ref s) => s,
 		_ => panic!("#[derive(RlpDecodable)] is only defined for structs."),
@@ -47,7 +48,7 @@ pub fn impl_decodable(ast: &syn::DeriveInput) -> quote::Tokens {
 	let stmts: Vec<_> = body.fields.iter().enumerate().map(decodable_field_map).collect();
 	let name = &ast.ident;

-	let dummy_const: syn::Ident = format!("_IMPL_RLP_DECODABLE_FOR_{}", name).into();
+	let dummy_const = syn::Ident::new(&format!("_IMPL_RLP_DECODABLE_FOR_{}", name), Span::call_site());
 	let impl_block = quote! {
 		impl rlp::Decodable for #name {
 			fn decode(rlp: &rlp::Rlp) -> Result<Self, rlp::DecoderError> {
@@ -69,7 +70,7 @@ pub fn impl_decodable(ast: &syn::DeriveInput) -> quote::Tokens {
 	}
 }

-pub fn impl_decodable_wrapper(ast: &syn::DeriveInput) -> quote::Tokens {
+pub fn impl_decodable_wrapper(ast: &syn::DeriveInput) -> TokenStream {
 	let body = match ast.data {
 		syn::Data::Struct(ref s) => s,
 		_ => panic!("#[derive(RlpDecodableWrapper)] is only defined for structs."),
@@ -87,7 +88,7 @@ pub fn impl_decodable_wrapper(ast: &syn::DeriveInput) -> quote::Tokens {

 	let name = &ast.ident;

-	let dummy_const: syn::Ident = format!("_IMPL_RLP_DECODABLE_FOR_{}", name).into();
+	let dummy_const = syn::Ident::new(&format!("_IMPL_RLP_DECODABLE_FOR_{}", name), Span::call_site());
 	let impl_block = quote! {
 		impl rlp::Decodable for #name {
 			fn decode(rlp: &rlp::Rlp) -> Result<Self, rlp::DecoderError> {
@@ -109,11 +110,11 @@ pub fn impl_decodable_wrapper(ast: &syn::DeriveInput) -> quote::Tokens {
 	}
 }

-fn decodable_field_map(tuple: (usize, &syn::Field)) -> quote::Tokens {
+fn decodable_field_map(tuple: (usize, &syn::Field)) -> TokenStream {
 	decodable_field(tuple.0, tuple.1, decodable_parse_quotes())
 }

-fn decodable_field(index: usize, field: &syn::Field, quotes: ParseQuotes) -> quote::Tokens {
+fn decodable_field(index: usize, field: &syn::Field, quotes: ParseQuotes) -> TokenStream {
 	let id = match field.ident {
 		Some(ref ident) => quote! { #ident },
 		None => {
--- a/util/rlp_derive/src/en.rs
+++ b/util/rlp_derive/src/en.rs
@@ -14,9 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

-use {syn, quote};
+use syn;
+use proc_macro2::{TokenStream, Span};

-pub fn impl_encodable(ast: &syn::DeriveInput) -> quote::Tokens {
+pub fn impl_encodable(ast: &syn::DeriveInput) -> TokenStream {
 	let body = match ast.data {
 		syn::Data::Struct(ref s) => s,
 		_ => panic!("#[derive(RlpEncodable)] is only defined for structs."),
@@ -27,7 +28,7 @@ pub fn impl_encodable(ast: &syn::DeriveInput) -> quote::Tokens {

 	let stmts_len = stmts.len();
 	let stmts_len = quote! { #stmts_len };
-	let dummy_const: syn::Ident = format!("_IMPL_RLP_ENCODABLE_FOR_{}", name).into();
+	let dummy_const = syn::Ident::new(&format!("_IMPL_RLP_ENCODABLE_FOR_{}", name), Span::call_site());
 	let impl_block = quote! {
 		impl rlp::Encodable for #name {
 			fn rlp_append(&self, stream: &mut rlp::RlpStream) {
@@ -46,7 +47,7 @@ pub fn impl_encodable(ast: &syn::DeriveInput) -> quote::Tokens {
 	}
 }

-pub fn impl_encodable_wrapper(ast: &syn::DeriveInput) -> quote::Tokens {
+pub fn impl_encodable_wrapper(ast: &syn::DeriveInput) -> TokenStream {
 	let body = match ast.data {
 		syn::Data::Struct(ref s) => s,
 		_ => panic!("#[derive(RlpEncodableWrapper)] is only defined for structs."),
@@ -64,7 +65,7 @@ pub fn impl_encodable_wrapper(ast: &syn::DeriveInput) -> quote::Tokens {

 	let name = &ast.ident;

-	let dummy_const: syn::Ident = format!("_IMPL_RLP_ENCODABLE_FOR_{}", name).into();
+	let dummy_const = syn::Ident::new(&format!("_IMPL_RLP_ENCODABLE_FOR_{}", name), Span::call_site());
 	let impl_block = quote! {
 		impl rlp::Encodable for #name {
 			fn rlp_append(&self, stream: &mut rlp::RlpStream) {
@@ -82,11 +83,11 @@ pub fn impl_encodable_wrapper(ast: &syn::DeriveInput) -> quote::Tokens {
 	}
 }

-fn encodable_field_map(tuple: (usize, &syn::Field)) -> quote::Tokens {
+fn encodable_field_map(tuple: (usize, &syn::Field)) -> TokenStream {
 	encodable_field(tuple.0, tuple.1)
 }

-fn encodable_field(index: usize, field: &syn::Field) -> quote::Tokens {
+fn encodable_field(index: usize, field: &syn::Field) -> TokenStream {
 	let ident = match field.ident {
 		Some(ref ident) => quote! { #ident },
 		None => {
--- a/util/rlp_derive/src/lib.rs
+++ b/util/rlp_derive/src/lib.rs
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 extern crate proc_macro;
+extern crate proc_macro2;
 extern crate syn;
 #[macro_use]
 extern crate quote;