From f8515e30aecc8e0a6d94c525a16bbaf11f6a7fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Gr=C3=BCner?= <47506558+MegaRedHand@users.noreply.github.com> Date: Mon, 24 Jun 2024 13:40:46 -0300 Subject: [PATCH] fix: make documentation optional in ORM table/dupsort macros --- src/orm/database.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/orm/database.rs b/src/orm/database.rs index 8cf78ce..b069ec4 100644 --- a/src/orm/database.rs +++ b/src/orm/database.rs @@ -181,8 +181,8 @@ where #[macro_export] macro_rules! table { - ($(#[$docs:meta])+ ( $name:ident ) $key:ty [ $seek_key:ty ] => $value:ty) => { - $(#[$docs])+ + ($(#[$docs:meta])* ( $name:ident ) $key:ty [ $seek_key:ty ] => $value:ty) => { + $(#[$docs])* /// #[doc = concat!("Takes [`", stringify!($key), "`] as a key and returns [`", stringify!($value), "`]")] #[derive(Clone, Copy, Debug, Default)] @@ -208,9 +208,9 @@ macro_rules! table { } } }; - ($(#[$docs:meta])+ ( $name:ident ) $key:ty => $value:ty) => { + ($(#[$docs:meta])* ( $name:ident ) $key:ty => $value:ty) => { table!( - $(#[$docs])+ + $(#[$docs])* ( $name ) $key [ $key ] => $value ); }; @@ -218,9 +218,9 @@ macro_rules! table { #[macro_export] macro_rules! dupsort { - ($(#[$docs:meta])+ ( $table_name:ident ) $key:ty [$seek_key:ty] => $value:ty [$seek_value:ty] ) => { + ($(#[$docs:meta])* ( $table_name:ident ) $key:ty [$seek_key:ty] => $value:ty [$seek_value:ty] ) => { table!( - $(#[$docs])+ + $(#[$docs])* /// #[doc = concat!("`DUPSORT` table with seek value type being: [`", stringify!($seek_value), "`].")] ( $table_name ) $key [$seek_key] => $value @@ -230,23 +230,23 @@ macro_rules! dupsort { } }; - ($(#[$docs:meta])+ ( $table_name:ident ) $key:ty [$seek_key:ty] => $value:ty ) => { + ($(#[$docs:meta])* ( $table_name:ident ) $key:ty [$seek_key:ty] => $value:ty ) => { dupsort!( - $(#[$docs])+ + $(#[$docs])* ( $table_name ) $key [$seek_key] => $value [$value] ); }; - ($(#[$docs:meta])+ ( $table_name:ident ) $key:ty => $value:ty [$seek_value:ty] ) => { + ($(#[$docs:meta])* ( $table_name:ident ) $key:ty => $value:ty [$seek_value:ty] ) => { dupsort!( - $(#[$docs])+ + $(#[$docs])* ( $table_name ) $key [$key] => $value [$seek_value] ); }; - ($(#[$docs:meta])+ ( $table_name:ident ) $key:ty => $value:ty ) => { + ($(#[$docs:meta])* ( $table_name:ident ) $key:ty => $value:ty ) => { dupsort!( - $(#[$docs])+ + $(#[$docs])* ( $table_name ) $key [$key] => $value [$value] ); };