Added 'log-like' macros to bridged logging in bridged_logging_domain_macros feature

Author: xanathar

.travis.yml

@@ -7,25 +7,25 @@ matrix:
       env: GTK=3.14 FEATURES=
     - os: linux
       rust: nightly
-      env: GTK=3.24 FEATURES="v2_48 log"
+      env: GTK=3.24 FEATURES="v2_48 log_macros"
     - os: linux
       rust: beta
       env: GTK=3.14 FEATURES=
     - os: linux
       rust: beta
-      env: GTK=3.24 FEATURES="v2_48 log"
+      env: GTK=3.24 FEATURES="v2_48 log_macros"
     - os: linux
       rust: 1.40.0
       env: GTK=3.14 FEATURES=
     - os: linux
       rust: 1.40.0
-      env: GTK=3.24 FEATURES="v2_48 log"
+      env: GTK=3.24 FEATURES="v2_48 log_macros"
     - os: linux
       rust: stable
       env: GTK=3.14 FEATURES=
     - os: linux
       rust: stable
-      env: GTK=3.24 FEATURES="v2_48 log"
+      env: GTK=3.24 FEATURES="v2_48 log_macros"
     - os: osx
       rust: nightly
       env: GTK=3.14 FEATURES=
@@ -55,7 +55,7 @@ matrix:
       env: GTK=3.14 FEATURES= ARM=1 OTHER_TARGET="--target armv7-unknown-linux-gnueabihf"
     - os: linux
       rust: nightly
-      env: GTK=3.24 FEATURES="v2_48 log" ARM=1 OTHER_TARGET="--target armv7-unknown-linux-gnueabihf"
+      env: GTK=3.24 FEATURES="v2_48 log_macros" ARM=1 OTHER_TARGET="--target armv7-unknown-linux-gnueabihf"
 addons:
   apt:
     packages:

Cargo.toml

@@ -49,7 +49,8 @@ v2_58 = ["v2_56", "glib-sys/v2_58", "gobject-sys/v2_58"]
 v2_60 = ["v2_58", "glib-sys/v2_60"]
 v2_62 = ["v2_60", "glib-sys/v2_62", "gobject-sys/v2_62"]
 v2_64 = ["v2_62", "glib-sys/v2_64"]
-dox = ["glib-sys/dox", "gobject-sys/dox", "log"]
+log_macros = ["log"]
+dox = ["glib-sys/dox", "gobject-sys/dox", "log_macros"]
 
 [package.metadata.docs.rs]
 features = ["dox"]

src/bridged_logging.rs

@@ -185,3 +185,133 @@ impl rs_log::Log for GlibLogger {
 
     fn flush(&self) {}
 }
