Skip to content

feat: edition 2024 #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 10, 2025
Merged

feat: edition 2024 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14ebab5
feat: edition 2024
cm-ayf Mar 16, 2025
8e04506
Merge branch 'main' into feat/edition-2024
cm-ayf Mar 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "jbonsai"
version = "0.2.2"
edition = "2021"
edition = "2024"

rust-version = "1.75.0"
rust-version = "1.85.0"

description = "Voice synthesis library for Text-to-Speech applications (Currently HTS Engine rewrite in Rust language)."
license = "BSD-3-Clause"
Expand Down
6 changes: 3 additions & 3 deletions benches/bonsais.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fn bonsai(bencher: &mut Bencher) {
"N^s-a+i=sil/A:-1+3+2/B:xx-xx_xx/C:02_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:4_4#0_xx@1_1|1_4/G:xx_xx%xx_xx_xx/H:xx_xx/I:1-4@1+1&1-1|1+4/J:xx_xx/K:1+1-4",
"s^a-i+sil=xx/A:0+4+1/B:xx-xx_xx/C:02_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:4_4#0_xx@1_1|1_4/G:xx_xx%xx_xx_xx/H:xx_xx/I:1-4@1+1&1-1|1+4/J:xx_xx/K:1+1-4",
"a^i-sil+xx=xx/A:xx+xx+xx/B:xx-xx_xx/C:xx_xx+xx/D:xx+xx_xx/E:4_4!0_xx-xx/F:xx_xx#xx_xx@xx_xx|xx_xx/G:xx_xx%xx_xx_xx/H:1_4/I:xx-xx@xx+xx&xx-xx|xx+xx/J:xx_xx/K:1+1-4",
];
];

let engine = Engine::load(&[MODEL_NITECH_ATR503]).unwrap();

Expand Down Expand Up @@ -58,7 +58,7 @@ fn is_bonsai(bencher: &mut Bencher) {
"s^U-k+a=sil/A:2+7+1/B:10-7_2/C:23_xx+xx/D:xx+xx_xx/E:3_3!0_xx-1/F:7_5#1_xx@2_1|4_7/G:xx_xx%xx_xx_xx/H:xx_xx/I:2-10@1+1&1-2|1+10/J:xx_xx/K:1+2-10",
"U^k-a+sil=xx/A:2+7+1/B:10-7_2/C:23_xx+xx/D:xx+xx_xx/E:3_3!0_xx-1/F:7_5#1_xx@2_1|4_7/G:xx_xx%xx_xx_xx/H:xx_xx/I:2-10@1+1&1-2|1+10/J:xx_xx/K:1+2-10",
"k^a-sil+xx=xx/A:xx+xx+xx/B:xx-xx_xx/C:xx_xx+xx/D:xx+xx_xx/E:7_5!1_xx-xx/F:xx_xx#xx_xx@xx_xx|xx_xx/G:xx_xx%xx_xx_xx/H:2_10/I:xx-xx@xx+xx&xx-xx|xx+xx/J:xx_xx/K:1+2-10",
];
];

let engine = Engine::load(&[MODEL_NITECH_ATR503]).unwrap();

Expand Down Expand Up @@ -130,7 +130,7 @@ fn bonsai_letter(bencher: &mut Bencher) {
"a^cl-t+a=sil/A:2+3+1/B:17-1_1/C:10_7+2/D:xx+xx_xx/E:3_1!0_xx-1/F:3_1#0_xx@6_1|22_3/G:xx_xx%xx_xx_xx/H:xx_xx/I:6-24@1+1&1-6|1+24/J:xx_xx/K:1+6-24",
"cl^t-a+sil=xx/A:2+3+1/B:17-1_1/C:10_7+2/D:xx+xx_xx/E:3_1!0_xx-1/F:3_1#0_xx@6_1|22_3/G:xx_xx%xx_xx_xx/H:xx_xx/I:6-24@1+1&1-6|1+24/J:xx_xx/K:1+6-24",
"t^a-sil+xx=xx/A:xx+xx+xx/B:xx-xx_xx/C:xx_xx+xx/D:xx+xx_xx/E:3_1!0_xx-xx/F:xx_xx#xx_xx@xx_xx|xx_xx/G:xx_xx%xx_xx_xx/H:6_24/I:xx-xx@xx+xx&xx-xx|xx+xx/J:xx_xx/K:1+6-24",
];
];

