Merge pull request #702 from kas-gui/push-yznwpomzrlrw

Update impl-tools-lib; use proc-macro-error3

Author: dhardy

Cargo.toml

@@ -176,7 +176,3 @@ resolver = "2"
 [patch.crates-io.kas-text]
 git = "https://github.com/kas-gui/kas-text.git"
 rev = "efe15a6040edde83b64cb668c64da63b164abfd7"
-
-[patch.crates-io.impl-tools-lib]
-git = "https://github.com/kas-gui/impl-tools.git"
-rev = "e0b80cf7f2b868b1ace4ec06601a5ed4cf098686"

crates/kas-macros/Cargo.toml

@@ -21,7 +21,7 @@ proc-macro = true
 log = []
 
 # Enable reporting of warnings from proc-macros
-nightly = ["proc-macro-error2/nightly"]
+nightly = ["proc-macro-error3/nightly"]
 
 # Enable pedantic warnings. These should be replaced with individual lints,
 # depending on the outcome of RFC 1566 (proc macro diagnostics).
@@ -30,11 +30,9 @@ nightly-pedantic = ["nightly"]
 [dependencies]
 quote = "1.0"
 proc-macro2 = { version = "1.0" }
-proc-macro-error2 = { version = "2.0", default-features = false }
+proc-macro-error3 = { version = "3.0", default-features = false }
 bitflags = "2.3.3"
-
-[dependencies.impl-tools-lib]
-version = "0.11.2" # version used in doc links
+impl-tools-lib = "0.12.0"
 
 [dependencies.syn]
 version = "2.0.22"

crates/kas-macros/src/lib.rs

@@ -11,7 +11,7 @@ extern crate proc_macro;
 
 use impl_tools_lib::{anon, autoimpl, scope};
 use proc_macro::TokenStream;
-use proc_macro_error2::{emit_call_site_error, emit_error, proc_macro_error};
+use proc_macro_error3::{emit_call_site_error, emit_error, proc_macro_error};
 use syn::parse_macro_input;
 use syn::spanned::Spanned;
 

crates/kas-macros/src/make_layout.rs

@@ -7,7 +7,7 @@ use crate::collection::{CellInfo, GridDimensions, NameGenerator};
 use crate::parser::{Parser, parse_grid, parse_list};
 use crate::widget_args::{Child, ChildIdent};
 use impl_tools_lib::scope::Scope;
-use proc_macro_error2::emit_error;
+use proc_macro_error3::emit_error;
 use proc_macro2::{Span, TokenStream as Toks};
 use quote::{ToTokens, TokenStreamExt, quote};
 use syn::parse::{Parse, ParseStream, Result};

crates/kas-macros/src/visitors.rs

@@ -3,7 +3,7 @@
 // You may obtain a copy of the License in the LICENSE-APACHE file or at:
 //     https://www.apache.org/licenses/LICENSE-2.0
 
-use proc_macro_error2::emit_error;
+use proc_macro_error3::emit_error;
 use proc_macro2::{Span, TokenStream};
 use syn::parse::{Parse, ParseStream};
 use syn::spanned::Spanned;

crates/kas-macros/src/widget.rs

@@ -6,7 +6,7 @@
 use crate::widget_args::{Child, ChildIdent, member};
 use impl_tools_lib::fields::{Fields, FieldsNamed, FieldsUnnamed};
 use impl_tools_lib::scope::{Scope, ScopeItem};
-use proc_macro_error2::{emit_error, emit_warning};
+use proc_macro_error3::{emit_error, emit_warning};
 use proc_macro2::{Span, TokenStream as Toks};
 use quote::{ToTokens, TokenStreamExt, quote, quote_spanned};
 use syn::ImplItem::{self, Verbatim};

crates/kas-macros/src/widget_derive.rs

@@ -8,7 +8,7 @@ use crate::widget_args::member;
 use impl_tools_lib::SimplePath;
 use impl_tools_lib::fields::{Fields, FieldsNamed, FieldsUnnamed};
 use impl_tools_lib::scope::{Scope, ScopeAttr, ScopeItem};
-use proc_macro_error2::{emit_error, emit_warning};
+use proc_macro_error3::{emit_error, emit_warning};
 use proc_macro2::Span;
 use quote::{ToTokens, quote};
 use syn::ImplItem::{self, Verbatim};