From 775805d4daf72d3ed3df87de1744f12d20138efe Mon Sep 17 00:00:00 2001
From: sevenc-nanashi <sevenc7c@sevenc7c.com>
Date: Thu, 20 Jun 2024 13:00:56 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20w=E5=BF=98=E3=82=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cargo.lock                              | 41 -------------------------
 crates/voicevox_core/Cargo.toml         |  5 ++-
 crates/voicevox_core/src/voice_model.rs |  4 +--
 3 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d7706e0a9..01f97abce 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1978,26 +1978,6 @@ dependencies = [
  "link-cplusplus",
 ]
 
-[[package]]
-name = "ort"
-version = "1.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "889dca4c98efa21b1ba54ddb2bde44fd4920d910f492b618351f839d8428d79d"
-dependencies = [
- "flate2",
- "half",
- "lazy_static",
- "libc",
- "ndarray",
- "tar",
- "thiserror",
- "tracing",
- "ureq",
- "vswhom",
- "winapi",
- "zip",
-]
-
 [[package]]
 name = "os_pipe"
 version = "1.1.2"
@@ -3559,7 +3539,6 @@ dependencies = [
  "ndarray",
  "once_cell",
  "open_jtalk",
- "ort",
  "ouroboros",
  "pretty_assertions",
  "rayon",
@@ -3670,26 +3649,6 @@ dependencies = [
  "voicevox_core",
 ]
 
-[[package]]
-name = "vswhom"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
-dependencies = [
- "libc",
- "vswhom-sys",
-]
-
-[[package]]
-name = "vswhom-sys"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "wait-timeout"
 version = "0.2.0"
diff --git a/crates/voicevox_core/Cargo.toml b/crates/voicevox_core/Cargo.toml
index bf45c28b2..f9772f76c 100644
--- a/crates/voicevox_core/Cargo.toml
+++ b/crates/voicevox_core/Cargo.toml
@@ -41,7 +41,6 @@ tokio = { workspace = true, features = ["sync", "macros", "rt"] }
 tracing.workspace = true
 uuid = { workspace = true, features = ["v4", "serde"] }
 voicevox_core_macros = { path = "../voicevox_core_macros" }
-voicevox-ort = { workspace = true, features = ["ndarray", "download-binaries"] }
 zip = { version = "0.6.6", default-features = false, features = [
   "deflate-zlib",
 ] }
@@ -63,11 +62,11 @@ windows = { version = "0.43.0", features = [
 
 [target."cfg(not(target_family = \"wasm\"))".dependencies]
 async_zip = { workspace = true, features = ["deflate"] }
-ort = { version = "1.16.3" }
+voicevox-ort = { workspace = true, features = ["ndarray", "download-binaries"] }
 
 [lints.rust]
 # FIXME: `unsafe impl Send`のもあるが、以下2つのマージにより消える予定
 # * https://github.com/VOICEVOX/voicevox_core/pull/725
 # * https://github.com/VOICEVOX/voicevox_core/pull/772
-unsafe_code = "allow" # WindowsのGPU情報表示に、Win32を利用
+unsafe_code = "allow"     # WindowsのGPU情報表示に、Win32を利用
 rust_2018_idioms = "warn"
diff --git a/crates/voicevox_core/src/voice_model.rs b/crates/voicevox_core/src/voice_model.rs
index 26f7d385a..3fc38cb9c 100644
--- a/crates/voicevox_core/src/voice_model.rs
+++ b/crates/voicevox_core/src/voice_model.rs
@@ -454,7 +454,6 @@ pub(crate) mod tokio {
     }
 }
 
-<<<<<<< HEAD
 #[cfg(target_family = "wasm")]
 pub(crate) mod tokio {
     use std::path::Path;
@@ -501,7 +500,7 @@ pub(crate) mod tokio {
         pub(crate) fn header(&self) -> &VoiceModelHeader {
             &self.inner.header()
         }
-=======
+    }}
 #[cfg(test)]
 mod tests {
     use once_cell::sync::Lazy;
@@ -598,6 +597,5 @@ mod tests {
             "order": null
         }))
         .unwrap()
->>>>>>> upstream/main
     }
 }