From 1749a0467b99eb69c7976ee68b7364dce4ca965d Mon Sep 17 00:00:00 2001
From: eladyn <eladyn@protonmail.com>
Date: Fri, 15 Mar 2024 08:14:41 +0100
Subject: [PATCH] clippy: complex match condition

---
 src/alsa_mixer.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/alsa_mixer.rs b/src/alsa_mixer.rs
index 5bac42ab..56645449 100644
--- a/src/alsa_mixer.rs
+++ b/src/alsa_mixer.rs
@@ -46,8 +46,8 @@ impl Mixer for AlsaMixer {
 
     fn volume(&self) -> u16 {
         let selem_id = alsa::mixer::SelemId::new(&self.mixer, 0);
-        match alsa::mixer::Mixer::new(&self.device, false)
-            .ok()
+        let mixer = alsa::mixer::Mixer::new(&self.device, false).ok();
+        let vol = mixer
             .as_ref()
             .and_then(|mixer| mixer.find_selem(&selem_id))
             .and_then(|elem| {
@@ -58,9 +58,10 @@ impl Mixer for AlsaMixer {
                         let volume_steps = max - min + 1;
                         ((volume - min) * (0xFFFF / volume_steps)) as u16
                     })
-            }) {
+            });
+        match vol {
             Some(vol) => vol,
-            _ => {
+            None => {
                 error!(
                     "Couldn't read volume from alsa device with name \"{}\".",
                     self.device