futures_lite::future::block_onを.block_on()として使えるようにする

crates/voicevox_core/src/future.rs

@@ -0,0 +1,16 @@
+use std::future::Future;
+
+use easy_ext::ext;
+
+/// `futures_lite::future::block_on`を、[pollster]のように`.block_on()`という形で使えるようにする。
+///
+/// [pollster]: https://docs.rs/crate/pollster
+#[ext(FutureExt)]
+impl<F: Future> F {
+    pub(crate) fn block_on(self) -> Self::Output
+    where
+        Self: Sized,
+    {
+        futures_lite::future::block_on(self)
+    }
+}

crates/voicevox_core/src/lib.rs

@@ -53,6 +53,7 @@ mod devices;
 /// cbindgen:ignore
 mod engine;
 mod error;
+mod future;
 mod infer;
 mod macros;
 mod manifest;

crates/voicevox_core/src/voice_model.rs

@@ -395,8 +395,8 @@ pub(crate) mod blocking {
     use uuid::Uuid;
 
     use crate::{
-        asyncs::Unstoppable, error::LoadModelResult, infer::domains::InferenceDomainMap,
-        VoiceModelMeta,
+        asyncs::Unstoppable, error::LoadModelResult, future::FutureExt as _,
+        infer::domains::InferenceDomainMap, VoiceModelMeta,
     };
 
     use super::{Inner, ModelBytesWithInnerVoiceIdsByDomain, VoiceModelHeader, VoiceModelId};
@@ -410,12 +410,12 @@ pub(crate) mod blocking {
         pub(crate) fn read_inference_models(
             &self,
         ) -> LoadModelResult<InferenceDomainMap<ModelBytesWithInnerVoiceIdsByDomain>> {
-            futures_lite::future::block_on(self.0.read_inference_models())
+            self.0.read_inference_models().block_on()
         }
 
         /// VVMファイルから`VoiceModel`をコンストラクトする。
         pub fn from_path(path: impl AsRef<Path>) -> crate::Result<Self> {
-            futures_lite::future::block_on(Inner::from_path(path)).map(Self)
+            Inner::from_path(path).block_on().map(Self)
         }
 
         /// ID。