Version and lint

Author: alexparlett

Cargo.toml

@@ -76,18 +76,18 @@ profile_with_tracy = ["bevy/trace_tracy"]
 [dependencies]
 bevy = { workspace = true }
 bevy_mod_scripting_core = { workspace = true }
-bevy_mod_scripting_lua = { path = "crates/languages/bevy_mod_scripting_lua", version = "0.12.0", optional = true }
-bevy_mod_scripting_rhai = { path = "crates/languages/bevy_mod_scripting_rhai", version = "0.12.0", optional = true }
+bevy_mod_scripting_lua = { path = "crates/languages/bevy_mod_scripting_lua", version = "0.13.0", optional = true }
+bevy_mod_scripting_rhai = { path = "crates/languages/bevy_mod_scripting_rhai", version = "0.13.0", optional = true }
 # bevy_mod_scripting_rune = { path = "crates/languages/bevy_mod_scripting_rune", version = "0.9.0-alpha.2", optional = true }
 bevy_mod_scripting_functions = { workspace = true }
 bevy_mod_scripting_derive = { workspace = true }
 
 [workspace.dependencies]
 profiling = { version = "1.0" }
 bevy = { version = "0.16.0", default-features = false }
-bevy_mod_scripting_core = { path = "crates/bevy_mod_scripting_core", version = "0.12.0" }
-bevy_mod_scripting_functions = { path = "crates/bevy_mod_scripting_functions", version = "0.12.0", default-features = false }
-bevy_mod_scripting_derive = { path = "crates/bevy_mod_scripting_derive", version = "0.12.0" }
+bevy_mod_scripting_core = { path = "crates/bevy_mod_scripting_core", version = "0.13.0" }
+bevy_mod_scripting_functions = { path = "crates/bevy_mod_scripting_functions", version = "0.13.0", default-features = false }
+bevy_mod_scripting_derive = { path = "crates/bevy_mod_scripting_derive", version = "0.13.0" }
 
 # test utilities
 script_integration_test_harness = { path = "crates/testing_crates/script_integration_test_harness" }

benches/benchmarks.rs

@@ -1,20 +1,23 @@
-use bevy::log::tracing_subscriber::layer::SubscriberExt;
-use bevy::log::{tracing, tracing_subscriber, Level};
-use bevy::reflect::Reflect;
+use std::{collections::HashMap, path::PathBuf, sync::LazyLock, time::Duration};
+
+use bevy::{
+    log::{
+        tracing, tracing::span, tracing_subscriber, tracing_subscriber::layer::SubscriberExt, Level,
+    },
+    reflect::Reflect,
+};
 use bevy_mod_scripting_core::bindings::{
     FromScript, IntoScript, Mut, Ref, ReflectReference, ScriptValue, Val,
 };
-use criterion::{criterion_main, measurement::Measurement, BenchmarkGroup, Criterion};
-use criterion::{BatchSize, BenchmarkFilter};
+use criterion::{
+    criterion_main, measurement::Measurement, BatchSize, BenchmarkFilter, BenchmarkGroup, Criterion,
+};
 use regex::Regex;
-use script_integration_test_harness::test_functions::rand::Rng;
 use script_integration_test_harness::{
     make_test_lua_plugin, make_test_rhai_plugin, perform_benchmark_with_generator,
     run_lua_benchmark, run_plugin_script_load_benchmark, run_rhai_benchmark,
+    test_functions::rand::Rng,
 };
-use std::collections::HashMap;
-use std::{path::PathBuf, sync::LazyLock, time::Duration};
-use bevy::log::tracing::span;
 use test_utils::{discover_all_tests, Test};
 
 extern crate bevy_mod_scripting;

crates/bevy_mod_scripting_core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_mod_scripting_core"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Maksymilian Mozolewski <[email protected]>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -32,7 +32,7 @@ rhai = { version = "1.21", default-features = false, features = [
 bevy = { workspace = true, default-features = false, features = ["bevy_asset", "std"] }
 parking_lot = "0.12.1"
 smallvec = "1.11"
