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 086caff6d4d6b7bb15716fb28e15e104315e991f..55a47b5d6c2e6b04b6d6f5739bd5a2f67691de80 100644 (file)
--- 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())