From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 13 Mar 2021 17:29:44 +0000 (+0000)
Subject: Fix dbgc! to report correct file and line
X-Git-Tag: otter-0.4.0~113
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=07b44c05718eecd92c669507f365a098a3a6e890;p=otter.git

Fix dbgc! to report correct file and line

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/utils.rs b/src/utils.rs
index 5ace2c8b..e2095f54 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -364,10 +364,11 @@ fn matches_doesnot_test() {
   );
 }
 
-pub fn dbgc_helper(values: &[(&'static str, &dyn Debug)]) {
+pub fn dbgc_helper(file: &'static str, line: u32,
+                   values: &[(&'static str, &dyn Debug)]) {
   let buf = (||{
     let mut buf = String::new();
-    write!(buf, "[{}:{}]", std::file!(), std::line!())?;
+    write!(buf, "[{}:{}]", file, line)?;
     for (s, v) in values.iter() {
       write!(buf, " {}={:?}", s, v)?;
     }
@@ -386,20 +387,22 @@ macro_rules! dbgc {
     // `$val` expression could be a block (`{ .. }`), in which case the `eprintln!`
     // will be malformed.
     () => {
-      dbgc_helper(&[])
+      dbgc_helper(std::file!(), std::line!(), &[])
     };
     ($val:expr $(,)?) => {
         // Use of `match` here is intentional because it affects the lifetimes
         // of temporaries - https://stackoverflow.com/a/48732525/1063961
         match $val {
             tmp => {
-                dbgc_helper(&[(std::stringify!($val), &tmp)]);
+                dbgc_helper(std::file!(), std::line!(),
+                            &[(std::stringify!($val), &tmp)]);
                 tmp
             }
         }
     };
     ($($val:expr),+ $(,)?) => {
-      dbgc_helper(&[$((std::stringify!($val), &$val)),+])
+      dbgc_helper(std::file!(), std::line!(),
+                  &[$((std::stringify!($val), &$val)),+])
     };
 }