matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
Matthias Beyer 2016-09-04 17:45:46 +02:00
parent 5e739df3f8
commit f61e14ff41
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
imag-diary/src/delete.rs
View file

@ -13,12 +13,10 @@ use util::get_diary_name;
pub fn delete(rt: &Runtime) { pub fn delete(rt: &Runtime) {
use libimaginteraction::ask::ask_bool; use libimaginteraction::ask::ask_bool;
let diaryname = get_diary_name(rt); let diaryname = get_diary_name(rt).unwrap_or_else(|| {
if diaryname.is_none() {
warn!("No diary selected. Use either the configuration file or the commandline option"); warn!("No diary selected. Use either the configuration file or the commandline option");
exit(1); exit(1);
} });
let diaryname = diaryname.unwrap();
let diary = Diary::open(rt.store(), &diaryname[..]); let diary = Diary::open(rt.store(), &diaryname[..]);
debug!("Diary opened: {:?}", diary); debug!("Diary opened: {:?}", diary);