From 64abf69987af9f3e85b28cf85226c0ad3b2776f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Mon, 16 Jan 2023 11:10:21 +0200
Subject: [PATCH] Use `glib::function_name!` instead of `module_path!` macro in
 more places

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1191>
---
 gstreamer-audio/src/audio_decoder.rs | 12 ++---
 gstreamer-video/src/video_decoder.rs | 12 ++---
 gstreamer/src/element.rs             | 72 ++++++++++++++--------------
 gstreamer/src/error.rs               | 12 ++---
 4 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/gstreamer-audio/src/audio_decoder.rs b/gstreamer-audio/src/audio_decoder.rs
index e557f2536..635078a8c 100644
--- a/gstreamer-audio/src/audio_decoder.rs
+++ b/gstreamer-audio/src/audio_decoder.rs
@@ -160,7 +160,7 @@ macro_rules! audio_decoder_error(
             Some($msg),
             Some($debug),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         )
     }};
@@ -172,7 +172,7 @@ macro_rules! audio_decoder_error(
             Some($msg),
             None,
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         )
     }};
@@ -184,7 +184,7 @@ macro_rules! audio_decoder_error(
             None,
             Some($debug),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         )
     }};
@@ -196,7 +196,7 @@ macro_rules! audio_decoder_error(
             Some(&format!($($msg)*)),
             Some(&format!($($debug)*)),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         )
     }};
@@ -208,7 +208,7 @@ macro_rules! audio_decoder_error(
             Some(&format!($($msg)*)),
             None,
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         )
     }};
@@ -220,7 +220,7 @@ macro_rules! audio_decoder_error(
             None,
             Some(&format!($($debug)*)),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         )
     }};
diff --git a/gstreamer-video/src/video_decoder.rs b/gstreamer-video/src/video_decoder.rs
index 0336f0ba6..5f4a9d981 100644
--- a/gstreamer-video/src/video_decoder.rs
+++ b/gstreamer-video/src/video_decoder.rs
@@ -361,7 +361,7 @@ macro_rules! video_decoder_error(
             Some($msg),
             Some($debug),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         )
     }};
@@ -373,7 +373,7 @@ macro_rules! video_decoder_error(
             Some($msg),
             None,
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         )
     }};
@@ -385,7 +385,7 @@ macro_rules! video_decoder_error(
             None,
             Some($debug),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         )
     }};
@@ -397,7 +397,7 @@ macro_rules! video_decoder_error(
             Some(&format!($($msg)*)),
             Some(&format!($($debug)*)),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         )
     }};
@@ -409,7 +409,7 @@ macro_rules! video_decoder_error(
             Some(&format!($($msg)*)),
             None,
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         )
     }};
@@ -421,7 +421,7 @@ macro_rules! video_decoder_error(
             None,
             Some(&format!($($debug)*)),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         )
     }};