-itertools = "0.13"
+itertools = "0.14"
 profiling = { workspace = true }
 bevy_mod_scripting_derive = { workspace = true }
 fixedbitset = "0.5"

crates/bevy_mod_scripting_core/src/asset.rs

@@ -1,25 +1,24 @@
 //! Systems and resources for handling script assets and events
 
-use crate::{
-    commands::{CreateOrUpdateScript, DeleteScript},
-    error::ScriptError,
-    script::ScriptId,
-    IntoScriptPluginParams, ScriptingSystemSet,
-};
+use std::borrow::Cow;
+
 use bevy::{
     app::{App, PreUpdate},
     asset::{Asset, AssetEvent, AssetId, AssetLoader, AssetPath, Assets},
-    prelude::Resource,
     log::{debug, info, trace, warn},
+    platform::collections::HashMap,
     prelude::{
-        Commands, Event, EventReader, EventWriter, Res,
-        ResMut,
+        Commands, Event, EventReader, EventWriter, IntoScheduleConfigs, Res, ResMut, Resource,
     },
     reflect::TypePath,
-    platform::collections::HashMap,
 };
-use std::borrow::Cow;
-use bevy::prelude::IntoScheduleConfigs;
+
+use crate::{
+    commands::{CreateOrUpdateScript, DeleteScript},
+    error::ScriptError,
+    script::ScriptId,
+    IntoScriptPluginParams, ScriptingSystemSet,
+};
 
 /// Represents a scripting language. Languages which compile into another language should use the target language as their language.
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Default)]

crates/bevy_mod_scripting_core/src/commands.rs

@@ -1,5 +1,10 @@
 //! Commands for creating, updating and deleting scripts
 
