Update to main Bevy

NiklasEi · May 18, 2024 · 6abc324 · 6abc324
1 parent 8792cfd
commit 6abc324
Show file tree

Hide file tree

Showing 16 changed files with 91 additions and 111 deletions.
diff --git a/examples/csv.rs b/examples/csv.rs
@@ -13,7 +13,7 @@ fn main() {
         .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
-        .run()
+        .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {

diff --git a/examples/json.rs b/examples/json.rs
@@ -12,7 +12,7 @@ fn main() {
         .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
-        .run()
+        .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {

diff --git a/examples/msgpack.rs b/examples/msgpack.rs
@@ -12,7 +12,7 @@ fn main() {
         .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
-        .run()
+        .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {

diff --git a/examples/postcard.rs b/examples/postcard.rs
@@ -12,7 +12,7 @@ fn main() {
         .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
-        .run()
+        .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {

diff --git a/examples/ron.rs b/examples/ron.rs
@@ -9,7 +9,7 @@ fn main() {
         .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
-        .run()
+        .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {

diff --git a/examples/toml.rs b/examples/toml.rs
@@ -12,7 +12,7 @@ fn main() {
         .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
-        .run()
+        .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {

diff --git a/examples/xml.rs b/examples/xml.rs
@@ -10,7 +10,7 @@ fn main() {
         .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
-        .run()
+        .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {

diff --git a/examples/yaml.rs b/examples/yaml.rs
@@ -12,7 +12,7 @@ fn main() {
         .init_state::<AppState>()
         .add_systems(Startup, setup)
         .add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
-        .run()
+        .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {

diff --git a/src/csv.rs b/src/csv.rs
@@ -1,6 +1,6 @@
 use bevy::app::{App, Plugin};
 use bevy::asset::io::Reader;
-use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, BoxedFuture, Handle, LoadContext};
+use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, Handle, LoadContext};
 use bevy::prelude::TypePath;
 use std::marker::PhantomData;
 use thiserror::Error;
@@ -99,26 +99,23 @@ where
     type Settings = ();
     type Error = CsvLoaderError;
 
-    fn load<'a>(
+    async fn load<'a>(
         &'a self,
-        reader: &'a mut Reader,
+        reader: &'a mut Reader<'_>,
         _settings: &'a (),
-        load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
-        Box::pin(async move {
-            let mut bytes = Vec::new();
-            reader.read_to_end(&mut bytes).await?;
-            let mut reader = csv::ReaderBuilder::new()
-                .delimiter(self.delimiter)
-                .from_reader(bytes.as_slice());
-            let mut handles = vec![];
-            for (index, result) in reader.deserialize().enumerate() {
-                let asset: A = result?;
-                handles
-                    .push(load_context.add_loaded_labeled_asset(index.to_string(), asset.into()));
-            }
-            Ok(LoadedCsv { rows: handles })
-        })
+        load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut bytes = Vec::new();
+        reader.read_to_end(&mut bytes).await?;
+        let mut reader = csv::ReaderBuilder::new()
+            .delimiter(self.delimiter)
+            .from_reader(bytes.as_slice());
+        let mut handles = vec![];
+        for (index, result) in reader.deserialize().enumerate() {
+            let asset: A = result?;
+            handles.push(load_context.add_loaded_labeled_asset(index.to_string(), asset.into()));
+        }
+        Ok(LoadedCsv { rows: handles })
     }
 
     fn extensions(&self) -> &[&str] {

diff --git a/src/json.rs b/src/json.rs
@@ -1,6 +1,6 @@
 use bevy::app::{App, Plugin};
 use bevy::asset::io::Reader;
-use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, BoxedFuture, LoadContext};
+use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, LoadContext};
 use serde_json::from_slice;
 use std::marker::PhantomData;
 use thiserror::Error;
@@ -63,18 +63,16 @@ where
     type Settings = ();
     type Error = JsonLoaderError;
 
-    fn load<'a>(
+    async fn load<'a>(
         &'a self,
-        reader: &'a mut Reader,
+        reader: &'a mut Reader<'_>,
         _settings: &'a (),
-        _load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
-        Box::pin(async move {
-            let mut bytes = Vec::new();
-            reader.read_to_end(&mut bytes).await?;
-            let asset = from_slice::<A>(&bytes)?;
-            Ok(asset)
-        })
+        _load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut bytes = Vec::new();
+        reader.read_to_end(&mut bytes).await?;
+        let asset = from_slice::<A>(&bytes)?;
+        Ok(asset)
     }
 
     fn extensions(&self) -> &[&str] {

diff --git a/src/msgpack.rs b/src/msgpack.rs
@@ -1,6 +1,6 @@
 use bevy::app::{App, Plugin};
 use bevy::asset::io::Reader;
-use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, BoxedFuture, LoadContext};
+use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, LoadContext};
 use rmp_serde::from_slice;
 use std::marker::PhantomData;
 use thiserror::Error;
@@ -63,18 +63,16 @@ where
     type Settings = ();
     type Error = MsgPackLoaderError;
 
-    fn load<'a>(
+    async fn load<'a>(
         &'a self,
-        reader: &'a mut Reader,
+        reader: &'a mut Reader<'_>,
         _settings: &'a (),
-        _load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
-        Box::pin(async move {
-            let mut bytes = Vec::new();
-            reader.read_to_end(&mut bytes).await?;
-            let asset = from_slice::<A>(&bytes)?;
-            Ok(asset)
-        })
+        _load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut bytes = Vec::new();
+        reader.read_to_end(&mut bytes).await?;
+        let asset = from_slice::<A>(&bytes)?;
+        Ok(asset)
     }
 
     fn extensions(&self) -> &[&str] {

diff --git a/src/postcard.rs b/src/postcard.rs
@@ -5,7 +5,6 @@ use bevy::{
         LoadContext,
     },
     prelude::*,
-    utils::{thiserror, BoxedFuture},
 };
 use postcard::{from_bytes, to_stdvec};
 use serde::{Deserialize, Serialize};
@@ -70,18 +69,16 @@ where
     type Settings = ();
     type Error = PostcardAssetError;
 
-    fn load<'a>(
+    async fn load<'a>(
         &'a self,
-        reader: &'a mut Reader,
+        reader: &'a mut Reader<'_>,
         _settings: &'a (),
-        _load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
-        Box::pin(async move {
-            let mut bytes = Vec::new();
-            reader.read_to_end(&mut bytes).await?;
-            let asset = from_bytes::<A>(&bytes)?;
-            Ok(asset)
-        })
+        _load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut bytes = Vec::new();
+        reader.read_to_end(&mut bytes).await?;
+        let asset = from_bytes::<A>(&bytes)?;
+        Ok(asset)
     }
 
     fn extensions(&self) -> &[&str] {
@@ -108,16 +105,14 @@ impl<A: Asset + for<'de> Deserialize<'de> + Serialize> AssetSaver for PostcardAs
     type OutputLoader = PostcardAssetLoader<A>;
     type Error = PostcardAssetError;
 
-    fn save<'a>(
+    async fn save<'a>(
         &'a self,
         writer: &'a mut bevy::asset::io::Writer,
         asset: bevy::asset::saver::SavedAsset<'a, Self::Asset>,
         _settings: &'a Self::Settings,
-    ) -> BoxedFuture<'a, Result<<Self::OutputLoader as AssetLoader>::Settings, Self::Error>> {
-        Box::pin(async move {
-            let bytes = to_stdvec(&asset.get())?;
-            writer.write_all(&bytes).await?;
-            Ok(())
-        })
+    ) -> Result<<Self::OutputLoader as AssetLoader>::Settings, Self::Error> {
+        let bytes = to_stdvec(&asset.get())?;
+        writer.write_all(&bytes).await?;
+        Ok(())
     }
 }
diff --git a/src/ron.rs b/src/ron.rs
@@ -1,6 +1,6 @@
 use bevy::app::{App, Plugin};
 use bevy::asset::io::Reader;
-use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, BoxedFuture, LoadContext};
+use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, LoadContext};
 use serde_ron::de::from_bytes;
 use std::marker::PhantomData;
 use thiserror::Error;
@@ -63,18 +63,16 @@ where
     type Settings = ();
     type Error = RonLoaderError;
 
-    fn load<'a>(
+    async fn load<'a>(
         &'a self,
-        reader: &'a mut Reader,
+        reader: &'a mut Reader<'_>,
         _settings: &'a (),
-        _load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
-        Box::pin(async move {
-            let mut bytes = Vec::new();
-            reader.read_to_end(&mut bytes).await?;
-            let asset = from_bytes::<A>(&bytes)?;
-            Ok(asset)
-        })
+        _load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut bytes = Vec::new();
+        reader.read_to_end(&mut bytes).await?;
+        let asset = from_bytes::<A>(&bytes)?;
+        Ok(asset)
     }
 
     fn extensions(&self) -> &[&str] {

diff --git a/src/toml.rs b/src/toml.rs
@@ -1,6 +1,6 @@
 use bevy::app::{App, Plugin};
 use bevy::asset::io::Reader;
-use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, BoxedFuture, LoadContext};
+use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, LoadContext};
 use std::marker::PhantomData;
 use std::str::from_utf8;
 use thiserror::Error;
@@ -66,18 +66,16 @@ where
     type Settings = ();
     type Error = TomlLoaderError;
 
-    fn load<'a>(
+    async fn load<'a>(
         &'a self,
-        reader: &'a mut Reader,
+        reader: &'a mut Reader<'_>,
         _settings: &'a (),
-        _load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
-        Box::pin(async move {
-            let mut bytes = Vec::new();
-            reader.read_to_end(&mut bytes).await?;
-            let asset = serde_toml::from_str::<A>(from_utf8(&bytes)?)?;
-            Ok(asset)
-        })
+        _load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut bytes = Vec::new();
+        reader.read_to_end(&mut bytes).await?;
+        let asset = serde_toml::from_str::<A>(from_utf8(&bytes)?)?;
+        Ok(asset)
     }
 
     fn extensions(&self) -> &[&str] {

diff --git a/src/xml.rs b/src/xml.rs
@@ -1,6 +1,6 @@
 use bevy::app::{App, Plugin};
 use bevy::asset::io::Reader;
-use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, BoxedFuture, LoadContext};
+use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, LoadContext};
 use quick_xml::de::from_str;
 use std::marker::PhantomData;
 use std::str::from_utf8;