diff --git a/gstreamer/src/element.rs b/gstreamer/src/element.rs
index ced33cfde..c9563b76a 100644
--- a/gstreamer/src/element.rs
+++ b/gstreamer/src/element.rs
@@ -1011,7 +1011,7 @@ macro_rules! element_error(
             Some($msg),
             Some($debug),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1023,7 +1023,7 @@ macro_rules! element_error(
             Some($msg),
             None,
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1035,7 +1035,7 @@ macro_rules! element_error(
             None,
             Some($debug),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1047,7 +1047,7 @@ macro_rules! element_error(
             Some(&format!($($msg)*)),
             Some(&format!($($debug)*)),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1059,7 +1059,7 @@ macro_rules! element_error(
             Some(&format!($($msg)*)),
             None,
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1071,7 +1071,7 @@ macro_rules! element_error(
             None,
             Some(&format!($($debug)*)),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1084,7 +1084,7 @@ macro_rules! element_error(
             Some($msg),
             Some($debug),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
@@ -1097,7 +1097,7 @@ macro_rules! element_error(
             Some($msg),
             None,
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
@@ -1110,7 +1110,7 @@ macro_rules! element_error(
             None,
             Some($debug),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
@@ -1123,7 +1123,7 @@ macro_rules! element_error(
             Some(&format!($($msg)*)),
             Some(&format!($($debug)*)),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
@@ -1136,7 +1136,7 @@ macro_rules! element_error(
             Some(&format!($($msg)*)),
             None,
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
@@ -1149,7 +1149,7 @@ macro_rules! element_error(
             None,
             Some(&format!($($debug)*)),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
@@ -1168,7 +1168,7 @@ macro_rules! element_warning(
             Some($msg),
             Some($debug),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1180,7 +1180,7 @@ macro_rules! element_warning(
             Some($msg),
             None,
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1192,7 +1192,7 @@ macro_rules! element_warning(
             None,
             Some($debug),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1204,7 +1204,7 @@ macro_rules! element_warning(
             Some(&format!($($msg)*)),
             Some(&format!($($debug)*)),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1216,7 +1216,7 @@ macro_rules! element_warning(
             Some(&format!($($msg)*)),
             None,
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1228,7 +1228,7 @@ macro_rules! element_warning(
             None,
             Some(&format!($($debug)*)),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1241,7 +1241,7 @@ macro_rules! element_warning(
             Some($msg),
             Some($debug),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
@@ -1254,7 +1254,7 @@ macro_rules! element_warning(
             Some($msg),
             None,
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
@@ -1267,7 +1267,7 @@ macro_rules! element_warning(
             None,
             Some($debug),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
@@ -1280,7 +1280,7 @@ macro_rules! element_warning(
             Some(&format!($($msg)*)),
             Some(&format!($($debug)*)),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
@@ -1293,7 +1293,7 @@ macro_rules! element_warning(
             Some(&format!($($msg)*)),
             None,
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
@@ -1306,7 +1306,7 @@ macro_rules! element_warning(
             None,
             Some(&format!($($debug)*)),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
@@ -1325,7 +1325,7 @@ macro_rules! element_info(
             Some($msg),
             Some($debug),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1337,7 +1337,7 @@ macro_rules! element_info(
             Some($msg),
             None,
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1349,7 +1349,7 @@ macro_rules! element_info(
             None,
             Some($debug),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1361,7 +1361,7 @@ macro_rules! element_info(
             Some(&format!($($msg)*)),
             Some(&format!($($debug)*)),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1373,7 +1373,7 @@ macro_rules! element_info(
             Some(&format!($($msg)*)),
             None,
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1385,7 +1385,7 @@ macro_rules! element_info(
             None,
             Some(&format!($($debug)*)),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
         );
     }};
@@ -1398,7 +1398,7 @@ macro_rules! element_info(
             Some($msg),
             Some($debug),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
@@ -1411,7 +1411,7 @@ macro_rules! element_info(
             Some($msg),
             None,
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
@@ -1424,7 +1424,7 @@ macro_rules! element_info(
             None,
             Some($debug),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
@@ -1437,7 +1437,7 @@ macro_rules! element_info(
             Some(&format!($($msg)*)),
             Some(&format!($($debug)*)),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
@@ -1450,7 +1450,7 @@ macro_rules! element_info(
             Some(&format!($($msg)*)),
             None,
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
@@ -1463,7 +1463,7 @@ macro_rules! element_info(
             None,
             Some(&format!($($debug)*)),
             file!(),
-            module_path!(),
+            $crate::glib::function_name!(),
             line!(),
             $details,
         );
diff --git a/gstreamer/src/error.rs b/gstreamer/src/error.rs
index e47d7580a..0a8d58139 100644
--- a/gstreamer/src/error.rs
+++ b/gstreamer/src/error.rs
@@ -9,35 +9,35 @@ macro_rules! error_msg(
     ($err:expr, ($msg:expr), [$dbg:expr]) =>  {
         $crate::ErrorMessage::new(&$err, Some($msg),
                           Some($dbg),
-                          file!(), module_path!(), line!())
+                          file!(), $crate::glib::function_name!(), line!())
     };
     ($err:expr, ($msg:expr)) => {
         $crate::ErrorMessage::new(&$err, Some($msg),
                           None,
-                          file!(), module_path!(), line!())
+                          file!(), $crate::glib::function_name!(), line!())
     };
     ($err:expr, [$dbg:expr]) => {
         $crate::ErrorMessage::new(&$err, None,
                           Some($dbg),
-                          file!(), module_path!(), line!())
+                          file!(), $crate::glib::function_name!(), line!())
     };
 
 // Format strings
     ($err:expr, ($($msg:tt)*), [$($dbg:tt)*]) =>  { {
         $crate::ErrorMessage::new(&$err, Some(format!($($msg)*).as_ref()),
                           Some(format!($($dbg)*).as_ref()),
-                          file!(), module_path!(), line!())
+                          file!(), $crate::glib::function_name!(), line!())
     }};
     ($err:expr, ($($msg:tt)*)) =>  { {
         $crate::ErrorMessage::new(&$err, Some(format!($($msg)*).as_ref()),
                           None,
-                          file!(), module_path!(), line!())
+                          file!(), $crate::glib::function_name!(), line!())
     }};
 
     ($err:expr, [$($dbg:tt)*]) =>  { {
         $crate::ErrorMessage::new(&$err, None,
                           Some(format!($($dbg)*).as_ref()),
-                          file!(), module_path!(), line!())
+                          file!(), $crate::glib::function_name!(), line!())
     }};
 );