From a3da3774a3befda7b45ec19e197e5029a3c291b2 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Mon, 5 Jul 2021 17:27:46 -0400 Subject: better error message when editor is set incorrectly --- src/edit.rs | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'src/edit.rs') diff --git a/src/edit.rs b/src/edit.rs index cac8794..45e9534 100644 --- a/src/edit.rs +++ b/src/edit.rs @@ -38,15 +38,22 @@ pub fn edit(contents: &str, help: &str) -> Result { drop(fh); args.push(file.as_os_str()); - let res = std::process::Command::new(&editor) - .args(&args) - .status() - .unwrap(); - if !res.success() { - return Err(Error::FailedToRunEditor { - editor: editor.to_owned(), - res, - }); + let res = std::process::Command::new(&editor).args(&args).status(); + match res { + Ok(res) => { + if !res.success() { + return Err(Error::FailedToRunEditor { + editor: editor.to_owned(), + res, + }); + } + } + Err(err) => { + return Err(Error::FailedToFindEditor { + editor: editor.to_owned(), + err, + }) + } } let mut fh = std::fs::File::open(&file).unwrap(); -- cgit v1.2.3-54-g00ecf