Many dbg! changed to dbgc!

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

diff --git a/apitest.rs b/apitest.rs
index 2765c86a684e15e413c5ba6c8b84aedfe8d62213..56593d8648e0a0ef8dd464117e1537438613e5f0 100644 (file)
--- a/apitest.rs
+++ b/apitest.rs
@@ -662,7 +662,7 @@ impl DirSubst {
       let data = fs::read(&path).context("read")?;
       let data = std::str::from_utf8(&data).context("convert from UTF-8")?;
       let data: toml::Value = data.parse().context("parse TOM")?;
-      dbg!(&data);
+      dbgc!(&data);
       let data = toml_de::from_value(&data).context("interperet TOML")?;
       Ok::<_,AE>(data)
     })()

diff --git a/apitest/at-otter.rs b/apitest/at-otter.rs
index fce63a6eb79f19488a634f0c6accab82728bd34c..f46c2b3984c5b7d3caa5336079ca4b606d279e0a 100644 (file)
--- a/apitest/at-otter.rs
+++ b/apitest/at-otter.rs
@@ -87,7 +87,7 @@ mod scraper_ext {
     assert_eq!(resp.status(), 200);
     let body = resp.text()?;
     let dom = scraper::Html::parse_document(&body);
-    //dbg!(&&dom);
+    //dbgc!(&&dom);
     dom
   }
 
@@ -143,20 +143,20 @@ impl Ctx {
     let client = reqwest::blocking::Client::new();
     let loading = client.get(&player.url).send_parse_html()?;
     let ptoken = loading.e_attr("#loading_token", "data-ptoken").unwrap();
-    dbg!(&ptoken);
+    dbgc!(&ptoken);
 
     let session = client.post(&self.su().ds.subst("@url@/_/session/Portrait")?)
       .json(&json!({ "ptoken": ptoken }))
       .send_parse_html()?;
 
     let ctoken = session.e_attr("#main-body", "data-ctoken").unwrap();
-    dbg!(&ctoken);
+    dbgc!(&ctoken);
 
     let gen: Generation = Generation(
       session.e_attr("#main-body", "data-gen").unwrap()
         .parse().unwrap()
     );
-    dbg!(gen);
+    dbgc!(gen);
 
     let mut sse = client.get(
       &self.su().ds
@@ -217,7 +217,7 @@ struct PieceInfo<I> {
 impl Session {
   #[throws(AE)]
   fn pieces<PI:Idx>(&self) -> IndexVec<PI, PieceInfo<JsV>> {
-    self.dom
+    let pieces = self.dom
       .element("#pieces_marker")
       .unwrap().next_siblings()
       .map_loop(|puse: ego_tree::NodeRef<scraper::Node>| {
@@ -234,7 +234,8 @@ impl Session {
         let info = serde_json::from_str(attr).unwrap();
         Loop::ok(PieceInfo { id, pos, info })
       })
-      .collect()
+      .collect();
+    dbgc!(pieces)
   }
 
   #[throws(AE)]
@@ -359,12 +360,11 @@ impl Ctx {
 
     let mut session = self.connect_player(&self.alice)?;
     let pieces = session.pieces::<PIA>()?;
-    dbg!(&pieces);
     let llm = pieces.into_iter()
       .filter(|pi| pi.info["desc"] == "a library load area marker")
       .collect::<ArrayVec<_>>();
     let llm: [_;2] = llm.into_inner().unwrap();
-    dbg!(&llm);
+    dbgc!(&llm);
 
     for (llm, pos) in izip!(&llm, [PosC([5,5]), PosC([50,25])].iter()) {
       session.api_with_piece_op(&llm.id, "m", json![pos.0])?;
@@ -385,7 +385,7 @@ impl Ctx {
         then { added.push(piece); }
       }
     )?;
-    dbg!(&added);
+    dbgc!(&added);
     assert_eq!(added.len(), 6);
   }
 
@@ -403,7 +403,7 @@ impl Ctx {
       .map(|(i,_)| i)
       .collect::<ArrayVec<[_;1]>>()
       .into_inner().unwrap();
-    dbg!(&hand);
+    dbgc!(&hand);
 
     alice.api_with_piece_op_synch(&a_pieces[hand].id, "k", json!({
       "opname": "claim",
@@ -419,7 +419,7 @@ impl Ctx {
         .take(2)
         .collect::<ArrayVec<[_;2]>>()
         .into_inner().unwrap();
-      dbg!(pawns)
+      dbgc!(pawns)
     }
 
     let a_pawns = find_pawns(a_pieces.as_slice());

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index 13550e617cd53eaec97069fe5371036e5920ca45..708b90d99ce03114c5ae5e671aecd3c97b613dec 100644 (file)
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -565,7 +565,7 @@ fn read_spec<T: DeserializeOwned + SomeSpec>
     let mut buf = String::new();
     f.read_to_string(&mut buf).context("read")?;
     let tv: toml::Value = buf.parse().context("parse TOML")?;
-    dbg!(&tv);
+    dbgc!(&tv);
     let spec: T = toml_de::from_value(&tv).context("parse value")?;
     Ok::<_,AE>(spec)
   })().with_context(|| format!("read {} {:?}", T::WHAT, &filename))?
@@ -1057,7 +1057,7 @@ mod library_add {
       None
     };
 
-    if ma.verbose > 2 { dbg!(&markers, &args, &already); }
+    if ma.verbose > 2 { dbgc!(&markers, &args, &already); }
 
     #[derive(Debug)]
     enum Situation {
@@ -1099,7 +1099,7 @@ mod library_add {
       }
       Good(good.into_inner().unwrap())
     };
-    if ma.verbose > 2 { dbg!(&situation); }
+    if ma.verbose > 2 { dbgc!(&situation); }
 
     #[derive(Debug)]
     struct Placement {
@@ -1131,7 +1131,7 @@ mod library_add {
         }
       }
     };
-    if ma.verbose > 3 { dbg!(&placement); }
+    if ma.verbose > 3 { dbgc!(&placement); }
 
     impl Placement {
       /// If returns None, has already maybe tried to take some space
@@ -1200,7 +1200,7 @@ mod library_add {
         let ttopleft = PosC([tlhs, self.top]);
         let tnominal = (ttopleft - bbox[0])?;
 
-        if ma.verbose > 3 { dbg!(&self, &tnominal); }
+        if ma.verbose > 3 { dbgc!(&self, &tnominal); }
         Some(tnominal)
       }
     }