diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2017-09-03 21:28:36 +0200 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2017-09-03 21:34:07 +0200 |
commit | 7ce44e80905cc60c656e385c7d1a4bb769f2c115 (patch) | |
tree | 9984e5d58814713c90db8624f87dbd759b2ff9be /lib/entry/libimagentrylink/src/external.rs | |
parent | 28d7085b2dbef61b95e41f05a276b256d66918dc (diff) |
Remove "IntoError" trait, use error_chain functionality
Diffstat (limited to 'lib/entry/libimagentrylink/src/external.rs')
-rw-r--r-- | lib/entry/libimagentrylink/src/external.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/entry/libimagentrylink/src/external.rs b/lib/entry/libimagentrylink/src/external.rs index 642f3cdc..2b3d0923 100644 --- a/lib/entry/libimagentrylink/src/external.rs +++ b/lib/entry/libimagentrylink/src/external.rs @@ -34,7 +34,6 @@ use std::ops::DerefMut; use std::collections::BTreeMap; use std::fmt::Debug; -use libimagerror::into::IntoError; use libimagstore::store::Entry; use libimagstore::store::FileLockEntry; use libimagstore::store::Store; @@ -46,6 +45,7 @@ use toml_query::read::TomlValueReadExt; use toml_query::set::TomlValueSetExt; use error::LinkErrorKind as LEK; +use error::LinkError as LE; use result::Result; use internal::InternalLinker; use module_path::ModuleEntryPath; @@ -95,7 +95,7 @@ impl<'a> Link<'a> { .chain_err(|| LEK::EntryHeaderReadError) }, Ok(None) => Ok(None), - _ => Err(LEK::EntryHeaderReadError.into_error()) + _ => Err(LE::from_kind(LEK::EntryHeaderReadError)) } } @@ -293,7 +293,7 @@ pub fn is_external_link_storeid<A: AsRef<StoreId> + Debug>(id: A) -> bool { fn get_external_link_from_file(entry: &FileLockEntry) -> Result<Url> { Link::get_link_uri_from_filelockentry(entry) // TODO: Do not hide error by using this function - .ok_or(LEK::StoreReadError.into_error()) + .ok_or(LE::from_kind(LEK::StoreReadError)) } /// Implement `ExternalLinker` for `Entry`, hiding the fact that there is no such thing as an external |