bevy::asset::Error -> bevy::asset::BoxedError

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<Self::Asset, bevy_asset::Error>> {
+        ) -> BoxedFuture<'a, Result<Self::Asset, crate::BoxedError>> {
             Box::pin(async move {
                 let mut bytes = Vec::new();
                 reader.read_to_end(&mut bytes).await?;

crates/bevy_asset/src/loader.rs

@@ -20,7 +20,7 @@ use std::{
 };
 use thiserror::Error;
 
-pub type Error = Box<dyn std::error::Error + Send + Sync>;
+pub type BoxedError = Box<dyn std::error::Error + Send + Sync>;
 
 /// 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<Self::Asset, Error>>;
+    ) -> BoxedFuture<'a, Result<Self::Asset, BoxedError>>;
 
     /// 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<dyn AssetMetaDyn>,
         load_context: LoadContext<'a>,
-    ) -> BoxedFuture<'a, Result<ErasedLoadedAsset, Error>>;
+    ) -> BoxedFuture<'a, Result<ErasedLoadedAsset, BoxedError>>;
 
     /// 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<dyn AssetMetaDyn>,
         mut load_context: LoadContext<'a>,
-    ) -> BoxedFuture<'a, Result<ErasedLoadedAsset, Error>> {
+    ) -> BoxedFuture<'a, Result<ErasedLoadedAsset, BoxedError>> {
         Box::pin(async move {
             let settings = meta
                 .loader_settings()

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<Self::Asset, bevy_asset::Error>> {
+    ) -> bevy_utils::BoxedFuture<'a, Result<Self::Asset, crate::BoxedError>> {
         unreachable!();
     }
 

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,
 }

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<<Self::OutputLoader as AssetLoader>::Settings, crate::Error>>;
+    ) -> BoxedFuture<'a, Result<<Self::OutputLoader as AssetLoader>::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<S: AssetSaver> 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::<S::Settings>()

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 {

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<AudioSource, bevy_asset::Error>> {
+    ) -> BoxedFuture<'a, Result<AudioSource, bevy_asset::BoxedError>> {
         Box::pin(async move {
             let mut bytes = Vec::new();
             reader.read_to_end(&mut bytes).await?;

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<Gltf, bevy_asset::Error>> {
+    ) -> bevy_utils::BoxedFuture<'a, Result<Gltf, bevy_asset::BoxedError>> {
         Box::pin(async move {
             let mut bytes = Vec::new();
             reader.read_to_end(&mut bytes).await?;

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<Shader, bevy_asset::Error>> {
+    ) -> BoxedFuture<'a, Result<Shader, bevy_asset::BoxedError>> {
         Box::pin(async move {
             let ext = load_context.path().extension().unwrap().to_str().unwrap();
 

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<ImageLoaderSettings, bevy_asset::Error>>
+    ) -> bevy_utils::BoxedFuture<'a, std::result::Result<ImageLoaderSettings, bevy_asset::BoxedError>>
     {
         // 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();

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<Image, bevy_asset::Error>> {
+    ) -> BoxedFuture<'a, Result<Image, bevy_asset::BoxedError>> {
         Box::pin(async move {
             let format = TextureFormat::Rgba32Float;
             debug_assert_eq!(

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<Image, bevy_asset::Error>> {
+    ) -> bevy_utils::BoxedFuture<'a, Result<Image, bevy_asset::BoxedError>> {
         Box::pin(async move {
             let format = TextureFormat::Rgba32Float;
             debug_assert_eq!(

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<Image, bevy_asset::Error>> {
+    ) -> bevy_utils::BoxedFuture<'a, Result<Image, bevy_asset::BoxedError>> {
         Box::pin(async move {
             // use the file extension for the image type
             let ext = load_context.path().extension().unwrap().to_str().unwrap();

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<Self::Asset, bevy_asset::Error>> {
+    ) -> BoxedFuture<'a, Result<Self::Asset, bevy_asset::BoxedError>> {
         Box::pin(async move {
             let mut bytes = Vec::new();
             reader.read_to_end(&mut bytes).await?;

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<Font, bevy_asset::Error>> {
+    ) -> bevy_utils::BoxedFuture<'a, Result<Font, bevy_asset::BoxedError>> {
         Box::pin(async move {
             let mut bytes = Vec::new();
             reader.read_to_end(&mut bytes).await?;

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<Self::Asset, bevy::asset::Error>> {
+    ) -> BoxedFuture<'a, Result<Self::Asset, bevy::asset::BoxedError>> {
         Box::pin(async move {
             let mut bytes = Vec::new();
             reader.read_to_end(&mut bytes).await?;

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<Text, bevy::asset::Error>> {
+    ) -> BoxedFuture<'a, Result<Text, bevy::asset::BoxedError>> {
         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<CoolText, bevy::asset::Error>> {
+    ) -> BoxedFuture<'a, Result<CoolText, bevy::asset::BoxedError>> {
         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<TextSettings, bevy::asset::Error>> {
+    ) -> BoxedFuture<'a, Result<TextSettings, bevy::asset::BoxedError>> {
         Box::pin(async move {
             let text = format!("{}{}", asset.text.clone(), settings.appended);
             writer.write_all(text.as_bytes()).await?;