diff options
Diffstat (limited to 'bin/domain/imag-diary')
| -rw-r--r-- | bin/domain/imag-diary/Cargo.toml | 1 | ||||
| -rw-r--r-- | bin/domain/imag-diary/src/create.rs | 7 | ||||
| -rw-r--r-- | bin/domain/imag-diary/src/lib.rs | 1 | ||||
| -rw-r--r-- | bin/domain/imag-diary/src/list.rs | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/bin/domain/imag-diary/Cargo.toml b/bin/domain/imag-diary/Cargo.toml index 26432644..669c9d31 100644 --- a/bin/domain/imag-diary/Cargo.toml +++ b/bin/domain/imag-diary/Cargo.toml @@ -27,6 +27,7 @@ toml-query = "0.9.2" itertools = "0.8.0" failure = "0.1.5" resiter = "0.4.0" +option-inspect = "0.1.0" libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" } libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" } diff --git a/bin/domain/imag-diary/src/create.rs b/bin/domain/imag-diary/src/create.rs index c6c4687f..d60045fa 100644 --- a/bin/domain/imag-diary/src/create.rs +++ b/bin/domain/imag-diary/src/create.rs @@ -25,6 +25,7 @@ use failure::Error; use failure::ResultExt; use failure::err_msg; use failure::Fallible as Result; +use option_inspect::*; use libimagdiary::diary::Diary; use libimagentryedit::edit::Edit; @@ -103,7 +104,7 @@ fn create_id_from_clispec(create: &ArgMatches, timed_type: Timed) -> Result<Naiv Timed::Minutely => { let min = create .value_of("minute") - .map_dbg(|m| format!("minute = {:?}", m)) + .inspect(|m| debug!("minute = {:?}", m)) .map(|s| { FromStr::from_str(s) .map_err(Error::from) @@ -123,7 +124,7 @@ fn create_id_from_clispec(create: &ArgMatches, timed_type: Timed) -> Result<Naiv Timed::Secondly => { let min = create .value_of("minute") - .map_dbg(|m| format!("minute = {:?}", m)) + .inspect(|m| debug!("minute = {:?}", m)) .map(|s| { FromStr::from_str(s) .map_err(Error::from) @@ -135,7 +136,7 @@ fn create_id_from_clispec(create: &ArgMatches, timed_type: Timed) -> Result<Naiv let sec = create .value_of("second") - .map_dbg(|s| format!("second = {:?}", s)) + .inspect(|s| debug!("second = {:?}", s)) .map(|s| { FromStr::from_str(s) .map_err(Error::from) diff --git a/bin/domain/imag-diary/src/lib.rs b/bin/domain/imag-diary/src/lib.rs index f87cd927..9a924857 100644 --- a/bin/domain/imag-diary/src/lib.rs +++ b/bin/domain/imag-diary/src/lib.rs @@ -42,6 +42,7 @@ extern crate chrono; extern crate toml; extern crate toml_query; extern crate itertools; +extern crate option_inspect; extern crate libimagdiary; extern crate libimagentryedit; diff --git a/bin/domain/imag-diary/src/list.rs b/bin/domain/imag-diary/src/list.rs index 634b0ff7..0f1018aa 100644 --- a/bin/domain/imag-diary/src/list.rs +++ b/bin/domain/imag-diary/src/list.rs @@ -26,7 +26,6 @@ use resiter::AndThen; use libimagdiary::diary::Diary; use libimagrt::runtime::Runtime; -use libimagutil::debug_result::*; use libimagdiary::diaryid::DiaryId; use libimagdiary::diaryid::FromStoreId; use libimagstore::storeid::IntoStoreId; @@ -37,8 +36,7 @@ pub fn list(rt: &Runtime) -> Result<()> { let diaryname = get_diary_name(rt) .ok_or_else(|| err_msg("No diary selected. Use either the configuration file or the commandline option"))?; - let mut ids = Diary::entries(rt.store(), &diaryname) - .map_dbg_str("Ok")? + let mut ids = Diary::entries(rt.store(), &diaryname)? .and_then_ok(|id| DiaryId::from_storeid(&id)) .collect::<Result<Vec<_>>>()?; |