StyleIdToModelInnerIdをnewtype化する

VOICEVOX · Mar 14, 2024 · 2521744 · 2521744
1 parent 7ccb2a3
commit 2521744
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/crates/voicevox_core/Cargo.toml b/crates/voicevox_core/Cargo.toml
@@ -32,7 +32,7 @@ open_jtalk.workspace = true
 ouroboros.workspace = true
 rayon.workspace = true
 regex.workspace = true
-serde = { workspace = true, features = ["derive"] }
+serde = { workspace = true, features = ["derive", "rc"] }
 serde_json = { workspace = true, features = ["preserve_order"] }
 smallvec.workspace = true
 strum = { workspace = true, features = ["derive"] }

diff --git a/crates/voicevox_core/src/manifest.rs b/crates/voicevox_core/src/manifest.rs
@@ -1,6 +1,7 @@
-use std::{collections::BTreeMap, fmt::Display};
+use std::{collections::BTreeMap, fmt::Display, sync::Arc};
 
 use derive_getters::Getters;
+use derive_more::Deref;
 use derive_new::new;
 use serde::{Deserialize, Serialize};
 
@@ -53,4 +54,6 @@ pub(crate) struct TalkManifest {
     pub(crate) style_id_to_model_inner_id: StyleIdToModelInnerId,
 }
 
-pub(crate) type StyleIdToModelInnerId = BTreeMap<StyleId, ModelInnerId>;
+#[derive(Default, Clone, Deref, Deserialize)]
+#[deref(forward)]
+pub(crate) struct StyleIdToModelInnerId(Arc<BTreeMap<StyleId, ModelInnerId>>);