From f5c8afce0d025de5bc0684e1853bf504316b2b74 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Tue, 2 Feb 2021 15:36:43 +0100
Subject: [PATCH] feat: remove ChainErrorFrom and IntoChainError, add From

ChainErrorFrom and IntoChainError are not needed anymore with the
`#[track_caller]` feature.

Now, a proper `From<T> for ChainError<T>` can be implemented.
---
 src/lib.rs | 34 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 910e8aa..7dfa5a0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -636,40 +636,16 @@ impl<T: 'static + Display + Debug> Debug for ChainError<T> {
     }
 }
 
-/// `ChainErrorFrom<T>` is similar to `From<T>`
-pub trait ChainErrorFrom<T>: Sized {
-    /// similar to From<T>::from()
-    fn chain_error_from(from: T, line_filename: Option<String>) -> ChainError<Self>;
-}
-
-/// `IntoChainError<T>` is similar to `Into<T>`
-pub trait IntoChainError<T>: Sized {
-    /// similar to Into<T>::into()
-    fn into_chain_error(self, line_filename: Option<String>) -> ChainError<T>;
-}
-
-impl<T, U> IntoChainError<U> for T
+impl<T> From<T> for ChainError<T>
 where
-    U: ChainErrorFrom<T>,
+    T: 'static + Display + Debug,
 {
+    #[track_caller]
     #[inline]
-    fn into_chain_error(self, line_filename: Option<String>) -> ChainError<U> {
-        U::chain_error_from(self, line_filename)
+    fn from(e: T) -> ChainError<T> {
+        ChainError::new(e, None, Some(Location::caller().to_string()))
     }
 }
-
-impl<T, U> ChainErrorFrom<T> for U
-where
-    T: Into<U>,
-    U: 'static + Display + Debug,
-{
-    #[inline]
-    fn chain_error_from(t: T, line_filename: Option<String>) -> ChainError<Self> {
-        let e: U = t.into();
-        ChainError::new(e, None, line_filename)
-    }
-}
-
 /// Convenience macro to create a "new type" T(String) and implement Display + Debug for T
 ///
 /// # Examples