diff --git a/macros/Cargo.toml b/macros/Cargo.toml index 691cebefd..d26cb523e 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -14,7 +14,7 @@ proc-macro = true [dependencies] mime = "0.3" proc-macro2 = "1.0" -proc-macro-error = "1.0" +proc-macro-error2 = "2.0.1" quote = "1.0" syn = { version = "1.0", features = ["full"] } heck = { version = "0.4", optional = true } diff --git a/macros/src/actix.rs b/macros/src/actix.rs index 5048adeba..b26d678d3 100644 --- a/macros/src/actix.rs +++ b/macros/src/actix.rs @@ -5,7 +5,6 @@ use heck::*; use http::StatusCode; use lazy_static::lazy_static; use proc_macro::TokenStream; -use proc_macro_error::ResultExt; use quote::{quote, ToTokens}; use strum_macros::EnumString; use syn::{ @@ -769,7 +768,9 @@ fn field_extract_f32(nv: MetaNameValue) -> Option { }, Lit::Float(f) => Ok(quote! { #f }), Lit::Int(i) => { - let f: f32 = i.base10_parse().unwrap_or_abort(); + let f: f32 = i + .base10_parse() + .unwrap_or_else(|e| abort!(i.span(), "{}", e)); Ok(quote! { #f }) } _ => { diff --git a/macros/src/lib.rs b/macros/src/lib.rs index 306709403..851e6c1e8 100644 --- a/macros/src/lib.rs +++ b/macros/src/lib.rs @@ -7,7 +7,7 @@ extern crate proc_macro; #[macro_use] -extern crate proc_macro_error; +extern crate proc_macro_error2; #[cfg(feature = "actix")] #[macro_use]