From 9d3f2816a482b2f28e93fdecc791088a46f4c113 Mon Sep 17 00:00:00 2001
From: Andrew Golovashevich <landgrafhomyak@gmail.com>
Date: Tue, 18 Nov 2025 18:35:03 +0300
Subject: [PATCH] Updated macros to match new generics and associated types

---
 src/lib.rs                       |  2 +-
 src/macros/builder_trait_decl.rs |  6 +++---
 src/macros/builder_type_t.rs     | 12 ++++++------
 src/macros/parser_fn_decl.rs     | 16 ++++++++--------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index c6b32d1..e6d9126 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,7 +1,7 @@
 #![allow(non_snake_case)]
 
 mod _keyword_impls;
-// mod macros;
+mod macros;
 
 pub trait Predicate<C> {
     fn check(&mut self, chr: C) -> bool;
diff --git a/src/macros/builder_trait_decl.rs b/src/macros/builder_trait_decl.rs
index ffa7f26..716da32 100644
--- a/src/macros/builder_trait_decl.rs
+++ b/src/macros/builder_trait_decl.rs
@@ -10,7 +10,7 @@ macro_rules! builder_trait_decl {
     ) => {
         $scope trait $name
         <
-            'source, 'pos, 'builder, C, P:Pos<'pos>, CS:CollectedSubstring<'source, C>
+            'source, 'pos, P:Pos<'pos>, CS:CollectedSubstring<'source>
             $(, $generic0Name $(: $generic0Bound)? $(, $genericNName $(: $genericNBound)?)* )?
         >
         $(: $base0 $(, $baseN)*)?
@@ -28,8 +28,8 @@ macro_rules! builder_trait_decl {
     ) => {
         $scope trait $name
         <
-            'source, 'pos, 'builder, $lifetime0Name $(, $lifetimeNName)*,
-            C, P: Pos<'pos>, CS: CollectedSubstring<'source, C>
+            'source, 'pos, $lifetime0Name $(, $lifetimeNName)*,
+            P: Pos<'pos>, CS: CollectedSubstring<'source>
             $(, $genericNName $(: $genericNBound)?)*
         >
        $(: $base0 $(, $baseN)*)?
diff --git a/src/macros/builder_type_t.rs b/src/macros/builder_type_t.rs
index caacc5b..1c122b8 100644
--- a/src/macros/builder_type_t.rs
+++ b/src/macros/builder_type_t.rs
@@ -9,7 +9,7 @@ macro_rules! builder_type_t {
     ) => {
         $name
         <
-            'source, 'pos, 'builder, C, P, CS
+            'source, 'pos, P, CS
             $(, $generic0Name $(, $genericNName)*)?
         >
 
@@ -23,8 +23,8 @@ macro_rules! builder_type_t {
     ) => {
         $name
         <
-            'source, 'pos, 'builder, $lifetime0Name $(, $lifetimeNName)*,
-            C, P, CS $(, $genericNName)*
+            'source, 'pos, $lifetime0Name $(, $lifetimeNName)*,
+            P, CS $(, $genericNName)*
         >
     };
 
@@ -37,7 +37,7 @@ macro_rules! builder_type_t {
     ) => {
         impl $name
         <
-            'source, 'pos, 'builder, C, P, CS
+            'source, 'pos, P, CS
             $(, $generic0Name $(, $genericNName)*)?
         >
 
@@ -51,8 +51,8 @@ macro_rules! builder_type_t {
     ) => {
         impl $name
         <
-            'source, 'pos, 'builder, $lifetime0Name $(, $lifetimeNName)*,
-            C, P, CS $(, $genericNName)*
+            'source, 'pos, $lifetime0Name $(, $lifetimeNName)*,
+            P, CS $(, $genericNName)*
         >
     };
 }
\ No newline at end of file
diff --git a/src/macros/parser_fn_decl.rs b/src/macros/parser_fn_decl.rs
index 2f952d2..a9eb333 100644
--- a/src/macros/parser_fn_decl.rs
+++ b/src/macros/parser_fn_decl.rs
@@ -12,7 +12,7 @@ macro_rules! parser_fn_decl {
     ) => {
         $scope fn $name
         <
-            'source, 'pos, 'builder, C, P:Pos<'pos>, CS:CollectedSubstring<'source, C>
+            'source, 'pos, P:Pos<'pos>, CS:CollectedSubstring<'source>
             $(, $generic0Name $(: $generic0Bound)? $(, $genericNName $(: $genericNBound)?)* )?
         >
         ($srcName: $srcType $(, $argNName : $argNType)*)
@@ -33,8 +33,8 @@ macro_rules! parser_fn_decl {
     ) => {
         $scope fn $name
         <
-            'source, 'pos, 'builder, $lifetime0Name $(, $lifetimeNName)*,
-            C, P: Pos<'pos>, CS: CollectedSubstring<'source, C>
+            'source, 'pos, $lifetime0Name $(, $lifetimeNName)*,
+            P: Pos<'pos>, CS: CollectedSubstring<'source>
             $(, $genericNName $(: $genericNBound)?)*
         >
         ($srcName: $srcType $(, $argNName : $argNType)*)
@@ -54,10 +54,10 @@ macro_rules! parser_fn_decl {
     ) => {
         $scope fn $name
         <
-            'source, 'pos, 'builder, C, P:Pos<'pos>, CS:CollectedSubstring<'source, C>
+            'source, 'pos, P:Pos<'pos>, CS:CollectedSubstring<'source>
             $(, $generic0Name $(: $generic0Bound)? $(, $genericNName $(: $genericNBound)?)* )?
         >
-        ($srcName: &'source mut impl SourceStream<'source, 'pos, C, P, CS> $(, $argNName : $argNType)*)
+        ($srcName: &'source mut impl SourceStream<'source, 'pos, P=P, CS=CS> $(, $argNName : $argNType)*)
         $(-> $ret)?
         $body
     };
@@ -75,11 +75,11 @@ macro_rules! parser_fn_decl {
     ) => {
         $scope fn $name
         <
-            'source, 'pos, 'builder, $lifetime0Name $(, $lifetimeNName)*,
-            C, P: Pos<'pos>, CS: CollectedSubstring<'source, C>
+            'source, 'pos, $lifetime0Name $(, $lifetimeNName)*,
+            P: Pos<'pos>, CS: CollectedSubstring<'source>
             $(, $genericNName $(: $genericNBound)?)*
         >
-        ($srcName: &'source mut impl SourceStream<'source, 'pos, C, P, CS> $(, $argNName : $argNType)*)
+        ($srcName: &'source mut impl SourceStream<'source, 'pos, P=P, CS=CS> $(, $argNName : $argNType)*)
         $(-> $ret)?
         $body
     };