Merge branch 'main' into feature/bevy-system-refactor

Author: makspll

crates/bevy_api_gen/Cargo.toml

@@ -36,12 +36,11 @@ source = "discover"
 [package.metadata.rust-analyzer]
 rustc_private = true
 
-
 [dependencies]
-rustc_plugin = { git = "https://github.com/makspll/rustc_plugin", branch = "feature/rust-1.82.0" }
-indexmap = "2"
 log = "0.4"
 env_logger = "0.11"
+rustc_plugin = { git = "https://github.com/makspll/rustc_plugin", branch = "feature/rust-1.82.0" }
+indexmap = "2"
 tempdir = "0.3"
 cargo_metadata = "0.18"
 serde_json = "1"

crates/bevy_api_gen/readme.md

@@ -8,7 +8,7 @@ bevy_api_gen is a Cargo plugin that generates reflection-powered wrappers for Be
 To install bevy_api_gen, use the following command:
 
 ```bash
-cargo +nightly-2024-01-24 install bevy_api_gen
+cargo +nightly-2024-11-05 install bevy_api_gen
 ```
 
 # Usage
@@ -18,39 +18,39 @@ cargo +nightly-2024-01-24 install bevy_api_gen
 To run the main codegen process, use the following command:
 
 ```bash
-cargo +nightly-2024-01-24 bevy-api-gen generate
+cargo +nightly-2024-11-05 bevy-api-gen generate
 ```
 
-This will perform all parts of the process and generate meta as well as .rs files for each crate in your workspace in your `/target/plugin-nightly-2024-01-24/bevy_api_gen` directory
+This will perform all parts of the process and generate meta as well as .rs files for each crate in your workspace in your `/target/plugin-nightly-2024-11-05/bevy_api_gen` directory
 
 ## Collect
 
 After generating all the files, you can 'collect' them in a mod.rs file like so:
 
 ```bash
-cargo +nightly-2024-01-24 bevy-api-gen collect
+cargo +nightly-2024-11-05 bevy-api-gen collect
 ```
 
 ## List Types
 
 To see a list of all `Reflect` implementing types in your workspace run:
 
 ```bash
-cargo +nightly-2024-01-24 bevy-api-gen list-types > all_types.txt
+cargo +nightly-2024-11-05 bevy-api-gen list-types > all_types.txt
 ```
 
 ## List Templates
 
 To see the list of all templates which you can override use:
 
 ```bash
-cargo +nightly-2024-01-24 bevy-api-gen list-templates
+cargo +nightly-2024-11-05 bevy-api-gen list-templates
 ```
 
 ## Print Template
 
 You can also print any of the templates to stdout:
 
 ```bash
-cargo +nightly-2024-01-24 bevy-api-gen print item.tera
+cargo +nightly-2024-11-05 bevy-api-gen print item.tera
 ```

crates/bevy_api_gen/src/bin/main.rs

@@ -1,5 +1,4 @@
 #![feature(rustc_private)]
-
 use std::{
     collections::HashMap,
     env,

crates/bevy_api_gen/src/context.rs

@@ -139,13 +139,13 @@ impl CachedTraits {
             .all(|t| self.std_source_traits.contains_key(*t))
     }
 
-    pub(crate) fn missing_std_source_traits(&self) -> Vec<String> {
-        STD_SOURCE_TRAITS
-            .iter()
-            .filter(|t| !self.std_source_traits.contains_key(**t))
-            .map(|s| (*s).to_owned())
-            .collect()
-    }
+    // pub(crate) fn missing_std_source_traits(&self) -> Vec<String> {
+    //     STD_SOURCE_TRAITS
+    //         .iter()
+    //         .filter(|t| !self.std_source_traits.contains_key(**t))
+    //         .map(|s| (*s).to_owned())
+    //         .collect()
+    // }
 }
 
 #[derive(Clone, Debug)]

crates/bevy_api_gen/src/lib.rs

@@ -1,16 +1,14 @@
 #![feature(rustc_private, let_chains)]
 #![deny(rustc::internal)]
+
 extern crate rustc_ast;
 extern crate rustc_const_eval;
 extern crate rustc_driver;
 extern crate rustc_errors;
 extern crate rustc_hir;
-extern crate rustc_hir_analysis;
 extern crate rustc_infer;
 extern crate rustc_interface;
-extern crate rustc_lint;
 extern crate rustc_middle;
-extern crate rustc_session;
 extern crate rustc_span;
 extern crate rustc_trait_selection;
 

crates/bevy_api_gen/src/meta.rs

