Skip to content

Commit

Permalink
Pin bevy to 0.14.2 and migrate rhai asset loader future
Browse files Browse the repository at this point in the history
  • Loading branch information
makspll committed Sep 7, 2024
1 parent 26d7678 commit 2e507fa
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ bevy_script_api = { path = "crates/bevy_script_api", version = "0.6.0", optional


[workspace.dependencies]
bevy = { version = "0.14", default-features = false }
bevy = { version = "0.14.2", default-features = false }
bevy_mod_scripting_core = { path = "crates/bevy_mod_scripting_core", version = "0.6.0" }
bevy_mod_scripting_common = { path = "crates/bevy_mod_scripting_common", version = "0.6.0" }

Expand Down
16 changes: 7 additions & 9 deletions crates/languages/bevy_mod_scripting_rhai/src/assets.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,15 @@ impl AssetLoader for RhaiLoader {
type Asset = RhaiFile;
type Settings = ();
type Error = anyhow::Error;
fn load<'a>(
async fn load<'a>(
&'a self,
reader: &'a mut Reader,
reader: &'a mut Reader<'_>,
_: &'a Self::Settings,
_: &'a mut LoadContext,
) -> bevy::asset::BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
Box::pin(async move {
let mut bytes = Vec::new();
reader.read_to_end(&mut bytes).await?;
Ok(RhaiFile { bytes })
})
_: &'a mut LoadContext<'_>,
) -> Result<Self::Asset, Self::Error> {
let mut bytes = Vec::new();
reader.read_to_end(&mut bytes).await?;
Ok(RhaiFile { bytes })
}

fn extensions(&self) -> &[&str] {
Expand Down
2 changes: 1 addition & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ TEST_NAME=
# # valgrind outputs a callgrind.out.<pid>. We can analyze this with kcachegrind
# kcachegrind
NIGHTLY_VERSION=nightly-2024-08-13
BEVY_VERSION=0.14.1
BEVY_VERSION=0.14.2
GLAM_VERSION=0.28.0
CODEGEN_PATH=${PWD}/target/codegen
BEVY_PATH=${CODEGEN_PATH}/bevy
Expand Down

0 comments on commit 2e507fa

Please sign in to comment.