matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Rewrite edit_in_tmpfile() for new Runtime::editor() signature

Browse source
This commit is contained in:
Matthias Beyer 2018-03-23 22:57:07 +01:00
parent ea38f2ffbf
commit 7429754665
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/entry/libimagentryedit/src/edit.rs
View file

@ -72,18 +72,19 @@ impl EditHeader for Entry {
pub fn edit_in_tmpfile(rt: &Runtime, s: &mut String) -> Result<()> {
use libimagutil::edit::edit_in_tmpfile_with_command;
rt.editor()
.ok_or(EE::from_kind(EditErrorKind::NoEditor))
.and_then(|editor| {
edit_in_tmpfile_with_command(editor, s)
.chain_err(|| EditErrorKind::IOError)
.and_then(|worked| {
if !worked {
Err(EditErrorKind::ProcessExitFailure.into())
} else {
Ok(())
}
})
let editor = rt
.editor()
.chain_err(|| EditErrorKind::NoEditor)?
.ok_or_else(|| EE::from_kind(EditErrorKind::NoEditor))?;
edit_in_tmpfile_with_command(editor, s)
.chain_err(|| EditErrorKind::IOError)
.and_then(|worked| {
if !worked {
Err(EditErrorKind::ProcessExitFailure.into())
} else {
Ok(())
}
})
}