bump rust version for codegen

Author: makspll

.github/workflows/bevy_api_gen.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2024-01-24
+          toolchain: nightly-2024-05-20
           override: true
       - name: Rust Cache
         uses: Swatinem/[email protected]
@@ -54,7 +54,7 @@ jobs:
         with:
           profile: minimal
           components: rustfmt
-          toolchain: nightly-2024-01-24
+          toolchain: nightly-2024-05-20
           override: true
       - name: Rust Cache
         uses: Swatinem/[email protected]
@@ -77,7 +77,7 @@ jobs:
           rm -rf crates
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2024-01-24
+          toolchain: nightly-2024-05-20
           components: clippy
           override: true
       - name: Rust Cache
@@ -100,7 +100,7 @@ jobs:
           rm -rf crates
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2024-01-24
+          toolchain: nightly-2024-05-20
           override: true
       - name: Rust Cache
         uses: Swatinem/[email protected]
@@ -122,7 +122,7 @@ jobs:
           rm -rf crates
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2024-01-24
+          toolchain: nightly-2024-05-20
           override: true
       - name: Rust Cache
         uses: Swatinem/[email protected]

check.sh

@@ -4,7 +4,7 @@ CURRENT_DIR=$(basename "$PWD")
 
 
 if [[ "$CURRENT_DIR" == "bevy_api_gen" ]]; then
-    cargo clippy --all-targets --message-format=json 
+    cargo +nightly-2024-05-20 clippy --all-targets --message-format=json 
 else
     cargo clippy --workspace --all-targets --message-format=json --features="lua54 lua_script_api rhai rhai_script_api teal rune bevy/file_watcher bevy/multi_threaded"
 fi

crates/bevy_api_gen/Cargo.toml

@@ -37,13 +37,13 @@ source = "discover"
 rustc_private = true
 
 [rust-analyzer.check]
-overrideCommand = ["cargo", "+nightly-2024-01-24", "a", "--message-format=json"]
+overrideCommand = ["cargo", "+nightly-2024-05-20", "a", "--message-format=json"]
 
 
 [dependencies]
 log = "0.4"
 env_logger = "0.11"
-rustc_plugin = "=0.9.0-nightly-2024-01-24"
+rustc_plugin = "=0.10.0-nightly-2024-05-20"
 indexmap = "2"
 tempdir = "0.3"
 cargo_metadata = "0.18"

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-05-20 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-05-20 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-05-20/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-05-20 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-05-20 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-05-20 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-05-20 bevy-api-gen print item.tera
 ```

crates/bevy_api_gen/rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
 components = ["clippy", "rust-src", "rustc-dev", "llvm-tools"]
-channel = "nightly-2024-01-24"
+channel = "nightly-2024-05-20"

crates/bevy_api_gen/src/feature_graph.rs

@@ -2,7 +2,7 @@ use std::collections::{HashMap, HashSet};
 
 use cargo_metadata::{DependencyKind, Metadata, Package};
 use itertools::{Either, Itertools};
-use log::{debug, info};
+use log::debug;
 
 #[derive(Clone, Debug)]
 pub enum FeatureEffect {

crates/bevy_api_gen/src/modifying_file_loader.rs

@@ -21,10 +21,11 @@ impl FileLoader for ModifyingFileLoader {
                 path.to_str().unwrap()
             );
             RealFileLoader.read_file(path).map(|mut f| {
-                if !f.contains("extern crate mlua") {
+                // we make it pub so in case we are re-exporting this crate we won't run into private re-export issues
+                if !f.contains("pub extern crate mlua") {
                     f.push_str("#[allow(unused_extern_crates)] extern crate mlua;");
                 }
-                if !f.contains("extern crate bevy_reflect") {
+                if !f.contains("pub extern crate bevy_reflect") {
                     f.push_str("#[allow(unused_extern_crates)] extern crate bevy_reflect;");
                 }
                 f

crates/bevy_api_gen/src/passes/find_methods_and_fields.rs

@@ -3,7 +3,7 @@ use log::{info, trace};
 use rustc_ast::Attribute;
 use rustc_hir::{
     def_id::{DefId, LOCAL_CRATE},
-    Unsafety,
+    Safety,
 };
 use rustc_infer::infer::TyCtxtInferExt;
 use rustc_middle::ty::{AdtKind, AssocKind, FieldDef, FnSig, ParamEnv, Ty, TyCtxt, TyKind};
@@ -135,7 +135,7 @@ pub(crate) fn find_methods_and_fields(ctxt: &mut BevyCtxt<'_>, _args: &Args) ->
                         }
                     };
 
-                    let is_unsafe = sig.unsafety == Unsafety::Unsafe;
+                    let is_unsafe = sig.safety == Safety::Unsafe;
 
                     if trait_did.is_none() && !ctxt.tcx.visibility(fn_did).is_public() {
                         log::info!(

makefile

@@ -21,7 +21,7 @@ PACKAGE=bevy_mod_scripting
 TEST_NAME=
 # # valgrind outputs a callgrind.out.<pid>. We can analyze this with kcachegrind
 # kcachegrind
-NIGHTLY_VERSION=nightly-2024-01-24
+NIGHTLY_VERSION=nightly-2024-05-20
 BEVY_VERSION=0.14.2
 GLAM_VERSION=0.28.0
 CODEGEN_PATH=${PWD}/target/codegen
@@ -48,6 +48,7 @@ valgrind:
 
 install_bevy_api_gen:
 	rustup install ${NIGHTLY_VERSION}
+	rustup component add rust-src rustc-dev llvm-tools-preview --toolchain ${NIGHTLY_VERSION}
 	cargo +${NIGHTLY_VERSION} install --path ./crates/bevy_api_gen
 
 prepare_api_gen: