Merge branch 'main' into onnxruntime-rs-to-ort

VOICEVOX · Feb 11, 2024 · 46a93dd · 46a93dd
2 parents 2108b90 + 9d1151f
commit 46a93dd
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 122 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,6 +12,7 @@ async-std = "1.12.0"
 async_zip = "0.0.11"
 binstall-tar = "0.4.39"
 bytes = "1.1.0"
+camino = "1.1.6"
 cbindgen = "0.24.3"
 chrono = { version = "0.4.26", default-features = false }
 clap = "4.0.10"
@@ -87,7 +88,7 @@ rev = "37af007322f0dd5a21e536ab3bcf727970f1283a"
 
 [workspace.dependencies.open_jtalk]
 git = "https://github.com/VOICEVOX/open_jtalk-rs.git"
-rev = "a16714ce16dec76fd0e3041a7acfa484921db3b5"
+rev = "70c76bb54522830e92803038191bf533ba68ce85"
 
 # FIXME: iOS対応のpull request(https://github.com/wesleywiser/process_path/pull/16)がマージされる見込みが無いため
 [workspace.dependencies.process_path]

diff --git a/crates/voicevox_core/Cargo.toml b/crates/voicevox_core/Cargo.toml
@@ -12,6 +12,7 @@ directml = ["voicevox-ort/directml"]
 [dependencies]
 anyhow.workspace = true
 async_zip = { workspace = true, features = ["full"] }
+camino.workspace = true
 derive-getters.workspace = true
 derive-new.workspace = true
 derive_more.workspace = true

diff --git a/crates/voicevox_core/src/__internal/doctest_fixtures.rs b/crates/voicevox_core/src/__internal/doctest_fixtures.rs
@@ -1,9 +1,9 @@
-use std::path::Path;
+use camino::Utf8Path;
 
 use crate::{AccelerationMode, InitializeOptions};
 
 pub async fn synthesizer_with_sample_voice_model(
-    open_jtalk_dic_dir: impl AsRef<Path>,
+    open_jtalk_dic_dir: impl AsRef<Utf8Path>,
 ) -> anyhow::Result<crate::tokio::Synthesizer<crate::tokio::OpenJtalk>> {
     let syntesizer = crate::tokio::Synthesizer::new(
         crate::tokio::OpenJtalk::new(open_jtalk_dic_dir).await?,