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:58:01 +02:00
parent b2b8f013af
commit 6b5d91e447
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
imag-diary/src/view.rs
View file

@ -9,12 +9,11 @@ use libimagerror::trace::trace_error;
use util::get_diary_name; use util::get_diary_name;
pub fn view(rt: &Runtime) { pub fn view(rt: &Runtime) {
let diaryname = get_diary_name(rt); let diaryname = get_diary_name(rt).unwrap_or_else(|| {
if diaryname.is_none() {
warn!("No diary name"); warn!("No diary name");
exit(1); exit(1);
} });
let diaryname = diaryname.unwrap();
let diary = Diary::open(rt.store(), &diaryname[..]); let diary = Diary::open(rt.store(), &diaryname[..]);
let show_header = rt.cli().subcommand_matches("view").unwrap().is_present("show-header"); let show_header = rt.cli().subcommand_matches("view").unwrap().is_present("show-header");