+
+/// A macro which behaves exactly as `log::error!` except that it sets the
+/// current log target to the contents of a `G_LOG_DOMAIN` constant (and fails
+/// to build if not defined).
+///
+/// In order to use this macro, `glib` must be built with the `log_macros`
+/// feature enabled and the [`GlibLogger`](struct.GlibLogger.html) must have been
+/// initialized using [`GlibLoggerDomain::CrateTarget`](enum.GlibLoggerDomain.html).
+///
+/// ```no_run
+/// #[macro_use] extern crate glib;
+///
+/// static G_LOG_DOMAIN: &str = "my-domain";
+///
+/// error!("This will be logged under 'my-domain'");
+/// ```
+#[macro_export]
+#[cfg(any(feature = "dox", feature = "log_macros"))]
+macro_rules! error {
+    (target: $target:expr, $($arg:tt)+) => (
+        log::log!(target: $target, log::Level::Error, $($arg)+);
+    );
+    ($($arg:tt)+) => (
+        log::log!(target: G_LOG_DOMAIN, log::Level::Error, $($arg)+);
+    )
+}
+
+/// A macro which behaves exactly as `log::warn!` except that it sets the
+/// current log target to the contents of a `G_LOG_DOMAIN` constant (and fails
+/// to build if not defined).
+///
+/// In order to use this macro, `glib` must be built with the `log_macros`
+/// feature enabled and the [`GlibLogger`](struct.GlibLogger.html) must have been
+/// initialized using [`GlibLoggerDomain::CrateTarget`](enum.GlibLoggerDomain.html).
+///
+/// ```no_run
+/// #[macro_use] extern crate glib;
+///
+/// static G_LOG_DOMAIN: &str = "my-domain";
+///
+/// warn!("This will be logged under 'my-domain'");
+/// ```
+#[macro_export]
+#[cfg(any(feature = "dox", feature = "log_macros"))]
+macro_rules! warn {
+    (target: $target:expr, $($arg:tt)+) => (
+        log::log!(target: $target, log::Level::Warn, $($arg)+);
+    );
+    ($($arg:tt)+) => (
+        log::log!(target: G_LOG_DOMAIN, log::Level::Warn, $($arg)+);
+    )
+}
+
+/// A macro which behaves exactly as `log::info!` except that it sets the
+/// current log target to the contents of a `G_LOG_DOMAIN` constant (and fails
+/// to build if not defined).
+///
+/// In order to use this macro, `glib` must be built with the `log_macros`
+/// feature enabled and the [`GlibLogger`](struct.GlibLogger.html) must have been
+/// initialized using [`GlibLoggerDomain::CrateTarget`](enum.GlibLoggerDomain.html).
+///
+/// ```no_run
+/// #[macro_use] extern crate glib;
+///
+/// static G_LOG_DOMAIN: &str = "my-domain";
+///
+/// info!("This will be logged under 'my-domain'");
+/// ```
+#[macro_export]
+#[cfg(any(feature = "dox", feature = "log_macros"))]
+macro_rules! info {
+    (target: $target:expr, $($arg:tt)+) => (
+        log::log!(target: $target, log::Level::Info, $($arg)+);
+    );
+    ($($arg:tt)+) => (
+        log::log!(target: G_LOG_DOMAIN, log::Level::Info, $($arg)+);
+    )
+}
+
+/// A macro which behaves exactly as `log::debug!` except that it sets the
+/// current log target to the contents of a `G_LOG_DOMAIN` constant (and fails
+/// to build if not defined).
+///
+/// In order to use this macro, `glib` must be built with the `log_macros`
+/// feature enabled and the [`GlibLogger`](struct.GlibLogger.html) must have been
+/// initialized using [`GlibLoggerDomain::CrateTarget`](enum.GlibLoggerDomain.html).
+///
+/// ```no_run
+/// #[macro_use] extern crate glib;
+///
+/// static G_LOG_DOMAIN: &str = "my-domain";
+///
+/// debug!("This will be logged under 'my-domain'");
+/// ```
+#[macro_export]
+#[cfg(any(feature = "dox", feature = "log_macros"))]
+macro_rules! debug {
+    (target: $target:expr, $($arg:tt)+) => (
+        log::log!(target: $target, log::Level::Debug, $($arg)+);
+    );
+    ($($arg:tt)+) => (
+        log::log!(target: G_LOG_DOMAIN, log::Level::Debug, $($arg)+);
+    )
+}
+
+/// A macro which behaves exactly as `log::trace!` except that it sets the
+/// current log target to the contents of a `G_LOG_DOMAIN` constant (and fails
+/// to build if not defined).
+///
+/// In order to use this macro, `glib` must be built with the `log_macros`
+/// feature enabled and the [`GlibLogger`](struct.GlibLogger.html) must have been
+/// initialized using [`GlibLoggerDomain::CrateTarget`](enum.GlibLoggerDomain.html).
+///
+/// ```no_run
+/// #[macro_use] extern crate glib;
+///
+/// static G_LOG_DOMAIN: &str = "my-domain";
+///
+/// trace!("This will be logged under 'my-domain'");
+/// ```
+#[macro_export]
+#[cfg(any(feature = "dox", feature = "log_macros"))]
+macro_rules! trace {
+    (target: $target:expr, $($arg:tt)+) => (
+        log::log!(target: $target, log::Level::Trace, $($arg)+);
+    );
+    ($($arg:tt)+) => (
+        log::log!(target: G_LOG_DOMAIN, log::Level::Trace, $($arg)+);
+    )
+}

src/lib.rs

@@ -200,6 +200,7 @@ pub use log::{
 };
 
 #[cfg(any(feature = "log", feature = "dox"))]
+#[macro_use]
 mod bridged_logging;
 #[cfg(any(feature = "log", feature = "dox"))]
 pub use bridged_logging::{GlibLogger, GlibLoggerDomain, GlibLoggerFormat};