From 1f4ed83b364652cc4f3ce136bdb4225d65b5f653 Mon Sep 17 00:00:00 2001
From: sark <sarkahn@gmail.com>
Date: Wed, 20 Jul 2022 14:14:30 +0000
Subject: [PATCH] Export anyhow::error for custom asset loaders (#5359)

If users try to implement a custom asset loader, they must manually import anyhow::error as it's used by the asset loader trait but not exported.

https://github.com/bevyengine/bevy/blob/2b93ab58128178fef64de8134a130f036f07dc5d/examples/asset/custom_asset.rs#L25

Fixes #3138

Co-authored-by: sark <sarkahn@hotmail.com>
---
 crates/bevy_asset/src/lib.rs    | 1 +
 crates/bevy_asset/src/loader.rs | 3 ++-
 examples/asset/custom_asset.rs  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_asset/src/lib.rs b/crates/bevy_asset/src/lib.rs
index f70bc5c1f4fd4..4e1dd9003495c 100644
--- a/crates/bevy_asset/src/lib.rs
+++ b/crates/bevy_asset/src/lib.rs
@@ -32,6 +32,7 @@ pub mod prelude {
     pub use crate::{AddAsset, AssetEvent, AssetServer, Assets, Handle, HandleUntyped};
 }
 
+pub use anyhow::Error;
 pub use asset_server::*;
 pub use assets::*;
 pub use bevy_utils::BoxedFuture;
diff --git a/crates/bevy_asset/src/loader.rs b/crates/bevy_asset/src/loader.rs
index 3d420e8f83429..f6a5153b490d9 100644
--- a/crates/bevy_asset/src/loader.rs
+++ b/crates/bevy_asset/src/loader.rs
@@ -2,6 +2,7 @@ use crate::{
     path::AssetPath, AssetIo, AssetIoError, AssetMeta, AssetServer, Assets, Handle, HandleId,
     RefChangeChannel,
 };
+use anyhow::Error;
 use anyhow::Result;
 use bevy_ecs::system::{Res, ResMut};
 use bevy_reflect::{TypeUuid, TypeUuidDynamic};
@@ -20,7 +21,7 @@ pub trait AssetLoader: Send + Sync + 'static {
         &'a self,
         bytes: &'a [u8],
         load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<(), anyhow::Error>>;
+    ) -> BoxedFuture<'a, Result<(), Error>>;
 
     /// Returns a list of extensions supported by this asset loader, without the preceding dot.
     fn extensions(&self) -> &[&str];
diff --git a/examples/asset/custom_asset.rs b/examples/asset/custom_asset.rs
index 3462f3e511e64..a8368c07a4bf2 100644
--- a/examples/asset/custom_asset.rs
+++ b/examples/asset/custom_asset.rs
@@ -22,7 +22,7 @@ impl AssetLoader for CustomAssetLoader {
         &'a self,
         bytes: &'a [u8],
         load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<(), anyhow::Error>> {
+    ) -> BoxedFuture<'a, Result<(), bevy::asset::Error>> {
         Box::pin(async move {
             let custom_asset = ron::de::from_bytes::<CustomAsset>(bytes)?;
             load_context.set_default_asset(LoadedAsset::new(custom_asset));