From c94560d10c3f1b9e77708b99f36c47e930a1532e Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Thu, 26 Oct 2023 01:23:16 +0900 Subject: [PATCH] =?UTF-8?q?voice=5Fsynthesizer.rs=20=E2=86=92=20synthesize?= =?UTF-8?q?r.rs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crates/voicevox_core/src/lib.rs | 4 ++-- .../src/{voice_synthesizer.rs => synthesizer.rs} | 0 crates/voicevox_core_c_api/tests/e2e/log_mask.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename crates/voicevox_core/src/{voice_synthesizer.rs => synthesizer.rs} (100%) diff --git a/crates/voicevox_core/src/lib.rs b/crates/voicevox_core/src/lib.rs index 3ad352486..798515fb9 100644 --- a/crates/voicevox_core/src/lib.rs +++ b/crates/voicevox_core/src/lib.rs @@ -13,10 +13,10 @@ mod metas; mod numerics; mod result; mod status; +mod synthesizer; mod user_dict; mod version; mod voice_model; -mod voice_synthesizer; #[doc(hidden)] pub mod __internal; @@ -36,9 +36,9 @@ pub use self::result::*; pub use self::voice_model::*; pub use devices::*; pub use manifest::*; +pub use synthesizer::*; pub use user_dict::*; pub use version::*; -pub use voice_synthesizer::*; use derive_getters::*; use derive_new::new; diff --git a/crates/voicevox_core/src/voice_synthesizer.rs b/crates/voicevox_core/src/synthesizer.rs similarity index 100% rename from crates/voicevox_core/src/voice_synthesizer.rs rename to crates/voicevox_core/src/synthesizer.rs diff --git a/crates/voicevox_core_c_api/tests/e2e/log_mask.rs b/crates/voicevox_core_c_api/tests/e2e/log_mask.rs index 76e01951f..ce364c1be 100644 --- a/crates/voicevox_core_c_api/tests/e2e/log_mask.rs +++ b/crates/voicevox_core_c_api/tests/e2e/log_mask.rs @@ -23,7 +23,7 @@ impl Utf8Output { pub(crate) fn mask_windows_video_cards(self) -> Self { self.mask_stderr( static_regex!( - r#"(?m)^\{timestamp\} INFO voicevox_core::voice_synthesizer: 検出されたGPU \(DirectMLには1番目のGPUが使われます\):(\n\{timestamp\} INFO voicevox_core::voice_synthesizer: - "[^"]+" \([0-9.]+ [a-zA-Z]+\))+"#, + r#"(?m)^\{timestamp\} INFO voicevox_core::synthesizer: 検出されたGPU \(DirectMLには1番目のGPUが使われます\):(\n\{timestamp\} INFO voicevox_core::synthesizer: - "[^"]+" \([0-9.]+ [a-zA-Z]+\))+"#, ), "{windows-video-cards}", )