Skip to content
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.

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

Update dependency Rust to v1.73.0 #639

Merged
merged 2 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 crates/voicevox_core/src/voice_model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ impl VvmEntryReader {
}

async fn read_vvm_entry(&self, filename: &str) -> LoadModelResult<Vec<u8>> {
(|| async {
async {
let me = self
.entry_map
.get(filename)
Expand All @@ -190,7 +190,7 @@ impl VvmEntryReader {
.read_to_end_checked(&mut buf, &me.entry)
.await?;
Ok::<_, anyhow::Error>(buf)
})()
}
.await
.map_err(|source| LoadModelError {
path: self.reader.path().to_owned(),
Expand Down
4 changes: 2 additions & 2 deletions crates/voicevox_core_c_api/src/compatible_engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ fn set_message(message: &str) {

#[no_mangle]
pub extern "C" fn initialize(use_gpu: bool, cpu_num_threads: c_int, load_all_models: bool) -> bool {
let result = RUNTIME.block_on((|| async {
let result = RUNTIME.block_on(async {
let synthesizer = voicevox_core::Synthesizer::new_with_initialize(
Arc::new(OpenJtalk::new_without_dic()),
&voicevox_core::InitializeOptions {
Expand All @@ -89,7 +89,7 @@ pub extern "C" fn initialize(use_gpu: bool, cpu_num_threads: c_int, load_all_mod
}

Ok::<_, voicevox_core::Error>(synthesizer)
})());
});

match result {
Ok(synthesizer) => {
Expand Down
4 changes: 2 additions & 2 deletions crates/voicevox_core_python_api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ impl Synthesizer {
.iter()
.map(|ap| to_pydantic_dataclass(ap, class))
.collect::<PyResult<Vec<_>>>();
let list = PyList::new(py, accent_phrases.into_iter());
let list = PyList::new(py, accent_phrases);
Ok(list.to_object(py))
})
},
Expand Down Expand Up @@ -314,7 +314,7 @@ impl Synthesizer {
.iter()
.map(|ap| to_pydantic_dataclass(ap, class))
.collect::<PyResult<Vec<_>>>();
let list = PyList::new(py, accent_phrases.into_iter());
let list = PyList::new(py, accent_phrases);
Ok(list.to_object(py))
})
},
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.71.1
1.73.0
Loading