From 484d5c848d4e66858571e30412063f1aa6ababcb Mon Sep 17 00:00:00 2001
From: shishanyue <62888460+shishanyue@users.noreply.github.com>
Date: Sat, 21 Jun 2025 15:35:04 +0800
Subject: [PATCH] fix

---
 crates/bevy_asset/src/lib.rs        |  4 ++--
 crates/bevy_asset/src/server/mod.rs | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/crates/bevy_asset/src/lib.rs b/crates/bevy_asset/src/lib.rs
index ea51991899..ed37740dd5 100644
--- a/crates/bevy_asset/src/lib.rs
+++ b/crates/bevy_asset/src/lib.rs
@@ -1574,7 +1574,7 @@ mod tests {
     }
 
     #[test]
-    fn load_folder() {
+    fn load_batch() {
         // The particular usage of GatedReader in this test will cause deadlocking if running single-threaded
         #[cfg(not(feature = "multi_threaded"))]
         panic!("This test requires the \"multi_threaded\" feature, otherwise it will deadlock.\ncargo test --package bevy_asset --features multi_threaded");
@@ -1619,7 +1619,7 @@ mod tests {
             .register_asset_loader(CoolTextLoader);
         let asset_server = app.world().resource::<AssetServer>().clone();
         let handle: Handle<LoadedBatch> =
-            asset_server.load_batch(LoadBatchRequest::new(vec!["text"]));
+            asset_server.load_batch(LoadBatchRequest::new(vec!["text/*","b.cool.ron"]));
         gate_opener.open(a_path);
         gate_opener.open(b_path);
         gate_opener.open(c_path);
diff --git a/crates/bevy_asset/src/server/mod.rs b/crates/bevy_asset/src/server/mod.rs
index 2c98cb298c..3835e9d125 100644
--- a/crates/bevy_asset/src/server/mod.rs
+++ b/crates/bevy_asset/src/server/mod.rs
@@ -944,7 +944,7 @@ impl AssetServer {
     /// removed, added or moved. This includes files in subdirectories and moving, adding,
     /// or removing complete subdirectories.
     #[must_use = "not using the returned strong handle may result in the unexpected release of the assets"]
-    pub fn load_batch<'a>(&self, load_batch_request: LoadBatchRequest) -> Handle<LoadedBatch> {
+    pub fn load_batch(&self, load_batch_request: LoadBatchRequest) -> Handle<LoadedBatch> {
         let handle = self.data.infos.write().create_loading_handle_untyped(
             TypeId::of::<LoadedBatch>(),
             core::any::type_name::<LoadedBatch>(),
@@ -1012,16 +1012,13 @@ impl AssetServer {
 
                         let path = AssetPath::from_path_buf(path);
 
-                        let source = match server.get_source(path.source()) {
-                            Ok(s) => s,
-                            Err(_) => {
-                                error!(
-                                    "Failed to load {}. AssetSource {} does not exist",
-                                    path,
-                                    path.source()
-                                );
-                                continue;
-                            }
+                        let Ok(source) = server.get_source(path.source()) else {
+                            error!(
+                                "Failed to load {}. AssetSource {} does not exist",
+                                path,
+                                path.source()
+                            );
+                            return;
                         };
 
                         if let Err(err) =
@@ -1040,7 +1037,7 @@ impl AssetServer {
                     id,
                     loaded_asset: LoadedAsset::new_with_dependencies(LoadedBatch { handles })
                         .into(),
-                })
+                });
             })
             .detach();
     }