From 10bc09ba826648d704e15147b7791ccae886accf Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Fri, 28 Aug 2020 20:29:18 +0200 Subject: [PATCH] gstreamer: error: Prefix gst_error_msg with $crate This macro might not have been imported in the surrounding scope where gst_panic_to_error is used, thus reference it directly by the full namespace. --- gstreamer/src/subclass/error.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gstreamer/src/subclass/error.rs b/gstreamer/src/subclass/error.rs index b660b3605..6b17c6057 100644 --- a/gstreamer/src/subclass/error.rs +++ b/gstreamer/src/subclass/error.rs @@ -21,7 +21,7 @@ macro_rules! gst_panic_to_error( #[allow(clippy::unused_unit)] { if $panicked.load(Ordering::Relaxed) { - $element.post_error_message(gst_error_msg!($crate::LibraryError::Failed, ["Panicked"])); + $element.post_error_message($crate::gst_error_msg!($crate::LibraryError::Failed, ["Panicked"])); $ret } else { let result = panic::catch_unwind(AssertUnwindSafe(|| $code)); @@ -31,11 +31,11 @@ macro_rules! gst_panic_to_error( Err(err) => { $panicked.store(true, Ordering::Relaxed); if let Some(cause) = err.downcast_ref::<&str>() { - $element.post_error_message(gst_error_msg!($crate::LibraryError::Failed, ["Panicked: {}", cause])); + $element.post_error_message($crate::gst_error_msg!($crate::LibraryError::Failed, ["Panicked: {}", cause])); } else if let Some(cause) = err.downcast_ref::() { - $element.post_error_message(gst_error_msg!($crate::LibraryError::Failed, ["Panicked: {}", cause])); + $element.post_error_message($crate::gst_error_msg!($crate::LibraryError::Failed, ["Panicked: {}", cause])); } else { - $element.post_error_message(gst_error_msg!($crate::LibraryError::Failed, ["Panicked"])); + $element.post_error_message($crate::gst_error_msg!($crate::LibraryError::Failed, ["Panicked"])); } $ret }