other: post-0.9.2 cleanup (#1203)

* other: some cleanup

* other: add conditional logging macros

* more cleanup

* use compile-time feature for some text in clap

1 files changed, 61 insertions, 1 deletions

diff --git a/src/utils/logging.rs b/src/utils/logging.rs
index ed1578d2..312c909f 100644
--- a/src/utils/logging.rs
+++ b/src/utils/logging.rs
@@ -1,4 +1,4 @@
-#[cfg(feature = "fern")]
+#[cfg(feature = "logging")]
 pub fn init_logger(
     min_level: log::LevelFilter, debug_file_name: &std::ffi::OsStr,
 ) -> Result<(), fern::InitError> {
@@ -28,3 +28,63 @@ pub fn init_logger(
 
     Ok(())
 }
+
+#[macro_export]
+macro_rules! c_debug {
+    ($($x:tt)*) => {
+        #[cfg(feature = "logging")]
+        {
+            log::debug!($($x)*)
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! c_error {
+    ($($x:tt)*) => {
+        #[cfg(feature = "logging")]
+        {
+            log::error!($($x)*)
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! c_info {
+    ($($x:tt)*) => {
+        #[cfg(feature = "logging")]
+        {
+            log::info!($($x)*)
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! c_log {
+    ($($x:tt)*) => {
+        #[cfg(feature = "logging")]
+        {
+            log::log!($($x)*)
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! c_trace {
+    ($($x:tt)*) => {
+        #[cfg(feature = "logging")]
+        {
+            log::trace!($($x)*)
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! c_warn {
+    ($($x:tt)*) => {
+        #[cfg(feature = "logging")]
+        {
+            log::warn!($($x)*)
+        }
+    };
+}