chiark / gitweb /
Use Void, not ad-hoc
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 2 Apr 2021 10:34:37 +0000 (11:34 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 2 Apr 2021 15:16:29 +0000 (16:16 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
daemon/cmdlistener.rs

index 22f26468a2551bb38273601e016dcf6f96d12d71..52ed8f9d5d0439d01925f67488b5fd81295d1264 100644 (file)
@@ -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)]