Replace is_none() -> unwrap() with unwrap_or_else()

This commit is contained in:
Matthias Beyer 2016-09-04 17:31:10 +02:00
parent 66ccd97ef2
commit 5e739df3f8

View file

@ -13,13 +13,11 @@ use libimagdiary::result::Result;
use util::get_diary_name;
pub fn create(rt: &Runtime) {
let diaryname = get_diary_name(rt);
if diaryname.is_none() {
let diaryname = get_diary_name(rt)
.unwrap_or_else(|| {
warn!("No diary selected. Use either the configuration file or the commandline option");
exit(1);
}
let diaryname = diaryname.unwrap();
exit(1)
});
let prevent_edit = rt.cli().subcommand_matches("create").unwrap().is_present("no-edit");