From fe95a31fe4bf87b8bc20901de871c98247439b3d Mon Sep 17 00:00:00 2001 From: Alex Kocharin Date: Thu, 9 Nov 2023 02:40:49 +0400 Subject: [PATCH] bevy::asset::Error -> bevy::asset::BoxedError --- crates/bevy_asset/src/lib.rs | 2 +- crates/bevy_asset/src/loader.rs | 8 ++++---- crates/bevy_asset/src/meta.rs | 2 +- crates/bevy_asset/src/processor/process.rs | 2 +- crates/bevy_asset/src/saver.rs | 6 +++--- crates/bevy_asset/src/server/mod.rs | 2 +- crates/bevy_audio/src/audio_source.rs | 2 +- crates/bevy_gltf/src/loader.rs | 2 +- crates/bevy_render/src/render_resource/shader.rs | 2 +- crates/bevy_render/src/texture/compressed_image_saver.rs | 2 +- crates/bevy_render/src/texture/exr_texture_loader.rs | 2 +- crates/bevy_render/src/texture/hdr_texture_loader.rs | 2 +- crates/bevy_render/src/texture/image_loader.rs | 2 +- crates/bevy_scene/src/scene_loader.rs | 2 +- crates/bevy_text/src/font_loader.rs | 2 +- examples/asset/custom_asset.rs | 2 +- examples/asset/processing/asset_processing.rs | 6 +++--- 17 files changed, 24 insertions(+), 24 deletions(-) diff --git a/crates/bevy_asset/src/lib.rs b/crates/bevy_asset/src/lib.rs index 17ad7c5fc7897..e54d8f71f975b 100644 --- a/crates/bevy_asset/src/lib.rs +++ b/crates/bevy_asset/src/lib.rs @@ -464,7 +464,7 @@ mod tests { reader: &'a mut Reader, _settings: &'a Self::Settings, load_context: &'a mut LoadContext, - ) -> BoxedFuture<'a, Result> { + ) -> BoxedFuture<'a, Result> { Box::pin(async move { let mut bytes = Vec::new(); reader.read_to_end(&mut bytes).await?; diff --git a/crates/bevy_asset/src/loader.rs b/crates/bevy_asset/src/loader.rs index c6564de2b6a20..1d0aac53c88cb 100644 --- a/crates/bevy_asset/src/loader.rs +++ b/crates/bevy_asset/src/loader.rs @@ -20,7 +20,7 @@ use std::{ }; use thiserror::Error; -pub type Error = Box; +pub type BoxedError = Box; /// Loads an [`Asset`] from a given byte [`Reader`]. This can accept [`AssetLoader::Settings`], which configure how the [`Asset`] /// should be loaded. @@ -35,7 +35,7 @@ pub trait AssetLoader: Send + Sync + 'static { reader: &'a mut Reader, settings: &'a Self::Settings, load_context: &'a mut LoadContext, - ) -> BoxedFuture<'a, Result>; + ) -> BoxedFuture<'a, Result>; /// Returns a list of extensions supported by this asset loader, without the preceding dot. fn extensions(&self) -> &[&str]; @@ -49,7 +49,7 @@ pub trait ErasedAssetLoader: Send + Sync + 'static { reader: &'a mut Reader, meta: Box, load_context: LoadContext<'a>, - ) -> BoxedFuture<'a, Result>; + ) -> BoxedFuture<'a, Result>; /// Returns a list of extensions supported by this asset loader, without the preceding dot. fn extensions(&self) -> &[&str]; @@ -77,7 +77,7 @@ where reader: &'a mut Reader, meta: Box, mut load_context: LoadContext<'a>, - ) -> BoxedFuture<'a, Result> { + ) -> BoxedFuture<'a, Result> { Box::pin(async move { let settings = meta .loader_settings() diff --git a/crates/bevy_asset/src/meta.rs b/crates/bevy_asset/src/meta.rs index 01574a3ff7880..57c07fc313c6e 100644 --- a/crates/bevy_asset/src/meta.rs +++ b/crates/bevy_asset/src/meta.rs @@ -198,7 +198,7 @@ impl AssetLoader for () { _reader: &'a mut crate::io::Reader, _settings: &'a Self::Settings, _load_context: &'a mut crate::LoadContext, - ) -> bevy_utils::BoxedFuture<'a, Result> { + ) -> bevy_utils::BoxedFuture<'a, Result> { unreachable!(); } diff --git a/crates/bevy_asset/src/processor/process.rs b/crates/bevy_asset/src/processor/process.rs index 33e601b3a07e3..df4b7fe775155 100644 --- a/crates/bevy_asset/src/processor/process.rs +++ b/crates/bevy_asset/src/processor/process.rs @@ -107,7 +107,7 @@ pub enum ProcessError { #[error("The wrong meta type was passed into a processor. This is probably an internal implementation error.")] WrongMetaType, #[error("Encountered an error while saving the asset: {0}")] - AssetSaveError(#[from] crate::Error), + AssetSaveError(#[from] crate::BoxedError), #[error("Assets without extensions are not supported.")] ExtensionRequired, } diff --git a/crates/bevy_asset/src/saver.rs b/crates/bevy_asset/src/saver.rs index 5d8f77ce3d32a..83300809382a7 100644 --- a/crates/bevy_asset/src/saver.rs +++ b/crates/bevy_asset/src/saver.rs @@ -21,7 +21,7 @@ pub trait AssetSaver: Send + Sync + 'static { writer: &'a mut Writer, asset: SavedAsset<'a, Self::Asset>, settings: &'a Self::Settings, - ) -> BoxedFuture<'a, Result<::Settings, crate::Error>>; + ) -> BoxedFuture<'a, Result<::Settings, crate::BoxedError>>; } /// A type-erased dynamic variant of [`AssetSaver`] that allows callers to save assets without knowing the actual type of the [`AssetSaver`]. @@ -33,7 +33,7 @@ pub trait ErasedAssetSaver: Send + Sync + 'static { writer: &'a mut Writer, asset: &'a ErasedLoadedAsset, settings: &'a dyn Settings, - ) -> BoxedFuture<'a, Result<(), crate::Error>>; + ) -> BoxedFuture<'a, Result<(), crate::BoxedError>>; /// The type name of the [`AssetSaver`]. fn type_name(&self) -> &'static str; @@ -45,7 +45,7 @@ impl ErasedAssetSaver for S { writer: &'a mut Writer, asset: &'a ErasedLoadedAsset, settings: &'a dyn Settings, - ) -> BoxedFuture<'a, Result<(), crate::Error>> { + ) -> BoxedFuture<'a, Result<(), crate::BoxedError>> { Box::pin(async move { let settings = settings .downcast_ref::() diff --git a/crates/bevy_asset/src/server/mod.rs b/crates/bevy_asset/src/server/mod.rs index 780b2713ea14b..1c383113e9fb5 100644 --- a/crates/bevy_asset/src/server/mod.rs +++ b/crates/bevy_asset/src/server/mod.rs @@ -1046,7 +1046,7 @@ pub enum AssetLoadError { AssetLoaderError { path: AssetPath<'static>, loader_name: &'static str, - error: crate::Error, + error: crate::BoxedError, }, #[error("The file at '{base_path}' does not contain the labeled asset '{label}'.")] MissingLabel { diff --git a/crates/bevy_audio/src/audio_source.rs b/crates/bevy_audio/src/audio_source.rs index 8f3509bc051fd..aeaef15532d89 100644 --- a/crates/bevy_audio/src/audio_source.rs +++ b/crates/bevy_audio/src/audio_source.rs @@ -47,7 +47,7 @@ impl AssetLoader for AudioLoader { reader: &'a mut Reader, _settings: &'a Self::Settings, _load_context: &'a mut LoadContext, - ) -> BoxedFuture<'a, Result> { + ) -> BoxedFuture<'a, Result> { Box::pin(async move { let mut bytes = Vec::new(); reader.read_to_end(&mut bytes).await?; diff --git a/crates/bevy_gltf/src/loader.rs b/crates/bevy_gltf/src/loader.rs index e5b35ffaba316..6dd569a98f43a 100644 --- a/crates/bevy_gltf/src/loader.rs +++ b/crates/bevy_gltf/src/loader.rs @@ -113,7 +113,7 @@ impl AssetLoader for GltfLoader { reader: &'a mut Reader, _settings: &'a (), load_context: &'a mut LoadContext, - ) -> bevy_utils::BoxedFuture<'a, Result> { + ) -> bevy_utils::BoxedFuture<'a, Result> { Box::pin(async move { let mut bytes = Vec::new(); reader.read_to_end(&mut bytes).await?; diff --git a/crates/bevy_render/src/render_resource/shader.rs b/crates/bevy_render/src/render_resource/shader.rs index 71b140fadf19f..aa2e102d7e1a4 100644 --- a/crates/bevy_render/src/render_resource/shader.rs +++ b/crates/bevy_render/src/render_resource/shader.rs @@ -255,7 +255,7 @@ impl AssetLoader for ShaderLoader { reader: &'a mut Reader, _settings: &'a Self::Settings, load_context: &'a mut LoadContext, - ) -> BoxedFuture<'a, Result> { + ) -> BoxedFuture<'a, Result> { Box::pin(async move { let ext = load_context.path().extension().unwrap().to_str().unwrap(); diff --git a/crates/bevy_render/src/texture/compressed_image_saver.rs b/crates/bevy_render/src/texture/compressed_image_saver.rs index 0e48a1b3fe752..6f5d58a89d86c 100644 --- a/crates/bevy_render/src/texture/compressed_image_saver.rs +++ b/crates/bevy_render/src/texture/compressed_image_saver.rs @@ -23,7 +23,7 @@ impl AssetSaver for CompressedImageSaver { writer: &'a mut bevy_asset::io::Writer, image: SavedAsset<'a, Self::Asset>, _settings: &'a Self::Settings, - ) -> bevy_utils::BoxedFuture<'a, std::result::Result> + ) -> bevy_utils::BoxedFuture<'a, std::result::Result> { // PERF: this should live inside the future, but CompressorParams and Compressor are not Send / can't be owned by the BoxedFuture (which _is_ Send) let mut compressor_params = basis_universal::CompressorParams::new(); diff --git a/crates/bevy_render/src/texture/exr_texture_loader.rs b/crates/bevy_render/src/texture/exr_texture_loader.rs index 2e1c882f595bb..7d1daa8adbe94 100644 --- a/crates/bevy_render/src/texture/exr_texture_loader.rs +++ b/crates/bevy_render/src/texture/exr_texture_loader.rs @@ -31,7 +31,7 @@ impl AssetLoader for ExrTextureLoader { reader: &'a mut Reader, _settings: &'a Self::Settings, _load_context: &'a mut LoadContext, - ) -> BoxedFuture<'a, Result> { + ) -> BoxedFuture<'a, Result> { Box::pin(async move { let format = TextureFormat::Rgba32Float; debug_assert_eq!( diff --git a/crates/bevy_render/src/texture/hdr_texture_loader.rs b/crates/bevy_render/src/texture/hdr_texture_loader.rs index c2c3be924bb23..71bffda00f4c7 100644 --- a/crates/bevy_render/src/texture/hdr_texture_loader.rs +++ b/crates/bevy_render/src/texture/hdr_texture_loader.rs @@ -24,7 +24,7 @@ impl AssetLoader for HdrTextureLoader { reader: &'a mut Reader, _settings: &'a (), _load_context: &'a mut LoadContext, - ) -> bevy_utils::BoxedFuture<'a, Result> { + ) -> bevy_utils::BoxedFuture<'a, Result> { Box::pin(async move { let format = TextureFormat::Rgba32Float; debug_assert_eq!( diff --git a/crates/bevy_render/src/texture/image_loader.rs b/crates/bevy_render/src/texture/image_loader.rs index e95a8f2b07dbd..f93b52e0cfd40 100644 --- a/crates/bevy_render/src/texture/image_loader.rs +++ b/crates/bevy_render/src/texture/image_loader.rs @@ -86,7 +86,7 @@ impl AssetLoader for ImageLoader { reader: &'a mut Reader, settings: &'a ImageLoaderSettings, load_context: &'a mut LoadContext, - ) -> bevy_utils::BoxedFuture<'a, Result> { + ) -> bevy_utils::BoxedFuture<'a, Result> { Box::pin(async move { // use the file extension for the image type let ext = load_context.path().extension().unwrap().to_str().unwrap(); diff --git a/crates/bevy_scene/src/scene_loader.rs b/crates/bevy_scene/src/scene_loader.rs index 858a015ffc1fb..c18eab9acba58 100644 --- a/crates/bevy_scene/src/scene_loader.rs +++ b/crates/bevy_scene/src/scene_loader.rs @@ -47,7 +47,7 @@ impl AssetLoader for SceneLoader { reader: &'a mut Reader, _settings: &'a (), _load_context: &'a mut LoadContext, - ) -> BoxedFuture<'a, Result> { + ) -> BoxedFuture<'a, Result> { Box::pin(async move { let mut bytes = Vec::new(); reader.read_to_end(&mut bytes).await?; diff --git a/crates/bevy_text/src/font_loader.rs b/crates/bevy_text/src/font_loader.rs index f9789af19355b..8f86d7e1e5cd9 100644 --- a/crates/bevy_text/src/font_loader.rs +++ b/crates/bevy_text/src/font_loader.rs @@ -25,7 +25,7 @@ impl AssetLoader for FontLoader { reader: &'a mut Reader, _settings: &'a (), _load_context: &'a mut LoadContext, - ) -> bevy_utils::BoxedFuture<'a, Result> { + ) -> bevy_utils::BoxedFuture<'a, Result> { Box::pin(async move { let mut bytes = Vec::new(); reader.read_to_end(&mut bytes).await?; diff --git a/examples/asset/custom_asset.rs b/examples/asset/custom_asset.rs index 682f31bf73fa4..8007ef255a4f3 100644 --- a/examples/asset/custom_asset.rs +++ b/examples/asset/custom_asset.rs @@ -39,7 +39,7 @@ impl AssetLoader for CustomAssetLoader { reader: &'a mut Reader, _settings: &'a (), _load_context: &'a mut LoadContext, - ) -> BoxedFuture<'a, Result> { + ) -> BoxedFuture<'a, Result> { Box::pin(async move { let mut bytes = Vec::new(); reader.read_to_end(&mut bytes).await?; diff --git a/examples/asset/processing/asset_processing.rs b/examples/asset/processing/asset_processing.rs index d6de283c9f284..038f52b15599f 100644 --- a/examples/asset/processing/asset_processing.rs +++ b/examples/asset/processing/asset_processing.rs @@ -84,7 +84,7 @@ impl AssetLoader for TextLoader { reader: &'a mut Reader, settings: &'a TextSettings, _load_context: &'a mut LoadContext, - ) -> BoxedFuture<'a, Result> { + ) -> BoxedFuture<'a, Result> { Box::pin(async move { let mut bytes = Vec::new(); reader.read_to_end(&mut bytes).await?; @@ -138,7 +138,7 @@ impl AssetLoader for CoolTextLoader { reader: &'a mut Reader, _settings: &'a Self::Settings, load_context: &'a mut LoadContext, - ) -> BoxedFuture<'a, Result> { + ) -> BoxedFuture<'a, Result> { Box::pin(async move { let mut bytes = Vec::new(); reader.read_to_end(&mut bytes).await?; @@ -182,7 +182,7 @@ impl AssetSaver for CoolTextSaver { writer: &'a mut Writer, asset: SavedAsset<'a, Self::Asset>, settings: &'a Self::Settings, - ) -> BoxedFuture<'a, Result> { + ) -> BoxedFuture<'a, Result> { Box::pin(async move { let text = format!("{}{}", asset.text.clone(), settings.appended); writer.write_all(text.as_bytes()).await?;