Remove dedicated result modules, use error chain generated Result types

51 files changed, 33 insertions, 321 deletions

diff --git a/lib/entry/libimagentryannotation/src/annotateable.rs b/lib/entry/libimagentryannotation/src/annotateable.rs
index b356753e..d51380cc 100644
--- a/lib/entry/libimagentryannotation/src/annotateable.rs
+++ b/lib/entry/libimagentryannotation/src/annotateable.rs
@@ -29,7 +29,7 @@ use libimagentrylink::internal::InternalLinker;
 use toml_query::read::TomlValueReadExt;
 use toml_query::insert::TomlValueInsertExt;
 
-use result::Result;
+use error::Result;
 use error::AnnotationErrorKind as AEK;
 use error::AnnotationError as AE;
 use error::ResultExt;
diff --git a/lib/entry/libimagentryannotation/src/annotation_fetcher.rs b/lib/entry/libimagentryannotation/src/annotation_fetcher.rs
index 27f2f4b8..49890550 100644
--- a/lib/entry/libimagentryannotation/src/annotation_fetcher.rs
+++ b/lib/entry/libimagentryannotation/src/annotation_fetcher.rs
@@ -24,7 +24,7 @@ use libimagnotes::note::Note;
 use libimagnotes::note::NoteIterator;
 use libimagstore::storeid::StoreIdIterator;
 
-use result::Result;
+use error::Result;
 use error::AnnotationErrorKind as AEK;
 use error::ResultExt;
 
