From 844ecebdad9cc5b3d2d6780eed104e3a203c3e26 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 6 Sep 2020 12:09:56 +0100 Subject: [PATCH] debug wip --- src/gamestate.rs | 13 ++++++++++++- src/updates.rs | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/gamestate.rs b/src/gamestate.rs index c93fa041..25ee9479 100644 --- a/src/gamestate.rs +++ b/src/gamestate.rs @@ -22,7 +22,7 @@ visible_slotmap_key!{ VisiblePieceId('.') } #[serde(try_from="f64")] pub struct ZCoord(pub f64); -#[derive(Clone,Debug,Serialize,Deserialize)] +#[derive(Clone,Serialize,Deserialize)] #[serde(transparent)] pub struct Html (pub String); @@ -178,6 +178,17 @@ impl Html { pub fn lit(s: &str) -> Self { Html(s.to_owned()) } } +impl Debug for Html { + fn fmt(&self, f: &mut Formatter) -> fmt::Result { + const MAX : usize = 23; + if self.0.len() < MAX { + write!(f, "<{}>", &self.0) + } else { + write!(f, "<{}>...", &self.0[0..MAX-3]) + } + } +} + // ---------- game state - rendering etc. ---------- impl PieceState { diff --git a/src/updates.rs b/src/updates.rs index 8fbadf27..323783fb 100644 --- a/src/updates.rs +++ b/src/updates.rs @@ -126,7 +126,7 @@ impl PreparedUpdateEntry { match self { Piece { ref op, .. } => { 50 + - op.new_state().map(|x| x.svg.0.len()).unwrap_or(0) + op.new_state().map(|x| x.svg.0.as_bytes().len()).unwrap_or(0) }, Log(logent) => { logent.html.0.as_bytes().len() * 3 -- 2.30.2