rust/sbv2-api
1
0
Fork 0
mirror of https://github.com/neodyland/sbv2-api.git synced 2025-12-22 23:49:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

clippy

Browse Source
This commit is contained in:
tuna2134
2024-09-09 08:47:05 +00:00
parent e075937ee7
commit 3e601662d9
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sbv2_core/src/main.rs
View File

@@ -7,8 +7,8 @@ fn main() -> error::Result<()> {
println!("{}", normalized_text); println!("{}", normalized_text);
let jtalk = text::JTalk::new()?; let jtalk = text::JTalk::new()?;
let phones = jtalk.g2p(&normalized_text)?; jtalk.g2p(&normalized_text)?;
println!("{:?}", phones); println!("{:?}", ());
let tokenizer = text::get_tokenizer()?; let tokenizer = text::get_tokenizer()?;
println!("{:?}", tokenizer); println!("{:?}", tokenizer);

16
sbv2_core/src/text.rs
View File

@@ -54,11 +54,11 @@ impl JTalk {
fn fix_phone_tone(&self, phone_tone_list: Vec<(String, i32)>) -> Result<Vec<(String, i32)>> { fn fix_phone_tone(&self, phone_tone_list: Vec<(String, i32)>) -> Result<Vec<(String, i32)>> {
let tone_values: HashSet<i32> = phone_tone_list let tone_values: HashSet<i32> = phone_tone_list
.iter() .iter()
.map(|(_letter, tone)| tone.clone()) .map(|(_letter, tone)| *tone)
.collect(); .collect();
if tone_values.len() == 1 { if tone_values.len() == 1 {
assert!(tone_values == hash_set![0], "{:?}", tone_values); assert!(tone_values == hash_set![0], "{:?}", tone_values);
return Ok(phone_tone_list); Ok(phone_tone_list)
} else if tone_values.len() == 2 { } else if tone_values.len() == 2 {
if tone_values == hash_set![0, 1] { if tone_values == hash_set![0, 1] {
return Ok(phone_tone_list); return Ok(phone_tone_list);
@@ -93,9 +93,9 @@ impl JTalk {
for (i, letter) in prosodies.iter().enumerate() { for (i, letter) in prosodies.iter().enumerate() {
if letter == "^" { if letter == "^" {
assert!(i == 0); assert!(i == 0);
} else if vec!["$", "?", "_", "#"].contains(&letter.as_str()) { } else if ["$", "?", "_", "#"].contains(&letter.as_str()) {
results.extend(self.fix_phone_tone(current_phrase.clone())?); results.extend(self.fix_phone_tone(current_phrase.clone())?);
if vec!["$", "?"].contains(&letter.as_str()) { if ["$", "?"].contains(&letter.as_str()) {
assert!(i == prosodies.len() - 1); assert!(i == prosodies.len() - 1);
} }
current_phrase = Vec::new(); current_phrase = Vec::new();
@@ -175,11 +175,11 @@ impl JTalk {
pub fn normalize_text(text: &str) -> String { pub fn normalize_text(text: &str) -> String {
// 日本語のテキストを正規化する // 日本語のテキストを正規化する
let text = text.replace("~", "ー"); let text = text.replace('~', "ー");
let text = text.replace("～", "ー"); let text = text.replace('～', "ー");
let text = text.replace("〜", "ー");
text text.replace('〜', "ー")
} }
pub fn get_tokenizer() -> Result<Tokenizer> { pub fn get_tokenizer() -> Result<Tokenizer> {