summaryrefslogtreecommitdiffstats
path: root/lib/core/libimagstore/src/storeid.rs
diff options
context:
space:
mode:
Diffstat (limited to 'lib/core/libimagstore/src/storeid.rs')
-rw-r--r--lib/core/libimagstore/src/storeid.rs18
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/core/libimagstore/src/storeid.rs b/lib/core/libimagstore/src/storeid.rs
index 3972f376..22f15734 100644
--- a/lib/core/libimagstore/src/storeid.rs
+++ b/lib/core/libimagstore/src/storeid.rs
@@ -26,10 +26,10 @@ use std::fmt::Error as FmtError;
use std::result::Result as RResult;
use std::path::Components;
-use failure::ResultExt;
-use failure::Fallible as Result;
-use failure::err_msg;
-use failure::Error;
+use anyhow::Context;
+use anyhow::Result;
+
+use anyhow::Error;
use crate::store::Store;
@@ -52,7 +52,7 @@ impl StoreId {
debug!("Trying to get a new baseless id from: {:?}", id);
if id.is_absolute() {
debug!("Error: Id is absolute!");
- Err(format_err!("Store Id local part is absolute: {}", id.display()))
+ Err(anyhow!("Store Id local part is absolute: {}", id.display()))
} else {
debug!("Building Storeid object baseless");
Ok(StoreId(id))
@@ -184,11 +184,11 @@ impl<'a> StoreIdWithBase<'a> {
store_part.display());
let p = full_path
.strip_prefix(store_part)
- .context(format_err!("Cannot strip prefix '{}' from path: '{}'",
+ .context(anyhow!("Cannot strip prefix '{}' from path: '{}'",
store_part.display(),
full_path.display()))
.map_err(Error::from)
- .context(err_msg("Error building Store Id from full path"))?;
+ .context(anyhow!("Error building Store Id from full path"))?;
Ok(StoreIdWithBase(store_part, PathBuf::from(p)))
}
}
@@ -227,7 +227,7 @@ macro_rules! module_entry_path_mod {
use std::path::Path;
use std::path::PathBuf;
use $crate::storeid::StoreId;
- use failure::Fallible as Result;
+ use anyhow::Result;
pub fn new_id<P: AsRef<Path>>(p: P) -> Result<StoreId> {
@@ -235,7 +235,7 @@ macro_rules! module_entry_path_mod {
.as_ref()
.to_str()
.ok_or_else(|| {
- format_err!("File path is not valid UTF-8: {}", p.as_ref().display())
+ anyhow!("File path is not valid UTF-8: {}", p.as_ref().display())
})?;
let id = format!("{}/{}", $name, path_str);