diff --git a/crates/bevy_asset/src/asset_server.rs b/crates/bevy_asset/src/asset_server.rs index 3fb29d0a27091..be185e515ba96 100644 --- a/crates/bevy_asset/src/asset_server.rs +++ b/crates/bevy_asset/src/asset_server.rs @@ -217,12 +217,11 @@ impl AssetServer { } // TODO: properly set failed LoadState in all failure cases - async fn load_async<'a, P: Into>>( + async fn load_async( &self, - path: P, + asset_path: AssetPath<'_>, force: bool, ) -> Result { - let asset_path: AssetPath = path.into(); let asset_loader = self.get_path_asset_loader(asset_path.path())?; let asset_path_id: AssetPathId = asset_path.get_id(); @@ -326,16 +325,11 @@ impl AssetServer { } pub fn load_untyped<'a, P: Into>>(&self, path: P) -> HandleUntyped { - let handle_id = self.load_untracked(path, false); + let handle_id = self.load_untracked(path.into(), false); self.get_handle_untyped(handle_id) } - pub(crate) fn load_untracked<'a, P: Into>>( - &self, - path: P, - force: bool, - ) -> HandleId { - let asset_path: AssetPath<'a> = path.into(); + pub(crate) fn load_untracked(&self, asset_path: AssetPath<'_>, force: bool) -> HandleId { let server = self.clone(); let owned_path = asset_path.to_owned(); self.server diff --git a/crates/bevy_asset/src/io/file_asset_io.rs b/crates/bevy_asset/src/io/file_asset_io.rs index bab6372651ff0..ee23a6c730c43 100644 --- a/crates/bevy_asset/src/io/file_asset_io.rs +++ b/crates/bevy_asset/src/io/file_asset_io.rs @@ -133,7 +133,7 @@ pub fn filesystem_watcher_system(asset_server: Res) { for path in paths.iter() { if !changed.contains(path) { let relative_path = path.strip_prefix(&asset_io.root_path).unwrap(); - let _ = asset_server.load_untracked(relative_path, true); + let _ = asset_server.load_untracked(relative_path.into(), true); } } changed.extend(paths);