diff --git a/crates/bevy_asset/src/asset_server.rs b/crates/bevy_asset/src/asset_server.rs index f46b96ed7b..9847e24254 100644 --- a/crates/bevy_asset/src/asset_server.rs +++ b/crates/bevy_asset/src/asset_server.rs @@ -53,7 +53,7 @@ pub struct AssetServerInternal { pub(crate) asset_ref_counter: AssetRefCounter, pub(crate) asset_sources: Arc>>, pub(crate) asset_lifecycles: Arc>>>, - loaders: RwLock>>>, + loaders: RwLock>>, extension_to_loader_index: RwLock>, handle_to_path: Arc>>>, task_pool: TaskPool, @@ -112,7 +112,7 @@ impl AssetServer { .write() .insert(extension.to_string(), loader_index); } - loaders.push(Arc::new(Box::new(loader))); + loaders.push(Arc::new(loader)); } pub fn watch_for_changes(&self) -> Result<(), AssetServerError> { @@ -130,10 +130,7 @@ impl AssetServer { HandleUntyped::strong(id.into(), sender) } - fn get_asset_loader( - &self, - extension: &str, - ) -> Result>, AssetServerError> { + fn get_asset_loader(&self, extension: &str) -> Result, AssetServerError> { let index = { // scope map to drop lock as soon as possible let map = self.server.extension_to_loader_index.read(); @@ -149,7 +146,7 @@ impl AssetServer { fn get_path_asset_loader>( &self, path: P, - ) -> Result>, AssetServerError> { + ) -> Result, AssetServerError> { let s = path .as_ref() .file_name() diff --git a/crates/bevy_core/src/lib.rs b/crates/bevy_core/src/lib.rs index 5af6bc88f2..2e8066d62f 100644 --- a/crates/bevy_core/src/lib.rs +++ b/crates/bevy_core/src/lib.rs @@ -43,7 +43,7 @@ impl Plugin for CorePlugin { app.world .get_resource::() .cloned() - .unwrap_or_else(DefaultTaskPoolOptions::default) + .unwrap_or_default() .create_default_pools(&mut app.world); app.init_resource::