summaryrefslogtreecommitdiffstats
path: root/lib/entry/libimagentryref
diff options
context:
space:
mode:
Diffstat (limited to 'lib/entry/libimagentryref')
-rw-r--r--lib/entry/libimagentryref/src/flags.rs2
-rw-r--r--lib/entry/libimagentryref/src/hasher.rs2
-rw-r--r--lib/entry/libimagentryref/src/hashers/nbytes.rs2
-rw-r--r--lib/entry/libimagentryref/src/lib.rs1
-rw-r--r--lib/entry/libimagentryref/src/lister.rs2
-rw-r--r--lib/entry/libimagentryref/src/reference.rs2
-rw-r--r--lib/entry/libimagentryref/src/result.rs25
7 files changed, 5 insertions, 31 deletions
diff --git a/lib/entry/libimagentryref/src/flags.rs b/lib/entry/libimagentryref/src/flags.rs
index 95873506..53b41540 100644
--- a/lib/entry/libimagentryref/src/flags.rs
+++ b/lib/entry/libimagentryref/src/flags.rs
@@ -23,7 +23,7 @@ use toml::Value;
use error::RefErrorKind as REK;
use error::ResultExt;
-use result::Result;
+use error::Result;
pub struct RefFlags {
content_hashing: bool,
diff --git a/lib/entry/libimagentryref/src/hasher.rs b/lib/entry/libimagentryref/src/hasher.rs
index 7d2922f2..ad10f71e 100644
--- a/lib/entry/libimagentryref/src/hasher.rs
+++ b/lib/entry/libimagentryref/src/hasher.rs
@@ -26,7 +26,7 @@ use error::ResultExt;
use crypto::sha1::Sha1;
use crypto::digest::Digest;
-use result::Result;
+use error::Result;
/// The Hasher trait is used to implement custom hashing functions for the ref library.
/// This means that one can define how the hash of a reference is constructed from the content of
diff --git a/lib/entry/libimagentryref/src/hashers/nbytes.rs b/lib/entry/libimagentryref/src/hashers/nbytes.rs
index e52ba813..be7b444b 100644
--- a/lib/entry/libimagentryref/src/hashers/nbytes.rs
+++ b/lib/entry/libimagentryref/src/hashers/nbytes.rs
@@ -25,7 +25,7 @@ use crypto::sha1::Sha1;
use crypto::digest::Digest;
use hasher::Hasher;
-use result::Result;
+use error::Result;
use error::RefErrorKind as REK;
use error::ResultExt;
diff --git a/lib/entry/libimagentryref/src/lib.rs b/lib/entry/libimagentryref/src/lib.rs
index beea98db..c72ee298 100644
--- a/lib/entry/libimagentryref/src/lib.rs
+++ b/lib/entry/libimagentryref/src/lib.rs
@@ -55,4 +55,3 @@ pub mod hasher;
pub mod hashers;
pub mod lister;
pub mod reference;
-pub mod result;
diff --git a/lib/entry/libimagentryref/src/lister.rs b/lib/entry/libimagentryref/src/lister.rs
index f87bea31..e560ac34 100644
--- a/lib/entry/libimagentryref/src/lister.rs
+++ b/lib/entry/libimagentryref/src/lister.rs
@@ -22,7 +22,7 @@ use std::io::stdout;
use std::io::Write;
use libimagentrylist::lister::Lister;
-use libimagentrylist::result::Result;
+use libimagentrylist::error::Result;
use libimagentrylist::error::ResultExt;
use libimagerror::trace::trace_error;
use libimagstore::store::FileLockEntry;
diff --git a/lib/entry/libimagentryref/src/reference.rs b/lib/entry/libimagentryref/src/reference.rs
index a62d0f5c..c9a7479a 100644
--- a/lib/entry/libimagentryref/src/reference.rs
+++ b/lib/entry/libimagentryref/src/reference.rs
@@ -43,7 +43,7 @@ use error::RefErrorKind as REK;
use error::RefError as RE;
use error::ResultExt;
use flags::RefFlags;
-use result::Result;
+use error::Result;
use hasher::*;
use module_path::ModuleEntryPath;
diff --git a/lib/entry/libimagentryref/src/result.rs b/lib/entry/libimagentryref/src/result.rs
deleted file mode 100644
index eefcec65..00000000
--- a/lib/entry/libimagentryref/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::RefError;
-
-pub type Result<T> = RResult<T, RefError>;
-