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_api_gen/src/bin/main.rs

@@ -1,11 +1,11 @@
 #![feature(rustc_private)]
 use std::{
-    collections::HashMap,
-    env,
-    fs::{create_dir_all, File},
-    io::{BufRead, Write},
-    path::{Path, PathBuf},
-    process::{Command, Stdio},
+	collections::HashMap,
+	env,
+	fs::{create_dir_all, File},
+	io::{BufRead, Write},
+	path::{Path, PathBuf},
+	process::{Command, Stdio},
 };
 
 use bevy_api_gen::*;

crates/bevy_api_gen/src/import_path.rs

@@ -1,8 +1,8 @@
 use indexmap::IndexMap;
 use log::trace;
 use rustc_hir::{
-    def::DefKind,
-    def_id::{CrateNum, DefId},
+	def::DefKind,
+	def_id::{CrateNum, DefId},
 };
 use rustc_middle::ty::TyCtxt;
 

crates/bevy_api_gen/src/lib.rs

@@ -36,5 +36,5 @@ pub use feature_graph::*;
 pub use meta::MetaLoader;
 pub use plugin::BevyAnalyzer;
 pub use template::{
-    configure_tera, extend_context_with_args, Collect, Crate, TemplateKind, TEMPLATE_DIR,
+	configure_tera, extend_context_with_args, Collect, Crate, TemplateKind, TEMPLATE_DIR,
 };

crates/bevy_api_gen/src/meta.rs

@@ -1,8 +1,8 @@
 use std::{
-    cell::RefCell,
-    collections::HashMap,
-    fs::File,
-    io::{BufReader, BufWriter, Write},
+	cell::RefCell,
+	collections::HashMap,
+	fs::File,
+	io::{BufReader, BufWriter, Write},
 };
 
 use cargo_metadata::camino::Utf8PathBuf;

crates/bevy_api_gen/src/modifying_file_loader.rs

@@ -1,9 +1,9 @@
 use std::{
-    io,
-    sync::{
-        atomic::{AtomicBool, Ordering},
-        Arc,
-    },
+	io,
+	sync::{
+		atomic::{AtomicBool, Ordering},
+		Arc,
+	},
 };
 
 use log::trace;

crates/bevy_api_gen/src/passes/cache_traits.rs