let engine = Engine::load(&[MODEL_NITECH_ATR503]).unwrap();

Expand Down
2 changes: 1 addition & 1 deletion examples/is-bonsai/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
"s^U-k+a=sil/A:2+7+1/B:10-7_2/C:23_xx+xx/D:xx+xx_xx/E:3_3!0_xx-1/F:7_5#1_xx@2_1|4_7/G:xx_xx%xx_xx_xx/H:xx_xx/I:2-10@1+1&1-2|1+10/J:xx_xx/K:1+2-10",
"U^k-a+sil=xx/A:2+7+1/B:10-7_2/C:23_xx+xx/D:xx+xx_xx/E:3_3!0_xx-1/F:7_5#1_xx@2_1|4_7/G:xx_xx%xx_xx_xx/H:xx_xx/I:2-10@1+1&1-2|1+10/J:xx_xx/K:1+2-10",
"k^a-sil+xx=xx/A:xx+xx+xx/B:xx-xx_xx/C:xx_xx+xx/D:xx+xx_xx/E:7_5!1_xx-xx/F:xx_xx#xx_xx@xx_xx|xx_xx/G:xx_xx%xx_xx_xx/H:2_10/I:xx-xx@xx+xx&xx-xx|xx+xx/J:xx_xx/K:1+2-10",
];
];

