From 02604ae58be17a9ab980b24b29192500c6658f9d Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 22 Dec 2019 19:01:01 +0100 Subject: Remove DebugResult and DebugOption helpers Signed-off-by: Matthias Beyer --- bin/domain/imag-diary/src/create.rs | 1 - bin/domain/imag-habit/src/lib.rs | 1 - lib/core/libimagrt/src/runtime.rs | 1 - lib/domain/libimaghabit/src/habit.rs | 1 - lib/entry/libimagentrylink/src/storecheck.rs | 1 - lib/entry/libimagentryurl/src/iter.rs | 1 - lib/etc/libimagutil/src/debug_option.rs | 28 --------------------------- lib/etc/libimagutil/src/debug_result.rs | 29 ---------------------------- lib/etc/libimagutil/src/lib.rs | 2 -- 9 files changed, 65 deletions(-) delete mode 100644 lib/etc/libimagutil/src/debug_option.rs delete mode 100644 lib/etc/libimagutil/src/debug_result.rs diff --git a/bin/domain/imag-diary/src/create.rs b/bin/domain/imag-diary/src/create.rs index d60045fa..7bd574c0 100644 --- a/bin/domain/imag-diary/src/create.rs +++ b/bin/domain/imag-diary/src/create.rs @@ -30,7 +30,6 @@ 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; diff --git a/bin/domain/imag-habit/src/lib.rs b/bin/domain/imag-habit/src/lib.rs index e77ff26b..e9ce9834 100644 --- a/bin/domain/imag-habit/src/lib.rs +++ b/bin/domain/imag-habit/src/lib.rs @@ -76,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; diff --git a/lib/core/libimagrt/src/runtime.rs b/lib/core/libimagrt/src/runtime.rs index 0c53b7e7..6791404e 100644 --- a/lib/core/libimagrt/src/runtime.rs +++ b/lib/core/libimagrt/src/runtime.rs @@ -44,7 +44,6 @@ use libimagerror::errors::ErrorMsg as EM; use libimagerror::trace::*; use libimagstore::store::Store; use libimagstore::storeid::StoreId; -use libimagutil::debug_result::DebugResult; use crate::spec::CliSpec; use atty; diff --git a/lib/domain/libimaghabit/src/habit.rs b/lib/domain/libimaghabit/src/habit.rs index 8ec5afa6..68a85f32 100644 --- a/lib/domain/libimaghabit/src/habit.rs +++ b/lib/domain/libimaghabit/src/habit.rs @@ -270,7 +270,6 @@ pub mod builder { use libimagstore::storeid::StoreId; use libimagstore::store::FileLockEntry; use libimagentryutil::isa::Is; - use libimagutil::debug_result::DebugResult; use failure::Error; use failure::Fallible as Result; diff --git a/lib/entry/libimagentrylink/src/storecheck.rs b/lib/entry/libimagentrylink/src/storecheck.rs index b57448f0..f78d52cc 100644 --- a/lib/entry/libimagentrylink/src/storecheck.rs +++ b/lib/entry/libimagentrylink/src/storecheck.rs @@ -21,7 +21,6 @@ use std::collections::HashMap; use libimagstore::store::Store; use libimagstore::storeid::StoreId; -use libimagutil::debug_result::DebugResult; use failure::ResultExt; use failure::Fallible as Result; diff --git a/lib/entry/libimagentryurl/src/iter.rs b/lib/entry/libimagentryurl/src/iter.rs index f6cc703e..f899cb38 100644 --- a/lib/entry/libimagentryurl/src/iter.rs +++ b/lib/entry/libimagentryurl/src/iter.rs @@ -32,7 +32,6 @@ use libimagentrylink::link::Link; use libimagentrylink::iter::LinkIter; use libimagstore::store::Store; -use libimagutil::debug_result::DebugResult; use failure::Fallible as Result; use failure::ResultExt; diff --git a/lib/etc/libimagutil/src/debug_option.rs b/lib/etc/libimagutil/src/debug_option.rs deleted file mode 100644 index 4f27279a..00000000 --- a/lib/etc/libimagutil/src/debug_option.rs +++ /dev/null @@ -1,28 +0,0 @@ -// -// imag - the personal information management suite for the commandline -// Copyright (C) 2015-2019 Matthias Beyer and contributors -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; version -// 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -// - -// Generates a extension for the `Option`, named `DebugOption` which has functionality to -// print `T` via `debug!()`. -generate_option_logging_extension!( - DebugOption, - map_dbg, - map_dbg_str, - |s| { debug!("{}", s); } -); - diff --git a/lib/etc/libimagutil/src/debug_result.rs b/lib/etc/libimagutil/src/debug_result.rs deleted file mode 100644 index dad06723..00000000 --- a/lib/etc/libimagutil/src/debug_result.rs +++ /dev/null @@ -1,29 +0,0 @@ -// -// imag - the personal information management suite for the commandline -// Copyright (C) 2015-2019 Matthias Beyer and contributors -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; version -// 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -// - -// Generates a extension for the `Result`, named `DebugResult` which has functionality to -// print either `T` or `E` via `debug!()`. -generate_result_logging_extension!( - DebugResult, - map_dbg, - map_dbg_str, - map_dbg_err, - map_dbg_err_str, - |s| { debug!("{}", s); } -); diff --git a/lib/etc/libimagutil/src/lib.rs b/lib/etc/libimagutil/src/lib.rs index 08de2392..77ee632b 100644 --- a/lib/etc/libimagutil/src/lib.rs +++ b/lib/etc/libimagutil/src/lib.rs @@ -47,8 +47,6 @@ extern crate chrono; #[macro_use] mod log_option; pub mod cli_validators; pub mod date; -pub mod debug_result; -pub mod debug_option; pub mod edit; pub mod info_result; pub mod info_option; -- cgit v1.2.3