VOICEVOX#558 に対応

qryxip · Sep 3, 2023 · d6489cc · d6489cc
1 parent d4b8b0b
commit d6489cc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/crates/voicevox_core/src/__internal.rs b/crates/voicevox_core/src/__internal.rs
@@ -1,11 +1,9 @@
 // FIXME: 要議論: https://github.com/VOICEVOX/voicevox_core/issues/595
 
-use std::fmt::Display;
-
 pub fn to_zenkaku(surface: &str) -> String {
     crate::user_dict::to_zenkaku(surface)
 }
 
-pub fn validate_pronunciation(pronunciation: &str) -> std::result::Result<(), impl Display> {
-    crate::user_dict::validate_pronunciation(pronunciation)
+pub fn validate_pronunciation(pronunciation: &str) -> crate::Result<()> {
+    crate::user_dict::validate_pronunciation(pronunciation).map_err(Into::into)
 }
diff --git a/crates/voicevox_core/src/error.rs b/crates/voicevox_core/src/error.rs
@@ -23,6 +23,13 @@ impl From<E> for Error {
     }
 }
 
+// FIXME: `ErrorRepr::InvalidWord`を`#[error(transparent)]`にする
+impl From<InvalidWordError> for Error {
+    fn from(err: InvalidWordError) -> Self {
+        ErrorRepr::InvalidWord(err).into()
+    }
+}
+
 impl Error {
     /// 対応する[`ErrorKind`]を返す。
     pub fn kind(&self) -> ErrorKind {

diff --git a/crates/voicevox_core_java_api/src/user_dict.rs b/crates/voicevox_core_java_api/src/user_dict.rs
@@ -213,7 +213,7 @@ extern "system" fn Java_jp_hiroshiba_voicevoxcore_UserDict_rsToZenkaku<'local>(
         let text = env.get_string(&text)?;
         let text = text.to_str()?;
 
-        let text = voicevox_core::to_zenkaku(text);
+        let text = voicevox_core::__internal::to_zenkaku(text);
 
         let text = env.new_string(text)?;
         Ok(text.into_raw())
@@ -230,7 +230,7 @@ extern "system" fn Java_jp_hiroshiba_voicevoxcore_UserDict_rsValidatePronunciati
         let text = env.get_string(&text)?;
         let text = text.to_str()?;
 
-        voicevox_core::validate_pronunciation(text)?;
+        voicevox_core::__internal::validate_pronunciation(text)?;
 
         Ok(())
     })