@@ -116,7 +116,7 @@ impl MetaLoader {
         let cache = self.cache.borrow();
         if cache.contains_key(crate_name) {
             trace!("Loading meta from cache for: {}", crate_name);
-            return cache.get(crate_name).cloned();
+            cache.get(crate_name).cloned()
         } else {
             trace!("Loading meta from filesystem for: {}", crate_name);
             drop(cache);

crates/bevy_api_gen/src/passes/find_methods_and_fields.rs

@@ -386,7 +386,7 @@ fn type_is_supported_as_non_proxy_return_val<'tcx>(
 ) -> bool {
     trace!("Checkign type is supported as non proxy return val: '{ty:?}' with param_env: '{param_env:?}'");
     if let TyKind::Ref(region, _, _) = ty.kind() {
-        if !region.get_name().is_some_and(|rn| rn.as_str() == "'static") {
+        if region.get_name().is_none_or(|rn| rn.as_str() != "'static") {
             return false;
         }
     }

crates/bevy_api_gen/src/template.rs

@@ -199,9 +199,8 @@ pub(crate) fn configure_tera_env(tera: &mut Tera, crate_name: &str) {
 
             let file = syn::parse_file(&str)
                 .map_err(|e| tera::Error::msg(e.to_string()))
-                .map_err(|e| {
+                .inspect_err(|_| {
                     log::error!("prettyplease error on input: ```\n{}\n```", str);
-                    e
                 })?;
 
             let out = prettyplease::unparse(&file);

crates/bevy_mod_scripting_core/Cargo.toml

@@ -25,6 +25,7 @@ mlua_impls = ["mlua"]
 [dependencies]
 mlua = { version = "0.9", optional = true }
 bevy = { workspace = true, default-features = false, features = ["bevy_asset"] }
+
 thiserror = "1.0.31"
 paste = "1.0.7"
 parking_lot = "0.12.1"

crates/languages/bevy_mod_scripting_lua/src/assets.rs

@@ -4,6 +4,7 @@
 //     utils::BoxedFuture,
 // };
 
+
 // use anyhow::Error;
 
 // #[derive(Asset, TypePath, Debug)]
@@ -145,6 +146,7 @@
 //         Ok(LuaFile { bytes })
 //     }
 
+
 //     #[cfg(feature = "teal")]
 //     fn extensions(&self) -> &[&str] {
 //         &["lua", "tl"]

crates/languages/bevy_mod_scripting_lua/src/docs.rs

@@ -97,7 +97,24 @@ impl DocumentationFragment for LuaDocumentationFragment {
         // fixes bug in tealr which causes syntax errors in teal due to duplicate fields (from having both getters and setters)
         tw.given_types.iter_mut().for_each(|tg| {
             if let TypeGenerator::Record(rg) = tg {
+                rg.fields
+                    .sort_by(|f1, f2| f1.name.deref().cmp(f2.name.deref()));
                 rg.fields.dedup_by(|a, b| a.name == b.name);
+                rg.static_fields
+                    .sort_by(|f1, f2| f1.name.deref().cmp(f2.name.deref()));
+                rg.static_fields.dedup_by(|a, b| a.name == b.name);
+                for field in rg.fields.iter_mut().chain(rg.static_fields.iter_mut()) {
+                    escape_name(&mut field.name);
+                }
+                for func in rg
+                    .functions
+                    .iter_mut()
+                    .chain(rg.mut_functions.iter_mut())
+                    .chain(rg.methods.iter_mut())
+                    .chain(rg.mut_methods.iter_mut())
+                {
+                    escape_name(&mut func.name);
+                }
             }
         });
 
@@ -148,3 +165,36 @@ impl DocumentationFragment for LuaDocumentationFragment {
         Ok(())
     }
 }
+
+/// Escapes a name of a table field, if that table field is a reserved keyword.
+///
+/// ## Background
+///
+/// String keys in a Lua table are allowed to be anything, even reserved
+/// keywords. By default when tealr generates the type definition for a table
+/// field, the string it generates is `{name} : {type}`. This causes a syntax
+/// error when writing a bare keyword, since `nil : {type}` is considered trying
+/// to add a type to the *value* nil (which is invalid).
+///
+/// To get around this tealr allows us to escape table fields using the
+/// `["{name}"] : {value}` syntax. This function detects if a name is one of the
+/// Lua reserved words and fixes it if so.
+fn escape_name(raw: &mut NameContainer) {
+    // List of Lua reserved keywords
+    const KEYWORD_FIELDS: &[&str] = &[
+        "false", "true", "nil", // Values
+        "and", "not", "or", // Operators
+        "if", "then", "else", "elseif", "end", // If-Else
+        "for", "in", "break", "do", "repeat", "until", "while", // Loops
+        "function", "return", // Funcs
+        "local",  // Declarations
+        "record", // Teal extra
+    ];
+    let Ok(name) = str::from_utf8(raw) else {
+        return;
+    };
+    if KEYWORD_FIELDS.contains(&name) {
+        let mapped = format!("[\"{name}\"]");
+        *raw = NameContainer::from(Cow::Owned(mapped));
+    }
+}