diff --git a/plugin/Cargo.toml b/plugin/Cargo.toml index 6a09c9c0c..4cebf0882 100644 --- a/plugin/Cargo.toml +++ b/plugin/Cargo.toml @@ -22,7 +22,7 @@ lazy_static = "1" bitflags = "2" byteorder = "1" quote = "1" -proc-macro-error = "1" +proc-macro-error2 = "2.0" [dependencies.syn] version = "1" diff --git a/plugin/src/arch/aarch64/compiler.rs b/plugin/src/arch/aarch64/compiler.rs index e04e6536d..91f0d47e5 100644 --- a/plugin/src/arch/aarch64/compiler.rs +++ b/plugin/src/arch/aarch64/compiler.rs @@ -10,7 +10,7 @@ use crate::parse_helpers::{as_ident, as_number, as_float, as_signed_number}; use syn::spanned::Spanned; use quote::{quote, quote_spanned}; use proc_macro2::TokenStream; -use proc_macro_error::emit_error; +use proc_macro_error2::emit_error; pub(super) fn compile_instruction(ctx: &mut Context, data: MatchData) -> Result<(), Option> { let mut cursor = 0usize; diff --git a/plugin/src/arch/aarch64/matching.rs b/plugin/src/arch/aarch64/matching.rs index 429c43b96..ad4d88e04 100644 --- a/plugin/src/arch/aarch64/matching.rs +++ b/plugin/src/arch/aarch64/matching.rs @@ -1,4 +1,4 @@ -use proc_macro_error::emit_error; +use proc_macro_error2::emit_error; use proc_macro2::Span; use super::Context; diff --git a/plugin/src/arch/aarch64/mod.rs b/plugin/src/arch/aarch64/mod.rs index 2a5ae9027..fb955443f 100644 --- a/plugin/src/arch/aarch64/mod.rs +++ b/plugin/src/arch/aarch64/mod.rs @@ -1,5 +1,5 @@ use syn::parse; -use proc_macro_error::emit_error; +use proc_macro_error2::emit_error; mod ast; mod parser; diff --git a/plugin/src/arch/mod.rs b/plugin/src/arch/mod.rs index 0e6511622..a1fa2f8b8 100644 --- a/plugin/src/arch/mod.rs +++ b/plugin/src/arch/mod.rs @@ -1,5 +1,5 @@ use syn::parse; -use proc_macro_error::emit_error; +use proc_macro_error2::emit_error; use crate::common::{Size, Stmt, Jump}; use crate::State; diff --git a/plugin/src/arch/x64/compiler.rs b/plugin/src/arch/x64/compiler.rs index 4fa7b9934..77d202f95 100644 --- a/plugin/src/arch/x64/compiler.rs +++ b/plugin/src/arch/x64/compiler.rs @@ -1,7 +1,7 @@ use syn::spanned::Spanned; use proc_macro2::{Span, TokenTree, Literal}; use quote::{quote_spanned}; -use proc_macro_error::emit_error; +use proc_macro_error2::emit_error; use crate::common::{Stmt, Size, Jump, JumpKind, delimited}; use crate::serialize; diff --git a/plugin/src/arch/x64/mod.rs b/plugin/src/arch/x64/mod.rs index bd908af2c..c7233cf9b 100644 --- a/plugin/src/arch/x64/mod.rs +++ b/plugin/src/arch/x64/mod.rs @@ -1,5 +1,5 @@ use syn::parse; -use proc_macro_error::emit_error; +use proc_macro_error2::emit_error; mod ast; mod compiler; diff --git a/plugin/src/arch/x64/parser.rs b/plugin/src/arch/x64/parser.rs index c3e3e4311..436a5afd9 100644 --- a/plugin/src/arch/x64/parser.rs +++ b/plugin/src/arch/x64/parser.rs @@ -1,7 +1,7 @@ use syn::{parse, Token}; use syn::spanned::Spanned; use proc_macro2::Span; -use proc_macro_error::emit_error; +use proc_macro_error2::emit_error; use lazy_static::lazy_static; diff --git a/plugin/src/directive.rs b/plugin/src/directive.rs index 6562c6f9e..e0a6c06f7 100644 --- a/plugin/src/directive.rs +++ b/plugin/src/directive.rs @@ -2,8 +2,8 @@ use std::collections::hash_map::Entry; use syn::parse; use syn::Token; -use proc_macro_error::emit_error; use proc_macro2::{TokenTree, Literal}; +use proc_macro_error2::emit_error; use crate::common::{Stmt, Size, delimited}; use crate::arch; diff --git a/plugin/src/lib.rs b/plugin/src/lib.rs index 00ac3bd71..b0bc3fab2 100644 --- a/plugin/src/lib.rs +++ b/plugin/src/lib.rs @@ -15,7 +15,7 @@ use syn::parse; use syn::{Token, parse_macro_input}; use proc_macro2::{TokenTree, TokenStream}; use quote::quote; -use proc_macro_error::proc_macro_error; +use proc_macro_error2::proc_macro_error; use std::collections::HashMap;