From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 2 Apr 2021 10:34:37 +0000 (+0100)
Subject: Use Void, not ad-hoc
X-Git-Tag: otter-0.5.0~324
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d783dab1634b15783e1b976a86d38462546617c5;p=otter.git

Use Void, not ad-hoc

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

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index 22f26468..52ed8f9d 100644
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -280,10 +280,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
   use MgmtGameResponse::Fine;
 
   fn tz_from_str(s: &str) -> Timezone {
-    match Timezone::from_str(s) {
-      Ok(tz) => tz,
-      Err(x) => match x { },
-    }
+    Timezone::from_str(s).void_unwrap()
   }
 
   #[throws(MgmtError)]