♻️ shorten

cyb3rpsych0s1s · Aug 30, 2024 · fbd0543 · fbd0543
1 parent 941c027
commit fbd0543
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 29 deletions.
diff --git a/bank/src/ensure.rs b/bank/src/ensure.rs
@@ -307,10 +307,7 @@ pub fn ensure_store_data<T: PartialEq + Eq + Hash + Clone + Into<Key>>(
     path: &impl AsRef<std::path::Path>,
     store: &mut HashMap<T, StaticSoundData>,
 ) -> Result<(), Error> {
-    let value = match settings {
-        Some(settings) => value.with(settings),
-        None => value,
-    };
+    let value = value.with(settings);
     ensure!(
         store.insert(key.clone(), value).is_none(),
         CannotStoreDataSnafu {

diff --git a/manifest/src/de.rs b/manifest/src/de.rs
@@ -188,11 +188,7 @@ impl From<AnyAudio> for Audio {
 
 impl From<(AnyAudio, Option<&Settings>)> for Audio {
     fn from((audio, settings): (AnyAudio, Option<&Settings>)) -> Self {
-        let mut audio: Audio = audio.into();
-        if let Some(settings) = settings {
-            audio = audio.with(settings.clone());
-        }
-        audio
+        Audio::from(audio).with(Option::<&Settings>::cloned(settings))
     }
 }
 
@@ -232,13 +228,7 @@ pub fn any_audios_into_audios<K: PartialEq + Eq + Hash>(
 ) -> HashMap<K, Audio> {
     value
         .into_iter()
-        .map(|(k, v)| {
-            let mut v: Audio = v.into();
-            if let Some(ref settings) = settings {
-                v = v.with(settings.clone());
-            }
-            (k, v)
-        })
+        .map(|(k, v)| (k, Audio::from(v).with(settings.clone())))
         .collect()
 }
 

diff --git a/manifest/src/de/voice.rs b/manifest/src/de/voice.rs
@@ -56,11 +56,7 @@ impl From<&Dialog> for Audio {
 
 impl From<(&Dialog, Option<&Settings>)> for Audio {
     fn from(value: (&Dialog, Option<&Settings>)) -> Self {
-        let mut audio: Audio = value.into();
-        if let Some(settings) = value.1 {
-            audio = audio.with(settings.clone());
-        }
-        audio
+        Into::<Audio>::into(value).with(Option::<&Settings>::cloned(value.1))
     }
 }
 
@@ -158,14 +154,8 @@ impl From<Voice> for AnyVoice {
                             aud.insert(
                                 k,
                                 GenderBased {
-                                    fem: settings.clone().map_or(dialogs.fem.basic.clone(), |x| {
-                                        dialogs.fem.basic.with(x)
-                                    }),
-                                    male: settings
-                                        .clone()
-                                        .map_or(dialogs.male.basic.clone(), |x| {
-                                            dialogs.male.basic.with(x)
-                                        }),
+                                    fem: dialogs.fem.basic.with(settings.clone()),
+                                    male: dialogs.male.basic.with(settings.clone()),
                                 },
                             );
                             sub.insert(