Fix: w忘れ

sevenc-nanashi · Jun 20, 2024 · 775805d · 775805d
1 parent 9903dc5
commit 775805d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 47 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
     }
 }