From 92bf787da5c71706c56bb1f0c53331058dc2e793 Mon Sep 17 00:00:00 2001
From: Diggory Hardy <git@dhardy.name>
Date: Wed, 10 Jun 2026 12:44:04 +0000
Subject: [PATCH] Update impl-tools-lib; use proc-macro-error3

---
 Cargo.toml                             | 4 ----
 crates/kas-macros/Cargo.toml           | 8 +++-----
 crates/kas-macros/src/lib.rs           | 2 +-
 crates/kas-macros/src/make_layout.rs   | 2 +-
 crates/kas-macros/src/visitors.rs      | 2 +-
 crates/kas-macros/src/widget.rs        | 2 +-
 crates/kas-macros/src/widget_derive.rs | 2 +-
 7 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f50fcecb2..92080d26f 100644
--- a/Cargo.toml
+++ b/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"
diff --git a/crates/kas-macros/Cargo.toml b/crates/kas-macros/Cargo.toml
index 67b6c2ab8..fa1a8fbad 100644
--- a/crates/kas-macros/Cargo.toml
+++ b/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"
diff --git a/crates/kas-macros/src/lib.rs b/crates/kas-macros/src/lib.rs
index 9e43f86fc..63d1e4260 100644
--- a/crates/kas-macros/src/lib.rs
+++ b/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;
 
diff --git a/crates/kas-macros/src/make_layout.rs b/crates/kas-macros/src/make_layout.rs
index 138b65ea5..696740470 100644
--- a/crates/kas-macros/src/make_layout.rs
+++ b/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};
diff --git a/crates/kas-macros/src/visitors.rs b/crates/kas-macros/src/visitors.rs
index faa427a42..41500bd0f 100644
--- a/crates/kas-macros/src/visitors.rs
+++ b/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;
diff --git a/crates/kas-macros/src/widget.rs b/crates/kas-macros/src/widget.rs
index e00c26f28..8f734662f 100644
--- a/crates/kas-macros/src/widget.rs
+++ b/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};
diff --git a/crates/kas-macros/src/widget_derive.rs b/crates/kas-macros/src/widget_derive.rs
index efbd0f454..012856916 100644
--- a/crates/kas-macros/src/widget_derive.rs
+++ b/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};