Merge tag '0.6.1'

Author: Yamakaky

CHANGELOG.md

@@ -3,6 +3,10 @@
 - New `Variant(Error) #[attrs]` for `links` and `foreign_links`.
 - Hide implementation details from the doc.
 
+# 0.6.1
+
+- Fix wrong trait constraint in ResultExt implementation (#66).
+
 # 0.6.0
 
 - Conditional compilation for error variants.

Cargo.toml

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

src/lib.rs

@@ -330,12 +330,11 @@ pub trait ResultExt<T, E, CE: ChainedError> {
         EK: Into<CE::ErrorKind>;
 }
 
-impl<T, E, CE> ResultExt<T, E, CE> for Result<T, E> where CE: ChainedError, E: Into<CE> {
+impl<T, E, CE> ResultExt<T, E, CE> for Result<T, E> where CE: ChainedError, E: error::Error + Send + 'static {
     fn chain_err<F, EK>(self, callback: F) -> Result<T, CE>
         where F: FnOnce() -> EK,
         EK: Into<CE::ErrorKind> {
         self.map_err(move |e| {
-            let e = e.into();
             #[cfg(feature = "backtrace")]
             let state = {
                 let backtrace = CE::extract_backtrace(&e)

tests/tests.rs

@@ -249,7 +249,7 @@ fn chain_err() {
     }
 
     let _: Result<()> = Err(fmt::Error).chain_err(|| "");
-    let _: Result<()> = Err(ErrorKind::Test).chain_err(|| "");
+    let _: Result<()> = Err(Error::from_kind(ErrorKind::Test)).chain_err(|| "");
 }
 
 #[test]