refactor(rust): MORA_LIST_MINIMUMをengine::talkから出す (#1076)

`mora_list`を`engine::talk`から`engine`直下に移し、`text2mora`だけ
`full_context_label`の中に埋め込む。

Refs: #1073
See-also: #1074

Author: qryxip

crates/voicevox_core/src/engine.rs

@@ -2,6 +2,7 @@
 
 mod acoustic_feature_extractor;
 mod audio_file;
+mod mora_list;
 pub(crate) mod talk;
 
 pub use self::audio_file::wav_from_s16le;

crates/voicevox_core/src/engine/talk/mora_list.rs renamed to crates/voicevox_core/src/engine/mora_list.rs

@@ -185,32 +185,3 @@ pub(super) const MORA_LIST_MINIMUM: &[[&str; 3]] = &[
     ["イ", "", "i"],
     ["ア", "", "a"],
 ];
-
-pub(crate) fn mora2text(mora: &str) -> &str {
-    for &[text, consonant, vowel] in MORA_LIST_MINIMUM {
-        if mora.len() >= consonant.len()
-            && &mora[..consonant.len()] == consonant
-            && &mora[consonant.len()..] == vowel
-        {
-            return text;
-        }
-    }
-    mora
-}
-
-#[cfg(test)]
-mod tests {
-    use pretty_assertions::assert_eq;
-    use rstest::rstest;
-
-    #[rstest]
-    #[case("da", "ダ")]
-    #[case("N", "ン")]
-    #[case("cl", "ッ")]
-    #[case("sho", "ショ")]
-    #[case("u", "ウ")]
-    #[case("fail", "fail")]
-    fn test_mora2text(#[case] mora: &str, #[case] text: &str) {
-        assert_eq!(super::mora2text(mora), text);
-    }
-}

crates/voicevox_core/src/engine/talk.rs

@@ -2,7 +2,6 @@ mod full_context_label;
 mod interpret_query;
 mod kana_parser;
 mod model;
-mod mora_list;
 pub(crate) mod open_jtalk;
 pub(crate) mod text_analyzer;
 pub(crate) mod user_dict;
@@ -11,4 +10,3 @@ pub(crate) use self::full_context_label::extract_full_context_label;
 pub(crate) use self::interpret_query::{initial_process, split_mora, DecoderFeature};
 pub(crate) use self::kana_parser::{create_kana, parse_kana, KanaParseError};
 pub use self::model::{AccentPhrase, AudioQuery, Mora};
-pub(crate) use self::mora_list::mora2text;

crates/voicevox_core/src/engine/talk/full_context_label.rs

@@ -5,7 +5,7 @@ use smallvec::SmallVec;
 
 use crate::AccentPhrase;
 
-use super::open_jtalk::FullcontextExtractor;
+use super::{super::mora_list::MORA_LIST_MINIMUM, open_jtalk::FullcontextExtractor};
 
 #[derive(thiserror::Error, Debug)]
 #[error("入力テキストからのフルコンテキストラベル抽出に失敗しました: {context}")]
@@ -173,7 +173,19 @@ pub fn mora_to_text(consonant: Option<&str>, vowel: &str) -> String {
         }
     );
     // もしカタカナに変換できなければ、引数で与えた文字列がそのまま返ってくる
-    super::mora2text(&mora_text).to_string()
+    mora2text(&mora_text).to_string()
+}
+
+fn mora2text(mora: &str) -> &str {
+    for &[text, consonant, vowel] in MORA_LIST_MINIMUM {
+        if mora.len() >= consonant.len()
+            && &mora[..consonant.len()] == consonant
+            && &mora[consonant.len()..] == vowel
+        {
+            return text;
+        }
+    }
+    mora
 }
 
 #[cfg(test)]
@@ -182,6 +194,7 @@ mod tests {
 
     use ::test_util::OPEN_JTALK_DIC_DIR;
     use jlabel::Label;
+    use pretty_assertions::assert_eq;
     use rstest::rstest;
     use rstest_reuse::*;
 
@@ -452,4 +465,15 @@ mod tests {
             accent_phrase
         );
     }
+
+    #[rstest]
+    #[case("da", "ダ")]
+    #[case("N", "ン")]
+    #[case("cl", "ッ")]
+    #[case("sho", "ショ")]
+    #[case("u", "ウ")]
+    #[case("fail", "fail")]
+    fn test_mora2text(#[case] mora: &str, #[case] text: &str) {
+        assert_eq!(super::mora2text(mora), text);
+    }
 }

crates/voicevox_core/src/engine/talk/kana_parser.rs

@@ -1,8 +1,8 @@
 use std::{collections::HashMap, sync::LazyLock};
 
 use super::{
+    super::mora_list::MORA_LIST_MINIMUM,
     model::{AccentPhrase, Mora},
-    mora_list::MORA_LIST_MINIMUM,
 };
 
 const UNVOICE_SYMBOL: char = '_';
@@ -199,7 +199,7 @@ mod tests {
     use pretty_assertions::assert_eq;
     use rstest::rstest;
 
-    use super::super::mora_list::MORA_LIST_MINIMUM;
+    use super::super::super::mora_list::MORA_LIST_MINIMUM;
 
     #[rstest]
     #[case(Some("da"), "ダ")]