+use std::{marker::PhantomData, sync::Arc};
+
+use bevy::{asset::Handle, ecs::entity::Entity, log::debug, prelude::Command};
+use parking_lot::Mutex;
+
 use crate::{
     asset::ScriptAsset,
     bindings::{ScriptValue, WorldGuard},
@@ -14,9 +19,6 @@ use crate::{
     script::{Script, ScriptId, Scripts, StaticScripts},
     IntoScriptPluginParams,
 };
-use bevy::{asset::Handle, ecs::entity::Entity, log::debug, prelude::Command};
-use parking_lot::Mutex;
-use std::{marker::PhantomData, sync::Arc};
 
 /// Deletes a script with the given ID
 pub struct DeleteScript<P: IntoScriptPluginParams> {
@@ -384,6 +386,7 @@ mod test {
         prelude::{Entity, World},
     };
 
+    use super::*;
     use crate::{
         asset::Language,
         bindings::script_value::ScriptValue,
@@ -393,8 +396,6 @@ mod test {
         script::Scripts,
     };
 
-    use super::*;
-
     fn setup_app() -> App {
         // setup all the resources necessary
         let mut app = App::new();

crates/bevy_mod_scripting_core/src/context.rs

@@ -1,13 +1,13 @@
 //! Traits and types for managing script contexts.
 
+use bevy::{ecs::entity::Entity, prelude::Resource};
+
 use crate::{
     bindings::{ThreadWorldContainer, WorldContainer, WorldGuard},
     error::{InteropError, ScriptError},
     script::ScriptId,
     IntoScriptPluginParams,
 };
-use bevy::ecs::{entity::Entity};
-use bevy::prelude::Resource;
 
 /// A trait that all script contexts must implement.
 ///

crates/bevy_mod_scripting_core/src/error.rs

@@ -1,15 +1,14 @@
 //! Errors that can occur when interacting with the scripting system
 
-use crate::{
-    bindings::{
-        access_map::{DisplayCodeLocation, ReflectAccessId},
-        function::namespace::Namespace,
-        pretty_print::DisplayWithWorld,
-        script_value::ScriptValue,
-        ReflectBaseType, ReflectReference,
-    },
-    script::ScriptId,
+use std::{
+    any::TypeId,
+    borrow::Cow,
+    fmt::{Debug, Display},
+    ops::Deref,
+    str::Utf8Error,
+    sync::Arc,
 };
+
 use bevy::{
     ecs::{
         component::ComponentId,
@@ -18,13 +17,16 @@ use bevy::{
     prelude::Entity,
     reflect::{PartialReflect, Reflect},
 };
-use std::{
-    any::TypeId,
-    borrow::Cow,
-    fmt::{Debug, Display},
-    ops::Deref,
-    str::Utf8Error,
-    sync::Arc,
+
+use crate::{
+    bindings::{
+        access_map::{DisplayCodeLocation, ReflectAccessId},
+        function::namespace::Namespace,
+        pretty_print::DisplayWithWorld,
+        script_value::ScriptValue,
+        ReflectBaseType, ReflectReference,
+    },
+    script::ScriptId,
 };
 
 /// An error with an optional script Context
@@ -1599,12 +1601,11 @@ impl Default for InteropErrorInner {
 mod test {
     use bevy::prelude::{AppTypeRegistry, World};
 
+    use super::*;
     use crate::bindings::{
         function::script_function::AppScriptFunctionRegistry, AppReflectAllocator, WorldGuard,
     };
 
-    use super::*;
-
     #[test]
     fn test_error_display() {
         let error =

crates/bevy_mod_scripting_core/src/event.rs

@@ -1,8 +1,9 @@
 //! Event handlers and event types for scripting.
 
-use crate::{bindings::script_value::ScriptValue, error::ScriptError, script::ScriptId};
 use bevy::{ecs::entity::Entity, prelude::Event, reflect::Reflect};
 
+use crate::{bindings::script_value::ScriptValue, error::ScriptError, script::ScriptId};
+
 /// An error coming from a script
 #[derive(Debug, Event)]
 pub struct ScriptErrorEvent {

crates/bevy_mod_scripting_core/src/extractors.rs

@@ -8,13 +8,12 @@ use bevy::ecs::{
     component::ComponentId,
     entity::Entity,
     event::{Event, EventCursor, EventIterator, Events},
+    prelude::Resource,
     query::{Access, AccessConflicts},
     storage::SparseSetIndex,
-    system::{Local, SystemParam, SystemState},
+    system::{Local, SystemParam, SystemParamValidationError, SystemState},
     world::World,
-    prelude::Resource,
 };
-use bevy::ecs::system::SystemParamValidationError;
 use fixedbitset::FixedBitSet;
 
 use crate::{
@@ -419,9 +418,9 @@ mod test {
         ecs::{
             component::Component,
             event::{Event, EventReader},
+            prelude::Resource,
             system::{Query, ResMut},
             world::FromWorld,
-            prelude::Resource,
         },
     };
     use test_utils::make_test_plugin;

crates/bevy_mod_scripting_core/src/handler.rs

@@ -1,4 +1,15 @@
 //! Contains the logic for handling script callback events
+use bevy::{
+    ecs::{
+        entity::Entity,
+        query::QueryState,
+        system::{Local, SystemState},
+        world::{Mut, World},
+    },
+    log::trace_once,
+    prelude::{Events, Ref, Resource},
+};
+
 use crate::{
     bindings::{
         pretty_print::DisplayWithWorld, script_value::ScriptValue, ThreadWorldContainer,
@@ -14,16 +25,6 @@ use crate::{
     script::{ScriptComponent, ScriptId},
     IntoScriptPluginParams,
 };
-use bevy::{
-    ecs::{
-        entity::Entity,
-        query::QueryState,
-        system::{Local, SystemState},
-        world::{Mut, World},
-    },
-    log::trace_once,
-    prelude::{Events, Ref, Resource},
-};
 
 /// A function that handles a callback event
 pub type HandlerFn<P> = fn(
@@ -295,6 +296,7 @@ mod test {
     use parking_lot::Mutex;
     use test_utils::make_test_plugin;
 
+    use super::*;
     use crate::{
         bindings::script_value::ScriptValue,
         context::{ContextBuilder, ContextLoadingSettings},
@@ -303,8 +305,6 @@ mod test {
         script::{Script, ScriptComponent, ScriptId, Scripts, StaticScripts},
         BMSScriptingInfrastructurePlugin,
     };
-
-    use super::*;
     struct OnTestCallback;
 
     impl IntoCallbackLabel for OnTestCallback {

crates/bevy_mod_scripting_core/src/lib.rs

@@ -2,7 +2,6 @@
 //!
 //! Contains language agnostic systems and types for handling scripting in bevy.
 
-use crate::event::ScriptErrorEvent;
 use asset::{
     configure_asset_systems, configure_asset_systems_for_plugin, Language, ScriptAsset,
     ScriptAssetLoader, ScriptAssetSettings,
@@ -24,6 +23,8 @@ use handler::{CallbackSettings, HandlerFn};
 use runtime::{initialize_runtime, Runtime, RuntimeContainer, RuntimeInitializer, RuntimeSettings};
 use script::{ScriptComponent, ScriptId, Scripts, StaticScripts};
 
+use crate::event::ScriptErrorEvent;
+
 pub mod asset;
 pub mod bindings;
 pub mod commands;

crates/bevy_mod_scripting_core/src/reflection_extensions.rs

@@ -1,14 +1,16 @@
 //! Various utility functions for working with reflection types.
 
-use crate::{
-    bindings::{ReflectReference, WorldGuard},
-    error::InteropError,
-};
-use bevy::reflect::{PartialReflect, Reflect, ReflectFromReflect, ReflectMut, TypeInfo};
 use std::{
     any::{Any, TypeId},
     cmp::max,
 };
+
+use bevy::reflect::{PartialReflect, Reflect, ReflectFromReflect, ReflectMut, TypeInfo};
+
+use crate::{
+    bindings::{ReflectReference, WorldGuard},
+    error::InteropError,
+};
 /// Extension trait for [`PartialReflect`] providing additional functionality for working with specific types.
 pub trait PartialReflectExt {
     /// Try to get a reference to the given key in an underyling map, if the type is a map.

crates/bevy_mod_scripting_core/src/runtime.rs

@@ -1,12 +1,13 @@
 //! "Runtime" here refers to the execution evironment of scripts. This might be the VM executing bytecode or the interpreter executing source code.
 //! The important thing is that there is only one runtime which is used to execute all scripts of a particular type or `context`.
 
-use crate::{error::ScriptError, IntoScriptPluginParams};
 use bevy::{
-    ecs::system::{ResMut},
+    ecs::system::ResMut,
     prelude::{Res, Resource},
 };
 
+use crate::{error::ScriptError, IntoScriptPluginParams};
+
 /// A trait that all script runtimes must implement.
 pub trait Runtime: Default + 'static + Send + Sync {}
 impl<T: Default + 'static + Send + Sync> Runtime for T {}

crates/bevy_mod_scripting_core/src/script.rs

@@ -1,11 +1,16 @@
 //! Script related types, functions and components
 
-use crate::{asset::ScriptAsset, IntoScriptPluginParams};
-use bevy::prelude::ReflectComponent;
-use bevy::{asset::Handle, prelude::Resource, reflect::Reflect};
-use parking_lot::Mutex;
 use std::{borrow::Cow, collections::HashMap, ops::Deref, sync::Arc};
-use bevy::platform::collections::HashSet;
+
+use bevy::{
+    asset::Handle,
+    platform::collections::HashSet,
+    prelude::{ReflectComponent, Resource},
+    reflect::Reflect,
+};
+use parking_lot::Mutex;
+
+use crate::{asset::ScriptAsset, IntoScriptPluginParams};
 
 /// A unique identifier for a script, by default corresponds to the path of the asset excluding the asset source.
 ///

crates/bevy_mod_scripting_derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_mod_scripting_derive"
-version = "0.12.0"
+version = "0.13.0"
 edition = "2021"
 authors = ["Maksymilian Mozolewski <[email protected]>"]
 license = "MIT OR Apache-2.0"