From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 17 Mar 2021 17:52:02 +0000 (+0000)
Subject: clock: in URender, distinguish a lack of player
X-Git-Tag: otter-0.5.0~673
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=99950fdc1eac91137e4f077a18efec021d2ecc80;p=otter.git

clock: in URender, distinguish a lack of player

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

diff --git a/src/clock.rs b/src/clock.rs
index 086caff6..55a47b5d 100644
--- a/src/clock.rs
+++ b/src/clock.rs
@@ -116,7 +116,7 @@ impl ChessClock {
 struct URender<'r> {
   st: URenderState,
   remaining: TimeSpec, // always >=0
-  nick: &'r str,
+  nick: Option<&'r str>,
 }
 
 #[derive(Debug,Copy,Clone)]
@@ -140,8 +140,7 @@ impl Clock {
       state.users.iter()
     ).map(|(&user, ustate)| {
       let nick = gplayers.get(ustate.player)
-        .map(|gpl| gpl.nick.as_str())
-        .unwrap_or("");
+        .map(|gpl| gpl.nick.as_str());
       let (st, remaining) =
         if ustate.remaining < TVL::zero() {
           (URS::Flag, TVL::zero())