diff --git a/src/macros/builder_trait_decl.rs b/src/macros/builder_trait_decl.rs index 01aae6d..ffa7f26 100644 --- a/src/macros/builder_trait_decl.rs +++ b/src/macros/builder_trait_decl.rs @@ -1,7 +1,7 @@ #[macro_export] macro_rules! builder_trait_decl { ( - $scope:vis $name:ident + $scope:vis trait $name:ident $(< $generic0Name:ident $(: $generic0Bound:path)? $(, $genericNName:ident $(: $genericNBound:path)?)* >)? @@ -18,7 +18,7 @@ macro_rules! builder_trait_decl { }; ( - $scope:vis $name:ident + $scope:vis trait $name:ident < $lifetime0Name:lifetime $(, $lifetimeNName:lifetime)* $(, $genericNName:ident $(: $genericNBound:path)?)* diff --git a/src/macros/mod.rs b/src/macros/mod.rs index 9643e7e..2a8f378 100644 --- a/src/macros/mod.rs +++ b/src/macros/mod.rs @@ -1,3 +1,3 @@ mod builder_type_t; -mod parser_func_decl; +mod parser_fn_decl; mod builder_trait_decl; \ No newline at end of file diff --git a/src/macros/parser_func_decl.rs b/src/macros/parser_fn_decl.rs similarity index 94% rename from src/macros/parser_func_decl.rs rename to src/macros/parser_fn_decl.rs index c4c7c71..2f952d2 100644 --- a/src/macros/parser_func_decl.rs +++ b/src/macros/parser_fn_decl.rs @@ -1,8 +1,8 @@ #[macro_export] -macro_rules! parser_func_decl { +macro_rules! parser_fn_decl { // only type generics | default src type ------------------------------------------------------- ( - $scope:vis $name:ident + $scope:vis fn $name:ident $(< $generic0Name:ident $(: $generic0Bound:path)? $(, $genericNName:ident $(: $genericNBound:path)?)* >)? @@ -22,7 +22,7 @@ macro_rules! parser_func_decl { // lifetime + type generics | default src type -------------------------------------------------- ( - $scope:vis $name:ident + $scope:vis fn $name:ident < $lifetime0Name:lifetime $(, $lifetimeNName:lifetime)* $(, $genericNName:ident $(: $genericNBound:path)?)* @@ -44,7 +44,7 @@ macro_rules! parser_func_decl { // only type generics | custom src type -------------------------------------------------------- ( - $scope:vis $name:ident + $scope:vis fn $name:ident $(< $generic0Name:ident $(: $generic0Bound:path)? $(, $genericNName:ident $(: $genericNBound:path)?)* >)? @@ -64,7 +64,7 @@ macro_rules! parser_func_decl { // lifetime + type generics | custom src type -------------------------------------------------- ( - $scope:vis $name:ident + $scope:vis fn $name:ident < $lifetime0Name:lifetime $(, $lifetimeNName:lifetime)* $(, $genericNName:ident $(: $genericNBound:path)?)*