summaryrefslogtreecommitdiffstats
path: root/bin/domain/imag-contact/src/edit.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 /bin/domain/imag-contact/src/edit.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 'bin/domain/imag-contact/src/edit.rs')
-rw-r--r--bin/domain/imag-contact/src/edit.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/domain/imag-contact/src/edit.rs b/bin/domain/imag-contact/src/edit.rs
index b276da64..34024949 100644
--- a/bin/domain/imag-contact/src/edit.rs
+++ b/bin/domain/imag-contact/src/edit.rs
@@ -35,8 +35,8 @@
use std::io::Read;
use std::io::Write;
-use failure::err_msg;
-use failure::Fallible as Result;
+
+use anyhow::Result;
use resiter::Filter;
use resiter::Map;
use resiter::AndThen;
@@ -58,12 +58,12 @@ pub fn edit(rt: &Runtime) -> Result<()> {
let retry = !scmd.is_present("fail-on-parse-error");
if rt.output_is_pipe() {
- return Err(err_msg("Cannot spawn editor if output is a pipe!"))
+ return Err(anyhow!("Cannot spawn editor if output is a pipe!"))
}
let mut output = rt.stdout();
let mut input = rt.stdin().ok_or_else(|| {
- err_msg("No input stream. Cannot ask for permission.")
+ anyhow!("No input stream. Cannot ask for permission.")
})?;
crate::util::find_contact_by_hash(rt, hash)?
@@ -92,13 +92,13 @@ fn edit_contact<'a>(rt: &Runtime, contact: &FileLockEntry<'a>, ref_config: &RefC
.get_path(ref_config)?;
let success = rt.editor()?
- .ok_or_else(|| err_msg("I have no editor configured. Cannot continue!"))?
+ .ok_or_else(|| anyhow!("I have no editor configured. Cannot continue!"))?
.arg(&filepath)
.status()?
.success();
if !success {
- return Err(err_msg("Editor failed!"))
+ return Err(anyhow!("Editor failed!"))
}
rt.store()