Make dbgc macro actually useable in base

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

diff --git a/base/misc.rs b/base/misc.rs
index 10d9fb1aba18580a9e7a6dd5a7417708cb4a5158..47df4d6bc009abe372f58721146e4ecd78d3b908 100644 (file)
--- a/base/misc.rs
+++ b/base/misc.rs
@@ -129,21 +129,21 @@ macro_rules! dbgc {
     // `$val` expression could be a block (`{ .. }`), in which case the `eprintln!`
     // will be malformed.
     () => {
-      dbgc_helper(std::file!(), std::line!(), &[])
+      $crate::misc::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::file!(), std::line!(),
-                            &[(std::stringify!($val), &tmp)]);
+                $crate::misc::dbgc_helper(std::file!(), std::line!(),
+                                          &[(std::stringify!($val), &tmp)]);
                 tmp
             }
         }
     };
     ($($val:expr),+ $(,)?) => {
-      dbgc_helper(std::file!(), std::line!(),
-                  &[$((std::stringify!($val), &$val)),+])
+      $crate::misc::dbgc_helper(std::file!(), std::line!(),
+                                &[$((std::stringify!($val), &$val)),+])
     };
 }

diff --git a/base/prelude.rs b/base/prelude.rs
index 91011f71c8b7d14fa68a9cb853a4c86ea3f1ccff..b1ec9193078d25d84ff7bd5162c11deafad89fe8 100644 (file)
--- a/base/prelude.rs
+++ b/base/prelude.rs
@@ -29,7 +29,7 @@ pub use void::{self, Void};
 pub use crate::html::*;
 
 pub use crate::geometry::{CoordinateOverflow, PosC, PosPromote};
-pub use crate::{hformat, hformat_as_display, hwrite};
+pub use crate::{dbgc, hformat, hformat_as_display, hwrite};
 pub use crate::misc::default;
 pub use crate::misc::display_as_debug;