summaryrefslogtreecommitdiffstats
path: root/lib/entry/libimagentrylink/src/iter.rs
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2020-03-07 16:04:33 +0100
committerMatthias Beyer <mail@beyermatthias.de>2020-03-08 11:43:24 +0100
commit8527d447ae2047e0d5d54cc70599a895b62a3ee0 (patch)
tree023de5d446d28c6a232308f8604e17a129ee49c7 /lib/entry/libimagentrylink/src/iter.rs
parent00aa4df88edae1d5eeb3fb365af05f95bd0de3b4 (diff)
Replace failure with anyhow in complete codebase
This patch was scripted with sed -i 's/use failure::Error/use anyhow::Error/' $(rg "use failure::Error" -l) sed -i 's/use failure::Fallible as /use anyhow::/' $(rg "use failure::Fallible" -l) sed -i 's/failure/anyhow/' $(rg "failure *=" -l) sed -i 's/format_err!/anyhow!/' $(rg "format_err!" -l) sed -i 's/use failure::ResultExt/use anyhow::Context/' $(rg "use failure::ResultExt" -l) sed -i 's/err_msg/anyhow!/' $(rg "use failure::err_msg" -l) sed -i 's/^anyhow\ *=.*$/anyhow = "1"/' $(rg "anyhow * =" -l) sed -i 's/^anyhow_derive.*//' $(rg "anyhow_derive" -l) sed -i 's/extern crate failure/extern crate anyhow/' $(rg "extern crate failure" -l) sed -i 's/.*extern crate anyhow_derive.*//' $(rg "anyhow_derive" -l) Some manual changes were added as well, so this patch was not completely scripted, but mostly. Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'lib/entry/libimagentrylink/src/iter.rs')
-rw-r--r--lib/entry/libimagentrylink/src/iter.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/entry/libimagentrylink/src/iter.rs b/lib/entry/libimagentrylink/src/iter.rs
index 3581a42d..82ec82bd 100644
--- a/lib/entry/libimagentrylink/src/iter.rs
+++ b/lib/entry/libimagentrylink/src/iter.rs
@@ -20,15 +20,13 @@
use std::vec::IntoIter;
-use failure::Error;
-use failure::ResultExt;
-use failure::Fallible as Result;
+use anyhow::Error;
+use anyhow::Result;
use toml::Value;
use itertools::Itertools;
use libimagstore::store::Store;
use libimagstore::store::FileLockEntry;
-use libimagerror::errors::ErrorMsg as EM;
use crate::link::Link;
@@ -64,7 +62,7 @@ impl<I: Iterator<Item = Link>> IntoValues for I {
fn into_values(self) -> Vec<Result<Value>> {
self.unique()
.sorted() // Cannot sort toml::Value, hence uglyness here
- .map(|link| link.to_value().context(EM::ConversionError).map_err(Error::from))
+ .map(|link| link.to_value().map_err(Error::from))
.collect()
}
}