[WIP] Fix #63

Author: Yamakaky

src/error_chain.rs

@@ -36,13 +36,13 @@ macro_rules! error_chain_processed {
         }
 
         links {
-            $( $link_variant:ident ( $link_error_path:path )
-               $( #[$meta_links:meta] )*; ) *
+            $( [$( #[$meta_links:meta] )*]
+               $link_variant:ident ( $link_error_path:path ); ) *
         }
 
         foreign_links {
-            $( $foreign_link_variant:ident ( $foreign_link_error_path:path )
-               $( #[$meta_foreign_links:meta] )*; )*
+            $( [$( #[$meta_foreign_links:meta] )*]
+               $foreign_link_variant:ident ( $foreign_link_error_path:path ); )*
         }
 
         errors {
@@ -251,6 +251,38 @@ macro_rules! error_chain_processed {
     };
 }
 
+/// Internal macro used for reordering of the fields.
+#[doc(hidden)]
+#[macro_export]
+macro_rules! handle_attributes {
+    ( { $($inner: tt)* } ) => {
+        handle_attributes!([] { $($inner)* } {})
+    };
+    ( [ $($attrs: tt)* ]
+      { #[$attr: meta] $( $to_parse:tt )* }
+      { $( $already_parsed:tt )* } ) => {
+        handle_attributes!([ $( $attrs )* #[$attr] ]
+                           { $( $to_parse )* }
+                           { $( $already_parsed )* })
+    };
+    ( [ $($attrs: tt)* ]
+      { $name:ident ( $variant:path ) $( $to_parse:tt )* }
+      { $already_parsed:tt } ) => {
+        handle_attributes!([]
+                           { $( $to_parse )* }
+                           { $( $already_parsed )*
+                             [ $( $attrs )* ]
+                             $name ( $variant )})
+    };
+    ( []
+      {}
+      { $( $parsed:tt )* }) => {
+        {
+            $( $parsed )*
+        }
+    };
+}
+
 /// Internal macro used for reordering of the fields.
 #[doc(hidden)]
 #[macro_export]
@@ -261,7 +293,7 @@ macro_rules! error_chain_processing {
         $( $tail:tt )*
     ) => {
         error_chain_processing! {
-            ($content, $b, $c, $d)
+            (handle_attributes!($content), $b, $c, $d)
             $($tail)*
         }
     };
@@ -271,7 +303,7 @@ macro_rules! error_chain_processing {
         $( $tail:tt )*
     ) => {
         error_chain_processing! {
-            ($a, $content, $c, $d)
+            ($a, handle_attributes!($content), $c, $d)
             $($tail)*
         }
     };

src/example_generated.rs

@@ -26,13 +26,15 @@ pub mod inner {
 
 error_chain! {
     links {
-        Inner(inner::Error) #[doc = "Link to another `ErrorChain`."];
+        /// "Link to another `ErrorChain`.
+        Inner(inner::Error);
     }
     foreign_links {
-        Io(::std::io::Error) #[doc = "Link to a `std::error::Error` type."];
+        /// Link to a `std::error::Error` type.
+        Io(::std::io::Error);
     }
     errors {
-        #[doc = "A custom error kind."]
+        /// "A custom error kind."
         Custom
     }
 }