Fix macro problems (the feature is still useless though)

Author: pengowen123

src/error_chain.rs

@@ -1,20 +1,15 @@
 /// Prefer to use `error_chain` instead of this macro.
 #[macro_export]
 macro_rules! error_chain_processed {
-    // Default values for `types` and `derive`.
+    // Default values for `types`.
     (
-        // FIXME does not work if either types or derive isn't empty
         types {}
-        derive {}
         $( $rest: tt )*
-    ) =>{
+    ) => {
         error_chain_processed! {
             types {
                 Error, ErrorKind, ResultExt, Result;
             }
-            derive {
-                Debug;
-            }
             $( $rest )*
         }
     };
@@ -26,7 +21,6 @@ macro_rules! error_chain_processed {
         }
         $( $rest: tt )*
     ) => {
-        log_syntax!(rest: $($rest)*);
         error_chain_processed! {
             types {
                 $error_name, $error_kind_name,
@@ -46,7 +40,7 @@ macro_rules! error_chain_processed {
         }
 
         derive {
-            $($trait:ident),*;
+            $($trait:ident),*
         }
 
         links {
@@ -394,10 +388,10 @@ macro_rules! error_chain_processing {
     ( ($a:tt, $b:tt, $c:tt, $d:tt, $e:tt) ) => {
         error_chain_processed! {
             types $a
-            derive $e
-            links $b
-            foreign_links $c
-            errors $d
+            derive $b
+            links $c
+            foreign_links $d
+            errors $e
         }
     };
 }

src/example_generated.rs

@@ -21,7 +21,11 @@
 
 /// Another code generated by the macro.
 pub mod inner {
-    error_chain!{}
+    error_chain! {
+        derive {
+            Send
+        }
+    }
 }
 
 error_chain! {
@@ -35,4 +39,12 @@ error_chain! {
         #[doc = "A custom error kind."]
         Custom
     }
+    derive {
+        Send
+    }
+}
+
+fn foo<T: Send>() {}
+fn bar() {
+    foo::<Error>();
 }

src/lib.rs

@@ -1,6 +1,4 @@
 #![deny(missing_docs)]
-// TODO: remove
-#![feature(log_syntax)]
 
 //! A library for consistent and reliable error handling
 //!