@@ -4,8 +4,8 @@ use rustc_middle::ty::TyCtxt;
 use rustc_span::Symbol;
 
 use crate::{
-    Args, BevyCtxt, DEF_PATHS_BMS_FROM_SCRIPT, DEF_PATHS_BMS_INTO_SCRIPT,
-    DEF_PATHS_GET_TYPE_REGISTRATION, DEF_PATHS_REFLECT, STD_SOURCE_TRAITS,
+	Args, BevyCtxt, DEF_PATHS_BMS_FROM_SCRIPT, DEF_PATHS_BMS_INTO_SCRIPT,
+	DEF_PATHS_GET_TYPE_REGISTRATION, DEF_PATHS_REFLECT, STD_SOURCE_TRAITS,
 };
 
 fn dump_traits(tcx: &TyCtxt) -> String{

crates/bevy_api_gen/src/passes/codegen.rs

@@ -3,8 +3,8 @@ use crate::{configure_tera, Args, BevyCtxt, TemplateKind};
 use log::info;
 use rustc_hir::def_id::LOCAL_CRATE;
 use std::{
-    fs::{self, File},
-    io::Write,
+	fs::{self, File},
+	io::Write,
 };
 use tera::Context;
 
@@ -44,15 +44,15 @@ pub(crate) fn codegen(ctxt: &mut BevyCtxt<'_>, args: &Args) -> bool {
 
 #[cfg(test)]
 mod tests {
-    use std::collections::HashSet;
+	use std::collections::HashSet;
 
-    use strum::VariantNames;
+	use strum::VariantNames;
 
-    use crate::TEMPLATE_DIR;
+	use crate::TEMPLATE_DIR;
 
-    use super::*;
+	use super::*;
 
-    #[test]
+	#[test]
     fn test_templates_exist() {
         let template_files: HashSet<&str> = TEMPLATE_DIR
             .files()

crates/bevy_api_gen/src/passes/find_methods_and_fields.rs

@@ -1,17 +1,18 @@
 use indexmap::IndexMap;
 use log::{info, trace};
+use syn::Attribute;
 use rustc_ast::Attribute;
 use rustc_hir::{
-    def_id::{DefId, LOCAL_CRATE},
-    Safety,
+	def_id::{DefId, LOCAL_CRATE},
+	Safety,
 };
 use rustc_infer::infer::TyCtxtInferExt;
 use rustc_middle::ty::{AdtKind, AssocKind, FieldDef, FnSig, Ty, TyCtxt, TyKind, TypingEnv};
 use rustc_span::Symbol;
 use rustc_trait_selection::infer::InferCtxtExt;
 
 use crate::{
-    Args, BevyCtxt, CachedTraits, FunctionContext, MetaLoader, ReflectType, ReflectionStrategy,
+	Args, BevyCtxt, CachedTraits, FunctionContext, MetaLoader, ReflectType, ReflectionStrategy,
 };
 
 /// Finds all methods and fields which can be wrapped on a proxy, stores them in sorted order.

crates/bevy_api_gen/src/passes/find_trait_impls.rs

@@ -3,8 +3,8 @@ use std::collections::HashMap;
 use log::trace;
 use rustc_hir::def_id::DefId;
 use rustc_infer::{
-    infer::{InferCtxt, TyCtxtInferExt},
-    traits::{Obligation, ObligationCause},
+	infer::{InferCtxt, TyCtxtInferExt},
+	traits::{Obligation, ObligationCause},
 };
 use rustc_middle::ty::{Ty, TypingEnv, TypingMode};
 use rustc_span::DUMMY_SP;

crates/bevy_api_gen/src/passes/populate_template_data.rs

@@ -1,16 +1,17 @@
 use std::{borrow::Cow, convert::identity};
 
 use log::{trace, warn};
+use syn::Attribute;
 use rustc_ast::Attribute;
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
 use rustc_middle::ty::{
-    AdtDef, FieldDef, GenericArg, GenericParamDefKind, TraitRef, Ty, TyKind, TypingEnv,
+	AdtDef, FieldDef, GenericArg, GenericParamDefKind, TraitRef, Ty, TyKind, TypingEnv,
 };
 use rustc_span::Symbol;
 
 use crate::{
-    Arg, Args, BevyCtxt, Field, Function, FunctionContext, Item, Output, ReflectType,
-    TemplateContext, Variant,
+	Arg, Args, BevyCtxt, Field, Function, FunctionContext, Item, Output, ReflectType,
+	TemplateContext, Variant,
 };
 /// Converts the BevyCtxt into simpler data that can be used in templates directly,
 /// Clears the BevyCtxt by clearing data structures after it uses them.

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/bindings/access_map.rs

@@ -3,9 +3,9 @@
 use std::hash::{BuildHasherDefault, Hasher};
 
 use bevy::{
-    ecs::{component::ComponentId, world::unsafe_world_cell::UnsafeWorldCell},
-    prelude::Resource,
-    platform::collections::{HashMap, HashSet},
+	ecs::{component::ComponentId, world::unsafe_world_cell::UnsafeWorldCell},
+	platform::collections::{HashMap, HashSet},
+	prelude::Resource,
 };
 use parking_lot::Mutex;
 use smallvec::SmallVec;
@@ -822,11 +822,11 @@ pub(crate) use with_global_access;
 
 #[cfg(test)]
 mod test {
-    use std::hash::Hash;
+	use std::hash::Hash;
 
-    use super::*;
+	use super::*;
 
-    #[test]
+	#[test]
     fn access_map_list_accesses() {
         let access_map = AccessMap::default();
 

crates/bevy_mod_scripting_core/src/bindings/allocator.rs

@@ -1,22 +1,22 @@
 //! An allocator used to control the lifetime of allocations
 
+use bevy::prelude::Resource;
 use bevy::{
-    app::{App, Plugin, PostUpdate},
-    diagnostic::{Diagnostic, DiagnosticPath, Diagnostics, RegisterDiagnostic},
-    ecs::system::{Res},
-    prelude::ResMut,
-    reflect::PartialReflect,
-    platform::collections::HashMap,
+	app::{App, Plugin, PostUpdate},
+	diagnostic::{Diagnostic, DiagnosticPath, Diagnostics, RegisterDiagnostic},
+	ecs::system::Res,
+	platform::collections::HashMap,
+	prelude::ResMut,
+	reflect::PartialReflect,
 };
 use parking_lot::{RwLock, RwLockReadGuard, RwLockWriteGuard};
 use std::{
-    cell::UnsafeCell,
-    cmp::Ordering,
-    fmt::{Display, Formatter},
-    hash::Hasher,
-    sync::{atomic::AtomicU64, Arc},
+	cell::UnsafeCell,
+	cmp::Ordering,
+	fmt::{Display, Formatter},
+	hash::Hasher,
+	sync::{atomic::AtomicU64, Arc},
 };
-use bevy::prelude::Resource;
 
 /// The path used for the total number of allocations diagnostic
 pub const ALLOCATOR_TOTAL_DIAG_PATH: DiagnosticPath =
@@ -261,9 +261,9 @@ impl Plugin for AllocatorDiagnosticPlugin {
 
 #[cfg(test)]
 mod test {
-    use super::*;
+	use super::*;
 
-    #[test]
+	#[test]
     fn test_reflect_allocator_garbage_clean() {
         let mut allocator = ReflectAllocator::default();
         let id = allocator.allocate(0);

crates/bevy_mod_scripting_core/src/bindings/function/arg_meta.rs

@@ -3,15 +3,15 @@
 use std::{ffi::OsString, path::PathBuf};
 
 use crate::{
-    bindings::{ReflectReference, ScriptValue},
-    docgen::TypedThrough, error::InteropError,
+	bindings::{ReflectReference, ScriptValue},
+	docgen::TypedThrough, error::InteropError,
 };
 
 use super::{
-    from::{FromScript, Mut, Ref, Union, Val},
-    into::IntoScript,
-    script_function::{DynamicScriptFunction, DynamicScriptFunctionMut, FunctionCallContext},
-    type_dependencies::GetTypeDependencies,
+	from::{FromScript, Mut, Ref, Union, Val},
+	into::IntoScript,
+	script_function::{DynamicScriptFunction, DynamicScriptFunctionMut, FunctionCallContext},
+	type_dependencies::GetTypeDependencies,
 };
 
 /// Marker trait for types that can be used as arguments to a script function.

crates/bevy_mod_scripting_core/src/bindings/function/from_ref.rs

@@ -1,13 +1,13 @@
 //! Contains the [`FromScriptRef`] trait and its implementations.
 
 use crate::{
-    bindings::{match_by_type, FromScript, WorldGuard},
-    error::InteropError,
-    reflection_extensions::TypeInfoExtensions,
-    ScriptValue,
+	bindings::{match_by_type, FromScript, WorldGuard},
+	error::InteropError,
+	reflection_extensions::TypeInfoExtensions,
+	ScriptValue,
 };
 use bevy::reflect::{
-    DynamicEnum, DynamicList, DynamicMap, DynamicTuple, DynamicVariant, Map, PartialReflect,
+	DynamicEnum, DynamicList, DynamicMap, DynamicTuple, DynamicVariant, Map, PartialReflect,
 };
 use std::{any::TypeId, ffi::OsString, path::PathBuf};
 

crates/bevy_mod_scripting_core/src/bindings/function/into.rs

@@ -5,8 +5,8 @@ use std::{borrow::Cow, collections::HashMap, ffi::OsString, path::PathBuf};
 
 use super::{DynamicScriptFunction, DynamicScriptFunctionMut, Union, Val};
 use crate::{
-    bindings::{ReflectReference, ScriptValue, WorldGuard},
-    error::InteropError,
+	bindings::{ReflectReference, ScriptValue, WorldGuard},
+	error::InteropError,
 };
 
 /// Converts a value into a [`ScriptValue`].