From 18e806f588a2917ba21d289e93216edd3d6c801e Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 3 Sep 2017 21:39:32 +0200 Subject: Remove dedicated result modules, use error chain generated Result types --- .../libimagentryannotation/src/annotateable.rs | 2 +- .../src/annotation_fetcher.rs | 4 ++-- lib/entry/libimagentryannotation/src/lib.rs | 1 - lib/entry/libimagentryannotation/src/result.rs | 26 ---------------------- 4 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 lib/entry/libimagentryannotation/src/result.rs (limited to 'lib/entry/libimagentryannotation') 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 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 = RResult; - - -- cgit v1.2.3