From a06b19fc0e2d6cfff423d43f1f5303fe7ac76d0a Mon Sep 17 00:00:00 2001 From: Pavlo Khrystenko Date: Wed, 11 Sep 2024 14:11:16 +0200 Subject: [PATCH] update proc_macro_error to proc_macro_error2 closes #1757 --- Cargo.lock | 20 +++++++++----------- Cargo.toml | 2 +- macro/Cargo.toml | 2 +- macro/src/lib.rs | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9f496e668a..56902d35cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3604,27 +3604,25 @@ dependencies = [ ] [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "proc-macro-error-attr2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" dependencies = [ - "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", - "version_check", ] [[package]] -name = "proc-macro-error-attr" -version = "1.0.4" +name = "proc-macro-error2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" dependencies = [ + "proc-macro-error-attr2", "proc-macro2", "quote", - "version_check", + "syn 2.0.60", ] [[package]] @@ -5757,7 +5755,7 @@ version = "0.37.0" dependencies = [ "darling 0.20.10", "parity-scale-codec", - "proc-macro-error", + "proc-macro-error2", "quote", "sc-executor", "sc-executor-common", diff --git a/Cargo.toml b/Cargo.toml index 76427563d1..9803a00183 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,7 +89,7 @@ indoc = "2" jsonrpsee = { version = "0.24.3" } pretty_assertions = "1.4.0" primitive-types = { version = "0.12.2", default-features = false } -proc-macro-error = "1.0.4" +proc-macro-error2 = "2.0.0" proc-macro2 = "1.0.86" quote = "1.0.37" regex = { version = "1.10.6", default-features = false } diff --git a/macro/Cargo.toml b/macro/Cargo.toml index a9fb46df28..8fd218fa5c 100644 --- a/macro/Cargo.toml +++ b/macro/Cargo.toml @@ -23,7 +23,7 @@ proc-macro = true [dependencies] codec = { package = "parity-scale-codec", workspace = true } darling = { workspace = true } -proc-macro-error = { workspace = true } +proc-macro-error2 = { workspace = true } syn = { workspace = true } quote = { workspace = true } subxt-codegen = { workspace = true, features = ["fetch-metadata"] } diff --git a/macro/src/lib.rs b/macro/src/lib.rs index 777f616afb..fd224b268e 100644 --- a/macro/src/lib.rs +++ b/macro/src/lib.rs @@ -9,7 +9,7 @@ use codec::Decode; use darling::{ast::NestedMeta, FromMeta}; use proc_macro::TokenStream; -use proc_macro_error::{abort_call_site, proc_macro_error}; +use proc_macro_error2::{abort_call_site, proc_macro_error}; use quote::ToTokens; use scale_typegen::typegen::{ settings::substitutes::path_segments,