From 4983523da627bbc0441be1d0eb55471a6adf03ac Mon Sep 17 00:00:00 2001 From: unspeaker Date: Thu, 31 Oct 2024 10:21:04 +0200 Subject: [PATCH] shorten some matches --- crates/tek_sequencer/src/arranger.rs | 31 +++++++++++----------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/crates/tek_sequencer/src/arranger.rs b/crates/tek_sequencer/src/arranger.rs index 21757721..268859e4 100644 --- a/crates/tek_sequencer/src/arranger.rs +++ b/crates/tek_sequencer/src/arranger.rs @@ -555,27 +555,20 @@ impl ArrangementFocus { ) -> String { format!("Selected: {}", match self { Self::Mix => format!("Everything"), - Self::Track(t) => if let Some(track) = tracks.get(*t) { - format!("T{t}: {}", &track.name.read().unwrap()) - } else { - format!("T??") + Self::Track(t) => match tracks.get(*t) { + Some(track) => format!("T{t}: {}", &track.name.read().unwrap()), + None => format!("T??"), }, - Self::Scene(s) => if let Some(scene) = scenes.get(*s) { - format!("S{s}: {}", &scene.name.read().unwrap()) - } else { - format!("S??") + Self::Scene(s) => match scenes.get(*s) { + Some(scene) => format!("S{s}: {}", &scene.name.read().unwrap()), + None => format!("S??"), }, - Self::Clip(t, s) => if let (Some(_), Some(scene)) = ( - tracks.get(*t), - scenes.get(*s), - ) { - if let Some(clip) = scene.clip(*t) { - format!("T{t} S{s} C{}", &clip.read().unwrap().name) - } else { - format!("T{t} S{s}: Empty") - } - } else { - format!("T{t} S{s}: Empty") + Self::Clip(t, s) => match (tracks.get(*t), scenes.get(*s)) { + (Some(_), Some(scene)) => match scene.clip(*t) { + Some(clip) => format!("T{t} S{s} C{}", &clip.read().unwrap().name), + None => format!("T{t} S{s}: Empty") + }, + _ => format!("T{t} S{s}: Empty"), } }) }