From bd4122e334054e38f7cf978f4640aa8075e49bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 26 Oct 2023 13:54:32 +0300 Subject: [PATCH] gstreamer: error: Allow using variable expansion in `loggable_error!` macro Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/issues/490 Part-of: --- gstreamer/src/error.rs | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/gstreamer/src/error.rs b/gstreamer/src/error.rs index c43926a82..1b3f7d951 100644 --- a/gstreamer/src/error.rs +++ b/gstreamer/src/error.rs @@ -62,12 +62,6 @@ impl ErrorMessage { #[macro_export] macro_rules! loggable_error( -// Plain strings - ($cat:expr, $msg:expr) => { - $crate::LoggableError::new($cat.clone(), $crate::glib::bool_error!($msg)) - }; - -// Format strings ($cat:expr, $($msg:tt)*) => { { $crate::LoggableError::new($cat.clone(), $crate::glib::bool_error!($($msg)*)) }}; @@ -75,13 +69,6 @@ macro_rules! loggable_error( #[macro_export] macro_rules! result_from_gboolean( -// Plain strings - ($ffi_bool:expr, $cat:expr, $msg:expr) => { - $crate::glib::result_from_gboolean!($ffi_bool, $msg) - .map_err(|bool_err| $crate::LoggableError::new($cat.clone(), bool_err)) - }; - -// Format strings ($ffi_bool:expr, $cat:expr, $($msg:tt)*) => { { $crate::glib::result_from_gboolean!($ffi_bool, $($msg)*) .map_err(|bool_err| $crate::LoggableError::new($cat.clone(), bool_err))