Merge pull request #22 from brson/next

Fix a resolve bug

Author: brson

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "error-chain"
-version = "0.4.0"
+version = "0.4.1"
 authors = [ "Brian Anderson <banderson@mozilla.com>",
             "Paul Colomiets <paul@colomiets.name>",
             "Colin Kiegel <kiegel@gmx.de>"]

src/lib.rs

@@ -481,14 +481,14 @@ macro_rules! error_chain {
 
                 $(
                     $link_variant(e: $link_kind_path) {
-                        description(e.description())
+                        description(::std::error::Error::description(e))
                         display("{}", e)
                     }
                 ) *
 
                 $(
                     $foreign_link_variant(err: $foreign_link_error_path) {
-                        description(err.description())
+                        description(::std::error::Error::description(err))
                         display("{}", err)
                     }
                 ) *

tests/tests.rs

@@ -112,7 +112,6 @@ fn empty() {
 #[cfg(test)]
 mod foreign_link_test {
 
-    use std::error::Error as StdError;
     use std::fmt;
 
     // Note: foreign errors must be `pub` because they appear in the
@@ -122,12 +121,12 @@ mod foreign_link_test {
         cause: ForeignErrorCause
     }
 
-    impl StdError for ForeignError {
+    impl ::std::error::Error for ForeignError {
         fn description(&self) -> &'static str {
             "Foreign error description"
         }
 
-        fn cause(&self) -> Option<&StdError> { Some(&self.cause) }
+        fn cause(&self) -> Option<&::std::error::Error> { Some(&self.cause) }
     }
 
     impl fmt::Display for ForeignError {
@@ -139,12 +138,12 @@ mod foreign_link_test {
     #[derive(Debug)]
     pub struct ForeignErrorCause {}
 
-    impl StdError for ForeignErrorCause {
+    impl ::std::error::Error for ForeignErrorCause {
         fn description(&self) -> &'static str {
             "Foreign error cause description"
         }
 
-        fn cause(&self) -> Option<&StdError> { None }
+        fn cause(&self) -> Option<&::std::error::Error> { None }
     }
 
     impl fmt::Display for ForeignErrorCause {
@@ -178,7 +177,7 @@ mod foreign_link_test {
         let chained_error = try_foreign_error().err().unwrap();
         assert_eq!(
             format!("{}", ForeignErrorCause{}),
-            format!("{}", chained_error.cause().unwrap())
+            format!("{}", ::std::error::Error::cause(&chained_error).unwrap())
         );
     }
 
@@ -195,7 +194,7 @@ mod foreign_link_test {
             format!("{}", error_iter.next().unwrap())
         );
         assert_eq!(
-            format!("{:?}", None as Option<&StdError>),
+            format!("{:?}", None as Option<&::std::error::Error>),
             format!("{:?}", error_iter.next())
         );
     }