Merge branch 'main' into add-morphing

VOICEVOX · Apr 20, 2024 · cfe60f0 · cfe60f0
2 parents 6f86e8a + 7afc276
commit cfe60f0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/crates/voicevox_core/Cargo.toml b/crates/voicevox_core/Cargo.toml
@@ -60,5 +60,8 @@ humansize.workspace = true
 windows = { workspace = true, features = ["Win32_Foundation", "Win32_Graphics_Dxgi"] }
 
 [lints.rust]
-unsafe_code = "deny" # FIXME: あまり意味が無くなっているため潔く`allow`にする。あるいはunsafeを撲滅する
+# 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を利用
 rust_2018_idioms = "warn"
diff --git a/crates/voicevox_core/src/engine/open_jtalk.rs b/crates/voicevox_core/src/engine/open_jtalk.rs
@@ -183,7 +183,6 @@ pub(crate) mod blocking {
     }
 
     // FIXME: open_jtalk-rs側で宣言する
-    #[allow(unsafe_code)]
     unsafe impl Send for Resources {}
 }
 

diff --git a/crates/voicevox_core/src/infer/runtimes/onnxruntime.rs b/crates/voicevox_core/src/infer/runtimes/onnxruntime.rs
@@ -249,6 +249,5 @@ mod assert_send {
     }
 
     // SAFETY: `Session` is probably "send"able.
-    #[allow(unsafe_code)]
     unsafe impl<T> Send for AssertSend<T> {}
 }
diff --git a/crates/voicevox_core/src/synthesizer.rs b/crates/voicevox_core/src/synthesizer.rs
@@ -1011,7 +1011,6 @@ pub(crate) mod blocking {
         }
 
         fn list_windows_video_cards() -> windows::core::Result<Vec<DXGI_ADAPTER_DESC>> {
-            #[allow(unsafe_code)]
             unsafe {
                 let factory = CreateDXGIFactory::<IDXGIFactory>()?;
                 (0..)

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.77.1
+1.77.2
-Original file line number
+Diff line change
@@ Expand Up / @@ -183,7 +183,6 @@ pub(crate) mod blocking { @@
         }
         // FIXME: open_jtalk-rs側で宣言する
-        #[allow(unsafe_code)]
         unsafe impl Send for Resources {}
     }
@@ Expand Down @@