From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 17 Mar 2021 17:35:43 +0000 (+0000)
Subject: clock: Abolish PMissing state
X-Git-Tag: otter-0.5.0~675
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6d91b563a17b72f3d262f443880adcb2cd84b5fa;p=otter.git

clock: Abolish PMissing state

We're just going to let this be fine

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

diff --git a/src/clock.rs b/src/clock.rs
index 19d78f6d..086caff6 100644
--- a/src/clock.rs
+++ b/src/clock.rs
@@ -128,7 +128,6 @@ enum URenderState {
   Stopped,
   Reset,
   Flag,
-  PMissing,
 }
 use URenderState as URS;
 
@@ -140,11 +139,13 @@ impl Clock {
       USERS.iter(),
       state.users.iter()
     ).map(|(&user, ustate)| {
-      let nick = gplayers.get(ustate.player).map(|gpl| gpl.nick.as_str());
-      let (st, remaining, nick) =
+      let nick = gplayers.get(ustate.player)
+        .map(|gpl| gpl.nick.as_str())
+        .unwrap_or("");
+      let (st, remaining) =
         if ustate.remaining < TVL::zero() {
-          (URS::Flag, TVL::zero(), nick.unwrap_or(""))
-        } else if let Some(nick) = nick {
+          (URS::Flag, TVL::zero())
+        } else {
           (
             if let Some(running) = &state.running {
               if running.user != user {
@@ -160,10 +161,8 @@ impl Clock {
               URS::Stopped
             }
 
-            , ustate.remaining, nick
+            , ustate.remaining
           )
-        } else {
-          (URS::PMissing, ustate.remaining, "")
         };
 
       URender { st, remaining, nick }