From b6b415dbfe74710f2b79a4bf0c2c7f6022c8b605 Mon Sep 17 00:00:00 2001 From: tison Date: Mon, 27 Jan 2025 22:24:40 +0800 Subject: [PATCH] refactor: use maintained proc-macro-error2 Signed-off-by: tison --- Cargo.lock | 32 +------------------------------- Cargo.toml | 2 +- src/lib.rs | 6 ++---- 3 files changed, 4 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3685b26..3597a41 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -268,7 +268,7 @@ dependencies = [ "log", "logforth", "pollster", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "syn 2.0.90", @@ -393,30 +393,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro-error-attr2" version = "2.0.0" @@ -710,12 +686,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/Cargo.toml b/Cargo.toml index 8f76eea..cbfe854 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ license = "MIT" proc-macro = true [dependencies] -proc-macro-error = { version = "1" } +proc-macro-error2 = { version = "2" } proc-macro2 = { version = "1" } quote = { version = "1" } syn = { version = "2", features = [ diff --git a/src/lib.rs b/src/lib.rs index b35b979..453c4d4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,11 +4,9 @@ // into a normal fn which returns `Box`, and this stops the macro from distinguishing `async fn` from `fn`. // The following code reused the `async_trait` probes from [tokio-tracing](https://github.com/tokio-rs/tracing/blob/6a61897a5e834988ad9ac709e28c93c4dbf29116/tracing-attributes/src/expand.rs). -extern crate proc_macro; -#[macro_use] -extern crate proc_macro_error; - use proc_macro2::Span; +use proc_macro_error2::abort_call_site; +use proc_macro_error2::proc_macro_error; use syn::parse::Parse; use syn::parse::ParseStream; use syn::spanned::Spanned;