diff options
Diffstat (limited to 'lib/entry/libimagentryview')
-rw-r--r-- | lib/entry/libimagentryview/src/builtin/editor.rs | 2 | ||||
-rw-r--r-- | lib/entry/libimagentryview/src/builtin/plain.rs | 2 | ||||
-rw-r--r-- | lib/entry/libimagentryview/src/builtin/stdout.rs | 2 | ||||
-rw-r--r-- | lib/entry/libimagentryview/src/lib.rs | 1 | ||||
-rw-r--r-- | lib/entry/libimagentryview/src/result.rs | 24 | ||||
-rw-r--r-- | lib/entry/libimagentryview/src/viewer.rs | 2 |
6 files changed, 4 insertions, 29 deletions
diff --git a/lib/entry/libimagentryview/src/builtin/editor.rs b/lib/entry/libimagentryview/src/builtin/editor.rs index be268acc..abfe0ed2 100644 --- a/lib/entry/libimagentryview/src/builtin/editor.rs +++ b/lib/entry/libimagentryview/src/builtin/editor.rs @@ -22,7 +22,7 @@ use libimagrt::runtime::Runtime; use libimagentryedit::edit::edit_in_tmpfile; use viewer::Viewer; -use result::Result; +use error::Result; use error::ResultExt; use error::ViewErrorKind as VEK; diff --git a/lib/entry/libimagentryview/src/builtin/plain.rs b/lib/entry/libimagentryview/src/builtin/plain.rs index f40b2527..c5c3a2a1 100644 --- a/lib/entry/libimagentryview/src/builtin/plain.rs +++ b/lib/entry/libimagentryview/src/builtin/plain.rs @@ -20,7 +20,7 @@ use libimagstore::store::Entry; use viewer::Viewer; -use result::Result; +use error::Result; pub struct PlainViewer { show_header: bool diff --git a/lib/entry/libimagentryview/src/builtin/stdout.rs b/lib/entry/libimagentryview/src/builtin/stdout.rs index 3d9fea05..20872ae6 100644 --- a/lib/entry/libimagentryview/src/builtin/stdout.rs +++ b/lib/entry/libimagentryview/src/builtin/stdout.rs @@ -22,7 +22,7 @@ use libimagstore::store::Entry; use toml::ser::to_string; use viewer::Viewer; -use result::Result; +use error::Result; pub struct StdoutViewer { view_header: bool, diff --git a/lib/entry/libimagentryview/src/lib.rs b/lib/entry/libimagentryview/src/lib.rs index c7870970..4ce6d2d0 100644 --- a/lib/entry/libimagentryview/src/lib.rs +++ b/lib/entry/libimagentryview/src/lib.rs @@ -45,6 +45,5 @@ extern crate libimagentryedit; pub mod error; pub mod builtin; -pub mod result; pub mod viewer; diff --git a/lib/entry/libimagentryview/src/result.rs b/lib/entry/libimagentryview/src/result.rs deleted file mode 100644 index 3650b1fe..00000000 --- a/lib/entry/libimagentryview/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::ViewError; - -pub type Result<T> = RResult<T, ViewError>; diff --git a/lib/entry/libimagentryview/src/viewer.rs b/lib/entry/libimagentryview/src/viewer.rs index 35763126..aad541c1 100644 --- a/lib/entry/libimagentryview/src/viewer.rs +++ b/lib/entry/libimagentryview/src/viewer.rs @@ -19,7 +19,7 @@ use libimagstore::store::Entry; -use result::Result; +use error::Result; pub trait Viewer { |