@@ -73,7 +73,7 @@ pub mod iter {
     use libimagnotes::note::Note;
     use libimagnotes::note::NoteIterator;
 
-    use result::Result;
+    use error::Result;
     use error::AnnotationErrorKind as AEK;
     use error::AnnotationError as AE;
     use error::ResultExt;
diff --git a/lib/entry/libimagentryannotation/src/lib.rs b/lib/entry/libimagentryannotation/src/lib.rs
index 204e67b3..bd1e9ed5 100644
--- a/lib/entry/libimagentryannotation/src/lib.rs
+++ b/lib/entry/libimagentryannotation/src/lib.rs
@@ -47,5 +47,4 @@ extern crate libimagnotes;
 pub mod annotateable;
 pub mod annotation_fetcher;
 pub mod error;
-pub mod result;
 
diff --git a/lib/entry/libimagentryannotation/src/result.rs b/lib/entry/libimagentryannotation/src/result.rs
deleted file mode 100644
index 292fc0e5..00000000
--- a/lib/entry/libimagentryannotation/src/result.rs
+++ /dev/null
@@ -1,26 +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::AnnotationError;
-
-pub type Result<T> = RResult<T, AnnotationError>;
-
-
diff --git a/lib/entry/libimagentrycategory/src/category.rs b/lib/entry/libimagentrycategory/src/category.rs
index 002922c1..f2a2b2cf 100644
--- a/lib/entry/libimagentrycategory/src/category.rs
+++ b/lib/entry/libimagentrycategory/src/category.rs
@@ -27,7 +27,7 @@ use libimagstore::store::Entry;
 use error::CategoryErrorKind as CEK;
 use error::CategoryError as CE;
 use error::ResultExt;
-use result::Result;
+use error::Result;
 use register::CategoryRegister;
 
 #[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
diff --git a/lib/entry/libimagentrycategory/src/lib.rs b/lib/entry/libimagentrycategory/src/lib.rs
index 1ea7d05b..06e13f9c 100644
--- a/lib/entry/libimagentrycategory/src/lib.rs
+++ b/lib/entry/libimagentrycategory/src/lib.rs
@@ -50,7 +50,6 @@ extern crate libimagstore;
 pub mod category;
 pub mod error;
 pub mod register;
-pub mod result;
 
 module_entry_path_mod!("category");
 
diff --git a/lib/entry/libimagentrycategory/src/register.rs b/lib/entry/libimagentrycategory/src/register.rs
index c4a475e4..ad4d5b73 100644
--- a/lib/entry/libimagentrycategory/src/register.rs
+++ b/lib/entry/libimagentrycategory/src/register.rs
@@ -32,7 +32,7 @@ use category::Category;
 use error::CategoryErrorKind as CEK;
 use error::CategoryError as CE;
 use error::ResultExt;
-use result::Result;
+use error::Result;
 
 pub const CATEGORY_REGISTER_NAME_FIELD_PATH : &'static str = "category.register.name";
 
diff --git a/lib/entry/libimagentrycategory/src/result.rs b/lib/entry/libimagentrycategory/src/result.rs
deleted file mode 100644
index 517d0e96..00000000
--- a/lib/entry/libimagentrycategory/src/result.rs
+++ /dev/null
@@ -1,26 +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::CategoryError;
-
-pub type Result<T> = RResult<T, CategoryError>;
-
diff --git a/lib/entry/libimagentrydatetime/src/datepath/compiler.rs b/lib/entry/libimagentrydatetime/src/datepath/compiler.rs
index 12537e8e..7910db7f 100644
--- a/lib/entry/libimagentrydatetime/src/datepath/compiler.rs
+++ b/lib/entry/libimagentrydatetime/src/datepath/compiler.rs
@@ -27,7 +27,7 @@ use libimagstore::storeid::StoreId;
 
 use datepath::accuracy::Accuracy;
 use datepath::format::Format;
-use datepath::result::Result;
+use datepath::error::Result;
 use datepath::error::DatePathCompilerErrorKind as DPCEK;
 use datepath::error::ResultExt;
 
diff --git a/lib/entry/libimagentrydatetime/src/datepath/mod.rs b/lib/entry/libimagentrydatetime/src/datepath/mod.rs
index c964abf9..2fbfc1c4 100644
--- a/lib/entry/libimagentrydatetime/src/datepath/mod.rs
+++ b/lib/entry/libimagentrydatetime/src/datepath/mod.rs
@@ -21,6 +21,5 @@ pub mod accuracy;
 pub mod compiler;
 pub mod error;
 pub mod format;
-pub mod result;
 pub mod to_store_id;
 
diff --git a/lib/entry/libimagentrydatetime/src/datepath/result.rs b/lib/entry/libimagentrydatetime/src/datepath/result.rs
deleted file mode 100644
index 2fc3350a..00000000
--- a/lib/entry/libimagentrydatetime/src/datepath/result.rs
+++ /dev/null
@@ -1,25 +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
-//
-
-/// Result type for this module.
-use super::error::DatePathCompilerError as DPCE;
-use std::result::Result as RResult;
-
-pub type Result<T> = RResult<T, DPCE>;
-
diff --git a/lib/entry/libimagentrydatetime/src/datepath/to_store_id.rs b/lib/entry/libimagentrydatetime/src/datepath/to_store_id.rs
index c781595b..6f24d517 100644
--- a/lib/entry/libimagentrydatetime/src/datepath/to_store_id.rs
+++ b/lib/entry/libimagentrydatetime/src/datepath/to_store_id.rs
@@ -20,7 +20,7 @@
 use chrono::naive::NaiveDateTime;
 
 use libimagstore::storeid::StoreId;
-use datepath::result::Result;
+use datepath::error::Result;
 use datepath::compiler::DatePathCompiler;
 
 //
diff --git a/lib/entry/libimagentrydatetime/src/datetime.rs b/lib/entry/libimagentrydatetime/src/datetime.rs
index 3a9ddf0c..06d11b07 100644
--- a/lib/entry/libimagentrydatetime/src/datetime.rs
+++ b/lib/entry/libimagentrydatetime/src/datetime.rs
@@ -28,7 +28,6 @@ use libimagstore::store::Entry;
 use error::DateErrorKind as DEK;
 use error::DateError as DE;
 use error::*;
-use result::Result;
 use range::DateTimeRange;
 
 pub trait EntryDate {
diff --git a/lib/entry/libimagentrydatetime/src/lib.rs b/lib/entry/libimagentrydatetime/src/lib.rs
index 3a231814..fdb8067b 100644
--- a/lib/entry/libimagentrydatetime/src/lib.rs
+++ b/lib/entry/libimagentrydatetime/src/lib.rs
@@ -48,5 +48,4 @@ pub mod datepath;
 pub mod datetime;
 pub mod error;
 pub mod range;
-pub mod result;
 
diff --git a/lib/entry/libimagentrydatetime/src/result.rs b/lib/entry/libimagentrydatetime/src/result.rs
deleted file mode 100644
index d6d0a5af..00000000
--- a/lib/entry/libimagentrydatetime/src/result.rs
+++ /dev/null
@@ -1,25 +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::DateError;
-
-pub type Result<T> = RResult<T, DateError>;
-
diff --git a/lib/entry/libimagentryedit/src/edit.rs b/lib/entry/libimagentryedit/src/edit.rs
index fab34d3d..bd2ee190 100644
--- a/lib/entry/libimagentryedit/src/edit.rs
+++ b/lib/entry/libimagentryedit/src/edit.rs
@@ -20,7 +20,7 @@
 use libimagrt::runtime::Runtime;
 use libimagstore::store::Entry;
 
-use result::Result;
+use error::Result;
 use error::EditErrorKind;
 use error::EditError as EE;
 use error::ResultExt;
diff --git a/lib/entry/libimagentryedit/src/lib.rs b/lib/entry/libimagentryedit/src/lib.rs
index 6776476f..cc385919 100644
--- a/lib/entry/libimagentryedit/src/lib.rs
+++ b/lib/entry/libimagentryedit/src/lib.rs
@@ -43,4 +43,3 @@ extern crate libimagutil;
 
 pub mod edit;
 pub mod error;
-pub mod result;
diff --git a/lib/entry/libimagentryedit/src/result.rs b/lib/entry/libimagentryedit/src/result.rs
deleted file mode 100644
index 1d917c05..00000000
--- a/lib/entry/libimagentryedit/src/result.rs
+++ /dev/null
@@ -1,25 +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::EditError;
-
-pub type Result<T> = RResult<T, EditError>;
-
diff --git a/lib/entry/libimagentrylink/src/external.rs b/lib/entry/libimagentrylink/src/external.rs
index 2b3d0923..b13ecbc5 100644
--- a/lib/entry/libimagentrylink/src/external.rs
+++ b/lib/entry/libimagentrylink/src/external.rs
@@ -46,7 +46,7 @@ use toml_query::set::TomlValueSetExt;
 
 use error::LinkErrorKind as LEK;
 use error::LinkError as LE;
-use result::Result;
+use error::Result;
 use internal::InternalLinker;
 use module_path::ModuleEntryPath;
 use error::ResultExt;
@@ -137,7 +137,7 @@ pub mod iter {
     use internal::iter::LinkIter;
     use error::LinkErrorKind as LEK;
     use error::ResultExt;
-    use result::Result;
+    use error::Result;
 
     use url::Url;
 
diff --git a/lib/entry/libimagentrylink/src/internal.rs b/lib/entry/libimagentrylink/src/internal.rs
index ed550eee..b5b0fd37 100644
--- a/lib/entry/libimagentrylink/src/internal.rs
+++ b/lib/entry/libimagentrylink/src/internal.rs
@@ -32,7 +32,7 @@ use toml_query::set::TomlValueSetExt;
 use error::LinkErrorKind as LEK;
 use error::LinkError as LE;
 use error::ResultExt;
-use result::Result;
+use error::Result;
 use self::iter::LinkIter;
 use self::iter::IntoValues;
 
@@ -188,7 +188,7 @@ pub mod iter {
 
     use error::LinkErrorKind as LEK;
     use error::ResultExt;
-    use result::Result;
+    use error::Result;
 
     use toml::Value;
     use itertools::Itertools;
@@ -618,7 +618,7 @@ pub mod store_check {
 
             use error::LinkErrorKind as LEK;
             use error::LinkError as LE;
-            use result::Result as LResult;
+            use error::Result as LResult;
             use internal::InternalLinker;
 
             use libimagstore::store::StoreObject;
diff --git a/lib/entry/libimagentrylink/src/lib.rs b/lib/entry/libimagentrylink/src/lib.rs
index 780cf351..5c24ee34 100644
--- a/lib/entry/libimagentrylink/src/lib.rs
+++ b/lib/entry/libimagentrylink/src/lib.rs
@@ -56,5 +56,4 @@ module_entry_path_mod!("links");
 pub mod error;
 pub mod external;
 pub mod internal;
-pub mod result;
 
diff --git a/lib/entry/libimagentrylink/src/result.rs b/lib/entry/libimagentrylink/src/result.rs
deleted file mode 100644
index 23e50363..00000000
--- a/lib/entry/libimagentrylink/src/result.rs
+++ /dev/null
@@ -1,25 +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::LinkError;
-
-pub type Result<T> = RResult<T, LinkError>;
-
diff --git a/lib/entry/libimagentrylist/src/cli.rs b/lib/entry/libimagentrylist/src/cli.rs
index 89dc29e1..e54deba0 100644
--- a/lib/entry/libimagentrylist/src/cli.rs
+++ b/lib/entry/libimagentrylist/src/cli.rs
@@ -21,7 +21,7 @@ use clap::{Arg, ArgMatches, App, SubCommand};
 
 use libimagstore::store::FileLockEntry;
 
-use result::Result;
+use error::Result;
 use listers::line::LineLister;
 use listers::path::PathLister;
 use lister::Lister;
diff --git a/lib/entry/libimagentrylist/src/lib.rs b/lib/entry/libimagentrylist/src/lib.rs
index 7d779d73..0f4748a4 100644
--- a/lib/entry/libimagentrylist/src/lib.rs
+++ b/lib/entry/libimagentrylist/src/lib.rs
@@ -48,5 +48,4 @@ pub mod cli;
 pub mod error;
 pub mod lister;
 pub mod listers;
-pub mod result;
 
diff --git a/lib/entry/libimagentrylist/src/lister.rs b/lib/entry/libimagentrylist/src/lister.rs
index 798061b8..3bb64786 100644
--- a/lib/entry/libimagentrylist/src/lister.rs
+++ b/lib/entry/libimagentrylist/src/lister.rs
@@ -19,7 +19,7 @@
 
 use libimagstore::store::FileLockEntry;
 
-use result::Result;
+use error::Result;
 
 pub trait Lister : Sized {
 
diff --git a/lib/entry/libimagentrylist/src/listers/core.rs b/lib/entry/libimagentrylist/src/listers/core.rs
index 74a99f47..d653c7bb 100644
--- a/lib/entry/libimagentrylist/src/listers/core.rs
+++ b/lib/entry/libimagentrylist/src/listers/core.rs
@@ -21,7 +21,7 @@ use std::io::stdout;
 use std::io::Write;
 
 use lister::Lister;
-use result::Result;
+use error::Result;
 use error::ResultExt;
 
 use libimagstore::store::FileLockEntry;
diff --git a/lib/entry/libimagentrylist/src/listers/line.rs b/lib/entry/libimagentrylist/src/listers/line.rs
index d61b8da3..69cef86e 100644
--- a/lib/entry/libimagentrylist/src/listers/line.rs
+++ b/lib/entry/libimagentrylist/src/listers/line.rs
@@ -21,7 +21,7 @@ use std::io::stdout;
 use std::io::Write;
 
 use lister::Lister;
-use result::Result;
+use error::Result;
 use error::ResultExt;
 
 use libimagstore::store::FileLockEntry;
diff --git a/lib/entry/libimagentrylist/src/listers/path.rs b/lib/entry/libimagentrylist/src/listers/path.rs
index 55a9afb0..d359226c 100644
--- a/lib/entry/libimagentrylist/src/listers/path.rs
+++ b/lib/entry/libimagentrylist/src/listers/path.rs
@@ -21,7 +21,7 @@ use std::io::stdout;
 use std::io::Write;
 
 use lister::Lister;
-use result::Result;
+use error::Result;
 use error::ResultExt;
 
 use libimagstore::store::FileLockEntry;
diff --git a/lib/entry/libimagentrylist/src/listers/table.rs b/lib/entry/libimagentrylist/src/listers/table.rs
index 08dea4f2..3bb58b95 100644
--- a/lib/entry/libimagentrylist/src/listers/table.rs
+++ b/lib/entry/libimagentrylist/src/listers/table.rs
@@ -20,7 +20,7 @@
 use std::io::stdout;
 
 use lister::Lister;
-use result::Result;
+use error::Result;
 use error::ResultExt;
 
 use libimagstore::store::FileLockEntry;
diff --git a/lib/entry/libimagentrylist/src/result.rs b/lib/entry/libimagentrylist/src/result.rs
deleted file mode 100644
index e29d7d34..00000000
--- a/lib/entry/libimagentrylist/src/result.rs
+++ /dev/null
@@ -1,25 +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::ListError;
-
-pub type Result<T> = RResult<T, ListError>;
-
diff --git a/lib/entry/libimagentrymarkdown/src/html.rs b/lib/entry/libimagentrymarkdown/src/html.rs
index c1c0bd7c..9322dcfd 100644
--- a/lib/entry/libimagentrymarkdown/src/html.rs
+++ b/lib/entry/libimagentrymarkdown/src/html.rs
@@ -21,7 +21,7 @@ use hoedown::{Markdown, Html as MdHtml};
 use hoedown::renderer::html::Flags as HtmlFlags;
 use hoedown::renderer::Render;