let engine = Engine::load(&[
"models/hts_voice_nitech_jp_atr503_m001-1.05/nitech_jp_atr503_m001.htsvoice",
Expand Down
2 changes: 1 addition & 1 deletion src/label.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ mod tests {
"19725000 20825000 N^s-a+i=sil/A:-1+3+2/B:xx-xx_xx/C:02_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:4_4#0_xx@1_1|1_4/G:xx_xx%xx_xx_xx/H:xx_xx/I:1-4@1+1&1-1|1+4/J:xx_xx/K:1+1-4",
"20825000 22725000 s^a-i+sil=xx/A:0+4+1/B:xx-xx_xx/C:02_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:4_4#0_xx@1_1|1_4/G:xx_xx%xx_xx_xx/H:xx_xx/I:1-4@1+1&1-1|1+4/J:xx_xx/K:1+1-4",
"22725000 30325000 a^i-sil+xx=xx/A:xx+xx+xx/B:xx-xx_xx/C:xx_xx+xx/D:xx+xx_xx/E:4_4!0_xx-xx/F:xx_xx#xx_xx@xx_xx|xx_xx/G:xx_xx%xx_xx_xx/H:1_4/I:xx-xx@xx+xx&xx-xx|xx+xx/J:xx_xx/K:1+1-4",
];
];
let labels = Labels::load_from_strings(48000, 240, &lines).unwrap();
let times = labels.times();

Expand Down
24 changes: 12 additions & 12 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ mod tests {
pub const MODEL_TOHOKU_F01_HAPPY: &str = "models/tohoku-f01/tohoku-f01-happy.htsvoice";

// 盆栽,名詞,一般,*,*,*,*,盆栽,ボンサイ,ボンサイ,0/4,C2
pub const SAMPLE_SENTENCE_1: [&str;8]= [
"xx^xx-sil+b=o/A:xx+xx+xx/B:xx-xx_xx/C:xx_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:xx_xx#xx_xx@xx_xx|xx_xx/G:4_4%0_xx_xx/H:xx_xx/I:xx-xx@xx+xx&xx-xx|xx+xx/J:1_4/K:1+1-4",
"xx^sil-b+o=N/A:-3+1+4/B:xx-xx_xx/C:02_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:4_4#0_xx@1_1|1_4/G:xx_xx%xx_xx_xx/H:xx_xx/I:1-4@1+1&1-1|1+4/J:xx_xx/K:1+1-4",
"sil^b-o+N=s/A:-3+1+4/B:xx-xx_xx/C:02_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:4_4#0_xx@1_1|1_4/G:xx_xx%xx_xx_xx/H:xx_xx/I:1-4@1+1&1-1|1+4/J:xx_xx/K:1+1-4",
"b^o-N+s=a/A:-2+2+3/B:xx-xx_xx/C:02_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:4_4#0_xx@1_1|1_4/G:xx_xx%xx_xx_xx/H:xx_xx/I:1-4@1+1&1-1|1+4/J:xx_xx/K:1+1-4",
"o^N-s+a=i/A:-1+3+2/B:xx-xx_xx/C:02_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:4_4#0_xx@1_1|1_4/G:xx_xx%xx_xx_xx/H:xx_xx/I:1-4@1+1&1-1|1+4/J:xx_xx/K:1+1-4",
"N^s-a+i=sil/A:-1+3+2/B:xx-xx_xx/C:02_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:4_4#0_xx@1_1|1_4/G:xx_xx%xx_xx_xx/H:xx_xx/I:1-4@1+1&1-1|1+4/J:xx_xx/K:1+1-4",
"s^a-i+sil=xx/A:0+4+1/B:xx-xx_xx/C:02_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:4_4#0_xx@1_1|1_4/G:xx_xx%xx_xx_xx/H:xx_xx/I:1-4@1+1&1-1|1+4/J:xx_xx/K:1+1-4",
"a^i-sil+xx=xx/A:xx+xx+xx/B:xx-xx_xx/C:xx_xx+xx/D:xx+xx_xx/E:4_4!0_xx-xx/F:xx_xx#xx_xx@xx_xx|xx_xx/G:xx_xx%xx_xx_xx/H:1_4/I:xx-xx@xx+xx&xx-xx|xx+xx/J:xx_xx/K:1+1-4",
];
pub const SAMPLE_SENTENCE_1: [&str; 8] = [
"xx^xx-sil+b=o/A:xx+xx+xx/B:xx-xx_xx/C:xx_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:xx_xx#xx_xx@xx_xx|xx_xx/G:4_4%0_xx_xx/H:xx_xx/I:xx-xx@xx+xx&xx-xx|xx+xx/J:1_4/K:1+1-4",
"xx^sil-b+o=N/A:-3+1+4/B:xx-xx_xx/C:02_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:4_4#0_xx@1_1|1_4/G:xx_xx%xx_xx_xx/H:xx_xx/I:1-4@1+1&1-1|1+4/J:xx_xx/K:1+1-4",
"sil^b-o+N=s/A:-3+1+4/B:xx-xx_xx/C:02_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:4_4#0_xx@1_1|1_4/G:xx_xx%xx_xx_xx/H:xx_xx/I:1-4@1+1&1-1|1+4/J:xx_xx/K:1+1-4",
"b^o-N+s=a/A:-2+2+3/B:xx-xx_xx/C:02_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:4_4#0_xx@1_1|1_4/G:xx_xx%xx_xx_xx/H:xx_xx/I:1-4@1+1&1-1|1+4/J:xx_xx/K:1+1-4",
"o^N-s+a=i/A:-1+3+2/B:xx-xx_xx/C:02_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:4_4#0_xx@1_1|1_4/G:xx_xx%xx_xx_xx/H:xx_xx/I:1-4@1+1&1-1|1+4/J:xx_xx/K:1+1-4",
"N^s-a+i=sil/A:-1+3+2/B:xx-xx_xx/C:02_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:4_4#0_xx@1_1|1_4/G:xx_xx%xx_xx_xx/H:xx_xx/I:1-4@1+1&1-1|1+4/J:xx_xx/K:1+1-4",
"s^a-i+sil=xx/A:0+4+1/B:xx-xx_xx/C:02_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:4_4#0_xx@1_1|1_4/G:xx_xx%xx_xx_xx/H:xx_xx/I:1-4@1+1&1-1|1+4/J:xx_xx/K:1+1-4",
"a^i-sil+xx=xx/A:xx+xx+xx/B:xx-xx_xx/C:xx_xx+xx/D:xx+xx_xx/E:4_4!0_xx-xx/F:xx_xx#xx_xx@xx_xx|xx_xx/G:xx_xx%xx_xx_xx/H:1_4/I:xx-xx@xx+xx&xx-xx|xx+xx/J:xx_xx/K:1+1-4",
];

#[test]
fn bonsai() {
Expand Down Expand Up @@ -86,7 +86,7 @@ mod tests {
// です,助動詞,*,*,*,特殊・デス,基本形,です,デス,デス’,1/2,動詞%F1/形容詞%F2/名詞%F2@1,-1
// か,助詞,副助詞／並立助詞／終助詞,*,*,*,*,か,カ,カ,0/1,動詞%F2/形容詞%F2/名詞%F1,-1
// ？,記号,一般,*,*,*,*,？,？,？,0/0,*,-1
pub const SAMPLE_SENTENCE_2: [&str;20]= [
pub const SAMPLE_SENTENCE_2: [&str; 20] = [
"xx^xx-sil+k=o/A:xx+xx+xx/B:xx-xx_xx/C:xx_xx+xx/D:xx+xx_xx/E:xx_xx!xx_xx-xx/F:xx_xx#xx_xx@xx_xx|xx_xx/G:3_3%0_xx_xx/H:xx_xx/I:xx-xx@xx+xx&xx-xx|xx+xx/J:2_10/K:1+2-10",
"xx^sil-k+o=r/A:-2+1+3/B:xx-xx_xx/C:04_xx+xx/D:24+xx_xx/E:xx_xx!xx_xx-xx/F:3_3#0_xx@1_2|1_10/G:7_5%1_xx_1/H:xx_xx/I:2-10@1+1&1-2|1+10/J:xx_xx/K:1+2-10",
"sil^k-o+r=e/A:-2+1+3/B:xx-xx_xx/C:04_xx+xx/D:24+xx_xx/E:xx_xx!xx_xx-xx/F:3_3#0_xx@1_2|1_10/G:7_5%1_xx_1/H:xx_xx/I:2-10@1+1&1-2|1+10/J:xx_xx/K:1+2-10",
Expand All @@ -107,7 +107,7 @@ mod tests {
"s^U-k+a=sil/A:2+7+1/B:10-7_2/C:23_xx+xx/D:xx+xx_xx/E:3_3!0_xx-1/F:7_5#1_xx@2_1|4_7/G:xx_xx%xx_xx_xx/H:xx_xx/I:2-10@1+1&1-2|1+10/J:xx_xx/K:1+2-10",
"U^k-a+sil=xx/A:2+7+1/B:10-7_2/C:23_xx+xx/D:xx+xx_xx/E:3_3!0_xx-1/F:7_5#1_xx@2_1|4_7/G:xx_xx%xx_xx_xx/H:xx_xx/I:2-10@1+1&1-2|1+10/J:xx_xx/K:1+2-10",
"k^a-sil+xx=xx/A:xx+xx+xx/B:xx-xx_xx/C:xx_xx+xx/D:xx+xx_xx/E:7_5!1_xx-xx/F:xx_xx#xx_xx@xx_xx|xx_xx/G:xx_xx%xx_xx_xx/H:2_10/I:xx-xx@xx+xx&xx-xx|xx+xx/J:xx_xx/K:1+2-10",
];
];

#[test]
fn is_this_bonsai() {
Expand Down
2 changes: 1 addition & 1 deletion src/mlpg_adjust/mlpg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use crate::model::{GvParameter, MeanVari, Windows};

use super::{mask::Mask, IterExt};
use super::{IterExt, mask::Mask};

const W1: f64 = 1.0;
const W2: f64 = 1.0;
Expand Down
2 changes: 1 addition & 1 deletion src/mlpg_adjust/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ impl<T: Copy + 'static, I: Iterator<Item = T>> IterExt for I {
durations: impl IntoIterator<Item = &'a usize> + 'a,
) -> impl Iterator<Item = Self::Item> {
self.zip(durations)
.flat_map(move |(item, duration)| iter::repeat(item).take(*duration))
.flat_map(move |(item, duration)| iter::repeat_n(item, *duration))
}

fn filter_by<'a>(
Expand Down
6 changes: 3 additions & 3 deletions src/model/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use self::voice::model::ModelParameter;

pub use self::{
interporation_weight::InterporationWeight,
voice::{window::Windows, GlobalModelMetadata, StreamModelMetadata, Voice},
voice::{GlobalModelMetadata, StreamModelMetadata, Voice, window::Windows},
};

use jlabel::Label;
Expand Down Expand Up @@ -168,13 +168,13 @@ pub(crate) mod tests {
use std::{borrow::Cow, sync::Arc};

use crate::{
model::{interporation_weight::InterporationWeight, MeanVari},
model::{MeanVari, interporation_weight::InterporationWeight},
tests::{
MODEL_NITECH_ATR503, MODEL_TOHOKU_F01_HAPPY, MODEL_TOHOKU_F01_NORMAL, SAMPLE_SENTENCE_1,
},
};

use super::{load_htsvoice_file, Models, Voice, VoiceSet};
use super::{Models, Voice, VoiceSet, load_htsvoice_file};

fn load_voice() -> Voice {
load_htsvoice_file(&MODEL_NITECH_ATR503).unwrap()
Expand Down
2 changes: 1 addition & 1 deletion src/model/parser/base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
use nom::{
IResult, Parser,
branch::alt,
bytes::complete::{take_while, take_while1},
combinator::{cut, map_res},
error::{ErrorKind, FromExternalError, ParseError},
multi::separated_list0,
sequence::{delimited, pair},
IResult, Parser,
};

use super::question::Question;
Expand Down
2 changes: 1 addition & 1 deletion src/model/parser/header/de.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::ops::{AddAssign, MulAssign};

use serde::de::{self, DeserializeSeed, MapAccess, SeqAccess, Visitor};
use serde::{forward_to_deserialize_any, Deserialize};
use serde::{Deserialize, forward_to_deserialize_any};

use super::error::DeserializeError;

Expand Down
3 changes: 2 additions & 1 deletion src/model/parser/header/deserialize_hashmap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
use std::collections::HashMap;

use serde::{
Deserialize, Deserializer,
de::{MapAccess, Visitor},
forward_to_deserialize_any, Deserialize, Deserializer,
forward_to_deserialize_any,
};

use super::error::DeserializeError;
Expand Down
4 changes: 2 additions & 2 deletions src/model/parser/header/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::collections::HashMap;

use serde::Deserialize;

use super::{base::ParseTarget, ModelParseError};
use super::{ModelParseError, base::ParseTarget};

pub fn parse_header<'de, S, T>(input: &'de S) -> Result<T, ModelParseError>
where
Expand Down Expand Up @@ -113,7 +113,7 @@ pub struct PositionData {
#[cfg(test)]
mod tests {
use super::{
de::from_str, deserialize_hashmap, Global, Position, PositionData, Stream, StreamData,
Global, Position, PositionData, Stream, StreamData, de::from_str, deserialize_hashmap,
};

use std::collections::HashMap;
Expand Down
8 changes: 4 additions & 4 deletions src/model/parser/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
//! `.htsvoice` parser.

use nom::{
error::{ContextError, ParseError},
IResult, Parser,
error::{ContextError, ParseError},
};

use self::{
base::ParseTarget,
header::parse_header,
header::{error::DeserializeError, Global, Position, Stream},
header::{Global, Position, Stream, error::DeserializeError},
model::parse_model,
window::WindowParser,
};

use super::voice::{model::Model, question, window::Windows, StreamModels, Voice};
use super::voice::{StreamModels, Voice, model::Model, question, window::Windows};

mod base;
mod header;
Expand Down Expand Up @@ -192,7 +192,7 @@ mod tests {

use crate::{model::parser::split_sections, tests::MODEL_NITECH_ATR503};

use super::{parse_htsvoice, ModelParseError};
use super::{ModelParseError, parse_htsvoice};

#[test]
fn load() {
Expand Down
2 changes: 1 addition & 1 deletion src/model/parser/model/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use nom::Parser;

use crate::model::voice::{model::Model, question::Question};

use super::{base::ParseTarget, parse_all, ModelParseError};
use super::{ModelParseError, base::ParseTarget, parse_all};

use self::{
question::QuestionParser,
Expand Down
6 changes: 3 additions & 3 deletions src/model/parser/model/question.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
use std::marker::PhantomData;

use nom::{
IResult, Parser,
bytes::complete::tag,
combinator::cut,
error::{context, ContextError, FromExternalError, ParseError},
error::{ContextError, FromExternalError, ParseError, context},
multi::separated_list0,
sequence::{delimited, pair, preceded, separated_pair, terminated},
IResult, Parser,
};

use crate::model::{parser::base::ParseTarget, voice::question};
Expand Down Expand Up @@ -85,7 +85,7 @@ where

#[cfg(test)]
mod tests {
use jlabel_question::{position::SignedRangePosition, AllQuestion};
use jlabel_question::{AllQuestion, position::SignedRangePosition};

use crate::model::parser::question;

Expand Down
4 changes: 2 additions & 2 deletions src/model/parser/model/tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
use std::marker::PhantomData;

use nom::{
AsChar, IResult, Parser,
branch::alt,
bytes::complete::tag,
character::complete::digit1,
combinator::{cut, map, opt, peek, recognize},
error::{context, ContextError, ErrorKind, FromExternalError, ParseError},
error::{ContextError, ErrorKind, FromExternalError, ParseError, context},
multi::{many_m_n, separated_list0},
sequence::{delimited, pair, preceded},
AsChar, IResult, Parser,
};

use crate::model::parser::base::ParseTarget;
Expand Down
2 changes: 1 addition & 1 deletion src/model/parser/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
use std::marker::PhantomData;

use nom::{
IResult, Parser,
character::complete::{digit1, space1},
combinator::map,
error::{ContextError, ErrorKind, ParseError},
multi::many_m_n,
number::complete::double,
sequence::preceded,
IResult, Parser,
};

use crate::model::voice::window::Window;
Expand Down
2 changes: 1 addition & 1 deletion src/model/voice/question.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use jlabel_question::{regex::RegexQuestion, AllQuestion, QuestionMatcher};
use jlabel_question::{AllQuestion, QuestionMatcher, regex::RegexQuestion};
use serde::{Deserialize, Serialize};

#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
Expand Down
4 changes: 2 additions & 2 deletions src/model/voice_set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
use std::{ops::Deref, sync::Arc};

use super::{
interporation_weight::Weights, voice::model::ModelParameter, GlobalModelMetadata, ModelError,
StreamModelMetadata, Voice, Windows,
GlobalModelMetadata, ModelError, StreamModelMetadata, Voice, Windows,
interporation_weight::Weights, voice::model::ModelParameter,
};

/// Set of voice model that can be morphed with each other.
Expand Down
2 changes: 1 addition & 1 deletion src/vocoder/mlsa/fir_simd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::{
ops::{Deref, DerefMut},
simd::{num::SimdFloat, LaneCount, Simd, StdFloat, SupportedLaneCount},
simd::{LaneCount, Simd, StdFloat, SupportedLaneCount, num::SimdFloat},
};

#[derive(Debug, Clone)]
Expand Down