From 9cc7b67da79b6f5994d4bff63db9552c6d87b3b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Mon, 4 Jan 2021 22:50:11 +0100
Subject: map unwrap or else

---
 mumd/src/audio.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mumd/src/audio.rs b/mumd/src/audio.rs
index 57bd9f0..e11c328 100644
--- a/mumd/src/audio.rs
+++ b/mumd/src/audio.rs
@@ -248,11 +248,9 @@ impl Audio {
 
         self.sounds = NotificationEvents::iter()
             .map(|event| {
-
-                let bytes = match overrides.get(&event) {
-                    Some(file) => get_sfx(file),
-                    None => get_default_sfx(),
-                };
+                let bytes = overrides.get(&event)
+                    .map(|file| get_sfx(file))
+                    .unwrap_or_else(|| get_default_sfx());
                 let reader = hound::WavReader::new(bytes.as_ref()).unwrap();
                 let spec = reader.spec();
                 let samples = match spec.sample_format {
-- 
cgit v1.2.1