From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 24 Apr 2022 11:36:23 +0000 (+0100)
Subject: Fix many dbgc calls to be trace_dbg instead
X-Git-Tag: otter-1.1.0~464
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0c8099192affc1009562b9e64f420fd87607c86d;p=otter.git

Fix many dbgc calls to be trace_dbg instead

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

diff --git a/src/deck.rs b/src/deck.rs
index 004bc881..7949caee 100644
--- a/src/deck.rs
+++ b/src/deck.rs
@@ -186,7 +186,7 @@ impl PieceTrait for Deck {
     let gpl = gplayers.byid_mut(player)?;
     let nick = gpl.nick.to_html();
 
-    dbgc!("ui op k entry", &opname);
+    trace_dbg!("ui op k entry", &opname);
 
     let rot_checked = gpc.occulter_check_unrotated(vis)?;
     let old_state = self.state(gpc, goccults)?;
@@ -231,19 +231,19 @@ impl PieceTrait for Deck {
     let puos = PUOs_Simple_Modify;
 
     if let Some((region, views)) = region_views {
-      dbgc!("creating occ");
+      trace_dbg!("creating occ");
       xupdates.extend(
         create_occultation(&mut gen.unique_gen(), &mut gs.max_z,
                            gplayers, gpieces, goccults, ipieces, ioccults,
                            to_recalculate, rot_checked,
                            region, piece, views, &puos)?
       );
-      dbgc!("creating occ done", &xupdates);
+      trace_dbg!("creating occ done", &xupdates);
     }
 
     let log = vec![ LogEntry { html: hformat!("{} {}", nick, did) }];
 
-    dbgc!("ui op k did main");
+    trace_dbg!("ui op k did main");
     
     (PieceUpdate {
       wrc, log,
diff --git a/src/hand.rs b/src/hand.rs
index eb4461cb..a6c02802 100644
--- a/src/hand.rs
+++ b/src/hand.rs
@@ -259,7 +259,7 @@ impl PieceTrait for Hand {
     let gpl = gplayers.byid_mut(player)?;
     let nick = gpl.nick.to_html();
 
-    dbgc!("ui op k entry", &opname, &xdata);
+    trace_dbg!("ui op k entry", &opname, &xdata);
 
     let puos = PUOs_Simple_Modify;
 
@@ -267,7 +267,7 @@ impl PieceTrait for Hand {
       match (opname, xdata.owner.is_some())
     {
       ("claim", false) => {
-        dbgc!("claiming");
+        trace_dbg!("claiming");
         let new_desc = self.behaviour.owned_desc(&nick);
         let new_owner = Some(MagicOwner {
           player,
@@ -279,7 +279,7 @@ impl PieceTrait for Hand {
           Some((mk_owner, mk_defview)) => {
             let rot_checked = rot_checked?;
             let (region, views) = (||{
-              dbgc!("claiming region");
+              trace_dbg!("claiming region");
               let rect   = self.shape.outline.rect  (gpc.pos)?;
               let region = self.shape.outline.region(gpc.pos)?;
               let displace = OccDisplacement::Rect { rect };
@@ -288,12 +288,12 @@ impl PieceTrait for Hand {
                 owner_view: mk_owner(&displace, &gpc.zlevel.z),
                 defview: mk_defview(&displace, &gpc.zlevel.z),
               }.views()?;
-              dbgc!("claiming got region", &region, &views);
+              trace_dbg!("claiming got region", &region, &views);
               Ok::<_,IE>((region, views))
             })()?;
             
             // actually do things:
-            dbgc!("creating occ");
+            trace_dbg!("creating occ");
             let xupdates =
               create_occultation(&mut gen.unique_gen(), &mut gs.max_z,
                                  gplayers, gpieces, goccults,
@@ -304,7 +304,7 @@ impl PieceTrait for Hand {
           }
         };
           
-        dbgc!("creating occ done", &new_owner, &xupdates);
+        trace_dbg!("creating occ done", &new_owner, &xupdates);
         (new_owner, xupdates, hformat!("claimed {}", &old_desc))
       }
       ("deactivate", true) => {
@@ -328,7 +328,7 @@ impl PieceTrait for Hand {
 
     let log = vec![ LogEntry { html: hformat!("{} {}", nick, did) }];
 
-    dbgc!("ui op k did main");
+    trace_dbg!("ui op k did main");
     
     // We need to reaquire mut references because create_occultation etc.
     // need mut access to gpieces.
@@ -337,7 +337,7 @@ impl PieceTrait for Hand {
       .expect("xdata disappeared!");
     assert_eq!(xdata.player(), old_player);
 
-    dbgc!("thinging done", &xdata, &new_owner);
+    trace_dbg!("thinging done", &xdata, &new_owner);
     xdata.owner = new_owner;
 
     (PieceUpdate {
diff --git a/src/pcrender.rs b/src/pcrender.rs
index f0446330..807e131e 100644
--- a/src/pcrender.rs
+++ b/src/pcrender.rs
@@ -141,7 +141,7 @@ impl PieceRenderInstructions {
       moveable   : gpc.moveable(),
       facehint   : pri.facehint(gpc),
     };
-    dbgc!(pri, ipc, gpc, r);
+    trace_dbg!("prep_piecestate", pri, ipc, gpc, r);
     r
   }
 
@@ -155,7 +155,7 @@ impl PieceRenderInstructions {
       svg, bbox,
       uos: pri.ui_operations(gs, gpc, ipc)?,
     };
-    dbgc!(pri, ipc, gpc, r);
+    trace_dbg!("prep_pieceimage", pri, ipc, gpc, r);
     r
   }
 
diff --git a/src/vpid.rs b/src/vpid.rs
index d463908b..cbc433a5 100644
--- a/src/vpid.rs
+++ b/src/vpid.rs
@@ -364,7 +364,7 @@ pub fn permute(occid: OccId,
 
   }
   occ.notches.table = new_notches;
-  dbgc!(&occ);
+  trace_dbg!("permuted", &occ);
 }
 
 #[cfg(not(debug_assertions))]