Merge pull request #1049 from matthiasbeyer/use-error-chain-result-type

Remove dedicated result modules, use error chain generated Result types

4 files changed, 2 insertions, 27 deletions

diff --git a/lib/etc/libimaginteraction/src/ask.rs b/lib/etc/libimaginteraction/src/ask.rs
index 475a2f0d..96dbc560 100644
--- a/lib/etc/libimaginteraction/src/ask.rs
+++ b/lib/etc/libimaginteraction/src/ask.rs
@@ -26,7 +26,7 @@ use std::result::Result as RResult;
 
 use error::InteractionErrorKind;
 use error::ResultExt;
-use result::Result;
+use error::Result;
 
 use regex::Regex;
 use ansi_term::Colour::*;
diff --git a/lib/etc/libimaginteraction/src/lib.rs b/lib/etc/libimaginteraction/src/lib.rs
index 36f9a04d..0a2aa118 100644
--- a/lib/etc/libimaginteraction/src/lib.rs
+++ b/lib/etc/libimaginteraction/src/lib.rs
@@ -49,6 +49,5 @@ extern crate libimagerror;
 pub mod ask;
 pub mod error;
 pub mod filter;
-pub mod result;
 pub mod ui;
 
diff --git a/lib/etc/libimaginteraction/src/result.rs b/lib/etc/libimaginteraction/src/result.rs
deleted file mode 100644
index 8eeaf47b..00000000
--- a/lib/etc/libimaginteraction/src/result.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// imag - the personal information management suite for the commandline
-// Copyright (C) 2015, 2016 Matthias Beyer <mail@beyermatthias.de> and contributors
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; version
-// 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-//
-
-use std::result::Result as RResult;
-
-use error::InteractionError;
-
-pub type Result<T> = RResult<T, InteractionError>;
diff --git a/lib/etc/libimaginteraction/src/ui.rs b/lib/etc/libimaginteraction/src/ui.rs
index f75c304a..d1712f94 100644
--- a/lib/etc/libimaginteraction/src/ui.rs
+++ b/lib/etc/libimaginteraction/src/ui.rs
@@ -23,8 +23,8 @@ use clap::{Arg, ArgMatches};
 
 use libimagstore::storeid::StoreId;
 
-use result::Result;
 use error::InteractionError as IE;
+use error::Result;
 use error::InteractionErrorKind as IEK;
 use error::ResultExt;