6 files changed, 11 insertions, 9 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..7bd574c0 100644
--- a/bin/domain/imag-diary/src/create.rs
+++ b/bin/domain/imag-diary/src/create.rs
@@ -25,11 +25,11 @@ 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;
 use libimagrt::runtime::Runtime;
-use libimagutil::debug_option::DebugOption;
 use libimagstore::store::FileLockEntry;
 use libimagstore::store::Store;
 
@@ -103,7 +103,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 +123,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 +135,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<_>>>()?;
 
diff --git a/bin/domain/imag-habit/Cargo.toml b/bin/domain/imag-habit/Cargo.toml
index 2e64c2fb..e4f96f7b 100644
--- a/bin/domain/imag-habit/Cargo.toml
+++ b/bin/domain/imag-habit/Cargo.toml
@@ -28,6 +28,7 @@ kairos = "0.3.0"
 prettytable-rs = "0.8.0"
 failure = "0.1.5"
 resiter = "0.4.0"
+result-inspect = "0.1"
 
 libimagerror       = { version = "0.10.0", path = "../../../lib/core/libimagerror" }
 libimagstore       = { version = "0.10.0", path = "../../../lib/core/libimagstore" }
diff --git a/bin/domain/imag-habit/src/lib.rs b/bin/domain/imag-habit/src/lib.rs
index c8075dfe..e9ce9834 100644
--- a/bin/domain/imag-habit/src/lib.rs
+++ b/bin/domain/imag-habit/src/lib.rs
@@ -43,6 +43,7 @@ extern crate resiter;
 extern crate chrono;
 extern crate prettytable;
 #[macro_use] extern crate failure;
+extern crate result_inspect;
 
 extern crate libimaghabit;
 extern crate libimagstore;
@@ -65,6 +66,7 @@ use resiter::Filter;
 use resiter::IterInnerOkOrElse;
 use clap::App;
 use chrono::NaiveDate;
+use result_inspect::*;
 
 use libimagrt::runtime::Runtime;
 use libimagrt::application::ImagApplication;
@@ -74,7 +76,6 @@ use libimaghabit::habit::HabitTemplate;
 use libimagstore::store::FileLockEntry;
 use libimagstore::iter::get::StoreIdGetIteratorExtension;
 use libimaginteraction::ask::ask_bool;
-use libimagutil::debug_result::DebugResult;
 
 
 mod ui;
@@ -133,7 +134,7 @@ fn create(rt: &Runtime) -> Result<()> {
 
     let parsedate = |d, pname| match kairos_parse(d)? {
         Parsed::TimeType(tt) => tt.calculate()
-            .map_dbg(|y| format!("TimeType yielded: '{:?}'", y))?
+            .inspect(|y| debug!("TimeType yielded: '{:?}'", y))?
             .get_moment()
             .ok_or_else(|| {
                 format_err!("Error: '{}' parameter does not yield a point in time", pname)