Remove "IntoError" trait, use error_chain functionality

3 files changed, 8 insertions, 22 deletions

diff --git a/lib/etc/libimaginteraction/src/error.rs b/lib/etc/libimaginteraction/src/error.rs
index e5daf160..28345c94 100644
--- a/lib/etc/libimaginteraction/src/error.rs
+++ b/lib/etc/libimaginteraction/src/error.rs
@@ -17,10 +17,6 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-use std::error::Error;
-
-use libimagerror::into::IntoError;
-
 error_chain! {
     types {
         InteractionError, InteractionErrorKind, ResultExt, Result;
@@ -85,14 +81,3 @@ error_chain! {
     }
 }
 
-impl IntoError for InteractionErrorKind {
-    type Target = InteractionError;
-
-    fn into_error(self) -> Self::Target {
-        InteractionError::from_kind(self)
-    }
-
-    fn into_error_with_cause(self, _: Box<Error>) -> Self::Target {
-        InteractionError::from_kind(self)
-    }
-}
diff --git a/lib/etc/libimaginteraction/src/readline.rs b/lib/etc/libimaginteraction/src/readline.rs
index 7b998dd0..58275444 100644
--- a/lib/etc/libimaginteraction/src/readline.rs
+++ b/lib/etc/libimaginteraction/src/readline.rs
@@ -17,6 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
+use error::InteractionError as IE;
 use error::InteractionErrorKind as IEK;
 use error::MapErrInto;
 
@@ -44,35 +45,35 @@ impl Readline {
 
         let histfile = try!(match histfile {
             Value::String(s) => PathBuf::from(s),
-            _ => Err(IEK::ConfigTypeError.into_error())
+            _ => Err(IE::from_kind(IEK::ConfigTypeError))
                 .map_err_into(IEK::ConfigError)
                 .map_err_into(IEK::ReadlineError)
         });
 
         let histsize = try!(match histsize {
             Value::Integer(i) => i,
-            _ => Err(IEK::ConfigTypeError.into_error())
+            _ => Err(IE::from_kind(IEK::ConfigTypeError))
                 .map_err_into(IEK::ConfigError)
                 .map_err_into(IEK::ReadlineError)
         });
 
         let histigndups = try!(match histigndups {
             Value::Boolean(b) => b,
-            _ => Err(IEK::ConfigTypeError.into_error())
+            _ => Err(IE::from_kind(IEK::ConfigTypeError))
                 .map_err_into(IEK::ConfigError)
                 .map_err_into(IEK::ReadlineError)
         });
 
         let histignspace = try!(match histignspace {
             Value::Boolean(b) => b,
-            _ => Err(IEK::ConfigTypeError.into_error())
+            _ => Err(IE::from_kind(IEK::ConfigTypeError))
                 .map_err_into(IEK::ConfigError)
                 .map_err_into(IEK::ReadlineError)
         });
 
         let prompt = try!(match prompt {
             Value::String(s) => s,
-            _ => Err(IEK::ConfigTypeError.into_error())
+            _ => Err(IE::from_kind(IEK::ConfigTypeError))
                 .map_err_into(IEK::ConfigError)
                 .map_err_into(IEK::ReadlineError)
         });
diff --git a/lib/etc/libimaginteraction/src/ui.rs b/lib/etc/libimaginteraction/src/ui.rs
index 0a5335b9..f75c304a 100644
--- a/lib/etc/libimaginteraction/src/ui.rs
+++ b/lib/etc/libimaginteraction/src/ui.rs
@@ -22,9 +22,9 @@ use std::path::PathBuf;
 use clap::{Arg, ArgMatches};
 
 use libimagstore::storeid::StoreId;
-use libimagerror::into::IntoError;
 
 use result::Result;
+use error::InteractionError as IE;
 use error::InteractionErrorKind as IEK;
 use error::ResultExt;
 
@@ -52,7 +52,7 @@ pub fn id_argument_long() -> &'static str {
 pub fn get_id(matches: &ArgMatches) -> Result<Vec<StoreId>> {
     matches
         .values_of(id_argument_name())
-        .ok_or(IEK::IdMissingError.into_error())
+        .ok_or(IE::from_kind(IEK::IdMissingError))
         .chain_err(|| IEK::CLIError)
         .and_then(|vals| {
             vals.into_iter()