@@ -68,18 +68,16 @@ where
     type Settings = ();
     type Error = XmlLoaderError;
 
-    fn load<'a>(
+    async fn load<'a>(
         &'a self,
-        reader: &'a mut Reader,
+        reader: &'a mut Reader<'_>,
         _settings: &'a (),
-        _load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
-        Box::pin(async move {
-            let mut bytes = Vec::new();
-            reader.read_to_end(&mut bytes).await?;
-            let asset = from_str::<A>(from_utf8(&bytes)?)?;
-            Ok(asset)
-        })
+        _load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut bytes = Vec::new();
+        reader.read_to_end(&mut bytes).await?;
+        let asset = from_str::<A>(from_utf8(&bytes)?)?;
+        Ok(asset)
     }
 
     fn extensions(&self) -> &[&str] {

diff --git a/src/yaml.rs b/src/yaml.rs
@@ -1,6 +1,6 @@
 use bevy::app::{App, Plugin};
 use bevy::asset::io::Reader;
-use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, BoxedFuture, LoadContext};
+use bevy::asset::{Asset, AssetApp, AssetLoader, AsyncReadExt, LoadContext};
 use serde_yaml::from_slice;
 use std::marker::PhantomData;
 use thiserror::Error;
@@ -63,18 +63,16 @@ where
     type Settings = ();
     type Error = YamlLoaderError;
 
-    fn load<'a>(
+    async fn load<'a>(
         &'a self,
-        reader: &'a mut Reader,
+        reader: &'a mut Reader<'_>,
         _settings: &'a (),
-        _load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
-        Box::pin(async move {
-            let mut bytes = Vec::new();
-            reader.read_to_end(&mut bytes).await?;
-            let asset = from_slice::<A>(&bytes)?;
-            Ok(asset)
-        })
+        _load_context: &'a mut LoadContext<'_>,
+    ) -> Result<Self::Asset, Self::Error> {
+        let mut bytes = Vec::new();
+        reader.read_to_end(&mut bytes).await?;
+        let asset = from_slice::<A>(&bytes)?;
+        Ok(asset)
     }
 
     fn extensions(&self) -> &[&str] {